From 7f1253ed112d318a25c22b267354b94af599af38 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 15 Nov 2013 15:44:23 +0000 Subject: Still use page_display.tpl for pages. --- mod/page.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mod/page.php b/mod/page.php index 403016eb2..38f40ddd6 100644 --- a/mod/page.php +++ b/mod/page.php @@ -112,7 +112,16 @@ function page_content(&$a) { xchan_query($r); $r = fetch_post_tags($r,true); - $o .= prepare_body($r[0],true); - return $o; + $body = prepare_body($r[0],true); + + return $o . replace_macros(get_markup_template('page_display.tpl'),array( + '$author' => (($naked) ? '' : $item['author']['xchan_name']), + '$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), + '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), + '$title' => smilies(bbcode($item['title'])), + '$body' => $body + )); } + + -- cgit v1.2.3 From 733cb37ef14eb4dd5408e1a8c453f13cd41952eb Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 15 Nov 2013 19:23:00 +0000 Subject: Copy paste from one terminal to another changed tab to whitespace. --- mod/page.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mod/page.php b/mod/page.php index 38f40ddd6..fdb8ee38f 100644 --- a/mod/page.php +++ b/mod/page.php @@ -115,13 +115,13 @@ function page_content(&$a) { $body = prepare_body($r[0],true); - return $o . replace_macros(get_markup_template('page_display.tpl'),array( - '$author' => (($naked) ? '' : $item['author']['xchan_name']), - '$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), - '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), - '$title' => smilies(bbcode($item['title'])), - '$body' => $body - )); + return $o . replace_macros(get_markup_template('page_display.tpl'),array( + '$author' => (($naked) ? '' : $item['author']['xchan_name']), + '$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), + '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), + '$title' => smilies(bbcode($item['title'])), + '$body' => $body + )); } -- cgit v1.2.3 From 48610a85dc2954074b2123b090207dcb4a4ab2be Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 11:25:20 +0100 Subject: make empty notes saveable as well --- mod/notes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/notes.php b/mod/notes.php index ce3460aa4..468b4ef26 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -6,11 +6,11 @@ function notes_init(&$a) { logger('mod_notes: ' . print_r($_REQUEST,true)); $ret = array('success' => true); - if($_REQUEST['note_text']) { + if($_REQUEST['note_text'] || $_REQUEST['note_text'] == '') { $body = escape_tags($_REQUEST['note_text']); set_pconfig(local_user(),'notes','text',$body); } logger('notes saved.'); json_return_and_die($ret); -} \ No newline at end of file +} -- cgit v1.2.3 From 1d8c15f2df45387993624a8217b648ac10491344 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 12:01:28 +0100 Subject: make suggest channels a feature --- include/features.php | 1 + include/widgets.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/features.php b/include/features.php index 05206106a..978d7af8a 100644 --- a/include/features.php +++ b/include/features.php @@ -49,6 +49,7 @@ function get_features() { array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), array('affinity', t('Affinity Tool'), t('Filter stream activity by depth of relationships')), + array('suggest', t('Suggest Channels'), t('Show channel suggestions')), ), // Item tools diff --git a/include/widgets.php b/include/widgets.php index cea5a6ce2..6d258d101 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -57,6 +57,9 @@ function widget_collections($args) { function widget_suggestions($arr) { + if((! local_user()) || (! feature_enabled(local_user(),'suggest'))) + return ''; + require_once('include/socgraph.php'); $r = suggestion_query(local_user(),get_observer_hash(),0,20); @@ -330,4 +333,4 @@ function widget_tagcloud_wall($arr) { if(feature_enabled($a->profile['profile_uid'],'tagadelic')) return tagblock('search',$a->profile['profile_uid'],$limit,$a->profile['channel_hash'],ITEM_WALL); return ''; -} \ No newline at end of file +} -- cgit v1.2.3 From d93ba783f54cf862bd91b231b7a9f7a19c657675 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 11 Dec 2013 15:35:19 +0000 Subject: Don't let nobody set an xconfig in safe search. --- include/dir_fns.php | 3 ++- mod/toggle_safesearch.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 0c9a6bd9f..02e8186b7 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -22,7 +22,8 @@ function dir_sort_links() { function dir_safe_mode() { $observer = get_observer_hash(); - +if (! $observer) + return; if ($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); if($safe_mode === '0') diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php index 5fb18f694..3c800c4f3 100644 --- a/mod/toggle_safesearch.php +++ b/mod/toggle_safesearch.php @@ -3,6 +3,8 @@ function toggle_safesearch_init(&$a) { $observer = get_observer_hash(); +if (! $observer) + return; if($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); -- cgit v1.2.3 From aea1e1af82ab2f76f0d8a421ff101316421cbd84 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 18:57:42 +0100 Subject: this makes quotes appear as quotes in notes once page is reloaded. i guess thats fine since we use escape_tags() in notes.php --- include/widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/widgets.php b/include/widgets.php index 6d258d101..abbe1e2e0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -146,7 +146,7 @@ function widget_notes($arr) { if(! feature_enabled(local_user(),'private_notes')) return ''; - $text = htmlspecialchars(get_pconfig(local_user(),'notes','text')); + $text = get_pconfig(local_user(),'notes','text'); $o = replace_macros(get_markup_template('notes.tpl'), array( '$banner' => t('Notes'), -- cgit v1.2.3 From 1add7d381d67708fe4b85fee3a7022e361f704ce Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 19:05:50 +0100 Subject: this saves notes on the fly. i think this is appropriate behavior for a notes widget. btw... one would get mad at oneself if noting something important and forget to save it. with this behavior one can at least get mad at the developer if something goes wrong :) --- view/tpl/notes.tpl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index 7300779f4..09932e545 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,13 +1,10 @@

{{$banner}}

- -
-- cgit v1.2.3 From 88761ec9ecf46dd3a3468fbff8a83651480c2a22 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 20:02:17 +0100 Subject: we dont use doubble tagging in /network and /channel anymore... remove it from /search as well --- view/tpl/search_item.tpl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 3018fc747..c5acfa4a4 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -29,13 +29,7 @@
{{$item.title}}
-
{{$item.body}} -
- {{foreach $item.tags as $tag}} - {{$tag}} - {{/foreach}} -
-
+
{{$item.body}}
-- cgit v1.2.3 From dd7fea10c1b70534b76bc4d5ea044187cd4cb77b Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 21:28:42 +0100 Subject: split out widgets.css --- view/css/widgets.css | 98 +++++++++++++++++++++++++++++++++ view/php/theme_init.php | 1 + view/theme/redbasic/css/style.css | 112 +++++++++++--------------------------- 3 files changed, 132 insertions(+), 79 deletions(-) create mode 100644 view/css/widgets.css diff --git a/view/css/widgets.css b/view/css/widgets.css new file mode 100644 index 000000000..3eb72eafc --- /dev/null +++ b/view/css/widgets.css @@ -0,0 +1,98 @@ +.widget { + padding: 8px; + margin-top: 5px; +} + +/* suggest */ + +.suggest-widget-more { + margin-top: 10px; +} + +/* follow */ + +#side-follow-url { + margin-top: 5px; +} + +#side-follow-submit { + margin-top: 15px; +} + +/* notes */ + +#note-text { + width: 190px; + max-width: 190px; + height: 150px; +} + +#note-save { + margin-top: 10px; +} + +/* saved searches */ + +.saved-search-li { + margin-top: 3px; +} + +.saved-search-li i { + opacity: 0; +} + +.saved-search-li:hover i { + opacity: 1; +} + +.savedsearchdrop { + opacity: 0; +} + +/* fileas */ + +.fileas-ul li { + margin-top: 10px; +} + +.fileas-link { + margin-left: 24px; +} + +.fileas-all { + margin-left: 0px; +} + +/* posted date */ + +#datebrowse-sidebar select { + margin-left: 25px; + opacity: 0.3; + filter:alpha(opacity=30); +} + +#datebrowse-sidebar select:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#posted-date-selector { + margin-left: 30px !important; + margin-top: 5px !important; + margin-right: 0px !important; + margin-bottom: 0px !important; +} + +/* categories */ + +.categories-ul li { + margin-top: 10px; +} + +.categories-link { + margin-left: 24px; +} + +.categories-all { + margin-left: 0px; +} diff --git a/view/php/theme_init.php b/view/php/theme_init.php index a2024d658..e1625b3e5 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -13,6 +13,7 @@ head_add_css('library/colorbox/colorbox.css'); // head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/bootstrap-red.css'); +head_add_css('view/css/widgets.css'); head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e13bc1edb..d716680ce 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -331,7 +331,8 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .search-selected, .active { +/*TODO: we should use .active class for all this, nets-selected probably obsolete */ +.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -671,36 +672,6 @@ footer { box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } - -#datebrowse-sidebar select { - margin-left: 25px; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - opacity: 0.3; - filter:alpha(opacity=30); -} - -#datebrowse-sidebar select:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -#posted-date-selector { - margin-left: 30px !important; - margin-top: 5px !important; - margin-right: 0px !important; - margin-bottom: 0px !important; -} - -#posted-date-selector:hover { - box-shadow: 4px 4px 3px 0 #444444; - margin-left: 25px !important; - margin-top: 0px !important; - margin-right: 5px !important; - margin-bottom: 5px !important; - -} - #side-bar-photos-albums { margin-top: 15px; } @@ -777,17 +748,16 @@ footer { width: 12px; } -#sidebar-group-list li, -.saved-search-li { +#sidebar-group-list li { margin-top: 3px; } - -.nets-ul, .fileas-ul, .categories-ul { +/* might be obsolete +.nets-ul { list-style-type: none; } -.nets-ul li, .fileas-ul li, .categories-ul li { +.nets-ul li { margin-top: 10px; } @@ -797,14 +767,7 @@ footer { .nets-all { margin-left: 42px; } - -.fileas-link, .categories-link { - margin-left: 24px; -} - -.fileas-all, .categories-all { - margin-left: 0px; -} +*/ #search-save { margin-left: 5px; @@ -813,20 +776,6 @@ footer { margin-right: 10px; } -#saved-search-ul { - list-style-type: none; -} - -.saved-search-li i { - opacity: 0; -} - -.saved-search-li:hover i { - opacity: 1; -} - - - .savedsearchterm { margin-left: 10px; } @@ -835,7 +784,8 @@ footer { #side-follow-wrapper { margin-top: 20px; } -#side-follow-url, #side-peoplefind-url { + +#side-peoplefind-url { margin-top: 5px; } @@ -851,7 +801,7 @@ footer { font-family: FontAwesome; } -#side-follow-submit, #side-peoplefind-submit { +#side-peoplefind-submit { margin-top: 15px; } @@ -860,7 +810,7 @@ footer { } -.widget, .pmenu { +.pmenu { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; @@ -1679,12 +1629,6 @@ div.jGrowl div.info { text-overflow: ellipsis; } -#datebrowse-sidebar select { - margin-left: 25px; -} - - - .jslider .jslider-scale ins { color: #333; font-size: $body_font_size; @@ -2255,8 +2199,7 @@ text-decoration: none; list-style-type: none; } -.group-edit-icon, -.savedsearchdrop { +.group-edit-icon { opacity: 0; } @@ -2395,8 +2338,6 @@ img.mail-list-sender-photo { max-width: $converse_width; } -/* conv_item */ - .wall-item-content-wrapper { border-radius: $radiuspx; background-color: $item_colour; @@ -2500,8 +2441,6 @@ img.mail-list-sender-photo { color: $toolicon_colour; } -/* comment_item */ - .my-comment-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; @@ -2538,14 +2477,29 @@ img.mail-list-sender-photo { .comment-edit-text-full { color: black; } -.suggest-widget-more { margin-top: 10px; } +/* widgets */ -#note-text { - width: 190px; - max-width: 190px; - height: 150px; +.widget { + border-bottom: 1px solid #eec; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +#saved-search-ul { + list-style-type: none; } -#note-save { margin-top: 10px; } +.fileas-ul { + list-style-type: none; +} +#datebrowse-sidebar select { + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + +.categories-ul { + list-style-type: none; +} -- cgit v1.2.3 From 169266b4547460296355b63c06dd0643667093d0 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 21:46:03 +0100 Subject: unify styling a little --- view/css/widgets.css | 18 +++--------------- view/theme/redbasic/css/style.css | 7 +++++++ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index 3eb72eafc..117751e43 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -66,21 +66,9 @@ /* posted date */ #datebrowse-sidebar select { - margin-left: 25px; - opacity: 0.3; - filter:alpha(opacity=30); -} - -#datebrowse-sidebar select:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -#posted-date-selector { - margin-left: 30px !important; - margin-top: 5px !important; - margin-right: 0px !important; - margin-bottom: 0px !important; + width: 190px; + max-width: 190px; + height: 150px; } /* categories */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d716680ce..ce13fa94c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2487,6 +2487,12 @@ img.mail-list-sender-photo { border-radius: $radiuspx; } +#note-text { + border: 1px solid #ccc; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + #saved-search-ul { list-style-type: none; } @@ -2496,6 +2502,7 @@ img.mail-list-sender-photo { } #datebrowse-sidebar select { + border: 1px solid #ccc; border-radius: $radiuspx; -moz-border-radius: $radiuspx; } -- cgit v1.2.3 From ebc788a69af4ee93bf683a856ac02956d413aec8 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 22:02:46 +0100 Subject: also add group widget to widgets.css --- view/css/widgets.css | 28 ++++++++++++++++++++++++++++ view/theme/redbasic/css/style.css | 36 +++++------------------------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index 117751e43..2008b10e0 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -45,6 +45,10 @@ opacity: 1; } +.savedsearchterm { + margin-left: 10px; +} + .savedsearchdrop { opacity: 0; } @@ -84,3 +88,27 @@ .categories-all { margin-left: 0px; } + +/* group */ + +#group-sidebar { + margin-bottom: 10px; +} + +#sidebar-group-list .icon, #sidebar-group-list .iconspacer { + display: inline-block; + height: 12px; + width: 12px; +} + +#sidebar-group-list li { + margin-top: 3px; +} + +.groupsideedit { + margin-right: 10px; +} + +.group-edit-icon { + opacity: 0; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ce13fa94c..4df791e73 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -327,11 +327,7 @@ footer { margin-bottom: 15px; } -#group-sidebar { - margin-bottom: 10px; -} - -/*TODO: we should use .active class for all this, nets-selected probably obsolete */ +/*TODO: we should use .selected class for all this, nets-selected probably obsolete */ .group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -738,20 +734,6 @@ footer { #netsearch-box { margin-bottom: 5px; } -#sidebar-group-list ul { - list-style-type: none; -} - -#sidebar-group-list .icon, #sidebar-group-list .iconspacer { - display: inline-block; - height: 12px; - width: 12px; -} - -#sidebar-group-list li { - margin-top: 3px; -} - /* might be obsolete .nets-ul { list-style-type: none; @@ -772,14 +754,6 @@ footer { #search-save { margin-left: 5px; } -.groupsideedit { - margin-right: 10px; -} - -.savedsearchterm { - margin-left: 10px; -} - #side-follow-wrapper { margin-top: 20px; @@ -2199,10 +2173,6 @@ text-decoration: none; list-style-type: none; } -.group-edit-icon { - opacity: 0; -} - .admin-icons { color: $toolicon_colour; margin-right: 10px; @@ -2510,3 +2480,7 @@ img.mail-list-sender-photo { .categories-ul { list-style-type: none; } + +#sidebar-group-list ul { + list-style-type: none; +} -- cgit v1.2.3 From e8821d78d517c838a630766bfc3bafb145a6be15 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 22:11:06 +0100 Subject: .selected is in use for something else already --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4df791e73..fa5bf51ef 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -327,7 +327,7 @@ footer { margin-bottom: 15px; } -/*TODO: we should use .selected class for all this, nets-selected probably obsolete */ +/*TODO: we should use one class for all this, nets-selected probably obsolete */ .group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } -- cgit v1.2.3 From 1fa4133d430d2cb2753a9fd7e6bf9bfcdc35659b Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 23:52:34 +0100 Subject: this is not needed anymore --- view/css/widgets.css | 4 ---- view/tpl/saved_searches.tpl | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index 2008b10e0..a95152888 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -49,10 +49,6 @@ margin-left: 10px; } -.savedsearchdrop { - opacity: 0; -} - /* fileas */ .fileas-ul li { diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index bdff72ba1..d0f9e2b0e 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@
    {{foreach $saved as $search}}
  • - + {{$search.displayterm}}
    • {{/foreach}} -- cgit v1.2.3 From 40e2900326a25ba0e2feedb802d38b7052b194cc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 14:54:36 -0800 Subject: comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using. --- include/identity.php | 7 +- mod/common.php | 8 -- mod/crepair.php | 171 -------------------------------------- mod/hcard.php | 53 ------------ mod/profile_photo.php | 10 --- mod/profiles.php | 11 --- mod/profperm.php | 9 -- mod/viewconnections.php | 11 --- version.inc | 2 +- view/css/mod_connections.css | 50 ----------- view/pdl/mod_common.pdl | 3 + view/pdl/mod_profile_photo.pdl | 3 + view/pdl/mod_profiles.pdl | 3 + view/pdl/mod_profperm.pdl | 3 + view/pdl/mod_viewconnections.pdl | 3 + view/theme/redbasic/css/style.css | 52 ++++++++++++ 16 files changed, 74 insertions(+), 325 deletions(-) delete mode 100644 mod/crepair.php delete mode 100644 mod/hcard.php create mode 100644 view/pdl/mod_common.pdl create mode 100644 view/pdl/mod_profile_photo.pdl create mode 100644 view/pdl/mod_profiles.pdl create mode 100644 view/pdl/mod_profperm.pdl create mode 100644 view/pdl/mod_viewconnections.pdl diff --git a/include/identity.php b/include/identity.php index b25594c87..6bbf193c1 100644 --- a/include/identity.php +++ b/include/identity.php @@ -655,6 +655,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { } } + if((x($profile,'address') == 1) || (x($profile,'locality') == 1) || (x($profile,'region') == 1) @@ -666,6 +667,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) { + $block = true; + } + if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) { $location = $pdesc = $gender = $marital = $homepage = False; } @@ -688,7 +693,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $channel_menu = menu_render($m); } $menublock = get_pconfig($profile['uid'],'system','channel_menublock'); - if ($menublock) { + if ($menublock && (! $block)) { require_once('include/comanche.php'); $channel_menu .= comanche_block($menublock); } diff --git a/mod/common.php b/mod/common.php index 4afaf37eb..e19a9d3a9 100644 --- a/mod/common.php +++ b/mod/common.php @@ -21,14 +21,6 @@ function common_init(&$a) { } -function common_aside(&$a) { - if(! $a->profile['profile_uid']) - return; - - profile_create_sidebar($a); -} - - function common_content(&$a) { $o = ''; diff --git a/mod/crepair.php b/mod/crepair.php deleted file mode 100644 index f749fac0e..000000000 --- a/mod/crepair.php +++ /dev/null @@ -1,171 +0,0 @@ -argc == 2) && intval($a->argv[1])) { - $contact_id = intval($a->argv[1]); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1", - intval(local_user()), - intval($contact_id) - ); - if(! count($r)) { - $contact_id = 0; - } - } - - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - - if($contact_id) { - $a->data['contact'] = $r[0]; - $o .= '
    '; - $o .= '
    ' . $a->data['contact']['name'] . '
    '; - $o .= '
    ' . $a->data['contact']['name'] . '
    '; - $o .= '
    '; - $a->page['aside'] .= $o; - - } -} - - -function crepair_post(&$a) { - if(! local_user()) - return; - - $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0); - - if($cid) { - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($cid), - intval(local_user()) - ); - } - - if(! count($r)) - return; - - $contact = $r[0]; - - $name = ((x($_POST,'name')) ? $_POST['name'] : $contact['name']); - $nick = ((x($_POST,'nick')) ? $_POST['nick'] : ''); - $url = ((x($_POST,'url')) ? $_POST['url'] : ''); - $request = ((x($_POST,'request')) ? $_POST['request'] : ''); - $confirm = ((x($_POST,'confirm')) ? $_POST['confirm'] : ''); - $notify = ((x($_POST,'notify')) ? $_POST['notify'] : ''); - $poll = ((x($_POST,'poll')) ? $_POST['poll'] : ''); - $attag = ((x($_POST,'attag')) ? $_POST['attag'] : ''); - $photo = ((x($_POST,'photo')) ? $_POST['photo'] : ''); - - $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' - WHERE `id` = %d AND `uid` = %d LIMIT 1", - dbesc($name), - dbesc($nick), - dbesc($url), - dbesc($request), - dbesc($confirm), - dbesc($notify), - dbesc($poll), - dbesc($attag), - intval($contact['id']), - local_user() - ); - - if($photo) { - logger('mod-crepair: updating photo from ' . $photo); - require_once('include/photo/photo_driver.php'); - - $photos = import_profile_photo($photo,local_user(),$contact['id']); - - $x = q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name_date` = '%s', - `uri_date` = '%s', - `avatar_date` = '%s' - WHERE `id` = %d LIMIT 1 - ", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($contact['id']) - ); - } - - if($r) - info( t('Contact settings applied.') . EOL); - else - notice( t('Contact update failed.') . EOL); - - - return; -} - - - -function crepair_content(&$a) { - - if(! local_user()) { - notice( t('Permission denied.') . EOL); - return; - } - - $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0); - - if($cid) { - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($cid), - intval(local_user()) - ); - } - - if(! count($r)) { - notice( t('Contact not found.') . EOL); - return; - } - - $contact = $r[0]; - - $msg1 = t('Repair Contact Settings'); - - $msg2 = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); - $msg3 = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); - - $o .= '

    ' . $msg1 . '

    '; - - $o .= '
    ' . $msg2 . EOL . EOL. $msg3 . '
    '; - - $o .= EOL . '' . t('Return to contact editor') . '' . EOL; - - $tpl = get_markup_template('crepair.tpl'); - $o .= replace_macros($tpl, array( - '$label_name' => t('Name'), - '$label_nick' => t('Account Nickname'), - '$label_attag' => t('@Tagname - overrides Name/Nickname'), - '$label_url' => t('Account URL'), - '$label_request' => t('Friend Request URL'), - '$label_confirm' => t('Friend Confirm URL'), - '$label_notify' => t('Notification Endpoint URL'), - '$label_poll' => t('Poll/Feed URL'), - '$label_photo' => t('New photo from this URL'), - '$contact_name' => $contact['name'], - '$contact_nick' => $contact['nick'], - '$contact_id' => $contact['id'], - '$contact_url' => $contact['url'], - '$request' => $contact['request'], - '$confirm' => $contact['confirm'], - '$notify' => $contact['notify'], - '$poll' => $contact['poll'], - '$contact_attag' => $contact['attag'], - '$lbl_submit' => t('Submit') - )); - - return $o; - -} diff --git a/mod/hcard.php b/mod/hcard.php deleted file mode 100644 index ab2fa88a1..000000000 --- a/mod/hcard.php +++ /dev/null @@ -1,53 +0,0 @@ -argc > 1) - $which = $a->argv[1]; - else { - notice( t('No profile') . EOL ); - $a->error = 404; - return; - } - - $profile = 0; - if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) { - $which = $a->user['nickname']; - $profile = $a->argv[1]; - } - - profile_load($a,$which,$profile); - - if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) { - $a->page['htmlhead'] .= ''; - } - if(x($a->profile,'openidserver')) - $a->page['htmlhead'] .= '' . "\r\n"; - if(x($a->profile,'openid')) { - $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']); - $a->page['htmlhead'] .= '' . "\r\n"; - } - - if(! $blocked) { - $keywords = ((x($a->profile,'keywords')) ? $a->profile['keywords'] : ''); - $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords); - if(strlen($keywords)) - $a->page['htmlhead'] .= '' . "\r\n" ; - } - - $a->page['htmlhead'] .= '' . "\r\n" ; - $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); - $a->page['htmlhead'] .= '' . "\r\n"; - header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); - - $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); - foreach($dfrn_pages as $dfrn) - $a->page['htmlhead'] .= "get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n"; - -} - -function hcard_aside(&$a) { - profile_create_sidebar($a); -} diff --git a/mod/profile_photo.php b/mod/profile_photo.php index e86e2a828..876e3a931 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -14,16 +14,6 @@ function profile_photo_init(&$a) { } -function profile_photo_aside(&$a) { - - if(! local_user()) { - return; - } - - profile_create_sidebar($a); -} - - function profile_photo_post(&$a) { if(! local_user()) { diff --git a/mod/profiles.php b/mod/profiles.php index 173d97138..4625a8805 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -146,17 +146,6 @@ function profiles_init(&$a) { } } -function profiles_aside(&$a) { - - if(! local_user()) { - return; - } - - if((argc() > 1) && (intval(argv(1)))) { - profile_create_sidebar($a); - } -} - function profiles_post(&$a) { if(! local_user()) { diff --git a/mod/profperm.php b/mod/profperm.php index 8054851e8..b31dfc128 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -13,15 +13,6 @@ function profperm_init(&$a) { } -function profperm_aside(&$a) { - - if(! local_user()) - return; - - profile_create_sidebar($a); -} - - function profperm_content(&$a) { if(! local_user()) { diff --git a/mod/viewconnections.php b/mod/viewconnections.php index 9c85d63b6..e0b1af346 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -11,17 +11,6 @@ function viewconnections_init(&$a) { profile_load($a,argv(1)); } - -function viewconnections_aside(&$a) { - - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - return; - } - - profile_create_sidebar($a); -} - - function viewconnections_content(&$a) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { diff --git a/version.inc b/version.inc index e228ff0df..7a72887e8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-10.523 +2013-12-11.524 diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index ee2ea52ac..d133a1b99 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -38,56 +38,6 @@ margin-bottom: 20px; } -.contact-entry-wrapper { - float: left; - width: 120px; - height: 120px; - padding: 10px; -} - -#contacts-search { - font-size: 1em; - width: 300px; -} - -#contacts-search-end { - margin-bottom: 10px; -} - -.contact-entry-photo img { - border: none; -} -.contact-entry-photo-end { - clear: both; -} -.contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - width: 120px; - overflow: hidden; -} -.contact-entry-edit-links { - margin-top: 6px; - margin-left: 10px; - width: 16px; -} -.contact-entry-nav-wrapper { - float: left; - margin-left: 10px; -} - -.contact-entry-edit-links img { - border: none; - margin-right: 15px; -} -.contact-entry-photo { - float: left; - position: relative; -} -.contact-entry-end { - clear: both; -} #contact-edit-wrapper { diff --git a/view/pdl/mod_common.pdl b/view/pdl/mod_common.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_common.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] diff --git a/view/pdl/mod_profile_photo.pdl b/view/pdl/mod_profile_photo.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_profile_photo.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] diff --git a/view/pdl/mod_profiles.pdl b/view/pdl/mod_profiles.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_profiles.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] diff --git a/view/pdl/mod_profperm.pdl b/view/pdl/mod_profperm.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_profperm.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] diff --git a/view/pdl/mod_viewconnections.pdl b/view/pdl/mod_viewconnections.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_viewconnections.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e13bc1edb..b7883f42e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2549,3 +2549,55 @@ img.mail-list-sender-photo { #note-save { margin-top: 10px; } +/* need to put these back in the theme for now - used in more than one module */ + +.contact-entry-wrapper { + float: left; + width: 120px; + height: 120px; + padding: 10px; +} + +#contacts-search { + font-size: 1em; + width: 300px; +} + +#contacts-search-end { + margin-bottom: 10px; +} + +.contact-entry-photo img { + border: none; +} +.contact-entry-photo-end { + clear: both; +} +.contact-entry-name { + float: left; + margin-left: 0px; + margin-right: 10px; + width: 120px; + overflow: hidden; +} +.contact-entry-edit-links { + margin-top: 6px; + margin-left: 10px; + width: 16px; +} +.contact-entry-nav-wrapper { + float: left; + margin-left: 10px; +} + +.contact-entry-edit-links img { + border: none; + margin-right: 15px; +} +.contact-entry-photo { + float: left; + position: relative; +} +.contact-entry-end { + clear: both; +} -- cgit v1.2.3 From 2c02f57f276658269a6cc2031fb0fc9ac0a9077c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 15:04:09 -0800 Subject: remove hidden and deleted channels from viewconnections --- mod/viewconnections.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mod/viewconnections.php b/mod/viewconnections.php index e0b1af346..4f6f81d82 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -30,14 +30,11 @@ function viewconnections_content(&$a) { - $r = q("SELECT COUNT(abook_id) as total FROM abook WHERE abook_channel = %d AND abook_flags = 0 ", - intval($a->profile['uid']) - ); - if($r) - $a->set_pager_total($r[0]['total']); - - $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_flags = 0 order by xchan_name LIMIT %d , %d ", + $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_flags = 0 and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) order by xchan_name LIMIT %d , %d ", intval($a->profile['uid']), + intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_DELETED), intval($a->pager['start']), intval($a->pager['itemspage']) ); -- cgit v1.2.3 From 4d187918528f12256ee7ae145b0e0e25578df8b4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 15:42:28 -0800 Subject: missing brace in redbasic style.css --- view/css/widgets.css | 1 + view/theme/redbasic/css/style.css | 1 + 2 files changed, 2 insertions(+) diff --git a/view/css/widgets.css b/view/css/widgets.css index a95152888..2e424a8dc 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -97,6 +97,7 @@ width: 12px; } + #sidebar-group-list li { margin-top: 3px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9b45102cf..a67742c81 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2529,6 +2529,7 @@ img.mail-list-sender-photo { } .contact-entry-end { clear: both; +} .categories-ul { list-style-type: none; -- cgit v1.2.3 From 2f46bacded409c86514bc7542a01337c3cbf642a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 18:29:56 -0800 Subject: head_remove_css, head_remove_js --- include/plugin.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/plugin.php b/include/plugin.php index 5ed2a1736..5ad467f98 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -494,6 +494,15 @@ function head_add_css($src,$media = 'screen') { get_app()->css_sources[] = array($src,$media); } + +function head_remove_css($src,$media = 'screen') { + $a = get_app(); + $index = array_search(array($src,$media),$a->css_sources); + if($index !== false) + unset($a->css_sources[$index]); + +} + function head_get_css() { $str = ''; $sources = get_app()->css_sources; @@ -515,11 +524,18 @@ function format_css_if_exists($source) { } - function head_add_js($src) { get_app()->js_sources[] = $src; } +function head_remove_js($src) { + $a = get_app(); + $index = array_search($src,$a->js_sources); + if($index !== false) + unset($a->js_sources[$index]); + +} + function head_get_js() { $str = ''; $sources = get_app()->js_sources; -- cgit v1.2.3 From b4e1e8a4a43721d0134e41944afaa9f45bcd8aa8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 19:43:41 -0800 Subject: The affinity tool is not a "traditional" widget. But it is nevertheless a widget. It just makes fewer page layout decisions which are hard-coded. If you want to shrink it down and put it on the sidebar in your theme, go for it. --- boot.php | 3 ++- include/widgets.php | 26 ++++++++++++++++++++++++++ mod/network.php | 25 ------------------------- view/pdl/mod_network.pdl | 7 ++++++- 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/boot.php b/boot.php index ce85de89c..1396de641 100755 --- a/boot.php +++ b/boot.php @@ -1883,7 +1883,8 @@ function construct_page(&$a) { $v = str_replace('$nav',$a->page['nav'],$v); } if(strpos($v,'$content') !== false) { - $v = str_replace('$content',$a->page['section'],$v); + + $v = str_replace('$content',$a->page['content'],$v); } $a->page[substr($k,7)] = $v; diff --git a/include/widgets.php b/include/widgets.php index abbe1e2e0..680c00df2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -334,3 +334,29 @@ function widget_tagcloud_wall($arr) { return tagblock('search',$a->profile['profile_uid'],$limit,$a->profile['channel_hash'],ITEM_WALL); return ''; } + + +function widget_affinity($arr) { + + if(! local_user()) + return ''; + + if(feature_enabled(local_user(),'affinity')) { + $tpl = get_markup_template('main_slider.tpl'); + $x = replace_macros($tpl,array( + '$val' => intval($_REQUEST['cmin']) . ';' . intval($_REQUEST['cmax']), + '$refresh' => t('Refresh'), + '$me' => t('Me'), + '$intimate' => t('Best Friends'), + '$friends' => t('Friends'), + '$coworkers' => t('Co-workers'), + '$oldfriends' => t('Former Friends'), + '$acquaintances' => t('Acquaintances'), + '$world' => t('Everybody') + )); + $arr = array('html' => $x); + call_hooks('main_slider',$arr); + return $arr['html']; + } + return ''; +} \ No newline at end of file diff --git a/mod/network.php b/mod/network.php index 754978949..1da5524c9 100644 --- a/mod/network.php +++ b/mod/network.php @@ -111,33 +111,8 @@ function network_content(&$a, $update = 0, $load = false) { if(! $update) { - - if(feature_enabled(local_user(),'affinity')) { - $tpl = get_markup_template('main_slider.tpl'); - $x = replace_macros($tpl,array( - '$val' => intval($cmin) . ';' . intval($cmax), - '$refresh' => t('Refresh'), - '$me' => t('Me'), - '$intimate' => t('Best Friends'), - '$friends' => t('Friends'), - '$coworkers' => t('Co-workers'), - '$oldfriends' => t('Former Friends'), - '$acquaintances' => t('Acquaintances'), - '$world' => t('Everybody') - )); - $arr = array('html' => $x); - call_hooks('main_slider',$arr); - $o .= $arr['html']; - } - - $o .= network_tabs(); - // --- end item filter tabs - - - - // search terms header if($search) $o .= '

    ' . t('Search Results For:') . ' ' . htmlspecialchars($search) . '

    '; diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index 168ca6acb..7624ace01 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -1,4 +1,5 @@ [region=nav]$nav[/region] + [region=aside] [widget=collections][/widget] [widget=archive][/widget] @@ -7,4 +8,8 @@ [widget=filer][/widget] [widget=notes][/widget] [/region] -[region=section]$content[/region] \ No newline at end of file + +[region=content] +[widget=affinity][/widget] +$content +[/region] \ No newline at end of file -- cgit v1.2.3 From 18f0ab2605790f616ffd9b7a988e8dbdb10a0157 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 19:56:57 -0800 Subject: cmax wasn't defaulting correctly --- include/widgets.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/widgets.php b/include/widgets.php index 680c00df2..495ce74aa 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -341,10 +341,13 @@ function widget_affinity($arr) { if(! local_user()) return ''; + $cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : 0); + $cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : 99); + if(feature_enabled(local_user(),'affinity')) { $tpl = get_markup_template('main_slider.tpl'); $x = replace_macros($tpl,array( - '$val' => intval($_REQUEST['cmin']) . ';' . intval($_REQUEST['cmax']), + '$val' => $cmin . ';' . $cmax, '$refresh' => t('Refresh'), '$me' => t('Me'), '$intimate' => t('Best Friends'), -- cgit v1.2.3 From b3fe221b7fe9c6ecc151d9c00f36d3913526f6a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 23:13:36 -0800 Subject: issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments. --- include/deliver.php | 1 + include/items.php | 71 ++++++++++++++++++++++++++--------------------------- include/text.php | 2 +- include/zot.php | 28 ++++++++++----------- mod/admin.php | 4 +-- mod/message.php | 34 +------------------------ mod/setup.php | 2 +- 7 files changed, 55 insertions(+), 87 deletions(-) diff --git a/include/deliver.php b/include/deliver.php index b1314ce39..b0d15e1ef 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -26,6 +26,7 @@ function deliver_run($argv, $argc) { // If there is no outq_msg, this is a refresh_all message which does not require local handling if($r[0]['outq_msg']) { $msg = array('body' => json_encode(array('pickup' => array(array('notify' => json_decode($r[0]['outq_notify'],true),'message' => json_decode($r[0]['outq_msg'],true)))))); + zot_import($msg,z_root()); $r = q("delete from outq where outq_hash = '%s' limit 1", dbesc($argv[$x]) diff --git a/include/items.php b/include/items.php index dd3cf7644..2cec6bc36 100755 --- a/include/items.php +++ b/include/items.php @@ -564,9 +564,9 @@ function title_is_body($title, $body) { function get_item_elements($x) { -// logger('get_item_elements'); + $arr = array(); - $arr['body'] = (($x['body']) ? htmlentities($x['body'],ENT_COMPAT,'UTF-8',false) : ''); + $arr['body'] = (($x['body']) ? htmlspecialchars($x['body'],ENT_COMPAT,'UTF-8',false) : ''); $arr['created'] = datetime_convert('UTC','UTC',$x['created']); $arr['edited'] = datetime_convert('UTC','UTC',$x['edited']); @@ -584,27 +584,27 @@ function get_item_elements($x) { ? datetime_convert('UTC','UTC',$x['commented']) : $arr['created']); - $arr['title'] = (($x['title']) ? htmlentities($x['title'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['title'] = (($x['title']) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8',false) : ''); if(mb_strlen($arr['title']) > 255) $arr['title'] = mb_substr($arr['title'],0,255); - $arr['app'] = (($x['app']) ? htmlentities($x['app'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['mid'] = (($x['message_id']) ? htmlentities($x['message_id'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['parent_mid'] = (($x['message_top']) ? htmlentities($x['message_top'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['thr_parent'] = (($x['message_parent']) ? htmlentities($x['message_parent'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['app'] = (($x['app']) ? htmlspecialchars($x['app'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['mid'] = (($x['message_id']) ? htmlspecialchars($x['message_id'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['parent_mid'] = (($x['message_top']) ? htmlspecialchars($x['message_top'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['thr_parent'] = (($x['message_parent']) ? htmlspecialchars($x['message_parent'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['plink'] = (($x['permalink']) ? htmlentities($x['permalink'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['location'] = (($x['location']) ? htmlentities($x['location'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['coord'] = (($x['longlat']) ? htmlentities($x['longlat'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['verb'] = (($x['verb']) ? htmlentities($x['verb'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['mimetype'] = (($x['mimetype']) ? htmlentities($x['mimetype'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['obj_type'] = (($x['object_type']) ? htmlentities($x['object_type'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['tgt_type'] = (($x['target_type']) ? htmlentities($x['target_type'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['comment_policy'] = (($x['comment_scope']) ? htmlentities($x['comment_scope'], ENT_COMPAT,'UTF-8',false) : 'contacts'); + $arr['plink'] = (($x['permalink']) ? htmlspecialchars($x['permalink'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['location'] = (($x['location']) ? htmlspecialchars($x['location'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['coord'] = (($x['longlat']) ? htmlspecialchars($x['longlat'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['verb'] = (($x['verb']) ? htmlspecialchars($x['verb'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['mimetype'] = (($x['mimetype']) ? htmlspecialchars($x['mimetype'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['obj_type'] = (($x['object_type']) ? htmlspecialchars($x['object_type'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['tgt_type'] = (($x['target_type']) ? htmlspecialchars($x['target_type'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['comment_policy'] = (($x['comment_scope']) ? htmlspecialchars($x['comment_scope'], ENT_COMPAT,'UTF-8',false) : 'contacts'); - $arr['sig'] = (($x['signature']) ? htmlentities($x['signature'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['sig'] = (($x['signature']) ? htmlspecialchars($x['signature'], ENT_COMPAT,'UTF-8',false) : ''); $arr['object'] = activity_sanitise($x['object']); @@ -667,7 +667,6 @@ function get_item_elements($x) { $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } - return $arr; } @@ -832,8 +831,8 @@ function decode_tags($t) { $ret = array(); foreach($t as $x) { $tag = array(); - $tag['term'] = htmlentities($x['tag'], ENT_COMPAT,'UTF-8',false); - $tag['url'] = htmlentities($x['url'], ENT_COMPAT,'UTF-8',false); + $tag['term'] = htmlspecialchars($x['tag'], ENT_COMPAT,'UTF-8',false); + $tag['url'] = htmlspecialchars($x['url'], ENT_COMPAT,'UTF-8',false); switch($x['type']) { case 'hashtag': $tag['type'] = TERM_HASHTAG; @@ -876,12 +875,12 @@ function activity_sanitise($arr) { if(is_array($x)) $ret[$k] = activity_sanitise($x); else - $ret[$k] = htmlentities($x, ENT_COMPAT,'UTF-8',false); + $ret[$k] = htmlspecialchars($x, ENT_COMPAT,'UTF-8',false); } return $ret; } else { - return htmlentities($arr, ENT_COMPAT,'UTF-8', false); + return htmlspecialchars($arr, ENT_COMPAT,'UTF-8', false); } } return ''; @@ -893,7 +892,7 @@ function array_sanitise($arr) { if($arr) { $ret = array(); foreach($arr as $x) { - $ret[] = htmlentities($x, ENT_COMPAT,'UTF-8',false); + $ret[] = htmlspecialchars($x, ENT_COMPAT,'UTF-8',false); } return $ret; } @@ -958,8 +957,8 @@ function get_mail_elements($x) { $arr = array(); - $arr['body'] = (($x['body']) ? htmlentities($x['body'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['title'] = (($x['title'])? htmlentities($x['title'],ENT_COMPAT,'UTF-8',false) : ''); + $arr['body'] = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['title'] = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : ''); $arr['created'] = datetime_convert('UTC','UTC',$x['created']); if((! array_key_exists('expires',$x)) || ($x['expires'] === '0000-00-00 00:00:00')) @@ -977,18 +976,18 @@ function get_mail_elements($x) { $key = get_config('system','pubkey'); $arr['mail_flags'] |= MAIL_OBSCURED; - $arr['body'] = htmlentities($arr['body'],ENT_COMPAT,'UTF-8',false); + $arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false); if($arr['body']) $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); - $arr['title'] = htmlentities($arr['title'],ENT_COMPAT,'UTF-8',false); + $arr['title'] = htmlspecialchars($arr['title'],ENT_COMPAT,'UTF-8',false); if($arr['title']) $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['created'] > datetime_convert()) $arr['created'] = datetime_convert(); - $arr['mid'] = (($x['message_id']) ? htmlentities($x['message_id'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['parent_mid'] = (($x['message_parent']) ? htmlentities($x['message_parent'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['mid'] = (($x['message_id']) ? htmlspecialchars($x['message_id'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['parent_mid'] = (($x['message_parent']) ? htmlspecialchars($x['message_parent'], ENT_COMPAT,'UTF-8',false) : ''); if($x['attach']) $arr['attach'] = activity_sanitise($x['attach']); @@ -1017,18 +1016,18 @@ function get_profile_elements($x) { else return array(); - $arr['desc'] = (($x['title']) ? htmlentities($x['title'],ENT_COMPAT,'UTF-8',false) : ''); + $arr['desc'] = (($x['title']) ? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : ''); $arr['dob'] = datetime_convert('UTC','UTC',$x['birthday'],'Y-m-d'); $arr['age'] = (($x['age']) ? intval($x['age']) : 0); - $arr['gender'] = (($x['gender']) ? htmlentities($x['gender'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['marital'] = (($x['marital']) ? htmlentities($x['marital'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['sexual'] = (($x['sexual']) ? htmlentities($x['sexual'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['locale'] = (($x['locale']) ? htmlentities($x['locale'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['region'] = (($x['region']) ? htmlentities($x['region'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['postcode'] = (($x['postcode']) ? htmlentities($x['postcode'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['country'] = (($x['country']) ? htmlentities($x['country'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['gender'] = (($x['gender']) ? htmlspecialchars($x['gender'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['marital'] = (($x['marital']) ? htmlspecialchars($x['marital'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['sexual'] = (($x['sexual']) ? htmlspecialchars($x['sexual'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['locale'] = (($x['locale']) ? htmlspecialchars($x['locale'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['region'] = (($x['region']) ? htmlspecialchars($x['region'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['postcode'] = (($x['postcode']) ? htmlspecialchars($x['postcode'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['country'] = (($x['country']) ? htmlspecialchars($x['country'], ENT_COMPAT,'UTF-8',false) : ''); $arr['keywords'] = (($x['keywords'] && is_array($x['keywords'])) ? array_sanitise($x['keywords']) : array()); diff --git a/include/text.php b/include/text.php index aa23f96b0..042a972d1 100755 --- a/include/text.php +++ b/include/text.php @@ -1065,7 +1065,7 @@ function theme_attachments(&$item) { break; } - $title = htmlentities($r['title'], ENT_COMPAT,'UTF-8'); + $title = htmlspecialchars($r['title'], ENT_COMPAT,'UTF-8'); if(! $title) $title = t('unknown.???'); $title .= ' ' . $r['length'] . ' ' . t('bytes'); diff --git a/include/zot.php b/include/zot.php index 77d82f110..b0d87cea9 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1633,22 +1633,22 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ $arr = array(); $arr['xprof_hash'] = $hash; - $arr['xprof_desc'] = (($profile['description']) ? htmlentities($profile['description'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_desc'] = (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT,'UTF-8',false) : ''); $arr['xprof_dob'] = datetime_convert('','',$profile['birthday'],'Y-m-d'); // !!!! check this for 0000 year $arr['xprof_age'] = (($profile['age']) ? intval($profile['age']) : 0); - $arr['xprof_gender'] = (($profile['gender']) ? htmlentities($profile['gender'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['xprof_marital'] = (($profile['marital']) ? htmlentities($profile['marital'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['xprof_sexual'] = (($profile['sexual']) ? htmlentities($profile['sexual'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['xprof_locale'] = (($profile['locale']) ? htmlentities($profile['locale'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['xprof_region'] = (($profile['region']) ? htmlentities($profile['region'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['xprof_postcode'] = (($profile['postcode']) ? htmlentities($profile['postcode'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['xprof_country'] = (($profile['country']) ? htmlentities($profile['country'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_gender'] = (($profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_marital'] = (($profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_sexual'] = (($profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_locale'] = (($profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_region'] = (($profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_postcode'] = (($profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_country'] = (($profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT,'UTF-8',false) : ''); $clean = array(); if(array_key_exists('keywords',$profile) and is_array($profile['keywords'])) { import_directory_keywords($hash,$profile['keywords']); foreach($profile['keywords'] as $kw) { - $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false)); + $kw = trim(htmlspecialchars($kw,ENT_COMPAT,'UTF-8',false)); $kw = trim($kw,','); $clean[] = $kw; } @@ -1750,7 +1750,7 @@ function import_directory_keywords($hash,$keywords) { $clean = array(); foreach($keywords as $kw) { - $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false)); + $kw = trim(htmlspecialchars($kw,ENT_COMPAT,'UTF-8',false)); $kw = trim($kw,','); $clean[] = $kw; } @@ -1849,10 +1849,10 @@ function import_site($arr,$pubkey) { $access_policy = ACCESS_TIERED; } - $directory_url = htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false); - $url = htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false); - $sellpage = htmlentities($arr['sellpage'],ENT_COMPAT,'UTF-8',false); - $site_location = htmlentities($arr['location'],ENT_COMPAT,'UTF-8',false); + $directory_url = htmlspecialchars($arr['directory_url'],ENT_COMPAT,'UTF-8',false); + $url = htmlspecialchars($arr['url'],ENT_COMPAT,'UTF-8',false); + $sellpage = htmlspecialchars($arr['sellpage'],ENT_COMPAT,'UTF-8',false); + $site_location = htmlspecialchars($arr['location'],ENT_COMPAT,'UTF-8',false); if($exists) { if(($siterecord['site_flags'] != $site_directory) diff --git a/mod/admin.php b/mod/admin.php index 9a6aea35a..91dd0b56e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -425,7 +425,7 @@ function admin_page_site(&$a) { '$baseurl' => $a->get_baseurl(true), // name, label, value, help string, extra data... - '$sitename' => array('sitename', t("Site name"), htmlentities(get_config('system','sitename'), ENT_QUOTES), ""), + '$sitename' => array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), @@ -436,7 +436,7 @@ function admin_page_site(&$a) { '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Register policy"), get_config('system','register_policy'), "", $register_choices), '$access_policy' => array('access_policy', t("Access policy"), get_config('system','access_policy'), "", $access_choices), - '$register_text' => array('register_text', t("Register text"), htmlentities(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), + '$register_text' => array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/mod/message.php b/mod/message.php index a0382f63d..bee3b68f3 100644 --- a/mod/message.php +++ b/mod/message.php @@ -425,39 +425,7 @@ function message_content(&$a) { foreach($messages as $message) { - $s = $arr = ''; - - if($message['attach']) - $arr = json_decode_plus($message['attach']); - if($arr) { - $s .= '
    '; - foreach($arr as $r) { - $matches = false; - $icon = ''; - $icontype = substr($r['type'],0,strpos($r['type'],'/')); - - switch($icontype) { - case 'video': - case 'audio': - case 'image': - case 'text': - $icon = '
    '; - break; - default: - $icon = '
    '; - break; - } - - $title = htmlentities($r['title'], ENT_COMPAT,'UTF-8'); - if(! $title) - $title = t('unknown.???'); - $title .= ' ' . $r['length'] . ' ' . t('bytes'); - - $url = $a->get_baseurl() . '/magic?f=&hash=' . $message['from_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision']; - $s .= '' . $icon . ''; - } - $s .= '
    '; - } + $s = theme_attachments($message); $mails[] = array( 'id' => $message['id'], diff --git a/mod/setup.php b/mod/setup.php index 429be43af..0198f1f09 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -543,7 +543,7 @@ function check_htaccess(&$checks) { function manual_config(&$a) { - $data = htmlentities($a->data['txt']); + $data = htmlspecialchars($a->data['txt'],ENT_COMPAT,'UTF-8'); $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'); $o .= ""; return $o; -- cgit v1.2.3 From 941f81eb300074b203dd480924f9cf8b9d41a08d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Dec 2013 02:01:42 -0800 Subject: check that every invocation of htmlspecialchars has the right arg list --- mod/editblock.php | 2 +- mod/editlayout.php | 2 +- mod/editpost.php | 2 +- mod/editwebpage.php | 2 +- mod/message.php | 2 +- mod/network.php | 2 +- mod/search.php | 6 +++--- version.inc | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mod/editblock.php b/mod/editblock.php index 9c691640b..8b5b2d16c 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -132,7 +132,7 @@ function editblock_content(&$a) { '$pvisit' => 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title']), + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$placeholdertitle' => t('Set title'), '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), diff --git a/mod/editlayout.php b/mod/editlayout.php index f8906d981..542bb8357 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -117,7 +117,7 @@ function editlayout_content(&$a) { '$pvisit' => 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title']), + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$placeholdertitle' => t('Set title'), '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), diff --git a/mod/editpost.php b/mod/editpost.php index f25d6d21d..e731c04fe 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -114,7 +114,7 @@ function editpost_content(&$a) { '$pvisit' => 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title']), + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$placeholdertitle' => t('Set title'), '$category' => $category, '$placeholdercategory' => t('Categories (comma-separated list)'), diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 840bda336..85bd9e918 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -164,7 +164,7 @@ function editwebpage_content(&$a) { '$jotnets' => $jotnets, '$mimeselect' => $mimeselect, '$layoutselect' => $layoutselect, - '$title' => htmlspecialchars($itm[0]['title']), + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$placeholdertitle' => t('Set title'), '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), diff --git a/mod/message.php b/mod/message.php index bee3b68f3..b5420e5b3 100644 --- a/mod/message.php +++ b/mod/message.php @@ -321,7 +321,7 @@ function message_content(&$a) { '$preid' => $preid, '$subject' => t('Subject:'), '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), - '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), + '$text' => ((x($_REQUEST,'body')) ? htmlspecialchars($_REQUEST['body'], ENT_COMPAT, 'UTF-8') : ''), '$readonly' => '', '$yourmessage' => t('Your message:'), '$select' => $select, diff --git a/mod/network.php b/mod/network.php index 1da5524c9..072f718ec 100644 --- a/mod/network.php +++ b/mod/network.php @@ -115,7 +115,7 @@ function network_content(&$a, $update = 0, $load = false) { // search terms header if($search) - $o .= '

    ' . t('Search Results For:') . ' ' . htmlspecialchars($search) . '

    '; + $o .= '

    ' . t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '

    '; nav_set_selected('network'); diff --git a/mod/search.php b/mod/search.php index 7651b3a4e..2b31002fa 100644 --- a/mod/search.php +++ b/mod/search.php @@ -17,7 +17,7 @@ function search_saved_searches() { $o .= '

    ' . t('Saved Searches') . '

    ' . "\r\n"; $o .= '
' . "\r\n"; } @@ -272,9 +272,9 @@ function search_content(&$a,$update = 0, $load = false) { if($tag) - $o .= '

Items tagged with: ' . htmlspecialchars($search) . '

'; + $o .= '

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

'; else - $o .= '

Search results for: ' . htmlspecialchars($search) . '

'; + $o .= '

Search results for: ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '

'; $o .= conversation($a,$items,'search',$update,'client'); diff --git a/version.inc b/version.inc index 7a72887e8..64336785f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-11.524 +2013-12-12.525 -- cgit v1.2.3 From 303324cdff3f7c8bc83fae89256a2133939944b2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Dec 2013 02:15:02 -0800 Subject: more htmlspecialchars sanitisation --- include/conversation.php | 4 ++-- include/network.php | 2 +- include/taxonomy.php | 4 ++-- include/widgets.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index f5fc9da93..29fb8a163 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1108,7 +1108,7 @@ function status_editor($a,$x,$popup=false) { '$shortsetloc' => t('set location'), '$noloc' => t('Clear browser location'), '$shortnoloc' => t('clear location'), - '$title' => ((x($x,'title')) ? htmlspecialchars($x['title']) : ''), + '$title' => ((x($x,'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => t('Set title'), '$catsenabled' => ((feature_enabled($x['profile_uid'],'categories') && (! $webpage)) ? 'categories' : ''), '$category' => "", @@ -1117,7 +1117,7 @@ function status_editor($a,$x,$popup=false) { '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), - '$content' => ((x($x,'body')) ? htmlspecialchars($x['body']) : ''), + '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$post_id' => '', '$baseurl' => $a->get_baseurl(true), '$defloc' => $x['default_location'], diff --git a/include/network.php b/include/network.php index 50f853ca0..225b215fe 100644 --- a/include/network.php +++ b/include/network.php @@ -582,7 +582,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) $a = get_app(); // Picture addresses can contain special characters - $s = htmlspecialchars_decode($s); + $s = htmlspecialchars_decode($s, ENT_COMPAT,'UTF-8'); $matches = null; $c = preg_match_all('/\[img(.*?)\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER); diff --git a/include/taxonomy.php b/include/taxonomy.php index 5159dad02..65d082bb0 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -87,9 +87,9 @@ function format_term_for_display($term) { return $s; if($term['url']) - $s .= '' . htmlspecialchars($term['term']) . ''; + $s .= '' . htmlspecialchars($term['term'], ENT_COMPAT,'UTF-8') . ''; else - $s .= htmlspecialchars($term['term']); + $s .= htmlspecialchars($term['term'], ENT_COMPAT,'UTF-8'); return $s; } diff --git a/include/widgets.php b/include/widgets.php index 495ce74aa..f53998b23 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -219,7 +219,7 @@ function widget_savedsearch($arr) { 'term' => $rr['term'], 'dellink' => z_root() . '/' . $srchurl . (($hasq) ? '' : '?f=') . '&searchremove=1&search=' . urlencode($rr['term']), 'srchlink' => z_root() . '/' . $srchurl . (($hasq) ? '' : '?f=') . '&search=' . urlencode($rr['term']), - 'displayterm' => htmlspecialchars($rr['term']), + 'displayterm' => htmlspecialchars($rr['term'], ENT_COMPAT,'UTF-8'), 'encodedterm' => urlencode($rr['term']), 'delete' => t('Remove term'), 'selected' => ($search==$rr['term']), @@ -317,7 +317,7 @@ function widget_fullprofile($arr) { function widget_categories($arr) { $a = get_app(); - $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : ''); + $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : ''); $srchurl = $a->query_string; $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); -- cgit v1.2.3 From 3a11980e495fc42c9fbf178480d16380f6cca69a Mon Sep 17 00:00:00 2001 From: zottel Date: Thu, 12 Dec 2013 13:32:11 +0100 Subject: htmspecialchars_decode only takes one argument. --- include/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 225b215fe..7446c2384 100644 --- a/include/network.php +++ b/include/network.php @@ -582,7 +582,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) $a = get_app(); // Picture addresses can contain special characters - $s = htmlspecialchars_decode($s, ENT_COMPAT,'UTF-8'); + $s = htmlspecialchars_decode($s, ENT_COMPAT); $matches = null; $c = preg_match_all('/\[img(.*?)\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER); -- cgit v1.2.3 From 8f6af66a730250c7688168eecf8ba9b99df2536b Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 12 Dec 2013 14:39:21 +0100 Subject: move affinity slider to widgets.css and minor cleanup --- view/css/widgets.css | 14 +++++++++++++- view/theme/redbasic/css/style.css | 30 +++++++----------------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index 2e424a8dc..a34508961 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -97,7 +97,6 @@ width: 12px; } - #sidebar-group-list li { margin-top: 3px; } @@ -109,3 +108,16 @@ .group-edit-icon { opacity: 0; } + +/* affinity - slider */ + +#main-slider { + position: relative; + left: 5px; + width: 90%; +} + +.slider { + margin-top: 10px; + margin-bottom: 45px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a67742c81..e02f55520 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1610,21 +1610,6 @@ div.jGrowl div.info { text-align: center; } - -.slider { - margin-top: 10px; - margin-bottom: 45px; -} - - -#main-slider { - position: relative; - left: 5px; - width: 90%; - -} - - #contact-slider { position: relative; left: 5%; @@ -2477,6 +2462,13 @@ img.mail-list-sender-photo { -moz-border-radius: $radiuspx; } +.categories-ul { + list-style-type: none; +} + +#sidebar-group-list ul { + list-style-type: none; +} /* need to put these back in the theme for now - used in more than one module */ @@ -2530,11 +2522,3 @@ img.mail-list-sender-photo { .contact-entry-end { clear: both; } - -.categories-ul { - list-style-type: none; -} - -#sidebar-group-list ul { - list-style-type: none; -} -- cgit v1.2.3 From b994faee9d24a6290e342b6389c56fa7f9ecfac1 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 12 Dec 2013 15:15:01 +0100 Subject: mark some things for deletion --- view/theme/redbasic/css/style.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e02f55520..0db9caa4e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -676,7 +676,7 @@ footer { list-style: none; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +/* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -2488,12 +2488,16 @@ img.mail-list-sender-photo { margin-bottom: 10px; } +/* seems oblolete .contact-entry-photo img { border: none; } +*/ + .contact-entry-photo-end { clear: both; } + .contact-entry-name { float: left; margin-left: 0px; @@ -2501,11 +2505,14 @@ img.mail-list-sender-photo { width: 120px; overflow: hidden; } + +/* seems obsolete .contact-entry-edit-links { margin-top: 6px; margin-left: 10px; width: 16px; } + .contact-entry-nav-wrapper { float: left; margin-left: 10px; @@ -2515,10 +2522,13 @@ img.mail-list-sender-photo { border: none; margin-right: 15px; } + .contact-entry-photo { float: left; position: relative; } +*/ + .contact-entry-end { clear: both; } -- cgit v1.2.3 From 65c0b84313ed3c08e4512968e0030631c55bcbb4 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Dec 2013 18:13:52 -0800 Subject: always load css and js sources using the same url as the page that is being visited so there is no http/https mismatch. --- include/plugin.php | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/include/plugin.php b/include/plugin.php index 5ad467f98..9982a48a2 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -520,10 +520,32 @@ function format_css_if_exists($source) { $path = theme_include($source[0]); if($path) - return '' . "\r\n"; + return '' . "\r\n"; } +function script_path() { + if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) + $scheme = 'https'; + elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) + $scheme = 'https'; + else + $scheme = 'http'; + + if(x($_SERVER,'SERVER_NAME')) { + $hostname = $_SERVER['SERVER_NAME']; + } + else { + return z_root(); + } + + if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) { + $hostname .= ':' . $_SERVER['SERVER_PORT']; + } + + return $scheme . '://' . $hostname; +} + function head_add_js($src) { get_app()->js_sources[] = $src; } @@ -552,7 +574,7 @@ function format_js_if_exists($source) { else $path = theme_include($source); if($path) - return '' . "\r\n" ; + return '' . "\r\n" ; } -- cgit v1.2.3 From 64b16f1e1ac303b476ffac891c99f6404bc04f53 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Dec 2013 01:13:35 -0800 Subject: add construct_page hook --- boot.php | 4 + doc/html/acl__selectors_8php.html | 2 +- doc/html/apw_2php_2style_8php.html | 2 +- doc/html/boot_8php.html | 64 +- doc/html/channel_8php.html | 18 - doc/html/channel_8php.js | 1 - doc/html/comanche_8php.html | 2 +- doc/html/common_8php.html | 18 - doc/html/common_8php.js | 1 - doc/html/contact__widgets_8php.html | 25 +- doc/html/contact__widgets_8php.js | 3 +- doc/html/conversation_8php.html | 8 +- doc/html/crypto_8php.html | 6 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 10 +- doc/html/dir_d41ce877eb409a4791b288730010abe2.js | 5 +- doc/html/extract_8php.html | 4 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 215 +- doc/html/globals_0x63.html | 15 - doc/html/globals_0x66.html | 3 - doc/html/globals_0x67.html | 2 +- doc/html/globals_0x68.html | 12 +- doc/html/globals_0x69.html | 9 - doc/html/globals_0x6c.html | 12 +- doc/html/globals_0x6e.html | 3 + doc/html/globals_0x70.html | 12 - doc/html/globals_0x73.html | 9 +- doc/html/globals_0x76.html | 3 - doc/html/globals_0x77.html | 33 + doc/html/globals_func_0x63.html | 15 - doc/html/globals_func_0x66.html | 3 - doc/html/globals_func_0x67.html | 2 +- doc/html/globals_func_0x68.html | 12 +- doc/html/globals_func_0x69.html | 9 - doc/html/globals_func_0x6c.html | 12 +- doc/html/globals_func_0x6e.html | 3 + doc/html/globals_func_0x70.html | 12 - doc/html/globals_func_0x73.html | 9 +- doc/html/globals_func_0x76.html | 3 - doc/html/globals_func_0x77.html | 33 + doc/html/identity_8php.html | 8 +- doc/html/include_2config_8php.html | 6 +- doc/html/include_2group_8php.html | 20 +- doc/html/include_2group_8php.js | 2 +- doc/html/include_2network_8php.html | 4 +- doc/html/items_8php.html | 6 +- doc/html/language_8php.html | 2 +- doc/html/mod_2network_8php.html | 20 - doc/html/mod_2network_8php.js | 3 +- doc/html/navtree.js | 13 +- doc/html/navtreeindex1.js | 8 +- doc/html/navtreeindex2.js | 10 +- doc/html/navtreeindex3.js | 84 +- doc/html/navtreeindex4.js | 42 +- doc/html/navtreeindex5.js | 220 +- doc/html/navtreeindex6.js | 266 +-- doc/html/navtreeindex7.js | 172 +- doc/html/permissions_8php.html | 4 +- doc/html/photo__driver_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/plugin_8php.html | 71 +- doc/html/plugin_8php.js | 3 + doc/html/profile_8php.html | 18 - doc/html/profile_8php.js | 1 - doc/html/profile__photo_8php.html | 18 - doc/html/profile__photo_8php.js | 1 - doc/html/profiles_8php.html | 18 - doc/html/profiles_8php.js | 1 - doc/html/profperm_8php.html | 18 - doc/html/profperm_8php.js | 1 - doc/html/search/all_63.js | 8 +- doc/html/search/all_66.js | 1 - doc/html/search/all_67.js | 2 +- doc/html/search/all_68.js | 5 +- doc/html/search/all_69.js | 4 - doc/html/search/all_6c.js | 5 +- doc/html/search/all_6e.js | 4 +- doc/html/search/all_70.js | 4 - doc/html/search/all_73.js | 5 +- doc/html/search/all_76.js | 1 - doc/html/search/all_77.js | 11 + doc/html/search/files_63.js | 1 - doc/html/search/files_68.js | 1 - doc/html/search/files_69.js | 1 - doc/html/search/files_6c.js | 1 - doc/html/search/files_6e.js | 1 + doc/html/search/functions_63.js | 5 - doc/html/search/functions_66.js | 1 - doc/html/search/functions_67.js | 2 +- doc/html/search/functions_68.js | 4 +- doc/html/search/functions_69.js | 3 - doc/html/search/functions_6c.js | 4 +- doc/html/search/functions_6e.js | 1 + doc/html/search/functions_70.js | 4 - doc/html/search/functions_73.js | 3 +- doc/html/search/functions_76.js | 1 - doc/html/search/functions_77.js | 11 + doc/html/security_8php.html | 2 +- doc/html/socgraph_8php.html | 2 +- doc/html/taxonomy_8php.html | 4 +- doc/html/text_8php.html | 74 +- doc/html/text_8php.js | 1 + doc/html/typo_8php.html | 2 +- doc/html/viewconnections_8php.html | 18 - doc/html/viewconnections_8php.js | 1 - doc/html/widgets_8php.html | 219 ++ doc/html/widgets_8php.js | 14 +- util/messages.po | 2462 +++++++++----------- version.inc | 2 +- 111 files changed, 2265 insertions(+), 2296 deletions(-) diff --git a/boot.php b/boot.php index 1396de641..4134ce3fa 100755 --- a/boot.php +++ b/boot.php @@ -1871,6 +1871,10 @@ function construct_page(&$a) { // layout completely with a new layout definition, or replace/remove existing content. if($comanche) { + $arr = array('module' => $a->module, 'layout' => $a->layout); + call_hooks('construct_page',$arr); + $a->layout = $arr['layout']; + foreach($a->layout as $k => $v) { if((strpos($k,'region_') === 0) && strlen($v)) { if(strpos($v,'$region_') !== false) { diff --git a/doc/html/acl__selectors_8php.html b/doc/html/acl__selectors_8php.html index 337a2fc68..b0bf3be67 100644 --- a/doc/html/acl__selectors_8php.html +++ b/doc/html/acl__selectors_8php.html @@ -270,7 +270,7 @@ Functions
-

Referenced by channel_content(), display_content(), events_content(), lastpost_content(), network_content(), photos_content(), rpost_content(), and webpages_content().

+

Referenced by channel_content(), display_content(), editwebpage_content(), events_content(), mitem_content(), network_content(), photos_content(), rpost_content(), and webpages_content().

diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index 59038c4ab..5493b91c9 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -128,7 +128,7 @@ Variables
-

Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), follow_widget(), get_all_perms(), get_pconfig(), get_theme_uid(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_tagcloud(), and zot_feed().

+

Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().

diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 0146399a4..99630baf6 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -698,7 +698,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(), lastpost_init(), layouts_content(), like_content(), lockview_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notifications_content(), 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_aside(), 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(), 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().

@@ -716,7 +716,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(), lastpost_init(), 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(), notifications_content(), 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_aside(), 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(), and zotfeed_init().

+

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), 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().

@@ -919,7 +919,7 @@ Variables
-

Referenced by api_user(), change_channel(), channel_content(), events_post(), feed_init(), import_content(), import_post(), item_post(), lastpost_content(), manage_content(), mimetype_select(), mood_init(), nav(), new_channel_content(), new_channel_post(), new_contact(), profile_content(), profile_photo_post(), profiles_init(), settings_post(), z_input_filter(), and zotfeed_init().

+

Referenced by api_user(), change_channel(), channel_content(), events_post(), feed_init(), import_content(), import_post(), item_post(), manage_content(), mimetype_select(), mood_init(), nav(), new_channel_content(), new_channel_post(), new_contact(), profile_content(), profile_photo_post(), profiles_init(), settings_post(), z_input_filter(), and zotfeed_init().

@@ -936,7 +936,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(), follow_widget(), 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(), 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(), 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(), saved_searches(), scale_external_images(), search(), 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_profile(), widget_tagcloud(), 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(), 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().

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

Referenced by 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_sidebar(), search_content(), stream_perms_xchans(), suggest_content(), tagger_content(), thing_init(), toggle_safesearch_init(), viewconnections_content(), vote_content(), vote_post(), wall_attach_post(), 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_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().

@@ -1016,7 +1016,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(), intro_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_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().

@@ -1067,7 +1067,7 @@ Variables
-

Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_post(), authenticate_success(), community_content(), connections_content(), connections_post(), crepair_post(), directory_content(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), intro_post(), item_post(), items_fetch(), lostpass_content(), lostpass_post(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), network_content(), notifications_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_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().

@@ -1153,7 +1153,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(), crepair_content(), crepair_init(), crepair_post(), 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(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), lastpost_init(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_content(), 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(), 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_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), 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_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_profile(), z_input_filter(), zid_init(), and zping_content().

+

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().

@@ -1187,7 +1187,7 @@ Variables
-

Referenced by admin_content(), api_content(), channel_content(), connections_content(), follow_content(), lastpost_content(), login_content(), message_content(), network_content(), notify_content(), oexchange_content(), post_to_red_displayAdminContent(), profile_content(), regmod_content(), and rpost_content().

+

Referenced by admin_content(), api_content(), channel_content(), connections_content(), follow_content(), login_content(), message_content(), network_content(), notify_content(), oexchange_content(), post_to_red_displayAdminContent(), profile_content(), regmod_content(), and rpost_content().

@@ -1205,7 +1205,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(), crepair_content(), crepair_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(), hcard_init(), import_content(), import_post(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), lastpost_content(), lastpost_init(), 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(), 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().

@@ -1244,7 +1244,7 @@ Variables
-

Referenced by channel_content(), community_content(), directory_aside(), directory_content(), display_content(), drop_items(), hcard_init(), item_content(), item_permissions_sql(), item_post(), lastpost_content(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), redir_init(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), widget_profile(), zid_init(), and zotfeed_init().

+

Referenced by channel_content(), community_content(), directory_aside(), directory_content(), display_content(), drop_items(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), redir_init(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().

@@ -1305,7 +1305,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_aside(), channel_content(), check_form_security_token(), community_content(), connections_aside(), connections_content(), connections_post(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), crepair_init(), crepair_post(), 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(), hcard_init(), import_post(), import_xchan(), info(), intro_content(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), lastpost_aside(), lastpost_content(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), 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(), saved_searches(), 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_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_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().

@@ -1339,7 +1339,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_css_if_exists(), format_filer(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), 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(), search_content(), 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(), 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(), 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().

@@ -1368,7 +1368,7 @@ Variables
-

Referenced by acl_init(), channel_content(), connections_content(), get_all_perms(), group_content(), group_get_members(), intro_post(), items_fetch(), lastpost_content(), network_content(), perm_is_allowed(), and search_content().

+

Referenced by acl_init(), channel_content(), connections_content(), get_all_perms(), group_content(), group_get_members(), items_fetch(), network_content(), perm_is_allowed(), and search_content().

@@ -1382,7 +1382,7 @@ Variables
-

Referenced by connections_content(), intro_content(), intro_post(), onepoll_run(), and poller_run().

+

Referenced by connections_content(), onepoll_run(), and poller_run().

@@ -1396,7 +1396,7 @@ Variables
-

Referenced by connections_content(), get_all_perms(), intro_post(), notifications_content(), and perm_is_allowed().

+

Referenced by connections_content(), get_all_perms(), and perm_is_allowed().

@@ -1410,7 +1410,7 @@ Variables
-

Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), intro_content(), notifications_content(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().

+

Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().

@@ -1424,7 +1424,7 @@ Variables
-

Referenced by abook_connections(), abook_self(), acl_init(), Conversation\add_thread(), api_get_user(), channel_remove(), collect_recipients(), connections_content(), connections_post(), contact_remove(), contact_select(), contactgroup_content(), create_identity(), follow_widget(), get_all_perms(), group_content(), group_get_members(), intro_content(), item_post(), load_contact_links(), new_contact(), notifier_run(), perm_is_allowed(), ping_init(), poco_init(), settings_aside(), and zot_refresh().

+

Referenced by abook_connections(), abook_self(), acl_init(), Conversation\add_thread(), api_get_user(), channel_remove(), collect_recipients(), connections_content(), connections_post(), contact_remove(), contact_select(), contactgroup_content(), create_identity(), get_all_perms(), group_content(), group_get_members(), item_post(), load_contact_links(), new_contact(), notifier_run(), perm_is_allowed(), ping_init(), poco_init(), settings_aside(), widget_follow(), and zot_refresh().

@@ -1607,7 +1607,7 @@ Variables
-

Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), like_content(), like_puller(), localize_item(), notifications_content(), and visible_activity().

+

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

@@ -1647,7 +1647,7 @@ Variables
-

Referenced by localize_item(), and notifications_content().

+

Referenced by localize_item().

@@ -1674,7 +1674,7 @@ Variables

activity stream defines

-

Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), like_content(), like_puller(), localize_item(), notifications_content(), and visible_activity().

+

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

@@ -2190,7 +2190,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(), crepair_content(), crepair_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(), hcard_init(), import_post(), import_xchan(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), lastpost_content(), lastpost_init(), 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(), 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().

@@ -2485,7 +2485,7 @@ Variables
-

Referenced by editpost_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), tag_deliver(), and unobscure().

+

Referenced by editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), post_activity_item(), tag_deliver(), and unobscure().

@@ -2566,7 +2566,7 @@ Variables
-

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

+

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

@@ -2592,7 +2592,7 @@ Variables
-

Referenced by api_statuses_home_timeline(), channel_content(), display_content(), format_notification(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), mood_init(), network_content(), and ping_init().

+

Referenced by api_statuses_home_timeline(), channel_content(), display_content(), format_notification(), item_post(), item_store(), item_store_update(), items_fetch(), mood_init(), network_content(), and ping_init().

@@ -2632,7 +2632,7 @@ Variables
-

Referenced by conversation(), get_item_elements(), Item\get_template_data(), item_post(), item_store(), and item_store_update().

+

Referenced by conversation(), get_item_elements(), Item\get_template_data(), item_post(), item_store(), item_store_update(), and post_activity_item().

@@ -2661,7 +2661,7 @@ Variables
-

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

+

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

@@ -4154,7 +4154,7 @@ Variables
-

Referenced by decode_tags(), file_tag_file_query(), fileas_widget(), filer_content(), filerm_content(), format_filer(), item_expire(), items_fetch(), and network_content().

+

Referenced by decode_tags(), file_tag_file_query(), fileas_widget(), filer_content(), filerm_content(), format_filer(), item_expire(), items_fetch(), network_content(), and widget_filer().

@@ -4286,7 +4286,7 @@ Variables
-

Referenced by network_init(), saved_searches(), search_init(), and search_saved_searches().

+

Referenced by search_init(), search_saved_searches(), and widget_savedsearch().

@@ -4400,7 +4400,7 @@ Variables
-

Referenced by channel_remove(), dirsearch_content(), and remove_all_xchan_resources().

+

Referenced by channel_remove(), dirsearch_content(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().

@@ -4414,7 +4414,7 @@ Variables
-

Referenced by dirsearch_content(), import_xchan(), suggestion_query(), syncdirs(), and zfinger_init().

+

Referenced by dirsearch_content(), import_xchan(), suggestion_query(), syncdirs(), viewconnections_content(), and zfinger_init().

@@ -4428,7 +4428,7 @@ Variables
-

Referenced by dirsearch_content().

+

Referenced by dirsearch_content(), and viewconnections_content().

diff --git a/doc/html/channel_8php.html b/doc/html/channel_8php.html index bea337346..61550f610 100644 --- a/doc/html/channel_8php.html +++ b/doc/html/channel_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('channel_8php.html','');}); Functions  channel_init (&$a)   - channel_aside (&$a) -   channel_content (&$a, $update=0, $load=false)  

Function Documentation

- -
-
- - - - - - - - -
channel_aside (& $a)
-
- -
-
diff --git a/doc/html/channel_8php.js b/doc/html/channel_8php.js index 4aa5d2d20..b76a435de 100644 --- a/doc/html/channel_8php.js +++ b/doc/html/channel_8php.js @@ -1,6 +1,5 @@ var channel_8php = [ - [ "channel_aside", "channel_8php.html#aea8e189f2fbabfda779349dd94082e8e", null ], [ "channel_content", "channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1", null ], [ "channel_init", "channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc", null ] ]; \ No newline at end of file diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html index 4b6a86ba4..57572239d 100644 --- a/doc/html/comanche_8php.html +++ b/doc/html/comanche_8php.html @@ -190,7 +190,7 @@ Functions
-

Referenced by page_content().

+

Referenced by construct_page(), and page_content().

diff --git a/doc/html/common_8php.html b/doc/html/common_8php.html index 4fea80ece..e70c1adb9 100644 --- a/doc/html/common_8php.html +++ b/doc/html/common_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('common_8php.html','');}); Functions  common_init (&$a)   - common_aside (&$a) -   common_content (&$a)  

Function Documentation

- -
-
- - - - - - - - -
common_aside (& $a)
-
- -
-
diff --git a/doc/html/common_8php.js b/doc/html/common_8php.js index 6f763d046..85ca9299c 100644 --- a/doc/html/common_8php.js +++ b/doc/html/common_8php.js @@ -1,6 +1,5 @@ var common_8php = [ - [ "common_aside", "common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a", null ], [ "common_content", "common_8php.html#ab63408f39abef7a6915186e8dabc5a96", null ], [ "common_init", "common_8php.html#aca62f113655809f41f49042ce9b123c2", null ] ]; \ No newline at end of file diff --git a/doc/html/contact__widgets_8php.html b/doc/html/contact__widgets_8php.html index 179eded89..8c7dc4b33 100644 --- a/doc/html/contact__widgets_8php.html +++ b/doc/html/contact__widgets_8php.html @@ -112,8 +112,6 @@ $(document).ready(function(){initNavTree('contact__widgets_8php.html','');}); - - @@ -148,7 +146,7 @@ Functions

Functions

 follow_widget ()
 
 findpeople_widget ()
 
 fileas_widget ($baseurl, $selected= '')
-

Referenced by channel_aside(), and lastpost_aside().

+

Referenced by widget_categories().

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

Referenced by channel_content(), and lastpost_content().

+

Referenced by channel_content().

@@ -194,8 +192,6 @@ Functions
-

Referenced by network_init().

-
@@ -213,23 +209,6 @@ Functions

Referenced by connections_aside(), directory_aside(), and suggest_aside().

- - - -
-
- - - - - - - -
follow_widget ()
-
- -

Referenced by connections_aside(), intro_aside(), and suggest_aside().

-
diff --git a/doc/html/contact__widgets_8php.js b/doc/html/contact__widgets_8php.js index 1b2a8ecd5..2963a1227 100644 --- a/doc/html/contact__widgets_8php.js +++ b/doc/html/contact__widgets_8php.js @@ -3,6 +3,5 @@ var contact__widgets_8php = [ "categories_widget", "contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353", null ], [ "common_friends_visitor_widget", "contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65", null ], [ "fileas_widget", "contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b", null ], - [ "findpeople_widget", "contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6", null ], - [ "follow_widget", "contact__widgets_8php.html#af24e693532a045954caab515942cfc6f", null ] + [ "findpeople_widget", "contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6", null ] ]; \ No newline at end of file diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index bc9198ee2..98d877a3b 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -230,7 +230,7 @@ Functions
-

Referenced by channel_content(), display_content(), items_fetch(), lastpost_content(), network_content(), and zot_feed().

+

Referenced by channel_content(), display_content(), items_fetch(), network_content(), and zot_feed().

@@ -287,7 +287,7 @@ Functions
  • conversation view The $mode parameter decides between the various renderings and also figures out how to determine page owner and other contextual items that are based on unique features of the calling module.
    • -

    Referenced by channel_content(), community_content(), display_content(), item_post(), lastpost_content(), network_content(), Item\remove_parent(), search_content(), and Item\set_conversation().

    +

    Referenced by channel_content(), community_content(), display_content(), item_post(), network_content(), Item\remove_parent(), search_content(), and Item\set_conversation().

    @@ -608,7 +608,7 @@ Functions
    -

    Referenced by channel_content(), events_content(), lastpost_content(), photos_content(), and profile_content().

    +

    Referenced by channel_content(), events_content(), photos_content(), and profile_content().

    @@ -752,7 +752,7 @@ Functions
    -

    Referenced by blocks_content(), channel_content(), display_content(), lastpost_content(), layouts_content(), network_content(), rpost_content(), and webpages_content().

    +

    Referenced by blocks_content(), channel_content(), display_content(), layouts_content(), network_content(), rpost_content(), and webpages_content().

    diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 3bf683aef..1b4f6ce6c 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -228,7 +228,7 @@ Functions
    -

    Referenced by crypto_encapsulate(), item_post(), and zfinger_init().

    +

    Referenced by crypto_encapsulate(), item_post(), post_activity_item(), and zfinger_init().

    @@ -318,7 +318,7 @@ Functions
    -

    Referenced by editpost_content(), encode_item(), encode_mail(), message_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().

    +

    Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), message_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().

    @@ -416,7 +416,7 @@ Functions
    -

    Referenced by create_identity(), fix_system_urls(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), post_post(), zfinger_init(), zot_build_packet(), and zot_fetch().

    +

    Referenced by create_identity(), fix_system_urls(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), post_activity_item(), post_post(), zfinger_init(), zot_build_packet(), and zot_fetch().

    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index fa92b651f..9a5af9023 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -334,7 +334,7 @@ Functions
    -

    Referenced by advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), like_content(), logger(), magic_init(), mail_store(), message_content(), message_post(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_store(), message_content(), message_post(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index da6e5eb43..dd7572f7c 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(), crepair_post(), 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(), lastpost_content(), 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(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), 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(), 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(), 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().

    @@ -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(), crepair_content(), crepair_init(), crepair_post(), 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(), follow_widget(), 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(), intro_content(), intro_post(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_content(), 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(), network_init(), 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_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), 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(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), 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(), 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(), 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().

    diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 6360d6c4d..7b7f02999 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -138,8 +138,6 @@ Files   file  contactgroup.php   -file  crepair.php -  file  delegate.php   file  directory.php @@ -174,8 +172,6 @@ Files   file  group.php   -file  hcard.php -  file  help.php   file  home.php @@ -184,14 +180,10 @@ Files   file  import.php   -file  intro.php -  file  invite.php   file  item.php   -file  lastpost.php -  file  layouts.php   file  like.php @@ -222,6 +214,8 @@ Files   file  new_channel.php   +file  notes.php +  file  notifications.php   file  notify.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 25d9c4366..b47296a36 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -17,7 +17,6 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "connect.php", "connect_8php.html", "connect_8php" ], [ "connections.php", "connections_8php.html", "connections_8php" ], [ "contactgroup.php", "contactgroup_8php.html", "contactgroup_8php" ], - [ "crepair.php", "crepair_8php.html", "crepair_8php" ], [ "delegate.php", "delegate_8php.html", "delegate_8php" ], [ "directory.php", "mod_2directory_8php.html", "mod_2directory_8php" ], [ "dirsearch.php", "dirsearch_8php.html", "dirsearch_8php" ], @@ -35,15 +34,12 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "follow.php", "mod_2follow_8php.html", "mod_2follow_8php" ], [ "fsuggest.php", "fsuggest_8php.html", "fsuggest_8php" ], [ "group.php", "mod_2group_8php.html", "mod_2group_8php" ], - [ "hcard.php", "hcard_8php.html", "hcard_8php" ], [ "help.php", "help_8php.html", "help_8php" ], [ "home.php", "home_8php.html", null ], [ "hostxrd.php", "hostxrd_8php.html", "hostxrd_8php" ], [ "import.php", "import_8php.html", "import_8php" ], - [ "intro.php", "intro_8php.html", "intro_8php" ], [ "invite.php", "invite_8php.html", "invite_8php" ], [ "item.php", "item_8php.html", "item_8php" ], - [ "lastpost.php", "lastpost_8php.html", "lastpost_8php" ], [ "layouts.php", "layouts_8php.html", "layouts_8php" ], [ "like.php", "like_8php.html", "like_8php" ], [ "lockview.php", "lockview_8php.html", "lockview_8php" ], @@ -59,6 +55,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "msearch.php", "msearch_8php.html", "msearch_8php" ], [ "network.php", "mod_2network_8php.html", "mod_2network_8php" ], [ "new_channel.php", "new__channel_8php.html", "new__channel_8php" ], + [ "notes.php", "notes_8php.html", "notes_8php" ], [ "notifications.php", "notifications_8php.html", "notifications_8php" ], [ "notify.php", "mod_2notify_8php.html", "mod_2notify_8php" ], [ "oembed.php", "mod_2oembed_8php.html", "mod_2oembed_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 0958db030..08972203b 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(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), 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(), 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_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().

    @@ -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(), 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(), 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().

    diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 437f5cf41..e1e853922 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions
    -

    Referenced by apw_form(), categories_widget(), channel_aside(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), lastpost_aside(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), saved_searches(), search_saved_searches(), settings_aside(), sources_content(), sources_post(), and thing_content().

    +

    Referenced by apw_form(), categories_widget(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), message_content(), message_post(), nav(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), search_saved_searches(), searchbox(), settings_aside(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_suggestions(), and widget_tagcloud_wall().

    diff --git a/doc/html/files.html b/doc/html/files.html index 5ab85789e..c570f79fd 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -206,115 +206,112 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*connect.php |o*connections.php |o*contactgroup.php -|o*crepair.php -|o*delegate.php -|o*directory.php -|o*dirsearch.php -|o*display.php -|o*editblock.php -|o*editlayout.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*filestorage.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*intro.php -|o*invite.php -|o*item.php -|o*lastpost.php -|o*layouts.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|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*delegate.php +|o*directory.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*filestorage.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*invite.php +|o*item.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*notes.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|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+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 3e16d0a6d..6c64df67e 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -171,9 +171,6 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • chanman_remove_everything_from_network() : chanman.php
    • -
  • channel_aside() -: channel.php -
  • channel_content() : channel.php
    • @@ -306,9 +303,6 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • comanche_widget() : comanche.php
    • -
  • common_aside() -: common.php -
  • common_content() : common.php
    • @@ -435,15 +429,6 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • create_identity() : identity.php
    • -
  • crepair_content() -: crepair.php -
    • -
  • crepair_init() -: crepair.php -
    • -
  • crepair_post() -: crepair.php -
  • cronhooks_run() : cronhooks.php
    • diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index e5f1aed68..716382f88 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -228,9 +228,6 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
  • follow_init() : follow.php
    • -
  • follow_widget() -: contact_widgets.php -
  • foreach : typo.php
    • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index b671ce7ba..6065c890b 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -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 fd225fed0..ef76758fb 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -150,12 +150,6 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
  • has_permissions() : items.php
    • -
  • hcard_aside() -: hcard.php -
    • -
  • hcard_init() -: hcard.php -
  • head_add_css() : plugin.php
    • @@ -171,6 +165,12 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
  • head_get_js() : plugin.php
    • +
  • head_remove_css() +: plugin.php +
    • +
  • head_remove_js() +: plugin.php +
  • head_set_icon() : boot.php
    • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index b7e2cc9a6..2af0ad401 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -202,15 +202,6 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • install_plugin() : plugin.php
    • -
  • intro_aside() -: intro.php -
    • -
  • intro_content() -: intro.php -
    • -
  • intro_post() -: intro.php -
  • invite_content() : invite.php
    • diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html index 3124f0a25..f8b3b2e43 100644 --- a/doc/html/globals_0x6c.html +++ b/doc/html/globals_0x6c.html @@ -153,15 +153,6 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
  • LANGUAGE_DETECT_MIN_LENGTH : boot.php
    • -
  • lastpost_aside() -: lastpost.php -
    • -
  • lastpost_content() -: lastpost.php -
    • -
  • lastpost_init() -: lastpost.php -
  • layout_select() : text.php
    • @@ -189,6 +180,9 @@ $(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_0x6e.html b/doc/html/globals_0x6e.html index 2c71a4ccb..8444dcae5 100644 --- a/doc/html/globals_0x6e.html +++ b/doc/html/globals_0x6e.html @@ -288,6 +288,9 @@ $(document).ready(function(){initNavTree('globals_0x6e.html','');});
  • notags() : text.php
    • +
  • notes_init() +: notes.php +
  • notice() : boot.php
    • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index b5a650642..f60daa3d6 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -506,9 +506,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • profile_activity() : activities.php
    • -
  • profile_aside() -: profile.php -
  • profile_content() : profile.php
    • @@ -521,9 +518,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • profile_load() : identity.php
    • -
  • profile_photo_aside() -: profile_photo.php -
  • profile_photo_init() : profile_photo.php
    • @@ -539,9 +533,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • profiler() : text.php
    • -
  • profiles_aside() -: profiles.php -
  • profiles_content() : profiles.php
    • @@ -551,9 +542,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • profiles_post() : profiles.php
    • -
  • profperm_aside() -: profperm.php -
  • profperm_content() : profperm.php
    • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index bb8384a0e..79951659d 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -147,12 +147,12 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • sanitise_acl() : text.php
    • -
  • saved_searches() -: network.php -
  • scale_external_images() : network.php
    • +
  • script_path() +: plugin.php +
  • search() : text.php
    • @@ -171,6 +171,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • search_saved_searches() : search.php
    • +
  • searchbox() +: text.php +
  • select_timezone() : datetime.php
    • diff --git a/doc/html/globals_0x76.html b/doc/html/globals_0x76.html index b6a1e3208..145d34826 100644 --- a/doc/html/globals_0x76.html +++ b/doc/html/globals_0x76.html @@ -162,9 +162,6 @@ $(document).ready(function(){initNavTree('globals_0x76.html','');});
  • view_init() : view.php
    • -
  • viewconnections_aside() -: viewconnections.php -
  • viewconnections_content() : viewconnections.php
    • diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index 7de93fd83..2b6c5d703 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -171,12 +171,45 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
  • while : docblox_errorchecker.php
    • +
  • widget_affinity() +: widgets.php +
    • +
  • widget_archive() +: widgets.php +
    • +
  • widget_categories() +: widgets.php +
    • +
  • widget_collections() +: widgets.php +
    • +
  • widget_filer() +: widgets.php +
    • +
  • widget_follow() +: widgets.php +
    • +
  • widget_fullprofile() +: widgets.php +
    • +
  • widget_notes() +: widgets.php +
  • widget_profile() : widgets.php
    • +
  • widget_savedsearch() +: widgets.php +
    • +
  • widget_suggestions() +: widgets.php +
  • widget_tagcloud() : widgets.php
    • +
  • widget_tagcloud_wall() +: widgets.php +
  • writepages_widget() : page_widgets.php
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index f4cbc1954..d783f629a 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -170,9 +170,6 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • chanman_remove_everything_from_network() : chanman.php
    • -
  • channel_aside() -: channel.php -
  • channel_content() : channel.php
    • @@ -296,9 +293,6 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • comanche_widget() : comanche.php
    • -
  • common_aside() -: common.php -
  • common_content() : common.php
    • @@ -416,15 +410,6 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • create_identity() : identity.php
    • -
  • crepair_content() -: crepair.php -
    • -
  • crepair_init() -: crepair.php -
    • -
  • crepair_post() -: crepair.php -
  • cronhooks_run() : cronhooks.php
    • diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 89475dd1f..935d33925 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -227,9 +227,6 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
  • follow_init() : follow.php
    • -
  • follow_widget() -: contact_widgets.php -
  • format_categories() : text.php
    • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 34086b120..ed640de4b 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -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 b5382ad9d..abab8925b 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.html @@ -149,12 +149,6 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});
  • has_permissions() : items.php
    • -
  • hcard_aside() -: hcard.php -
    • -
  • hcard_init() -: hcard.php -
  • head_add_css() : plugin.php
    • @@ -170,6 +164,12 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});
  • head_get_js() : plugin.php
    • +
  • head_remove_css() +: plugin.php +
    • +
  • head_remove_js() +: plugin.php +
  • head_set_icon() : boot.php
    • diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index cd82b3b08..1c0b48bfb 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -194,15 +194,6 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
  • install_plugin() : plugin.php
    • -
  • intro_aside() -: intro.php -
    • -
  • intro_content() -: intro.php -
    • -
  • intro_post() -: intro.php -
  • invite_content() : invite.php
    • diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index d361f9967..4eaccbd4f 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -146,15 +146,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
  • lang_selector() : text.php
    • -
  • lastpost_aside() -: lastpost.php -
    • -
  • lastpost_content() -: lastpost.php -
    • -
  • lastpost_init() -: lastpost.php -
  • layout_select() : text.php
    • @@ -182,6 +173,9 @@ $(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_0x6e.html b/doc/html/globals_func_0x6e.html index 0197c2b99..8af69c3b4 100644 --- a/doc/html/globals_func_0x6e.html +++ b/doc/html/globals_func_0x6e.html @@ -200,6 +200,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');});
  • notags() : text.php
    • +
  • notes_init() +: notes.php +
  • notice() : boot.php
    • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index b9d28bdc8..ed1fdd0b7 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -374,9 +374,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • profile_activity() : activities.php
    • -
  • profile_aside() -: profile.php -
  • profile_content() : profile.php
    • @@ -389,9 +386,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • profile_load() : identity.php
    • -
  • profile_photo_aside() -: profile_photo.php -
  • profile_photo_init() : profile_photo.php
    • @@ -407,9 +401,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • profiler() : text.php
    • -
  • profiles_aside() -: profiles.php -
  • profiles_content() : profiles.php
    • @@ -419,9 +410,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • profiles_post() : profiles.php
    • -
  • profperm_aside() -: profperm.php -
  • profperm_content() : profperm.php
    • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index ca9a9361b..45afdd162 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -146,12 +146,12 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • sanitise_acl() : text.php
    • -
  • saved_searches() -: network.php -
  • scale_external_images() : network.php
    • +
  • script_path() +: plugin.php +
  • search() : text.php
    • @@ -170,6 +170,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • search_saved_searches() : search.php
    • +
  • searchbox() +: text.php +
  • select_timezone() : datetime.php
    • diff --git a/doc/html/globals_func_0x76.html b/doc/html/globals_func_0x76.html index c61a91b6b..b8447e3c0 100644 --- a/doc/html/globals_func_0x76.html +++ b/doc/html/globals_func_0x76.html @@ -161,9 +161,6 @@ $(document).ready(function(){initNavTree('globals_func_0x76.html','');});
  • view_init() : view.php
    • -
  • viewconnections_aside() -: viewconnections.php -
  • viewconnections_content() : viewconnections.php
    • diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index 96406899a..c91da46b5 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -167,12 +167,45 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
  • what_next() : setup.php
    • +
  • widget_affinity() +: widgets.php +
    • +
  • widget_archive() +: widgets.php +
    • +
  • widget_categories() +: widgets.php +
    • +
  • widget_collections() +: widgets.php +
    • +
  • widget_filer() +: widgets.php +
    • +
  • widget_follow() +: widgets.php +
    • +
  • widget_fullprofile() +: widgets.php +
    • +
  • widget_notes() +: widgets.php +
  • widget_profile() : widgets.php
    • +
  • widget_savedsearch() +: widgets.php +
    • +
  • widget_suggestions() +: widgets.php +
  • widget_tagcloud() : widgets.php
    • +
  • widget_tagcloud_wall() +: widgets.php +
  • writepages_widget() : page_widgets.php
    • diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 6bd7cb296..82016ca06 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -385,7 +385,7 @@ Functions
    -

    Referenced by channel_aside(), common_aside(), connect_init(), hcard_aside(), lastpost_aside(), profile_aside(), profile_photo_aside(), profiles_aside(), profperm_aside(), and viewconnections_aside().

    +

    Referenced by connect_init().

    @@ -432,7 +432,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(), hcard_init(), lastpost_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(), profile_init(), profile_photo_init(), profiles_init(), profperm_init(), viewconnections_init(), and webpages_content().

    @@ -470,7 +470,7 @@ Functions

    : array $profile

    Returns HTML string stuitable for sidebar inclusion Exceptions: Returns empty string if passed $profile is wrong type or not populated

    -

    Referenced by profile_create_sidebar(), and widget_profile().

    +

    Referenced by profile_create_sidebar(), widget_fullprofile(), and widget_profile().

    @@ -579,7 +579,7 @@ Functions
    Returns
    string

    'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else

    -

    Referenced by conversation(), format_categories(), get_plink(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), and viewconnections_content().

    +

    Referenced by conversation(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), and viewconnections_content().

    diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index bb9e9d40f..335b90d0d 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(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), lastpost_content(), 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_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_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), 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_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().

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

    Referenced by Conversation\__construct(), authenticate_success(), App\build_pagehead(), change_channel(), channel_aside(), 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(), intro_content(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), lastpost_aside(), lastpost_content(), 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(), and theme_content().

    +

    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().

    @@ -508,7 +508,7 @@ Functions
    -

    Referenced by connect_post(), invite_post(), process_channel_sync_delivery(), register_post(), settings_post(), and theme_post().

    +

    Referenced by connect_post(), invite_post(), notes_init(), process_channel_sync_delivery(), register_post(), settings_post(), and theme_post().

    diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index 21bff3376..cc72d1a96 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= '') -  + group_side ($every="contacts", $each="group", $edit=false, $group_id=0, $cid= '', $mode=1) +   expand_groups ($a)    member_of ($c) @@ -300,7 +300,7 @@ Functions
    -

    Referenced by connections_post(), network_content(), and new_contact().

    +

    Referenced by connections_post(), items_fetch(), network_content(), and new_contact().

    @@ -366,7 +366,7 @@ Functions - +
    @@ -398,7 +398,13 @@ Functions - + + + + + + + @@ -408,7 +414,7 @@ Functions
     $cid = '' $cid = '',
     $mode = 1 
    -

    Referenced by connections_aside(), group_aside(), and network_init().

    +

    Referenced by connections_aside(), group_aside(), and widget_collections().

    @@ -436,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 ef82dca8f..abd215694 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#a1042d74055bafe54a6a30103d87a7f17", null ], + [ "group_side", "include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2", 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_2network_8php.html b/doc/html/include_2network_8php.html index 5f9f69ea0..64a44cb62 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -385,7 +385,7 @@ Functions
    -

    Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), dirsearch_content(), new_channel_init(), oexchange_content(), post_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().

    +

    Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), dirsearch_content(), new_channel_init(), notes_init(), oexchange_content(), post_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().

    @@ -413,7 +413,7 @@ Functions
    -

    Referenced by consume_feed(), and notifications_content().

    +

    Referenced by consume_feed().

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index cdb6587c5..d76cf3b7f 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -830,7 +830,7 @@ Functions
    -

    Referenced by channel_content(), display_content(), editpost_content(), events_content(), item_expire(), items_fetch(), lastpost_content(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().

    +

    Referenced by channel_content(), display_content(), editpost_content(), events_content(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().

    @@ -1382,8 +1382,6 @@ Functions
    -

    Referenced by channel_aside(), lastpost_aside(), and network_init().

    -
    @@ -1410,7 +1408,7 @@ Functions
    -

    Referenced by posted_date_widget().

    +

    Referenced by posted_date_widget(), and widget_archive().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index ed8674731..4d3a8e489 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(), crepair_content(), crepair_post(), 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(), follow_widget(), 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(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_check_service_class(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), lastpost_content(), lastpost_init(), 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_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(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), 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_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(), 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().

    diff --git a/doc/html/mod_2network_8php.html b/doc/html/mod_2network_8php.html index fa143845a..16de4ad96 100644 --- a/doc/html/mod_2network_8php.html +++ b/doc/html/mod_2network_8php.html @@ -114,8 +114,6 @@ $(document).ready(function(){initNavTree('mod_2network_8php.html','');}); Functions  network_init (&$a)   - saved_searches ($search) -   network_content (&$a, $update=0, $load=false)   @@ -168,24 +166,6 @@ Functions
    -
    - - -
    -
    - - - - - - - - -
    saved_searches ( $search)
    -
    - -

    Referenced by network_init().

    -
    diff --git a/doc/html/mod_2network_8php.js b/doc/html/mod_2network_8php.js index f076a234a..651e6f6bd 100644 --- a/doc/html/mod_2network_8php.js +++ b/doc/html/mod_2network_8php.js @@ -1,6 +1,5 @@ var mod_2network_8php = [ [ "network_content", "mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4", null ], - [ "network_init", "mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec", null ], - [ "saved_searches", "mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad", null ] + [ "network_init", "mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec", null ] ]; \ No newline at end of file diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 4557e049a..ca237cc06 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -37,13 +37,12 @@ var NAVTREEINDEX = [ "BaseObject_8php.html", "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7", -"classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934", -"contactgroup_8php.html", -"globals_0x6c.html", -"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2", -"php2po_8php.html", -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d", -"zping_8php.html" +"classFKOAuthDataStore.html#a4edfe2e77ecd2e16ff6b5eb516ed3599", +"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3", +"globals_0x73.html", +"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274", +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1", +"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 28b238093..516ba1cee 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -122,9 +122,8 @@ var NAVTREEINDEX1 = "boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,204], "cache_8php.html":[5,0,0,11], "channel_8php.html":[5,0,1,9], -"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,9,1], -"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,9,2], -"channel_8php.html#aea8e189f2fbabfda779349dd94082e8e":[5,0,1,9,0], +"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], "classApp.html":[4,0,5], @@ -249,5 +248,6 @@ var NAVTREEINDEX1 = "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#a431b44d70e3da6a8256ab38f710e3050":[4,0,14,5], +"classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934":[4,0,14,4] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 9fc916d75..6b6980037 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,6 +1,5 @@ var NAVTREEINDEX2 = { -"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], @@ -223,9 +222,8 @@ var NAVTREEINDEX2 = "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#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,12,0], -"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,12,1], -"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,12,2], +"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], @@ -249,5 +247,7 @@ var NAVTREEINDEX2 = "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], -"contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,19,4] +"contactgroup_8php.html":[5,0,1,16], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,16,0], +"conversation_8php.html":[5,0,0,20] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index d333cde66..0a8edd5de 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,8 +1,5 @@ var NAVTREEINDEX3 = { -"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], @@ -27,10 +24,6 @@ var NAVTREEINDEX3 = "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,20,18], "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,20,12], "conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81":[5,0,0,20,3], -"crepair_8php.html":[5,0,1,17], -"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,17,0], -"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,17,1], -"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,17,2], "cronhooks_8php.html":[5,0,0,22], "cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,22,0], "crypto_8php.html":[5,0,0,23], @@ -76,8 +69,8 @@ var NAVTREEINDEX3 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], "dba__mysql_8php.html":[5,0,0,0,1], "dba__mysqli_8php.html":[5,0,0,0,2], -"delegate_8php.html":[5,0,1,18], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,18,0], +"delegate_8php.html":[5,0,1,17], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,17,0], "deliver_8php.html":[5,0,0,25], "deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,25,0], "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,2,0], @@ -109,12 +102,12 @@ var NAVTREEINDEX3 = "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0], "dir_d520c5cf583201d9437764f209363c22.html":[5,0,3,1,0], -"dirsearch_8php.html":[5,0,1,20], -"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,20,1], -"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,20,2], -"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,20,0], -"display_8php.html":[5,0,1,21], -"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,21,0], +"dirsearch_8php.html":[5,0,1,19], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,19,1], +"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,19,2], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,19,0], +"display_8php.html":[5,0,1,20], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,20,0], "docblox__errorchecker_8php.html":[5,0,2,3], "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,3,3], "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,3,2], @@ -127,14 +120,14 @@ var NAVTREEINDEX3 = "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,3,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,3,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,3,10], -"editblock_8php.html":[5,0,1,22], -"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,22,0], -"editlayout_8php.html":[5,0,1,23], -"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,23,0], -"editpost_8php.html":[5,0,1,24], -"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,24,0], -"editwebpage_8php.html":[5,0,1,25], -"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,25,0], +"editblock_8php.html":[5,0,1,21], +"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,21,0], +"editlayout_8php.html":[5,0,1,22], +"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,22,0], +"editpost_8php.html":[5,0,1,23], +"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,23,0], +"editwebpage_8php.html":[5,0,1,24], +"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,24,0], "enotify_8php.html":[5,0,0,28], "enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,28,1], "event_8php.html":[5,0,0,29], @@ -145,9 +138,9 @@ var NAVTREEINDEX3 = "event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,29,2], "event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,29,3], "event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,29,4], -"events_8php.html":[5,0,1,26], -"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,26,0], -"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,26,1], +"events_8php.html":[5,0,1,25], +"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,25,0], +"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,25,1], "expire_8php.html":[5,0,0,30], "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,30,0], "extract_8php.html":[5,0,2,4], @@ -155,20 +148,20 @@ var NAVTREEINDEX3 = "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,4,2], "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,4,0], "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,4,1], -"fbrowser_8php.html":[5,0,1,27], -"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,27,0], +"fbrowser_8php.html":[5,0,1,26], +"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,26,0], "features_8php.html":[5,0,0,31], "features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,31,0], "features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,31,1], -"feed_8php.html":[5,0,1,28], -"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,28,0], -"filer_8php.html":[5,0,1,29], -"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,29,0], -"filerm_8php.html":[5,0,1,30], -"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,30,0], +"feed_8php.html":[5,0,1,27], +"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,27,0], +"filer_8php.html":[5,0,1,28], +"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,28,0], +"filerm_8php.html":[5,0,1,29], +"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,29,0], "files.html":[5,0], -"filestorage_8php.html":[5,0,1,31], -"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,31,0], +"filestorage_8php.html":[5,0,1,30], +"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,30,0], "fpostit_8php.html":[5,0,2,0,0], "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0], "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[5,0,2,0,0,1], @@ -189,9 +182,9 @@ var NAVTREEINDEX3 = "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,5,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,5,3], "friendica__smarty_8php.html":[5,0,0,33], -"fsuggest_8php.html":[5,0,1,33], -"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,33,1], -"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,33,0], +"fsuggest_8php.html":[5,0,1,32], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,32,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,32,0], "full_8php.html":[5,0,3,0,1], "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0], "functions.html":[4,3,0], @@ -215,8 +208,8 @@ var NAVTREEINDEX3 = "functions_0x73.html":[4,3,0,17], "functions_0x74.html":[4,3,0,18], "functions_0x76.html":[4,3,0,19], -"functions_func.html":[4,3,1,0], "functions_func.html":[4,3,1], +"functions_func.html":[4,3,1,0], "functions_func_0x61.html":[4,3,1,1], "functions_func_0x62.html":[4,3,1,2], "functions_func_0x63.html":[4,3,1,3], @@ -236,8 +229,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], "globals.html":[5,1,0,0], +"globals.html":[5,1,0], "globals_0x5f.html":[5,1,0,1], "globals_0x61.html":[5,1,0,2], "globals_0x62.html":[5,1,0,3], @@ -249,5 +242,12 @@ var NAVTREEINDEX3 = "globals_0x68.html":[5,1,0,9], "globals_0x69.html":[5,1,0,10], "globals_0x6a.html":[5,1,0,11], -"globals_0x6b.html":[5,1,0,12] +"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] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 507a865e8..942f2f0f7 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,12 +1,5 @@ var NAVTREEINDEX4 = { -"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_0x73.html":[5,1,0,20], "globals_0x74.html":[5,1,0,21], "globals_0x75.html":[5,1,0,22], @@ -67,16 +60,13 @@ var NAVTREEINDEX4 = "gprobe_8php.html":[5,0,0,34], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,34,0], "greenthumbnails_8php.html":[5,0,3,1,0,1,3], -"hcard_8php.html":[5,0,1,35], -"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,35,0], -"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,35,1], -"help_8php.html":[5,0,1,36], -"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,36,1], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,36,0], +"help_8php.html":[5,0,1,34], +"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,34,1], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,34,0], "hierarchy.html":[4,2], -"home_8php.html":[5,0,1,37], -"hostxrd_8php.html":[5,0,1,38], -"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,38,0], +"home_8php.html":[5,0,1,35], +"hostxrd_8php.html":[5,0,1,36], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,36,0], "html2bbcode_8php.html":[5,0,0,36], "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,36,3], "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,36,1], @@ -106,9 +96,9 @@ var NAVTREEINDEX4 = "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], -"import_8php.html":[5,0,1,39], -"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,39,1], -"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,39,0], +"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], "include_2api_8php.html":[5,0,0,5], "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], @@ -195,7 +185,6 @@ var NAVTREEINDEX4 = "include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,35,2], "include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,35,10], "include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,35,1], -"include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17":[5,0,0,35,8], "include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,35,0], "include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,35,6], "include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,35,7], @@ -203,6 +192,7 @@ var NAVTREEINDEX4 = "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], @@ -249,5 +239,15 @@ var NAVTREEINDEX4 = "include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,50,5], "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#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] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index ab423c32c..c4756ba10 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,15 +1,5 @@ var NAVTREEINDEX5 = { -"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_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], @@ -17,20 +7,16 @@ var NAVTREEINDEX5 = "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], -"intro_8php.html":[5,0,1,40], -"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,40,1], -"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,40,0], -"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,40,2], -"invite_8php.html":[5,0,1,41], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,41,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,41,1], -"item_8php.html":[5,0,1,42], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,42,0], -"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,42,3], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,42,5], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,42,4], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,42,1], -"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,42,2], +"invite_8php.html":[5,0,1,38], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,38,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,38,1], +"item_8php.html":[5,0,1,39], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,39,0], +"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,39,3], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,39,5], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,39,4], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,39,1], +"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,39,2], "items_8php.html":[5,0,0,41], "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,53], "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,41,2], @@ -96,27 +82,23 @@ var NAVTREEINDEX5 = "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,42,5], "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,42,2], "language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,42,8], -"lastpost_8php.html":[5,0,1,43], -"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,43,0], -"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,43,1], -"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,43,2], -"layouts_8php.html":[5,0,1,44], -"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,44,0], -"like_8php.html":[5,0,1,45], -"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,45,0], -"lockview_8php.html":[5,0,1,46], -"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,46,0], -"login_8php.html":[5,0,1,47], -"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,47,0], -"lostpass_8php.html":[5,0,1,48], -"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,48,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,48,1], -"magic_8php.html":[5,0,1,49], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,49,0], -"manage_8php.html":[5,0,1,50], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,50,0], -"match_8php.html":[5,0,1,51], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,51,0], +"layouts_8php.html":[5,0,1,40], +"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,40,0], +"like_8php.html":[5,0,1,41], +"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,41,0], +"lockview_8php.html":[5,0,1,42], +"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,42,0], +"login_8php.html":[5,0,1,43], +"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,43,0], +"lostpass_8php.html":[5,0,1,44], +"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,44,0], +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,44,1], +"magic_8php.html":[5,0,1,45], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,45,0], +"manage_8php.html":[5,0,1,46], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,46,0], +"match_8php.html":[5,0,1,47], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,47,0], "md_README.html":[2], "md_config.html":[0], "md_fresh.html":[1], @@ -128,10 +110,10 @@ var NAVTREEINDEX5 = "minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,1,0,1,4,0], "minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,1,0,1,4,2], "minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,1,0,1,4,1], -"mitem_8php.html":[5,0,1,54], -"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,54,2], -"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,54,0], -"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,54,1], +"mitem_8php.html":[5,0,1,50], +"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], @@ -139,54 +121,53 @@ var NAVTREEINDEX5 = "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_2directory_8php.html":[5,0,1,19], -"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,19,2], -"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,19,0], -"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,19,1], -"mod_2follow_8php.html":[5,0,1,32], -"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,32,1], -"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,32,0], -"mod_2group_8php.html":[5,0,1,34], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,34,1], -"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,34,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,34,2], -"mod_2menu_8php.html":[5,0,1,52], -"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,52,0], -"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,52,1], -"mod_2message_8php.html":[5,0,1,53], -"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,53,2], -"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,53,1], -"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,53,0], -"mod_2network_8php.html":[5,0,1,57], -"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,57,1], -"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,57,2], -"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,57,0], -"mod_2notify_8php.html":[5,0,1,60], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,60,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,60,0], -"mod_2oembed_8php.html":[5,0,1,61], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,61,0], -"mod_2photos_8php.html":[5,0,1,67], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,67,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,67,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,67,1], +"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], +"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,18,1], +"mod_2follow_8php.html":[5,0,1,31], +"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_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_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], +"mod_2notify_8php.html":[5,0,1,57], +"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,57,1], +"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,57,0], +"mod_2oembed_8php.html":[5,0,1,58], +"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,58,0], +"mod_2photos_8php.html":[5,0,1,64], +"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,64,2], +"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,64,0], +"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,55], -"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,55,0], -"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,55,1], -"msearch_8php.html":[5,0,1,56], -"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,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], +"msearch_8php.html":[5,0,1,52], +"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,52,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[3,0,0], "namespaceacl__selectors.html":[4,0,0], -"namespacefriendica-to-smarty-tpl.html":[4,0,2], +"namespaceacl__selectors.html":[3,0,0], "namespacefriendica-to-smarty-tpl.html":[3,0,2], +"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacemembers.html":[3,1,0], "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], @@ -198,41 +179,43 @@ var NAVTREEINDEX5 = "nav_8php.html":[5,0,0,45], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,45,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,45,1], -"new__channel_8php.html":[5,0,1,58], -"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,58,2], -"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,58,1], -"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,58,0], +"new__channel_8php.html":[5,0,1,54], +"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], -"notifications_8php.html":[5,0,1,59], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,59,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,59,0], +"notes_8php.html":[5,0,1,55], +"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,55,0], +"notifications_8php.html":[5,0,1,56], +"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,56,1], +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,56,0], "notifier_8php.html":[5,0,0,47], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,47,0], "oauth_8php.html":[5,0,0,49], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,49,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,49,2], -"oexchange_8php.html":[5,0,1,62], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,62,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,62,1], +"oexchange_8php.html":[5,0,1,59], +"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,59,0], +"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,59,1], "olddefault_8php.html":[5,0,3,1,0,1,5], "onedirsync_8php.html":[5,0,0,51], "onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,51,0], "onepoll_8php.html":[5,0,0,52], "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,52,0], -"opensearch_8php.html":[5,0,1,63], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,63,0], -"page_8php.html":[5,0,1,64], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,64,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,64,0], +"opensearch_8php.html":[5,0,1,60], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,60,0], +"page_8php.html":[5,0,1,61], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,61,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,61,0], "page__widgets_8php.html":[5,0,0,53], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,53,1], "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,53,0], "pages.html":[], -"parse__url_8php.html":[5,0,1,65], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,65,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,65,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,65,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,65,0], +"parse__url_8php.html":[5,0,1,62], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,62,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,62,3], +"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,62,1], +"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,62,0], "passion_8php.html":[5,0,3,1,0,1,6], "passionwide_8php.html":[5,0,3,1,0,1,7], "permissions_8php.html":[5,0,0,54], @@ -241,13 +224,30 @@ var NAVTREEINDEX5 = "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,54,3], "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,54,4], "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,54,1], -"photo_8php.html":[5,0,1,66], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,66,0], +"photo_8php.html":[5,0,1,63], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,63,0], "photo__driver_8php.html":[5,0,0,1,0], "photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca":[5,0,0,1,0,3], "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2], "photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[5,0,0,1,0,1], "photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[5,0,0,1,0,4], "photo__gd_8php.html":[5,0,0,1,1], -"photo__imagick_8php.html":[5,0,0,1,2] +"photo__imagick_8php.html":[5,0,0,1,2], +"php2po_8php.html":[5,0,2,6], +"php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[5,0,2,6,7], +"php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[5,0,2,6,5], +"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[5,0,2,6,6], +"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,6,3], +"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,6,0], +"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,6,1], +"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,6,4], +"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] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 12b23d172..6c08416b4 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,63 +1,49 @@ var NAVTREEINDEX6 = { -"php2po_8php.html":[5,0,2,6], -"php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[5,0,2,6,7], -"php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[5,0,2,6,5], -"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[5,0,2,6,6], -"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,6,3], -"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,6,0], -"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,6,1], -"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,6,4], -"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,68], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,68,0], -"pine_8php.html":[5,0,3,1,0,1,8], -"ping_8php.html":[5,0,1,69], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,69,0], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,66,0], "plugin_8php.html":[5,0,0,56], -"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,18], -"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,21], +"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,21], +"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,24], +"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,56,20], "plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,56,8], -"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,14], -"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,16], +"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,16], +"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,18], "plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,56,7], -"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,13], -"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,25], +"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,15], +"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,56,13], +"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,28], "plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,56,9], -"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,23], +"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,26], "plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,56,11], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,20], -"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,24], +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,23], +"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,27], "plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,56,4], "plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,56,0], -"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,56,26], +"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,56,29], "plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,56,1], -"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,56,22], -"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,56,19], -"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,56,15], +"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,56,25], +"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,56,22], +"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,56,12], +"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,56,17], "plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,56,3], "plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,56,6], "plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,56,2], -"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,56,12], +"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,56,14], "plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,56,10], -"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,17], +"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,19], "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,56,5], "po2php_8php.html":[5,0,2,7], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0], -"poco_8php.html":[5,0,1,70], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,70,0], -"poke_8php.html":[5,0,1,71], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,71,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,71,0], +"poco_8php.html":[5,0,1,67], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,67,0], +"poke_8php.html":[5,0,1,68], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,68,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,68,0], "poller_8php.html":[5,0,0,57], "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,57,0], -"post_8php.html":[5,0,1,72], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,72,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,72,1], +"post_8php.html":[5,0,1,69], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,69,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,69,1], "post__to__red_8php.html":[5,0,2,1,0,0], "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823":[5,0,2,1,0,0,16], "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,0,12], @@ -83,42 +69,38 @@ var NAVTREEINDEX6 = "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,0,18], "post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,0,23], "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,0,11], -"pretheme_8php.html":[5,0,1,73], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,73,0], -"probe_8php.html":[5,0,1,74], -"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,74,0], -"profile_8php.html":[5,0,1,75], -"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,75,0], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,75,1], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,75,2], -"profile__photo_8php.html":[5,0,1,76], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,76,1], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,76,2], -"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,76,0], +"pretheme_8php.html":[5,0,1,70], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,70,0], +"probe_8php.html":[5,0,1,71], +"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,71,0], +"profile_8php.html":[5,0,1,72], +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,72,0], +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,72,1], +"profile__photo_8php.html":[5,0,1,73], +"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,73,0], +"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,73,1], "profile__selectors_8php.html":[5,0,0,58], "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,58,2], "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,58,1], "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,58,0], -"profiles_8php.html":[5,0,1,77], -"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,77,0], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,77,2], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,77,1], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,77,3], -"profperm_8php.html":[5,0,1,78], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,78,2], -"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,78,0], -"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,78,1], -"pubsites_8php.html":[5,0,1,79], -"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,79,0], -"qsearch_8php.html":[5,0,1,80], -"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,80,0], +"profiles_8php.html":[5,0,1,74], +"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,74,1], +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,74,0], +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,74,2], +"profperm_8php.html":[5,0,1,75], +"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,75,1], +"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,81], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,81,0], +"randprof_8php.html":[5,0,1,78], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,78,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], @@ -151,32 +133,32 @@ 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,82], -"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,82,0], -"register_8php.html":[5,0,1,83], -"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,83,0], -"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,83,2], -"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,83,1], -"regmod_8php.html":[5,0,1,84], -"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,84,0], -"removeme_8php.html":[5,0,1,85], -"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,85,0], -"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,85,1], -"rmagic_8php.html":[5,0,1,86], -"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,86,0], -"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,86,2], -"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,86,1], -"rpost_8php.html":[5,0,1,87], -"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,87,0], -"rsd__xml_8php.html":[5,0,1,88], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,88,0], -"search_8php.html":[5,0,1,89], -"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,89,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,89,3], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,89,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,89,1], -"search__ac_8php.html":[5,0,1,90], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,90,0], +"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], "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], @@ -201,37 +183,37 @@ 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,91], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,91,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,91,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,91,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,91,1], -"setup_8php.html":[5,0,1,92], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,92,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,92,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,92,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,92,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,92,9], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,92,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,92,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,92,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,92,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,92,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,92,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,92,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,92,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,92,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,92,14], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,92,6], -"share_8php.html":[5,0,1,93], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,93,0], -"siteinfo_8php.html":[5,0,1,94], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,94,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,94,0], -"sitelist_8php.html":[5,0,1,95], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,95,0], -"smilies_8php.html":[5,0,1,96], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,96,0], +"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], "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], @@ -242,12 +224,30 @@ 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,97], -"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,97,0], -"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,97,1], -"starred_8php.html":[5,0,1,98], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,98,0], -"subthread_8php.html":[5,0,1,99], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,99,0], -"suggest_8php.html":[5,0,1,100] +"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], +"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], +"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], +"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,67,2], +"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] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 34efe688e..f17235309 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,23 +1,5 @@ var NAVTREEINDEX7 = { -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,100,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,100,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,100,2], -"system__unavailable_8php.html":[5,0,0,66], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,66,0], -"tagger_8php.html":[5,0,1,101], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,101,0], -"tagrm_8php.html":[5,0,1,102], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,102,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,102,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], -"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,67,2], -"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#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,67,1], "taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,67,13], "taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,67,12], @@ -37,7 +19,7 @@ var NAVTREEINDEX7 = "text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,69,11], "text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,69,44], "text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,69,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,77], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,78], "text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,69,32], "text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,69,35], "text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,69,49], @@ -46,42 +28,42 @@ var NAVTREEINDEX7 = "text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,69,47], "text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,69,42], "text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,69,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,85], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,74], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,86], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,75], "text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,69,48], "text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,69,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,87], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,88], "text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,69,23], -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,82], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,80], +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,83], +"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,81], "text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,69,30], "text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,69,41], -"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,71], +"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,72], "text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,69,7], "text_8php.html#a3ef8c0cf31f35f77462067de8712fa34":[5,0,0,69,28], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,83], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,84], "text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,33], -"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,70], +"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,71], "text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,69,31], "text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,69,43], "text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,69,61], "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,69,50], "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,69,24], "text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,69,60], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,79], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,80], "text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,69,9], "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,69,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,78], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,79], "text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,69,40], "text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,69,27], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,75], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,76], "text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,69,1], "text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,69,34], "text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,69,26], -"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,76], +"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,77], "text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,69,8], "text_8php.html#a876e94892867019935b348b573299352":[5,0,0,69,68], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,72], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,73], "text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,69,15], "text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,69,20], "text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,69,59], @@ -95,12 +77,13 @@ var NAVTREEINDEX7 = "text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,69,17], "text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,69,55], "text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,69,36], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,86], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,81], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,84], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,87], +"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,69,69], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,82], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,85], "text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,69,56], "text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,69,37], -"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,69], +"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,70], "text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,69,21], "text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,69,2], "text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,69,13], @@ -112,7 +95,7 @@ var NAVTREEINDEX7 = "text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,69,57], "text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,69,25], "text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,69,0], -"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,73], +"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,74], "text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,69,62], "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,69,22], "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,69,12], @@ -128,13 +111,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,103], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,103,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,103,1], -"toggle__mobile_8php.html":[5,0,1,104], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,104,0], -"toggle__safesearch_8php.html":[5,0,1,105], -"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,105,0], +"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], "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], @@ -148,18 +131,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,106], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,106,0], -"update__channel_8php.html":[5,0,1,107], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,107,0], -"update__community_8php.html":[5,0,1,108], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,108,0], -"update__display_8php.html":[5,0,1,109], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,109,0], -"update__network_8php.html":[5,0,1,110], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,110,0], -"update__search_8php.html":[5,0,1,111], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,111,0], +"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], "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], @@ -187,38 +170,49 @@ 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,112], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,112,0], -"viewconnections_8php.html":[5,0,1,113], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,113,2], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,113,1], -"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,113,0], -"viewsrc_8php.html":[5,0,1,114], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,114,0], -"vote_8php.html":[5,0,1,115], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,115,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,115,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,115,1], -"wall__attach_8php.html":[5,0,1,116], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,116,0], -"wall__upload_8php.html":[5,0,1,117], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,117,0], -"webfinger_8php.html":[5,0,1,118], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,118,0], -"webpages_8php.html":[5,0,1,119], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,119,0], -"wfinger_8php.html":[5,0,1,120], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,120,0], +"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], "widedarkness_8php.html":[5,0,3,1,0,1,10], "widgets_8php.html":[5,0,0,70], -"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,70,1], -"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,70,0], -"xchan_8php.html":[5,0,1,121], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,121,0], -"xrd_8php.html":[5,0,1,122], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,122,0], -"zfinger_8php.html":[5,0,1,123], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,123,0], +"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,70,11], +"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,70,8], +"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], "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], @@ -248,6 +242,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,124], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,124,0] +"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] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 9ab1d6ef2..c9294e06c 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(), lastpost_content(), layouts_content(), page_content(), photos_init(), webpages_content(), and zfinger_init().

    +

    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().

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

    Referenced by Conversation\add_thread(), 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_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(), z_readdir(), and zot_feed().

    diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index b30d3e156..19e276148 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -226,7 +226,7 @@ Functions
    -

    Referenced by crepair_post(), import_post(), import_xchan(), and poller_run().

    +

    Referenced by import_post(), import_xchan(), and poller_run().

    diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 666aede97..04ba0e59d 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(), lastpost_content(), lastpost_init(), layouts_content(), magic_init(), message_content(), message_post(), 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_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().

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 6a9842f46..ec97aaa58 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -150,12 +150,18 @@ Functions    head_add_css ($src, $media= 'screen')   + head_remove_css ($src, $media= 'screen') +   head_get_css ()    format_css_if_exists ($source)   + script_path () +   head_add_js ($src)   + head_remove_js ($src) +   head_get_js ()    format_js_if_exists ($source) @@ -192,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(), 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(), 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_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().

    @@ -284,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(), crepair_content(), 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(), follow_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(), intro_content(), invite_content(), lang_selector(), lastpost_content(), 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(), saved_searches(), 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(), 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(), 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().

    @@ -420,6 +426,48 @@ Functions

    Referenced by App\build_pagehead().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    head_remove_css ( $src,
     $media = 'screen' 
    )
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    head_remove_js ( $src)
    +
    +
    @@ -566,6 +614,23 @@ Functions

    Referenced by poller_run().

    + + + +
    +
    + + + + + + + +
    script_path ()
    +
    + +

    Referenced by format_css_if_exists(), and format_js_if_exists().

    +
    @@ -626,7 +691,7 @@ Functions
    -

    Referenced by attach_store(), filestorage_content(), follow_widget(), manage_content(), photo_upload(), and photos_content().

    +

    Referenced by attach_store(), filestorage_content(), manage_content(), photo_upload(), photos_content(), and widget_follow().

    diff --git a/doc/html/plugin_8php.js b/doc/html/plugin_8php.js index ff6745471..e338c63d6 100644 --- a/doc/html/plugin_8php.js +++ b/doc/html/plugin_8php.js @@ -12,12 +12,15 @@ var plugin_8php = [ "head_add_js", "plugin_8php.html#a516591850f4fd49fd1425cfa54089db8", null ], [ "head_get_css", "plugin_8php.html#af92789f559b89a380e49d303218aeeca", null ], [ "head_get_js", "plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1", null ], + [ "head_remove_css", "plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf", null ], + [ "head_remove_js", "plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4", null ], [ "insert_hook", "plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b", null ], [ "install_plugin", "plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5", null ], [ "load_hooks", "plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813", null ], [ "load_plugin", "plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d", null ], [ "register_hook", "plugin_8php.html#a425472c5f3afc137268b2ad45652b209", null ], [ "reload_plugins", "plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025", null ], + [ "script_path", "plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3", null ], [ "service_class_allows", "plugin_8php.html#a030cec6793b909c439c0336ba39b1571", null ], [ "service_class_fetch", "plugin_8php.html#a905b54e10704b283ac64680a8abc0971", null ], [ "theme_include", "plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2", null ], diff --git a/doc/html/profile_8php.html b/doc/html/profile_8php.html index a44f39cf3..4e95ad2b8 100644 --- a/doc/html/profile_8php.html +++ b/doc/html/profile_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('profile_8php.html','');}); Functions  profile_init (&$a)   - profile_aside (&$a) -   profile_content (&$a, $update=0)  

    Function Documentation

    - -
    -
    - - - - - - - - -
    profile_aside (& $a)
    -
    - -
    -
    diff --git a/doc/html/profile_8php.js b/doc/html/profile_8php.js index 942cf9b3d..249035945 100644 --- a/doc/html/profile_8php.js +++ b/doc/html/profile_8php.js @@ -1,6 +1,5 @@ var profile_8php = [ - [ "profile_aside", "profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e", null ], [ "profile_content", "profile_8php.html#a3775cf6eef6587e5143133356a7b76c0", null ], [ "profile_init", "profile_8php.html#ab5d0246be0552e2182a585c1206d22a5", null ] ]; \ No newline at end of file diff --git a/doc/html/profile__photo_8php.html b/doc/html/profile__photo_8php.html index 769fa21a7..5d775fc65 100644 --- a/doc/html/profile__photo_8php.html +++ b/doc/html/profile__photo_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('profile__photo_8php.html','');}); Functions  profile_photo_init (&$a)   - profile_photo_aside (&$a) -   profile_photo_post (&$a)  

    Function Documentation

    - -
    -
    - - - - - - - - -
    profile_photo_aside (& $a)
    -
    - -
    -
    diff --git a/doc/html/profile__photo_8php.js b/doc/html/profile__photo_8php.js index c9a379a2e..db2f4e25e 100644 --- a/doc/html/profile__photo_8php.js +++ b/doc/html/profile__photo_8php.js @@ -1,6 +1,5 @@ var profile__photo_8php = [ - [ "profile_photo_aside", "profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3", null ], [ "profile_photo_init", "profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02", null ], [ "profile_photo_post", "profile__photo_8php.html#a4b80234074bd603221aa5364f330e479", null ] ]; \ No newline at end of file diff --git a/doc/html/profiles_8php.html b/doc/html/profiles_8php.html index 17239b852..1b947e0ed 100644 --- a/doc/html/profiles_8php.html +++ b/doc/html/profiles_8php.html @@ -114,30 +114,12 @@ $(document).ready(function(){initNavTree('profiles_8php.html','');}); Functions  profiles_init (&$a)   - profiles_aside (&$a) -   profiles_post (&$a)    profiles_content (&$a)  

    Function Documentation

    - -
    -
    - - - - - - - - -
    profiles_aside (& $a)
    -
    - -
    -
    diff --git a/doc/html/profiles_8php.js b/doc/html/profiles_8php.js index 6bc83ad62..256ba1080 100644 --- a/doc/html/profiles_8php.js +++ b/doc/html/profiles_8php.js @@ -1,6 +1,5 @@ var profiles_8php = [ - [ "profiles_aside", "profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c", null ], [ "profiles_content", "profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00", null ], [ "profiles_init", "profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e", null ], [ "profiles_post", "profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04", null ] diff --git a/doc/html/profperm_8php.html b/doc/html/profperm_8php.html index 315bc21bb..a99c661fb 100644 --- a/doc/html/profperm_8php.html +++ b/doc/html/profperm_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('profperm_8php.html','');}); Functions  profperm_init (&$a)   - profperm_aside (&$a) -   profperm_content (&$a)  

    Function Documentation

    - -
    -
    - - - - - - - - -
    profperm_aside (& $a)
    -
    - -
    -
    diff --git a/doc/html/profperm_8php.js b/doc/html/profperm_8php.js index 978df3252..95b68003d 100644 --- a/doc/html/profperm_8php.js +++ b/doc/html/profperm_8php.js @@ -1,6 +1,5 @@ var profperm_8php = [ - [ "profperm_aside", "profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc", null ], [ "profperm_content", "profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023", null ], [ "profperm_init", "profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6", null ] ]; \ No newline at end of file diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 0ac1b9a56..9f968e083 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -11,11 +11,10 @@ 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',['../include_2chanman_8php.html',1,'']]], ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], + ['chanman_2ephp',['chanman.php',['../include_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_5faside',['channel_aside',['../channel_8php.html#aea8e189f2fbabfda779349dd94082e8e',1,'channel.php']]], ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]], ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]], ['channel_5fremove',['channel_remove',['../Contact_8php.html#a186162051a5127069cc851d78740f205',1,'Contact.php']]], @@ -72,7 +71,6 @@ var searchData= ['comanche_5fwebpage',['comanche_webpage',['../comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a',1,'comanche.php']]], ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f',1,'comanche.php']]], ['common_2ephp',['common.php',['../common_8php.html',1,'']]], - ['common_5faside',['common_aside',['../common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a',1,'common.php']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], ['common_5ffriends',['common_friends',['../socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918',1,'socgraph.php']]], ['common_5ffriends_5fvisitor_5fwidget',['common_friends_visitor_widget',['../contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65',1,'contact_widgets.php']]], @@ -134,10 +132,6 @@ var searchData= ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], - ['crepair_2ephp',['crepair.php',['../crepair_8php.html',1,'']]], - ['crepair_5fcontent',['crepair_content',['../crepair_8php.html#a29464c01838e209c8059cfcd2d195caa',1,'crepair.php']]], - ['crepair_5finit',['crepair_init',['../crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198',1,'crepair.php']]], - ['crepair_5fpost',['crepair_post',['../crepair_8php.html#acc4493e1ffd1462a605dd9b870034513',1,'crepair.php']]], ['cronhooks_2ephp',['cronhooks.php',['../cronhooks_8php.html',1,'']]], ['cronhooks_5frun',['cronhooks_run',['../cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca',1,'cronhooks.php']]], ['cropimage',['cropImage',['../classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e',1,'photo_driver\cropImage()'],['../classphoto__gd.html#ab2232d775c8bacf66773a03308105f0c',1,'photo_gd\cropImage()'],['../classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4',1,'photo_imagick\cropImage()']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 3f5c1a2d9..58826efd6 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -44,7 +44,6 @@ var searchData= ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]], ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]], ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]], - ['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]], ['foreach',['foreach',['../typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5',1,'typo.php']]], ['format_5fcategories',['format_categories',['../text_8php.html#a3054189cff173977f4216c9a3dd29e1b',1,'text.php']]], ['format_5fcss_5fif_5fexists',['format_css_if_exists',['../plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6',1,'plugin.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 4aabc9746..acc803194 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -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#a1042d74055bafe54a6a30103d87a7f17',1,'group.php']]], + ['group_5fside',['group_side',['../include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2',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 8948f18f4..6aa164847 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -2,14 +2,13 @@ var searchData= [ ['handle_5ftag',['handle_tag',['../item_8php.html#abd0e603a6696051af16476eb968d52e7',1,'item.php']]], ['has_5fpermissions',['has_permissions',['../items_8php.html#a77051724d1784074ff187e73a4db93fe',1,'items.php']]], - ['hcard_2ephp',['hcard.php',['../hcard_8php.html',1,'']]], - ['hcard_5faside',['hcard_aside',['../hcard_8php.html#a956c7cae2009652a37900306e5b7b73d',1,'hcard.php']]], - ['hcard_5finit',['hcard_init',['../hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d',1,'hcard.php']]], ['head_5fadd_5fcss',['head_add_css',['../plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a',1,'plugin.php']]], ['head_5fadd_5fjs',['head_add_js',['../plugin_8php.html#a516591850f4fd49fd1425cfa54089db8',1,'plugin.php']]], ['head_5fget_5fcss',['head_get_css',['../plugin_8php.html#af92789f559b89a380e49d303218aeeca',1,'plugin.php']]], ['head_5fget_5ficon',['head_get_icon',['../classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166',1,'App\head_get_icon()'],['../boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77',1,'head_get_icon(): boot.php']]], ['head_5fget_5fjs',['head_get_js',['../plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1',1,'plugin.php']]], + ['head_5fremove_5fcss',['head_remove_css',['../plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf',1,'plugin.php']]], + ['head_5fremove_5fjs',['head_remove_js',['../plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4',1,'plugin.php']]], ['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_2ephp',['help.php',['../help_8php.html',1,'']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index 075a6789e..4601373ca 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -22,10 +22,6 @@ var searchData= ['insert_5fhook',['insert_hook',['../plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b',1,'plugin.php']]], ['install',['install',['../classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746',1,'dba_driver']]], ['install_5fplugin',['install_plugin',['../plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5',1,'plugin.php']]], - ['intro_2ephp',['intro.php',['../intro_8php.html',1,'']]], - ['intro_5faside',['intro_aside',['../intro_8php.html#abc3abf25da64f98f215126eb08c7936b',1,'intro.php']]], - ['intro_5fcontent',['intro_content',['../intro_8php.html#a3e2a523697633ddb4517b9266a515f5b',1,'intro.php']]], - ['intro_5fpost',['intro_post',['../intro_8php.html#af3681062183ccbdf065ae2647b07d6f1',1,'intro.php']]], ['invite_2ephp',['invite.php',['../invite_8php.html',1,'']]], ['invite_5fcontent',['invite_content',['../invite_8php.html#a244385b28cfd021d308715f01158bfd9',1,'invite.php']]], ['invite_5fpost',['invite_post',['../invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5',1,'invite.php']]], diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js index d286ba28a..c256f5457 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -4,10 +4,6 @@ var searchData= ['language_2ephp',['language.php',['../language_8php.html',1,'']]], ['language_5fdetect_5fmin_5fconfidence',['LANGUAGE_DETECT_MIN_CONFIDENCE',['../boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11',1,'boot.php']]], ['language_5fdetect_5fmin_5flength',['LANGUAGE_DETECT_MIN_LENGTH',['../boot_8php.html#a17cf72338b040891781a4bcbdd9a8595',1,'boot.php']]], - ['lastpost_2ephp',['lastpost.php',['../lastpost_8php.html',1,'']]], - ['lastpost_5faside',['lastpost_aside',['../lastpost_8php.html#a6108289ef2a767495c7c85a24f364983',1,'lastpost.php']]], - ['lastpost_5fcontent',['lastpost_content',['../lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493',1,'lastpost.php']]], - ['lastpost_5finit',['lastpost_init',['../lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c',1,'lastpost.php']]], ['layout_5fselect',['layout_select',['../text_8php.html#a3999a0b3e22e440f280ee791ce34d384',1,'text.php']]], ['layouts_2ephp',['layouts.php',['../layouts_8php.html',1,'']]], ['layouts_5fcontent',['layouts_content',['../layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50',1,'layouts.php']]], @@ -20,6 +16,7 @@ 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_6e.js b/doc/html/search/all_6e.js index 9c8d326de..6dfd8d4fc 100644 --- a/doc/html/search/all_6e.js +++ b/doc/html/search/all_6e.js @@ -57,6 +57,8 @@ var searchData= ['normalise_5flink',['normalise_link',['../text_8php.html#a4bbb7d00c05cd20b4e043424f322388f',1,'text.php']]], ['normalise_5fopenid',['normalise_openid',['../text_8php.html#adba17ec946f4285285dc100f7860bf51',1,'text.php']]], ['notags',['notags',['../text_8php.html#a1af49756c8c71902a66c7e329c462beb',1,'text.php']]], + ['notes_2ephp',['notes.php',['../notes_8php.html',1,'']]], + ['notes_5finit',['notes_init',['../notes_8php.html#a4dbd7b1f906440746af48b484d66535a',1,'notes.php']]], ['notice',['notice',['../boot_8php.html#a9255af5ae9c887520091ea04763c1a88',1,'boot.php']]], ['notification',['notification',['../enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc',1,'enotify.php']]], ['notifications_2ephp',['notifications.php',['../notifications_8php.html',1,'']]], @@ -64,8 +66,8 @@ var searchData= ['notifications_5fpost',['notifications_post',['../notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33',1,'notifications.php']]], ['notifier_2ephp',['notifier.php',['../notifier_8php.html',1,'']]], ['notifier_5frun',['notifier_run',['../notifier_8php.html#a568c502f626cff95e344c0748938b85d',1,'notifier.php']]], - ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]], ['notify_2ephp',['notify.php',['../include_2notify_8php.html',1,'']]], + ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]], ['notify_5fcomment',['NOTIFY_COMMENT',['../boot_8php.html#a20f0eed431d25870b624b8937a07a59f',1,'boot.php']]], ['notify_5fconfirm',['NOTIFY_CONFIRM',['../boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d',1,'boot.php']]], ['notify_5fcontent',['notify_content',['../mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3',1,'notify.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index db470676e..36a75ee55 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -152,13 +152,11 @@ var searchData= ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]], ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]], ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]], - ['profile_5faside',['profile_aside',['../profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e',1,'profile.php']]], ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]], ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'identity.php']]], ['profile_5finit',['profile_init',['../profile_8php.html#ab5d0246be0552e2182a585c1206d22a5',1,'profile.php']]], ['profile_5fload',['profile_load',['../identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'identity.php']]], ['profile_5fphoto_2ephp',['profile_photo.php',['../profile__photo_8php.html',1,'']]], - ['profile_5fphoto_5faside',['profile_photo_aside',['../profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3',1,'profile_photo.php']]], ['profile_5fphoto_5finit',['profile_photo_init',['../profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02',1,'profile_photo.php']]], ['profile_5fphoto_5fpost',['profile_photo_post',['../profile__photo_8php.html#a4b80234074bd603221aa5364f330e479',1,'profile_photo.php']]], ['profile_5fselectors_2ephp',['profile_selectors.php',['../profile__selectors_8php.html',1,'']]], @@ -166,12 +164,10 @@ var searchData= ['profile_5ftabs',['profile_tabs',['../conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273',1,'conversation.php']]], ['profiler',['profiler',['../text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6',1,'text.php']]], ['profiles_2ephp',['profiles.php',['../profiles_8php.html',1,'']]], - ['profiles_5faside',['profiles_aside',['../profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c',1,'profiles.php']]], ['profiles_5fcontent',['profiles_content',['../profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00',1,'profiles.php']]], ['profiles_5finit',['profiles_init',['../profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e',1,'profiles.php']]], ['profiles_5fpost',['profiles_post',['../profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04',1,'profiles.php']]], ['profperm_2ephp',['profperm.php',['../profperm_8php.html',1,'']]], - ['profperm_5faside',['profperm_aside',['../profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc',1,'profperm.php']]], ['profperm_5fcontent',['profperm_content',['../profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023',1,'profperm.php']]], ['profperm_5finit',['profperm_init',['../profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6',1,'profperm.php']]], ['protect_5fsprintf',['protect_sprintf',['../text_8php.html#a4e7698aca48982512594b274543c3b9b',1,'text.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index d9a496489..62b0494ae 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -2,12 +2,12 @@ var searchData= [ ['sanitise_5facl',['sanitise_acl',['../text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c',1,'text.php']]], ['save',['save',['../classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac',1,'photo_driver']]], - ['saved_5fsearches',['saved_searches',['../mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad',1,'network.php']]], ['saveimage',['saveImage',['../classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3',1,'photo_driver']]], ['scale_5fexternal_5fimages',['scale_external_images',['../include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f',1,'network.php']]], ['scaleimage',['scaleImage',['../classphoto__driver.html#af0f7ec48a31ae9b557b6e3f8bd5b4af0',1,'photo_driver']]], ['scaleimagesquare',['scaleImageSquare',['../classphoto__driver.html#a56634842b071b96502716e9843ea5361',1,'photo_driver']]], ['scaleimageup',['scaleImageUp',['../classphoto__driver.html#a1a63c4ae17e892a115ab9cf6efb960ce',1,'photo_driver']]], + ['script_5fpath',['script_path',['../plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3',1,'plugin.php']]], ['search',['search',['../text_8php.html#a876e94892867019935b348b573299352',1,'text.php']]], ['search_2ephp',['search.php',['../search_8php.html',1,'']]], ['search_5fac_2ephp',['search_ac.php',['../search__ac_8php.html',1,'']]], @@ -16,6 +16,7 @@ var searchData= ['search_5finit',['search_init',['../search_8php.html#acf19fd30f07f495781ca0d7a0a08b435',1,'search.php']]], ['search_5fpost',['search_post',['../search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7',1,'search.php']]], ['search_5fsaved_5fsearches',['search_saved_searches',['../search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6',1,'search.php']]], + ['searchbox',['searchbox',['../text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447',1,'text.php']]], ['security_2ephp',['security.php',['../security_8php.html',1,'']]], ['select_5ftimezone',['select_timezone',['../datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f',1,'datetime.php']]], ['send',['send',['../classenotify.html#afbc088860f534c6c05788b48cfc262c6',1,'enotify']]], @@ -99,8 +100,8 @@ var searchData= ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]], ['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']]], - ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['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,'']]], diff --git a/doc/html/search/all_76.js b/doc/html/search/all_76.js index 84866ad49..13376a70b 100644 --- a/doc/html/search/all_76.js +++ b/doc/html/search/all_76.js @@ -10,7 +10,6 @@ var searchData= ['view_2ephp',['view.php',['../view_8php.html',1,'']]], ['view_5finit',['view_init',['../view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e',1,'view.php']]], ['viewconnections_2ephp',['viewconnections.php',['../viewconnections_8php.html',1,'']]], - ['viewconnections_5faside',['viewconnections_aside',['../viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6',1,'viewconnections.php']]], ['viewconnections_5fcontent',['viewconnections_content',['../viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776',1,'viewconnections.php']]], ['viewconnections_5finit',['viewconnections_init',['../viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330',1,'viewconnections.php']]], ['viewsrc_2ephp',['viewsrc.php',['../viewsrc_8php.html',1,'']]], diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index 3223b0d56..662ebcb04 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -15,8 +15,19 @@ var searchData= ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], ['while',['while',['../docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d',1,'docblox_errorchecker.php']]], ['widedarkness_2ephp',['widedarkness.php',['../widedarkness_8php.html',1,'']]], + ['widget_5faffinity',['widget_affinity',['../widgets_8php.html#add9b24d3304e529a7975e96122315554',1,'widgets.php']]], + ['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_5ffiler',['widget_filer',['../widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0',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_5fnotes',['widget_notes',['../widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256',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_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']]], ['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/files_63.js b/doc/html/search/files_63.js index 531b158b2..3608cf3e6 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -25,7 +25,6 @@ var searchData= ['contactgroup_2ephp',['contactgroup.php',['../contactgroup_8php.html',1,'']]], ['conversation_2ephp',['conversation.php',['../conversation_8php.html',1,'']]], ['conversationobject_2ephp',['ConversationObject.php',['../ConversationObject_8php.html',1,'']]], - ['crepair_2ephp',['crepair.php',['../crepair_8php.html',1,'']]], ['cronhooks_2ephp',['cronhooks.php',['../cronhooks_8php.html',1,'']]], ['crypto_2ephp',['crypto.php',['../crypto_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_68.js b/doc/html/search/files_68.js index 4377d15af..533921876 100644 --- a/doc/html/search/files_68.js +++ b/doc/html/search/files_68.js @@ -1,6 +1,5 @@ var searchData= [ - ['hcard_2ephp',['hcard.php',['../hcard_8php.html',1,'']]], ['help_2ephp',['help.php',['../help_8php.html',1,'']]], ['home_2ephp',['home.php',['../home_8php.html',1,'']]], ['hostxrd_2ephp',['hostxrd.php',['../hostxrd_8php.html',1,'']]], diff --git a/doc/html/search/files_69.js b/doc/html/search/files_69.js index 1ac9204d9..a08e0c1d4 100644 --- a/doc/html/search/files_69.js +++ b/doc/html/search/files_69.js @@ -2,7 +2,6 @@ var searchData= [ ['identity_2ephp',['identity.php',['../identity_8php.html',1,'']]], ['import_2ephp',['import.php',['../import_8php.html',1,'']]], - ['intro_2ephp',['intro.php',['../intro_8php.html',1,'']]], ['invite_2ephp',['invite.php',['../invite_8php.html',1,'']]], ['item_2ephp',['item.php',['../item_8php.html',1,'']]], ['itemobject_2ephp',['ItemObject.php',['../ItemObject_8php.html',1,'']]], diff --git a/doc/html/search/files_6c.js b/doc/html/search/files_6c.js index 663f102d3..ffcd040c5 100644 --- a/doc/html/search/files_6c.js +++ b/doc/html/search/files_6c.js @@ -1,7 +1,6 @@ var searchData= [ ['language_2ephp',['language.php',['../language_8php.html',1,'']]], - ['lastpost_2ephp',['lastpost.php',['../lastpost_8php.html',1,'']]], ['layouts_2ephp',['layouts.php',['../layouts_8php.html',1,'']]], ['like_2ephp',['like.php',['../like_8php.html',1,'']]], ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]], diff --git a/doc/html/search/files_6e.js b/doc/html/search/files_6e.js index 0aa61f5c1..2722d4f7d 100644 --- a/doc/html/search/files_6e.js +++ b/doc/html/search/files_6e.js @@ -5,6 +5,7 @@ var searchData= ['network_2ephp',['network.php',['../mod_2network_8php.html',1,'']]], ['new_5fchannel_2ephp',['new_channel.php',['../new__channel_8php.html',1,'']]], ['none_2ephp',['none.php',['../none_8php.html',1,'']]], + ['notes_2ephp',['notes.php',['../notes_8php.html',1,'']]], ['notifications_2ephp',['notifications.php',['../notifications_8php.html',1,'']]], ['notifier_2ephp',['notifier.php',['../notifier_8php.html',1,'']]], ['notify_2ephp',['notify.php',['../include_2notify_8php.html',1,'']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index b7e0d9f33..1a00e2f8a 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -10,7 +10,6 @@ var searchData= ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]], ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]], ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], - ['channel_5faside',['channel_aside',['../channel_8php.html#aea8e189f2fbabfda779349dd94082e8e',1,'channel.php']]], ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]], ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]], ['channel_5fremove',['channel_remove',['../Contact_8php.html#a186162051a5127069cc851d78740f205',1,'Contact.php']]], @@ -58,7 +57,6 @@ var searchData= ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], ['comanche_5fwebpage',['comanche_webpage',['../comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a',1,'comanche.php']]], ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f',1,'comanche.php']]], - ['common_5faside',['common_aside',['../common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a',1,'common.php']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], ['common_5ffriends',['common_friends',['../socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918',1,'socgraph.php']]], ['common_5ffriends_5fvisitor_5fwidget',['common_friends_visitor_widget',['../contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65',1,'contact_widgets.php']]], @@ -102,9 +100,6 @@ var searchData= ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], - ['crepair_5fcontent',['crepair_content',['../crepair_8php.html#a29464c01838e209c8059cfcd2d195caa',1,'crepair.php']]], - ['crepair_5finit',['crepair_init',['../crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198',1,'crepair.php']]], - ['crepair_5fpost',['crepair_post',['../crepair_8php.html#acc4493e1ffd1462a605dd9b870034513',1,'crepair.php']]], ['cronhooks_5frun',['cronhooks_run',['../cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca',1,'cronhooks.php']]], ['cropimage',['cropImage',['../classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e',1,'photo_driver\cropImage()'],['../classphoto__gd.html#ab2232d775c8bacf66773a03308105f0c',1,'photo_gd\cropImage()'],['../classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4',1,'photo_imagick\cropImage()']]], ['crypto_5fencapsulate',['crypto_encapsulate',['../crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c',1,'crypto.php']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index a97f0bc6e..5b30db5d9 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -30,7 +30,6 @@ var searchData= ['flip',['flip',['../classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832',1,'photo_driver\flip()'],['../classphoto__gd.html#a44cedef376044018702d9355ddc813ce',1,'photo_gd\flip()'],['../classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393',1,'photo_imagick\flip()']]], ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]], ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]], - ['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]], ['format_5fcategories',['format_categories',['../text_8php.html#a3054189cff173977f4216c9a3dd29e1b',1,'text.php']]], ['format_5fcss_5fif_5fexists',['format_css_if_exists',['../plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6',1,'plugin.php']]], ['format_5fevent_5fbbcode',['format_event_bbcode',['../event_8php.html#abb74206cf42d694307c3d7abb7af9869',1,'event.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index b3e96032c..ed30eaa80 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -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#a1042d74055bafe54a6a30103d87a7f17',1,'group.php']]], + ['group_5fside',['group_side',['../include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2',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 2fcb45ed0..b923ff905 100644 --- a/doc/html/search/functions_68.js +++ b/doc/html/search/functions_68.js @@ -2,13 +2,13 @@ var searchData= [ ['handle_5ftag',['handle_tag',['../item_8php.html#abd0e603a6696051af16476eb968d52e7',1,'item.php']]], ['has_5fpermissions',['has_permissions',['../items_8php.html#a77051724d1784074ff187e73a4db93fe',1,'items.php']]], - ['hcard_5faside',['hcard_aside',['../hcard_8php.html#a956c7cae2009652a37900306e5b7b73d',1,'hcard.php']]], - ['hcard_5finit',['hcard_init',['../hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d',1,'hcard.php']]], ['head_5fadd_5fcss',['head_add_css',['../plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a',1,'plugin.php']]], ['head_5fadd_5fjs',['head_add_js',['../plugin_8php.html#a516591850f4fd49fd1425cfa54089db8',1,'plugin.php']]], ['head_5fget_5fcss',['head_get_css',['../plugin_8php.html#af92789f559b89a380e49d303218aeeca',1,'plugin.php']]], ['head_5fget_5ficon',['head_get_icon',['../classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166',1,'App\head_get_icon()'],['../boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77',1,'head_get_icon(): boot.php']]], ['head_5fget_5fjs',['head_get_js',['../plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1',1,'plugin.php']]], + ['head_5fremove_5fcss',['head_remove_css',['../plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf',1,'plugin.php']]], + ['head_5fremove_5fjs',['head_remove_js',['../plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4',1,'plugin.php']]], ['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']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index a1e34fb82..97aeb2799 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -19,9 +19,6 @@ var searchData= ['insert_5fhook',['insert_hook',['../plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b',1,'plugin.php']]], ['install',['install',['../classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746',1,'dba_driver']]], ['install_5fplugin',['install_plugin',['../plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5',1,'plugin.php']]], - ['intro_5faside',['intro_aside',['../intro_8php.html#abc3abf25da64f98f215126eb08c7936b',1,'intro.php']]], - ['intro_5fcontent',['intro_content',['../intro_8php.html#a3e2a523697633ddb4517b9266a515f5b',1,'intro.php']]], - ['intro_5fpost',['intro_post',['../intro_8php.html#af3681062183ccbdf065ae2647b07d6f1',1,'intro.php']]], ['invite_5fcontent',['invite_content',['../invite_8php.html#a244385b28cfd021d308715f01158bfd9',1,'invite.php']]], ['invite_5fpost',['invite_post',['../invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5',1,'invite.php']]], ['is_5fa_5fdate_5farg',['is_a_date_arg',['../text_8php.html#a1557112a774ec00fa06ed6b6f6495506',1,'text.php']]], diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index 7df51ec1b..b88f51b9d 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -1,9 +1,6 @@ var searchData= [ ['lang_5fselector',['lang_selector',['../text_8php.html#a71f6952243d3fe1c5a8154f78027e29c',1,'text.php']]], - ['lastpost_5faside',['lastpost_aside',['../lastpost_8php.html#a6108289ef2a767495c7c85a24f364983',1,'lastpost.php']]], - ['lastpost_5fcontent',['lastpost_content',['../lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493',1,'lastpost.php']]], - ['lastpost_5finit',['lastpost_init',['../lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c',1,'lastpost.php']]], ['layout_5fselect',['layout_select',['../text_8php.html#a3999a0b3e22e440f280ee791ce34d384',1,'text.php']]], ['layouts_5fcontent',['layouts_content',['../layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50',1,'layouts.php']]], ['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]], @@ -13,6 +10,7 @@ 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_6e.js b/doc/html/search/functions_6e.js index 075156110..c51d3673c 100644 --- a/doc/html/search/functions_6e.js +++ b/doc/html/search/functions_6e.js @@ -21,6 +21,7 @@ var searchData= ['normalise_5flink',['normalise_link',['../text_8php.html#a4bbb7d00c05cd20b4e043424f322388f',1,'text.php']]], ['normalise_5fopenid',['normalise_openid',['../text_8php.html#adba17ec946f4285285dc100f7860bf51',1,'text.php']]], ['notags',['notags',['../text_8php.html#a1af49756c8c71902a66c7e329c462beb',1,'text.php']]], + ['notes_5finit',['notes_init',['../notes_8php.html#a4dbd7b1f906440746af48b484d66535a',1,'notes.php']]], ['notice',['notice',['../boot_8php.html#a9255af5ae9c887520091ea04763c1a88',1,'boot.php']]], ['notification',['notification',['../enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc',1,'enotify.php']]], ['notifications_5fcontent',['notifications_content',['../notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62',1,'notifications.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 00f3caee0..b22e3e78d 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -78,22 +78,18 @@ var searchData= ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]], ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]], ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]], - ['profile_5faside',['profile_aside',['../profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e',1,'profile.php']]], ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]], ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'identity.php']]], ['profile_5finit',['profile_init',['../profile_8php.html#ab5d0246be0552e2182a585c1206d22a5',1,'profile.php']]], ['profile_5fload',['profile_load',['../identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'identity.php']]], - ['profile_5fphoto_5faside',['profile_photo_aside',['../profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3',1,'profile_photo.php']]], ['profile_5fphoto_5finit',['profile_photo_init',['../profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02',1,'profile_photo.php']]], ['profile_5fphoto_5fpost',['profile_photo_post',['../profile__photo_8php.html#a4b80234074bd603221aa5364f330e479',1,'profile_photo.php']]], ['profile_5fsidebar',['profile_sidebar',['../identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc',1,'identity.php']]], ['profile_5ftabs',['profile_tabs',['../conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273',1,'conversation.php']]], ['profiler',['profiler',['../text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6',1,'text.php']]], - ['profiles_5faside',['profiles_aside',['../profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c',1,'profiles.php']]], ['profiles_5fcontent',['profiles_content',['../profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00',1,'profiles.php']]], ['profiles_5finit',['profiles_init',['../profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e',1,'profiles.php']]], ['profiles_5fpost',['profiles_post',['../profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04',1,'profiles.php']]], - ['profperm_5faside',['profperm_aside',['../profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc',1,'profperm.php']]], ['profperm_5fcontent',['profperm_content',['../profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023',1,'profperm.php']]], ['profperm_5finit',['profperm_init',['../profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6',1,'profperm.php']]], ['protect_5fsprintf',['protect_sprintf',['../text_8php.html#a4e7698aca48982512594b274543c3b9b',1,'text.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index b62e60888..4e80eec4f 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -2,18 +2,19 @@ var searchData= [ ['sanitise_5facl',['sanitise_acl',['../text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c',1,'text.php']]], ['save',['save',['../classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac',1,'photo_driver']]], - ['saved_5fsearches',['saved_searches',['../mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad',1,'network.php']]], ['saveimage',['saveImage',['../classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3',1,'photo_driver']]], ['scale_5fexternal_5fimages',['scale_external_images',['../include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f',1,'network.php']]], ['scaleimage',['scaleImage',['../classphoto__driver.html#af0f7ec48a31ae9b557b6e3f8bd5b4af0',1,'photo_driver']]], ['scaleimagesquare',['scaleImageSquare',['../classphoto__driver.html#a56634842b071b96502716e9843ea5361',1,'photo_driver']]], ['scaleimageup',['scaleImageUp',['../classphoto__driver.html#a1a63c4ae17e892a115ab9cf6efb960ce',1,'photo_driver']]], + ['script_5fpath',['script_path',['../plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3',1,'plugin.php']]], ['search',['search',['../text_8php.html#a876e94892867019935b348b573299352',1,'text.php']]], ['search_5fac_5finit',['search_ac_init',['../search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138',1,'search_ac.php']]], ['search_5fcontent',['search_content',['../search_8php.html#ab2568591359edde5b483a6cd9a24b2cc',1,'search.php']]], ['search_5finit',['search_init',['../search_8php.html#acf19fd30f07f495781ca0d7a0a08b435',1,'search.php']]], ['search_5fpost',['search_post',['../search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7',1,'search.php']]], ['search_5fsaved_5fsearches',['search_saved_searches',['../search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6',1,'search.php']]], + ['searchbox',['searchbox',['../text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447',1,'text.php']]], ['select_5ftimezone',['select_timezone',['../datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f',1,'datetime.php']]], ['send',['send',['../classenotify.html#afbc088860f534c6c05788b48cfc262c6',1,'enotify']]], ['send_5fmessage',['send_message',['../include_2message_8php.html#a751ffd6635022b2190f56154ee745752',1,'message.php']]], diff --git a/doc/html/search/functions_76.js b/doc/html/search/functions_76.js index 562e0412b..7e2c42234 100644 --- a/doc/html/search/functions_76.js +++ b/doc/html/search/functions_76.js @@ -8,7 +8,6 @@ var searchData= ['var_5freplace',['var_replace',['../classTemplate.html#abbc484016ddf5d818f55b823cae6feb0',1,'Template']]], ['vcard_5ffrom_5fxchan',['vcard_from_xchan',['../Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960',1,'Contact.php']]], ['view_5finit',['view_init',['../view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e',1,'view.php']]], - ['viewconnections_5faside',['viewconnections_aside',['../viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6',1,'viewconnections.php']]], ['viewconnections_5fcontent',['viewconnections_content',['../viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776',1,'viewconnections.php']]], ['viewconnections_5finit',['viewconnections_init',['../viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330',1,'viewconnections.php']]], ['viewsrc_5fcontent',['viewsrc_content',['../viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4',1,'viewsrc.php']]], diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index 85ab44b93..e03b445eb 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -8,7 +8,18 @@ var searchData= ['webpages_5fcontent',['webpages_content',['../webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d',1,'webpages.php']]], ['wfinger_5finit',['wfinger_init',['../wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3',1,'wfinger.php']]], ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], + ['widget_5faffinity',['widget_affinity',['../widgets_8php.html#add9b24d3304e529a7975e96122315554',1,'widgets.php']]], + ['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_5ffiler',['widget_filer',['../widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0',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_5fnotes',['widget_notes',['../widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256',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_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']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index b1263fa59..00bbb448c 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -361,7 +361,7 @@ Functions

    Profile owner - everything is visible

    Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.

    -

    Referenced by channel_content(), items_fetch(), lastpost_content(), page_content(), pdl_selector(), share_init(), and zot_feed().

    +

    Referenced by channel_content(), items_fetch(), page_content(), pdl_selector(), share_init(), and zot_feed().

    diff --git a/doc/html/socgraph_8php.html b/doc/html/socgraph_8php.html index 5f67be58c..d85a7c0a7 100644 --- a/doc/html/socgraph_8php.html +++ b/doc/html/socgraph_8php.html @@ -406,7 +406,7 @@ Functions
    -

    Referenced by suggest_content().

    +

    Referenced by suggest_content(), and widget_suggestions().

    diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index bb854072f..7a01392cd 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -250,8 +250,6 @@ Functions
    -

    Referenced by lastpost_content().

    -
    @@ -493,7 +491,7 @@ Functions
    -

    Referenced by channel_aside(), and lastpost_aside().

    +

    Referenced by widget_tagcloud_wall().

    diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index b4472a962..9ee0d4d8a 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -175,6 +175,8 @@ Functions    search ($s, $id='search-box', $url='/search', $save=false)   + searchbox ($s, $id='search-box', $url='/search', $save=false) +   valid_email ($x)    linkify ($s) @@ -358,7 +360,7 @@ Variables
    -

    Referenced by channel_content(), community_content(), directory_content(), lastpost_content(), message_content(), and network_content().

    +

    Referenced by channel_content(), community_content(), directory_content(), message_content(), and network_content().

    @@ -475,7 +477,7 @@ Variables
    -

    Referenced by aes_encapsulate(), allowed_public_recips(), create_identity(), fix_system_urls(), get_item_elements(), identity_basic_export(), import_author_zot(), import_post(), import_xchan(), item_post(), item_store(), item_store_update(), magic_init(), oembed_iframe(), post_post(), random_string(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().

    +

    Referenced by aes_encapsulate(), allowed_public_recips(), create_identity(), fix_system_urls(), get_item_elements(), identity_basic_export(), import_author_zot(), import_post(), import_xchan(), item_post(), item_store(), item_store_update(), magic_init(), oembed_iframe(), post_activity_item(), post_post(), random_string(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().

    @@ -545,7 +547,7 @@ Variables
    -

    Referenced by Item\check_wall_to_wall(), directory_content(), fetch_post_tags(), Item\get_template_data(), localize_item(), randprof_init(), and suggest_content().

    +

    Referenced by Item\check_wall_to_wall(), directory_content(), fetch_post_tags(), Item\get_template_data(), localize_item(), randprof_init(), suggest_content(), and widget_suggestions().

    @@ -684,7 +686,7 @@ Variables
    Returns
    string
    -

    Referenced by admin_page_logs(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_content(), message_post(), network_content(), post_activity_item(), printable(), profiles_post(), thing_init(), and z_input_filter().

    +

    Referenced by admin_page_logs(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_post(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().

    @@ -1021,7 +1023,7 @@ Variables
    -

    Referenced by channel_content(), display_content(), items_fetch(), lastpost_content(), network_content(), and zot_feed().

    +

    Referenced by channel_content(), display_content(), items_fetch(), network_content(), and zot_feed().

    @@ -1144,7 +1146,7 @@ Variables
    -

    Referenced by editpost_content(), encode_item(), encode_mail(), localize_item(), message_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), remove_community_tag(), tag_deliver(), theme_attachments(), and unobscure().

    +

    Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), localize_item(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), remove_community_tag(), tag_deliver(), theme_attachments(), and unobscure().

    @@ -1285,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(), crepair_post(), 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(), 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(), 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().

    @@ -1484,7 +1486,7 @@ Variables
    -

    Referenced by admin_page_users(), community_content(), connections_content(), intro_content(), match_content(), notifications_content(), photos_content(), and viewconnections_content().

    +

    Referenced by admin_page_users(), community_content(), connections_content(), match_content(), photos_content(), and viewconnections_content().

    @@ -1502,7 +1504,7 @@ Variables
    -

    Referenced by events_post(), item_post(), menu_add_item(), menu_edit_item(), mitem_post(), photo_upload(), photos_post(), and settings_post().

    +

    Referenced by events_post(), item_post(), menu_add_item(), menu_edit_item(), photo_upload(), photos_post(), and settings_post().

    @@ -1643,7 +1645,7 @@ Variables
    -

    Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), lastpost_content(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().

    +

    Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().

    @@ -1661,7 +1663,7 @@ Variables
    -

    Referenced by get_atom_elements(), post_activity_item(), and z_input_filter().

    +

    Referenced by get_atom_elements(), and z_input_filter().

    @@ -1770,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(), crepair_content(), 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(), follow_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(), intro_content(), invite_content(), lang_selector(), lastpost_content(), 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(), saved_searches(), 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(), 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(), 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().

    @@ -1842,7 +1844,47 @@ Variables
    -

    Referenced by saved_searches(), and search_content().

    +

    Referenced by search_content().

    + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    searchbox ( $s,
     $id = 'search-box',
     $url = '/search',
     $save = false 
    )
    +
    + +

    Referenced by widget_savedsearch().

    @@ -1954,7 +1996,7 @@ Variables
    -

    Referenced by prepare_body().

    +

    Referenced by message_content(), and prepare_body().

    @@ -2088,7 +2130,7 @@ Variables
    -

    Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), channel_content(), display_content(), events_content(), item_post(), items_fetch(), lastpost_content(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), and zot_feed().

    +

    Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), channel_content(), display_content(), events_content(), item_post(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), and zot_feed().

    @@ -2148,7 +2190,7 @@ Variables
    -

    Referenced by item_post(), item_store(), and item_store_update().

    +

    Referenced by item_post(), item_store(), item_store_update(), and post_activity_item().

    diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index cf3d8b77f..525dbb5d8 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -69,6 +69,7 @@ var text_8php = [ "return_bytes", "text_8php.html#ae2126da85966da0e79c6bcbac63b0bda", null ], [ "sanitise_acl", "text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c", null ], [ "search", "text_8php.html#a876e94892867019935b348b573299352", null ], + [ "searchbox", "text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447", null ], [ "smile_decode", "text_8php.html#aca0f589be74fab1a460c57e88dad9779", null ], [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ], [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ], diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index c643c7fae..84a43b90e 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_aside(), channel_content(), channel_init(), channel_remove(), chanview_content(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_aside(), 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(), crepair_content(), crepair_init(), crepair_post(), 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(), follow_widget(), 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(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), help_content(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), lastpost_aside(), lastpost_content(), lastpost_init(), 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_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), 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(), saved_searches(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_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_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_profile(), widget_tagcloud(), 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(), 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().

    diff --git a/doc/html/viewconnections_8php.html b/doc/html/viewconnections_8php.html index 944b4efe2..ebdf48289 100644 --- a/doc/html/viewconnections_8php.html +++ b/doc/html/viewconnections_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('viewconnections_8php.html','');}); Functions  viewconnections_init (&$a)   - viewconnections_aside (&$a) -   viewconnections_content (&$a)  

    Function Documentation

    - -
    -
    - - - - - - - - -
    viewconnections_aside (& $a)
    -
    - -
    -
    diff --git a/doc/html/viewconnections_8php.js b/doc/html/viewconnections_8php.js index 5b9ec8153..f74e87152 100644 --- a/doc/html/viewconnections_8php.js +++ b/doc/html/viewconnections_8php.js @@ -1,6 +1,5 @@ var viewconnections_8php = [ - [ "viewconnections_aside", "viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6", null ], [ "viewconnections_content", "viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776", null ], [ "viewconnections_init", "viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330", null ] ]; \ No newline at end of file diff --git a/doc/html/widgets_8php.html b/doc/html/widgets_8php.html index d91f1a939..df9959890 100644 --- a/doc/html/widgets_8php.html +++ b/doc/html/widgets_8php.html @@ -112,12 +112,181 @@ $(document).ready(function(){initNavTree('widgets_8php.html','');}); + + + + + + + + + + + + + + + + + + + + + + + +

    Functions

     list_widgets ()
     
     widget_profile ($args)
     
     widget_tagcloud ($args)
     
     widget_collections ($args)
     
     widget_suggestions ($arr)
     
     widget_follow ($args)
     
     widget_notes ($arr)
     
     widget_savedsearch ($arr)
     
     widget_filer ($arr)
     
     widget_archive ($arr)
     
     widget_fullprofile ($arr)
     
     widget_categories ($arr)
     
     widget_tagcloud_wall ($arr)
     
     widget_affinity ($arr)
     

    Function Documentation

    + +
    +
    + + + + + + + +
    list_widgets ()
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_affinity ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_archive ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_categories ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_collections ( $args)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_filer ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_follow ( $args)
    +
    + +

    Referenced by connections_aside(), and suggest_aside().

    + +
    +
    + +
    +
    + + + + + + + + +
    widget_fullprofile ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_notes ( $arr)
    +
    + +
    +
    @@ -132,6 +301,40 @@ Functions
    +
    +
    + +
    +
    + + + + + + + + +
    widget_savedsearch ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_suggestions ( $arr)
    +
    + +

    Referenced by connections_aside(), and directory_content().

    +
    @@ -148,6 +351,22 @@ Functions
    +
    +
    + +
    +
    + + + + + + + + +
    widget_tagcloud_wall ( $arr)
    +
    +
    diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js index 0b1db1013..d83669dc3 100644 --- a/doc/html/widgets_8php.js +++ b/doc/html/widgets_8php.js @@ -1,5 +1,17 @@ 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_filer", "widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0", null ], + [ "widget_follow", "widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd", null ], + [ "widget_fullprofile", "widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165", null ], + [ "widget_notes", "widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256", null ], [ "widget_profile", "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ], - [ "widget_tagcloud", "widgets_8php.html#a6dbc227aac750774284ee39c45f0a200", null ] + [ "widget_savedsearch", "widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8", null ], + [ "widget_suggestions", "widgets_8php.html#a0d404276fedc59f5038cf5c085028326", null ], + [ "widget_tagcloud", "widgets_8php.html#a6dbc227aac750774284ee39c45f0a200", null ], + [ "widget_tagcloud_wall", "widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653", null ] ]; \ No newline at end of file diff --git a/util/messages.po b/util/messages.po index 485d47394..db21568c7 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-12-06.519\n" +"Project-Id-Version: 2013-12-13.526\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-06 00:02-0800\n" +"POT-Creation-Date: 2013-12-13 00:04-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,6 +53,34 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" +#: ../../include/dir_fns.php:15 +msgid "Sort Options" +msgstr "" + +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" +msgstr "" + +#: ../../include/dir_fns.php:30 +msgid "Enable Safe Search" +msgstr "" + +#: ../../include/dir_fns.php:32 +msgid "Disable Safe Search" +msgstr "" + +#: ../../include/dir_fns.php:34 +msgid "Safe Mode" +msgstr "" + #: ../../include/enotify.php:40 msgid "Red Matrix Notification" msgstr "" @@ -248,21 +276,21 @@ msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:101 ../../mod/settings.php:671 ../../mod/menu.php:55 +#: ../../mod/webpages.php:118 ../../mod/settings.php:671 ../../mod/menu.php:55 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 -#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 +#: ../../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:628 -#: ../../mod/settings.php:672 ../../mod/admin.php:690 ../../mod/group.php:182 -#: ../../mod/photos.php:1141 ../../mod/connections.php:374 +#: ../../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 msgid "Delete" msgstr "" -#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 +#: ../../include/ItemObject.php:113 ../../include/conversation.php:631 msgid "Select" msgstr "" @@ -286,7 +314,7 @@ msgstr "" msgid "starred" msgstr "" -#: ../../include/ItemObject.php:160 ../../include/conversation.php:638 +#: ../../include/ItemObject.php:160 ../../include/conversation.php:642 msgid "Message is verified" msgstr "" @@ -339,20 +367,20 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:216 ../../include/conversation.php:682 +#: ../../include/ItemObject.php:216 ../../include/conversation.php:686 #, php-format msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 +#: ../../include/ItemObject.php:219 ../../include/conversation.php:689 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/ItemObject.php:246 ../../include/conversation.php:702 -#: ../../include/conversation.php:1112 ../../mod/photos.php:1072 -#: ../../mod/message.php:332 ../../mod/message.php:516 -#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 +#: ../../include/ItemObject.php:246 ../../include/conversation.php:706 +#: ../../include/conversation.php:1116 ../../mod/photos.php:1072 +#: ../../mod/message.php:332 ../../mod/message.php:484 +#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:152 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123 msgid "Please wait" msgstr "" @@ -365,7 +393,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 -#: ../../include/contact_widgets.php:148 +#: ../../include/contact_widgets.php:124 msgid "show more" msgstr "" @@ -379,22 +407,21 @@ msgstr "" msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:530 ../../mod/events.php:469 +#: ../../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:418 -#: ../../mod/admin.php:683 ../../mod/admin.php:823 ../../mod/admin.php:1022 -#: ../../mod/admin.php:1109 ../../mod/group.php:87 ../../mod/photos.php:685 +#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../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:515 -#: ../../mod/profiles.php:529 ../../mod/connections.php:452 -#: ../../mod/import.php:387 ../../mod/crepair.php:166 ../../mod/poke.php:166 -#: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 -#: ../../view/theme/redbasic/php/config.php:85 +#: ../../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 #: ../../view/theme/apw/php/config.php:231 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/blogga/php/config.php:67 @@ -433,22 +460,22 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075 -#: ../../mod/webpages.php:105 ../../mod/photos.php:1092 -#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150 +#: ../../include/ItemObject.php:539 ../../include/conversation.php:1079 +#: ../../mod/webpages.php:122 ../../mod/photos.php:1092 +#: ../../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:1139 -#: ../../mod/message.php:338 ../../mod/message.php:521 +#: ../../include/ItemObject.php:542 ../../include/conversation.php:1143 +#: ../../mod/message.php:338 ../../mod/message.php:489 #: ../../mod/editpost.php:134 msgid "Encrypt text" msgstr "" -#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 -#: ../../include/identity.php:613 ../../mod/match.php:62 -#: ../../mod/suggest.php:56 ../../mod/directory.php:198 +#: ../../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 msgid "Connect" msgstr "" @@ -460,6 +487,128 @@ msgstr "" 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 +msgid "Categories" +msgstr "" + +#: ../../include/widgets.php:98 ../../mod/suggest.php:60 +msgid "Ignore/Hide" +msgstr "" + +#: ../../include/widgets.php:104 ../../mod/connections.php:583 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:105 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:127 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/widgets.php:133 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:134 +msgid "Enter the channel address" +msgstr "" + +#: ../../include/widgets.php:135 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:152 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:154 ../../include/text.php:738 +#: ../../include/text.php:752 ../../mod/filer.php:36 +msgid "Save" +msgstr "" + +#: ../../include/widgets.php:224 ../../mod/search.php:20 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:233 ../../include/features.php:48 +#: ../../mod/search.php:17 +msgid "Saved Searches" +msgstr "" + +#: ../../include/widgets.php:234 ../../include/group.php:290 +msgid "add" +msgstr "" + +#: ../../include/widgets.php:264 ../../include/features.php:62 +#: ../../include/contact_widgets.php:52 +msgid "Saved Folders" +msgstr "" + +#: ../../include/widgets.php:267 ../../include/contact_widgets.php:55 +#: ../../include/contact_widgets.php:89 +msgid "Everything" +msgstr "" + +#: ../../include/widgets.php:299 ../../include/items.php:3550 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:351 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:352 ../../mod/connections.php:408 +msgid "Me" +msgstr "" + +#: ../../include/widgets.php:353 ../../mod/connections.php:410 +msgid "Best Friends" +msgstr "" + +#: ../../include/widgets.php:354 ../../include/profile_selectors.php:42 +#: ../../include/identity.php:298 ../../mod/connections.php:411 +msgid "Friends" +msgstr "" + +#: ../../include/widgets.php:355 +msgid "Co-workers" +msgstr "" + +#: ../../include/widgets.php:356 ../../mod/connections.php:412 +msgid "Former Friends" +msgstr "" + +#: ../../include/widgets.php:357 ../../mod/connections.php:413 +msgid "Acquaintances" +msgstr "" + +#: ../../include/widgets.php:358 +msgid "Everybody" +msgstr "" + #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "" @@ -520,8 +669,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:686 -#: ../../mod/admin.php:695 ../../boot.php:1442 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 +#: ../../mod/admin.php:698 ../../boot.php:1442 msgid "Email" msgstr "" @@ -639,419 +788,422 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/event.php:40 ../../include/identity.php:663 -#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462 -#: ../../mod/directory.php:173 +#: ../../include/event.php:40 ../../include/identity.php:664 +#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 +#: ../../mod/directory.php:174 msgid "Location:" msgstr "" -#: ../../include/features.php:21 -msgid "General Features" +#: ../../include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../include/features.php:23 -msgid "Content Expiration" +#: ../../include/group.php:223 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/features.php:23 -msgid "Remove posts/comments and/or private messages at a future time" +#: ../../include/group.php:242 ../../mod/admin.php:698 +msgid "All Channels" msgstr "" -#: ../../include/features.php:24 -msgid "Multiple Profiles" +#: ../../include/group.php:264 +msgid "edit" msgstr "" -#: ../../include/features.php:24 -msgid "Ability to create multiple profiles" +#: ../../include/group.php:285 +msgid "Collections" msgstr "" -#: ../../include/features.php:25 -msgid "Web Pages" +#: ../../include/group.php:286 +msgid "Edit collection" msgstr "" -#: ../../include/features.php:25 -msgid "Provide managed web pages on your channel" +#: ../../include/group.php:287 +msgid "Create a new collection" msgstr "" -#: ../../include/features.php:26 -msgid "Enhanced Photo Albums" +#: ../../include/group.php:288 +msgid "Channels not in any collection" msgstr "" -#: ../../include/features.php:26 -msgid "Enable photo album with enhanced features" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" msgstr "" -#: ../../include/features.php:28 -msgid "Extended Identity Sharing" +#: ../../include/js_strings.php:8 +msgid "show fewer" msgstr "" -#: ../../include/features.php:28 ../../include/js_strings.php:30 -msgid " " +#: ../../include/js_strings.php:9 +msgid "Password too short" msgstr "" -#: ../../include/features.php:29 -msgid "Expert Mode" +#: ../../include/js_strings.php:10 +msgid "Passwords do not match" msgstr "" -#: ../../include/features.php:29 -msgid "Enable Expert Mode to provide advanced configuration options" +#: ../../include/js_strings.php:11 ../../mod/photos.php:45 +msgid "everybody" msgstr "" -#: ../../include/features.php:30 -msgid "Premium Channel" +#: ../../include/js_strings.php:12 +msgid "Secret Passphrase" msgstr "" -#: ../../include/features.php:30 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../include/js_strings.php:13 +msgid "Passphrase hint" msgstr "" -#: ../../include/features.php:35 -msgid "Post Composition Features" +#: ../../include/js_strings.php:15 +msgid "timeago.prefixAgo" msgstr "" -#: ../../include/features.php:36 -msgid "Richtext Editor" +#: ../../include/js_strings.php:16 +msgid "timeago.suffixAgo" msgstr "" -#: ../../include/features.php:36 -msgid "Enable richtext editor" +#: ../../include/js_strings.php:17 +msgid "ago" msgstr "" -#: ../../include/features.php:37 -msgid "Post Preview" +#: ../../include/js_strings.php:18 +msgid "from now" msgstr "" -#: ../../include/features.php:37 -msgid "Allow previewing posts and comments before publishing them" +#: ../../include/js_strings.php:19 +msgid "less than a minute" msgstr "" -#: ../../include/features.php:38 ../../mod/settings.php:120 -#: ../../mod/sources.php:67 -msgid "Channel Sources" +#: ../../include/js_strings.php:20 +msgid "about a minute" msgstr "" -#: ../../include/features.php:38 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/js_strings.php:21 +#, php-format +msgid "%d minutes" msgstr "" -#: ../../include/features.php:39 -msgid "Even More Encryption" +#: ../../include/js_strings.php:22 +msgid "about an hour" msgstr "" -#: ../../include/features.php:39 -msgid "Allow encryption of content end-to-end with a shared secret key" +#: ../../include/js_strings.php:23 +#, php-format +msgid "about %d hours" msgstr "" -#: ../../include/features.php:44 -msgid "Network and Stream Filtering" +#: ../../include/js_strings.php:24 +msgid "a day" msgstr "" -#: ../../include/features.php:45 -msgid "Search by Date" +#: ../../include/js_strings.php:25 +#, php-format +msgid "%d days" msgstr "" -#: ../../include/features.php:45 -msgid "Ability to select posts by date ranges" +#: ../../include/js_strings.php:26 +msgid "about a month" msgstr "" -#: ../../include/features.php:46 -msgid "Collections Filter" +#: ../../include/js_strings.php:27 +#, php-format +msgid "%d months" msgstr "" -#: ../../include/features.php:46 -msgid "Enable widget to display Network posts only from selected collections" +#: ../../include/js_strings.php:28 +msgid "about a year" msgstr "" -#: ../../include/features.php:47 ../../mod/search.php:17 -#: ../../mod/network.php:122 -msgid "Saved Searches" +#: ../../include/js_strings.php:29 +#, php-format +msgid "%d years" msgstr "" -#: ../../include/features.php:47 -msgid "Save search terms for re-use" +#: ../../include/js_strings.php:30 ../../include/features.php:29 +msgid " " msgstr "" -#: ../../include/features.php:48 -msgid "Network Personal Tab" +#: ../../include/js_strings.php:31 +msgid "timeago.numbers" msgstr "" -#: ../../include/features.php:48 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/message.php:18 +msgid "No recipient provided." msgstr "" -#: ../../include/features.php:49 -msgid "Network New Tab" +#: ../../include/message.php:23 +msgid "[no subject]" msgstr "" -#: ../../include/features.php:49 -msgid "Enable tab to display all new Network activity" +#: ../../include/message.php:42 +msgid "Unable to determine sender." msgstr "" -#: ../../include/features.php:50 -msgid "Affinity Tool" +#: ../../include/message.php:143 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/features.php:50 -msgid "Filter stream activity by depth of relationships" +#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 +#: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797 +#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 +#: ../../mod/profile_photo.php:336 +msgid "Profile Photos" msgstr "" -#: ../../include/features.php:55 -msgid "Post/Comment Tools" +#: ../../include/api.php:972 +msgid "Public Timeline" msgstr "" -#: ../../include/features.php:57 -msgid "Edit Sent Posts" +#: ../../include/network.php:640 +msgid "view full size" msgstr "" -#: ../../include/features.php:57 -msgid "Edit and correct posts and comments after sending" +#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 +#: ../../include/bbcode.php:497 +msgid "Image/photo" msgstr "" -#: ../../include/features.php:58 -msgid "Tagging" +#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 +msgid "Encrypted content" msgstr "" -#: ../../include/features.php:58 -msgid "Ability to tag existing posts" +#: ../../include/bbcode.php:173 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/features.php:59 -msgid "Post Categories" +#: ../../include/bbcode.php:175 +msgid "post" msgstr "" -#: ../../include/features.php:59 -msgid "Add categories to your posts" +#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 +msgid "$1 wrote:" msgstr "" -#: ../../include/features.php:60 ../../include/contact_widgets.php:76 -msgid "Saved Folders" +#: ../../include/oembed.php:150 +msgid "Embedded content" msgstr "" -#: ../../include/features.php:60 -msgid "Ability to file posts under folders" +#: ../../include/oembed.php:159 +msgid "Embedding disabled" msgstr "" -#: ../../include/features.php:61 -msgid "Dislike Posts" +#: ../../include/features.php:21 +msgid "General Features" msgstr "" -#: ../../include/features.php:61 -msgid "Ability to dislike posts/comments" +#: ../../include/features.php:23 +msgid "Content Expiration" msgstr "" -#: ../../include/features.php:62 -msgid "Star Posts" +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:62 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/features.php:24 +msgid "Multiple Profiles" msgstr "" -#: ../../include/features.php:63 -msgid "Tag Cloud" +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/features.php:63 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/features.php:25 +msgid "Web Pages" msgstr "" -#: ../../include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +#: ../../include/features.php:25 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/group.php:223 -msgid "Default privacy group for new contacts" +#: ../../include/features.php:26 +msgid "Private Notes" msgstr "" -#: ../../include/group.php:242 ../../mod/admin.php:695 -msgid "All Channels" +#: ../../include/features.php:26 +msgid "Enables a tool to store notes and reminders" +msgstr "" + +#: ../../include/features.php:27 +msgid "Enhanced Photo Albums" msgstr "" -#: ../../include/group.php:264 -msgid "edit" +#: ../../include/features.php:27 +msgid "Enable photo album with enhanced features" msgstr "" -#: ../../include/group.php:285 -msgid "Collections" +#: ../../include/features.php:29 +msgid "Extended Identity Sharing" msgstr "" -#: ../../include/group.php:286 -msgid "Edit collection" +#: ../../include/features.php:30 +msgid "Expert Mode" msgstr "" -#: ../../include/group.php:287 -msgid "Create a new collection" +#: ../../include/features.php:30 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/group.php:288 -msgid "Channels not in any collection" +#: ../../include/features.php:31 +msgid "Premium Channel" msgstr "" -#: ../../include/group.php:290 ../../mod/network.php:123 -msgid "add" +#: ../../include/features.php:31 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" +#: ../../include/features.php:36 +msgid "Post Composition Features" msgstr "" -#: ../../include/js_strings.php:8 -msgid "show fewer" +#: ../../include/features.php:37 +msgid "Richtext Editor" msgstr "" -#: ../../include/js_strings.php:9 -msgid "Password too short" +#: ../../include/features.php:37 +msgid "Enable richtext editor" msgstr "" -#: ../../include/js_strings.php:10 -msgid "Passwords do not match" +#: ../../include/features.php:38 +msgid "Post Preview" msgstr "" -#: ../../include/js_strings.php:11 ../../mod/photos.php:45 -msgid "everybody" +#: ../../include/features.php:38 +msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/js_strings.php:12 -msgid "Secret Passphrase" +#: ../../include/features.php:39 ../../mod/settings.php:120 +#: ../../mod/sources.php:67 +msgid "Channel Sources" msgstr "" -#: ../../include/js_strings.php:13 -msgid "Passphrase hint" +#: ../../include/features.php:39 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/js_strings.php:15 -msgid "timeago.prefixAgo" +#: ../../include/features.php:40 +msgid "Even More Encryption" msgstr "" -#: ../../include/js_strings.php:16 -msgid "timeago.suffixAgo" +#: ../../include/features.php:40 +msgid "Allow encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/js_strings.php:17 -msgid "ago" +#: ../../include/features.php:45 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/js_strings.php:18 -msgid "from now" +#: ../../include/features.php:46 +msgid "Search by Date" msgstr "" -#: ../../include/js_strings.php:19 -msgid "less than a minute" +#: ../../include/features.php:46 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/js_strings.php:20 -msgid "about a minute" +#: ../../include/features.php:47 +msgid "Collections Filter" msgstr "" -#: ../../include/js_strings.php:21 -#, php-format -msgid "%d minutes" +#: ../../include/features.php:47 +msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/js_strings.php:22 -msgid "about an hour" +#: ../../include/features.php:48 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/js_strings.php:23 -#, php-format -msgid "about %d hours" +#: ../../include/features.php:49 +msgid "Network Personal Tab" msgstr "" -#: ../../include/js_strings.php:24 -msgid "a day" +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/js_strings.php:25 -#, php-format -msgid "%d days" +#: ../../include/features.php:50 +msgid "Network New Tab" msgstr "" -#: ../../include/js_strings.php:26 -msgid "about a month" +#: ../../include/features.php:50 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/js_strings.php:27 -#, php-format -msgid "%d months" +#: ../../include/features.php:51 +msgid "Affinity Tool" msgstr "" -#: ../../include/js_strings.php:28 -msgid "about a year" +#: ../../include/features.php:51 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/js_strings.php:29 -#, php-format -msgid "%d years" +#: ../../include/features.php:52 +msgid "Suggest Channels" msgstr "" -#: ../../include/js_strings.php:31 -msgid "timeago.numbers" +#: ../../include/features.php:52 +msgid "Show channel suggestions" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/features.php:57 +msgid "Post/Comment Tools" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/features.php:59 +msgid "Edit Sent Posts" msgstr "" -#: ../../include/message.php:42 -msgid "Unable to determine sender." +#: ../../include/features.php:59 +msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../include/message.php:143 -msgid "Stored post could not be verified." +#: ../../include/features.php:60 +msgid "Tagging" msgstr "" -#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797 -#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 -#: ../../mod/profile_photo.php:346 -msgid "Profile Photos" +#: ../../include/features.php:60 +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/api.php:972 -msgid "Public Timeline" +#: ../../include/features.php:61 +msgid "Post Categories" msgstr "" -#: ../../include/network.php:640 -msgid "view full size" +#: ../../include/features.php:61 +msgid "Add categories to your posts" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 -#: ../../include/bbcode.php:497 -msgid "Image/photo" +#: ../../include/features.php:62 +msgid "Ability to file posts under folders" msgstr "" -#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 -msgid "Encrypted content" +#: ../../include/features.php:63 +msgid "Dislike Posts" msgstr "" -#: ../../include/bbcode.php:173 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/features.php:63 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/bbcode.php:175 -msgid "post" +#: ../../include/features.php:64 +msgid "Star Posts" msgstr "" -#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 -msgid "$1 wrote:" +#: ../../include/features.php:64 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/oembed.php:150 -msgid "Embedded content" +#: ../../include/features.php:65 +msgid "Tag Cloud" msgstr "" -#: ../../include/oembed.php:159 -msgid "Embedding disabled" +#: ../../include/features.php:65 +msgid "Provide a personal tag cloud on your channel page" msgstr "" #: ../../include/notify.php:23 @@ -1068,30 +1220,29 @@ 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:3412 ../../mod/common.php:43 -#: ../../mod/events.php:139 ../../mod/invite.php:13 ../../mod/invite.php:102 +#: ../../include/items.php:3429 ../../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/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:30 -#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:586 -#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 -#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 +#: ../../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/intro.php:50 ../../mod/profiles.php:163 -#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 -#: ../../mod/new_channel.php:97 ../../mod/connections.php:197 -#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 -#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48 -#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 -#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64 +#: ../../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/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:110 ../../mod/fsuggest.php:78 +#: ../../mod/channel.php:86 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189 -#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/suggest.php:33 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178 -#: ../../index.php:340 +#: ../../index.php:346 msgid "Permission denied." msgstr "" @@ -1104,7 +1255,7 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 +#: ../../include/photos.php:124 ../../mod/profile_photo.php:147 msgid "Unable to process image" msgstr "" @@ -1112,7 +1263,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../include/conversation.php:1453 +#: ../../include/photos.php:288 ../../include/conversation.php:1457 msgid "Photo Albums" msgstr "" @@ -1265,11 +1416,6 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:298 -#: ../../mod/network.php:215 ../../mod/connections.php:407 -msgid "Friends" -msgstr "" - #: ../../include/profile_selectors.php:42 msgid "Friends/Benefits" msgstr "" @@ -1441,8 +1587,8 @@ msgstr "" msgid "Your posts and conversations" msgstr "" -#: ../../include/nav.php:76 ../../include/conversation.php:925 -#: ../../mod/connections.php:327 ../../mod/connections.php:441 +#: ../../include/nav.php:76 ../../include/conversation.php:929 +#: ../../mod/connections.php:331 ../../mod/connections.php:445 msgid "View Profile" msgstr "" @@ -1458,7 +1604,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:79 ../../include/conversation.php:1450 +#: ../../include/nav.php:79 ../../include/conversation.php:1454 #: ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" @@ -1513,7 +1659,7 @@ msgid "Addon applications, utilities, games" msgstr "" #: ../../include/nav.php:135 ../../include/text.php:736 -#: ../../mod/search.php:96 +#: ../../include/text.php:750 ../../mod/search.php:96 msgid "Search" msgstr "" @@ -1521,7 +1667,7 @@ msgstr "" msgid "Search site content" msgstr "" -#: ../../include/nav.php:138 ../../mod/directory.php:225 +#: ../../include/nav.php:138 ../../mod/directory.php:228 msgid "Directory" msgstr "" @@ -1538,143 +1684,163 @@ msgid "Your matrix" msgstr "" #: ../../include/nav.php:150 -msgid "See all matrix notifications" -msgstr "" - -#: ../../include/nav.php:151 msgid "Mark all matrix notifications seen" msgstr "" -#: ../../include/nav.php:153 +#: ../../include/nav.php:152 msgid "Channel Home" msgstr "" -#: ../../include/nav.php:153 +#: ../../include/nav.php:152 msgid "Channel home" msgstr "" -#: ../../include/nav.php:154 -msgid "See all channel notifications" -msgstr "" - -#: ../../include/nav.php:155 +#: ../../include/nav.php:153 msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:158 +#: ../../include/nav.php:156 msgid "Intros" msgstr "" -#: ../../include/nav.php:158 ../../mod/connections.php:585 +#: ../../include/nav.php:156 ../../mod/connections.php:589 msgid "New Connections" msgstr "" #: ../../include/nav.php:159 -msgid "See all channel introductions" -msgstr "" - -#: ../../include/nav.php:162 msgid "Notices" msgstr "" -#: ../../include/nav.php:162 ../../mod/notifications.php:218 +#: ../../include/nav.php:159 msgid "Notifications" msgstr "" -#: ../../include/nav.php:163 +#: ../../include/nav.php:160 msgid "See all notifications" msgstr "" -#: ../../include/nav.php:164 +#: ../../include/nav.php:161 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:166 +#: ../../include/nav.php:163 msgid "Mail" msgstr "" -#: ../../include/nav.php:166 +#: ../../include/nav.php:163 msgid "Private mail" msgstr "" -#: ../../include/nav.php:167 +#: ../../include/nav.php:164 msgid "See all private messages" msgstr "" -#: ../../include/nav.php:168 +#: ../../include/nav.php:165 msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:169 +#: ../../include/nav.php:166 msgid "Inbox" msgstr "" -#: ../../include/nav.php:170 +#: ../../include/nav.php:167 msgid "Outbox" msgstr "" -#: ../../include/nav.php:171 ../../mod/message.php:24 +#: ../../include/nav.php:168 ../../mod/message.php:24 msgid "New Message" msgstr "" -#: ../../include/nav.php:174 ../../include/conversation.php:1461 -#: ../../mod/events.php:353 +#: ../../include/nav.php:171 ../../include/conversation.php:1465 +#: ../../mod/events.php:354 msgid "Events" msgstr "" -#: ../../include/nav.php:174 +#: ../../include/nav.php:171 msgid "Event Calendar" msgstr "" -#: ../../include/nav.php:175 +#: ../../include/nav.php:172 msgid "See all events" msgstr "" -#: ../../include/nav.php:176 +#: ../../include/nav.php:173 msgid "Mark all events seen" msgstr "" -#: ../../include/nav.php:178 +#: ../../include/nav.php:175 msgid "Channel Select" msgstr "" -#: ../../include/nav.php:178 +#: ../../include/nav.php:175 msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:180 ../../mod/settings.php:131 -#: ../../mod/admin.php:782 ../../mod/admin.php:987 +#: ../../include/nav.php:177 ../../mod/settings.php:131 +#: ../../mod/admin.php:785 ../../mod/admin.php:990 msgid "Settings" msgstr "" -#: ../../include/nav.php:180 +#: ../../include/nav.php:177 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:182 ../../mod/connections.php:690 +#: ../../include/nav.php:179 ../../mod/connections.php:694 msgid "Connections" msgstr "" -#: ../../include/nav.php:182 +#: ../../include/nav.php:179 msgid "Manage/Edit Friends and Connections" msgstr "" -#: ../../include/nav.php:189 ../../mod/admin.php:111 +#: ../../include/nav.php:186 ../../mod/admin.php:111 msgid "Admin" msgstr "" -#: ../../include/nav.php:189 +#: ../../include/nav.php:186 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:215 +#: ../../include/nav.php:212 msgid "Nothing new here" msgstr "" -#: ../../include/nav.php:220 +#: ../../include/nav.php:217 msgid "Please wait..." msgstr "" +#: ../../include/taxonomy.php:210 +msgid "Tags" +msgstr "" + +#: ../../include/taxonomy.php:224 +msgid "Keywords" +msgstr "" + +#: ../../include/taxonomy.php:249 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:249 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:250 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:250 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:251 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:252 +msgid "dislikes" +msgstr "" + #: ../../include/account.php:23 msgid "Not a valid email address" msgstr "" @@ -1731,12 +1897,12 @@ msgstr "" msgid "Registration revoked for %s" msgstr "" -#: ../../include/conversation.php:117 ../../include/text.php:1609 +#: ../../include/conversation.php:117 ../../include/text.php:1621 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/conversation.php:120 ../../include/text.php:1612 +#: ../../include/conversation.php:120 ../../include/text.php:1624 #: ../../mod/tagger.php:49 msgid "event" msgstr "" @@ -1745,12 +1911,12 @@ msgstr "" msgid "channel" msgstr "" -#: ../../include/conversation.php:145 ../../include/text.php:1615 +#: ../../include/conversation.php:145 ../../include/text.php:1627 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/conversation.php:147 ../../include/text.php:1617 +#: ../../include/conversation.php:147 ../../include/text.php:1629 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" @@ -1770,352 +1936,352 @@ msgstr "" msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/conversation.php:232 +#: ../../include/conversation.php:236 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:236 ../../include/text.php:776 +#: ../../include/conversation.php:240 ../../include/text.php:790 msgid "poked" msgstr "" -#: ../../include/conversation.php:254 ../../mod/mood.php:63 +#: ../../include/conversation.php:258 ../../mod/mood.php:63 #, php-format msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/conversation.php:658 +#: ../../include/conversation.php:662 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:672 +#: ../../include/conversation.php:676 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:673 +#: ../../include/conversation.php:677 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:700 +#: ../../include/conversation.php:704 msgid "View in context" msgstr "" -#: ../../include/conversation.php:826 +#: ../../include/conversation.php:830 msgid "remove" msgstr "" -#: ../../include/conversation.php:830 +#: ../../include/conversation.php:834 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:831 +#: ../../include/conversation.php:835 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:922 +#: ../../include/conversation.php:926 msgid "View Source" msgstr "" -#: ../../include/conversation.php:923 +#: ../../include/conversation.php:927 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:924 +#: ../../include/conversation.php:928 msgid "View Status" msgstr "" -#: ../../include/conversation.php:926 +#: ../../include/conversation.php:930 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:927 +#: ../../include/conversation.php:931 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:928 +#: ../../include/conversation.php:932 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:929 +#: ../../include/conversation.php:933 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:930 +#: ../../include/conversation.php:934 msgid "Poke" msgstr "" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:996 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:996 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:996 +#: ../../include/conversation.php:1000 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:998 +#: ../../include/conversation.php:1002 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1004 +#: ../../include/conversation.php:1008 msgid "and" msgstr "" -#: ../../include/conversation.php:1007 +#: ../../include/conversation.php:1011 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1008 +#: ../../include/conversation.php:1012 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1008 +#: ../../include/conversation.php:1012 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1058 +#: ../../include/conversation.php:1062 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1059 ../../mod/message.php:281 +#: ../../include/conversation.php:1063 ../../mod/message.php:281 #: ../../mod/message.php:417 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1060 +#: ../../include/conversation.php:1064 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1061 +#: ../../include/conversation.php:1065 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1066 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1063 ../../mod/filer.php:35 +#: ../../include/conversation.php:1067 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1064 +#: ../../include/conversation.php:1068 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1065 ../../mod/message.php:282 +#: ../../include/conversation.php:1069 ../../mod/message.php:282 #: ../../mod/message.php:418 ../../mod/editpost.php:52 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1089 ../../mod/photos.php:1071 +#: ../../include/conversation.php:1093 ../../mod/photos.php:1071 msgid "Share" msgstr "" -#: ../../include/conversation.php:1091 +#: ../../include/conversation.php:1095 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1093 ../../mod/message.php:329 -#: ../../mod/message.php:512 ../../mod/editlayout.php:101 -#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98 +#: ../../include/conversation.php:1097 ../../mod/message.php:329 +#: ../../mod/message.php:480 ../../mod/editlayout.php:101 +#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:98 #: ../../mod/editblock.php:115 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1094 +#: ../../include/conversation.php:1098 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1095 ../../mod/message.php:330 -#: ../../mod/message.php:513 ../../mod/editlayout.php:102 -#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99 +#: ../../include/conversation.php:1099 ../../mod/message.php:330 +#: ../../mod/message.php:481 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:99 #: ../../mod/editblock.php:116 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1096 +#: ../../include/conversation.php:1100 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1097 ../../mod/message.php:331 -#: ../../mod/message.php:514 ../../mod/editlayout.php:103 -#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100 +#: ../../include/conversation.php:1101 ../../mod/message.php:331 +#: ../../mod/message.php:482 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:100 #: ../../mod/editblock.php:117 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1098 +#: ../../include/conversation.php:1102 msgid "web link" msgstr "" -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1103 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1100 +#: ../../include/conversation.php:1104 msgid "video link" msgstr "" -#: ../../include/conversation.php:1101 +#: ../../include/conversation.php:1105 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1102 +#: ../../include/conversation.php:1106 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107 -#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 +#: ../../include/conversation.php:1107 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:150 ../../mod/editpost.php:104 #: ../../mod/editblock.php:121 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1104 +#: ../../include/conversation.php:1108 msgid "set location" msgstr "" -#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 +#: ../../include/conversation.php:1109 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:105 #: ../../mod/editblock.php:122 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1106 +#: ../../include/conversation.php:1110 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118 +#: ../../include/conversation.php:1112 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:168 ../../mod/editpost.php:118 #: ../../mod/editblock.php:136 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123 -#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120 +#: ../../include/conversation.php:1115 ../../mod/editlayout.php:123 +#: ../../mod/editwebpage.php:170 ../../mod/editpost.php:120 #: ../../mod/editblock.php:138 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110 -#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107 +#: ../../include/conversation.php:1117 ../../mod/editlayout.php:110 +#: ../../mod/editwebpage.php:153 ../../mod/editpost.php:107 #: ../../mod/editblock.php:124 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1114 +#: ../../include/conversation.php:1118 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118 -#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115 +#: ../../include/conversation.php:1126 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:163 ../../mod/editpost.php:115 #: ../../mod/editblock.php:133 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121 +#: ../../include/conversation.php:1128 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:171 ../../mod/editpost.php:121 #: ../../mod/editblock.php:139 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1137 ../../mod/message.php:336 -#: ../../mod/message.php:519 ../../mod/editlayout.php:134 -#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132 +#: ../../include/conversation.php:1141 ../../mod/message.php:336 +#: ../../mod/message.php:487 ../../mod/editlayout.php:134 +#: ../../mod/editwebpage.php:181 ../../mod/editpost.php:132 #: ../../mod/editblock.php:149 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1364 +#: ../../include/conversation.php:1368 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1367 +#: ../../include/conversation.php:1371 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1370 +#: ../../include/conversation.php:1374 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1373 +#: ../../include/conversation.php:1377 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1377 ../../mod/notifications.php:86 +#: ../../include/conversation.php:1381 msgid "Personal" msgstr "" -#: ../../include/conversation.php:1380 +#: ../../include/conversation.php:1384 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1383 ../../mod/menu.php:57 -#: ../../mod/connections.php:552 +#: ../../include/conversation.php:1387 ../../mod/menu.php:57 +#: ../../mod/connections.php:556 msgid "New" msgstr "" -#: ../../include/conversation.php:1386 +#: ../../include/conversation.php:1390 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1393 +#: ../../include/conversation.php:1397 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1396 +#: ../../include/conversation.php:1400 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1403 +#: ../../include/conversation.php:1407 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1406 +#: ../../include/conversation.php:1410 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1436 +#: ../../include/conversation.php:1440 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1439 +#: ../../include/conversation.php:1443 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1443 +#: ../../include/conversation.php:1447 msgid "About" msgstr "" -#: ../../include/conversation.php:1446 +#: ../../include/conversation.php:1450 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1464 +#: ../../include/conversation.php:1468 msgid "Events and Calendar" msgstr "" -#: ../../include/conversation.php:1469 +#: ../../include/conversation.php:1473 msgid "Webpages" msgstr "" -#: ../../include/conversation.php:1472 +#: ../../include/conversation.php:1476 msgid "Manage Webpages" msgstr "" @@ -2133,70 +2299,45 @@ msgstr "" #: ../../include/contact_widgets.php:14 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/contact_widgets.php:20 -msgid "Add New Connection" -msgstr "" - -#: ../../include/contact_widgets.php:21 -msgid "Enter the channel address" -msgstr "" - -#: ../../include/contact_widgets.php:22 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/contact_widgets.php:38 -#, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:44 +#: ../../include/contact_widgets.php:20 msgid "Find Channels" msgstr "" -#: ../../include/contact_widgets.php:45 +#: ../../include/contact_widgets.php:21 msgid "Enter name or interest" msgstr "" -#: ../../include/contact_widgets.php:46 +#: ../../include/contact_widgets.php:22 msgid "Connect/Follow" msgstr "" -#: ../../include/contact_widgets.php:47 +#: ../../include/contact_widgets.php:23 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:696 -#: ../../mod/directory.php:221 ../../mod/directory.php:226 +#: ../../include/contact_widgets.php:24 ../../mod/connections.php:700 +#: ../../mod/directory.php:224 ../../mod/directory.php:229 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:66 msgid "Channel Suggestions" msgstr "" -#: ../../include/contact_widgets.php:51 +#: ../../include/contact_widgets.php:27 msgid "Random Profile" msgstr "" -#: ../../include/contact_widgets.php:52 +#: ../../include/contact_widgets.php:28 msgid "Invite Friends" msgstr "" -#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 -msgid "Everything" -msgstr "" - -#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 -msgid "Categories" -msgstr "" - -#: ../../include/contact_widgets.php:143 +#: ../../include/contact_widgets.php:119 #, php-format msgid "%d connection in common" msgid_plural "%d connections in common" @@ -2246,274 +2387,282 @@ msgstr[1] "" msgid "View Connections" msgstr "" -#: ../../include/text.php:738 ../../mod/filer.php:36 -msgid "Save" -msgstr "" - -#: ../../include/text.php:776 +#: ../../include/text.php:790 msgid "poke" msgstr "" -#: ../../include/text.php:777 +#: ../../include/text.php:791 msgid "ping" msgstr "" -#: ../../include/text.php:777 +#: ../../include/text.php:791 msgid "pinged" msgstr "" -#: ../../include/text.php:778 +#: ../../include/text.php:792 msgid "prod" msgstr "" -#: ../../include/text.php:778 +#: ../../include/text.php:792 msgid "prodded" msgstr "" -#: ../../include/text.php:779 +#: ../../include/text.php:793 msgid "slap" msgstr "" -#: ../../include/text.php:779 +#: ../../include/text.php:793 msgid "slapped" msgstr "" -#: ../../include/text.php:780 +#: ../../include/text.php:794 msgid "finger" msgstr "" -#: ../../include/text.php:780 +#: ../../include/text.php:794 msgid "fingered" msgstr "" -#: ../../include/text.php:781 +#: ../../include/text.php:795 msgid "rebuff" msgstr "" -#: ../../include/text.php:781 +#: ../../include/text.php:795 msgid "rebuffed" msgstr "" -#: ../../include/text.php:793 +#: ../../include/text.php:807 msgid "happy" msgstr "" -#: ../../include/text.php:794 +#: ../../include/text.php:808 msgid "sad" msgstr "" -#: ../../include/text.php:795 +#: ../../include/text.php:809 msgid "mellow" msgstr "" -#: ../../include/text.php:796 +#: ../../include/text.php:810 msgid "tired" msgstr "" -#: ../../include/text.php:797 +#: ../../include/text.php:811 msgid "perky" msgstr "" -#: ../../include/text.php:798 +#: ../../include/text.php:812 msgid "angry" msgstr "" -#: ../../include/text.php:799 +#: ../../include/text.php:813 msgid "stupified" msgstr "" -#: ../../include/text.php:800 +#: ../../include/text.php:814 msgid "puzzled" msgstr "" -#: ../../include/text.php:801 +#: ../../include/text.php:815 msgid "interested" msgstr "" -#: ../../include/text.php:802 +#: ../../include/text.php:816 msgid "bitter" msgstr "" -#: ../../include/text.php:803 +#: ../../include/text.php:817 msgid "cheerful" msgstr "" -#: ../../include/text.php:804 +#: ../../include/text.php:818 msgid "alive" msgstr "" -#: ../../include/text.php:805 +#: ../../include/text.php:819 msgid "annoyed" msgstr "" -#: ../../include/text.php:806 +#: ../../include/text.php:820 msgid "anxious" msgstr "" -#: ../../include/text.php:807 +#: ../../include/text.php:821 msgid "cranky" msgstr "" -#: ../../include/text.php:808 +#: ../../include/text.php:822 msgid "disturbed" msgstr "" -#: ../../include/text.php:809 +#: ../../include/text.php:823 msgid "frustrated" msgstr "" -#: ../../include/text.php:810 +#: ../../include/text.php:824 msgid "motivated" msgstr "" -#: ../../include/text.php:811 +#: ../../include/text.php:825 msgid "relaxed" msgstr "" -#: ../../include/text.php:812 +#: ../../include/text.php:826 msgid "surprised" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Monday" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Tuesday" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Wednesday" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Thursday" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Friday" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Saturday" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Sunday" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "January" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "February" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "March" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "April" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "May" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "June" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "July" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "August" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "September" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "October" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "November" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "December" msgstr "" -#: ../../include/text.php:1058 ../../mod/message.php:453 +#: ../../include/text.php:1070 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1059 ../../mod/message.php:454 +#: ../../include/text.php:1071 msgid "bytes" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1106 msgid "remove category" msgstr "" -#: ../../include/text.php:1116 +#: ../../include/text.php:1128 msgid "remove from file" msgstr "" -#: ../../include/text.php:1170 ../../include/text.php:1182 +#: ../../include/text.php:1182 ../../include/text.php:1194 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1358 ../../mod/events.php:331 +#: ../../include/text.php:1370 ../../mod/events.php:332 msgid "link to source" msgstr "" -#: ../../include/text.php:1377 +#: ../../include/text.php:1389 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1380 ../../include/text.php:1445 +#: ../../include/text.php:1392 ../../include/text.php:1457 msgid "default" msgstr "" -#: ../../include/text.php:1416 +#: ../../include/text.php:1428 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1457 +#: ../../include/text.php:1469 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1622 +#: ../../include/text.php:1634 msgid "activity" msgstr "" -#: ../../include/text.php:1884 +#: ../../include/text.php:1896 msgid "Design" msgstr "" -#: ../../include/text.php:1886 +#: ../../include/text.php:1898 msgid "Blocks" msgstr "" -#: ../../include/text.php:1887 +#: ../../include/text.php:1899 msgid "Menus" msgstr "" -#: ../../include/text.php:1888 +#: ../../include/text.php:1900 msgid "Layouts" msgstr "" -#: ../../include/text.php:1889 +#: ../../include/text.php:1901 msgid "Pages" msgstr "" +#: ../../include/plugin.php:475 ../../include/plugin.php:477 +msgid "Click here to upgrade." +msgstr "" + +#: ../../include/plugin.php:483 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: ../../include/plugin.php:488 +msgid "This action is not available under your subscription plan." +msgstr "" + #: ../../include/follow.php:21 msgid "Channel is blocked on this site." msgstr "" @@ -2626,56 +2775,12 @@ msgstr "" msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/taxonomy.php:210 -msgid "Tags" -msgstr "" - -#: ../../include/taxonomy.php:224 -msgid "Keywords" -msgstr "" - -#: ../../include/taxonomy.php:249 -msgid "have" -msgstr "" - -#: ../../include/taxonomy.php:249 -msgid "has" -msgstr "" - -#: ../../include/taxonomy.php:250 -msgid "want" -msgstr "" - -#: ../../include/taxonomy.php:250 -msgid "wants" -msgstr "" - -#: ../../include/taxonomy.php:251 -msgid "likes" -msgstr "" - -#: ../../include/taxonomy.php:252 -msgid "dislikes" -msgstr "" - -#: ../../include/plugin.php:475 ../../include/plugin.php:477 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/plugin.php:483 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/plugin.php:488 -msgid "This action is not available under your subscription plan." -msgstr "" - #: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 #: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "" -#: ../../include/identity.php:29 ../../mod/item.php:1148 +#: ../../include/identity.php:29 ../../mod/item.php:1151 msgid "Unable to obtain identity information from database" msgstr "" @@ -2723,7 +2828,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:627 ../../mod/profiles.php:624 +#: ../../include/identity.php:627 ../../mod/profiles.php:613 msgid "Change profile photo" msgstr "" @@ -2735,7 +2840,7 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:634 ../../mod/profiles.php:625 +#: ../../include/identity.php:634 ../../mod/profiles.php:614 msgid "Create New Profile" msgstr "" @@ -2743,162 +2848,162 @@ msgstr "" msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:648 ../../mod/profiles.php:636 +#: ../../include/identity.php:648 ../../mod/profiles.php:625 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:651 ../../mod/profiles.php:639 +#: ../../include/identity.php:651 ../../mod/profiles.php:628 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:652 ../../mod/profiles.php:640 +#: ../../include/identity.php:652 ../../mod/profiles.php:629 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:665 ../../include/identity.php:883 -#: ../../mod/directory.php:175 +#: ../../include/identity.php:666 ../../include/identity.php:891 +#: ../../mod/directory.php:176 msgid "Gender:" msgstr "" -#: ../../include/identity.php:666 ../../include/identity.php:903 -#: ../../mod/directory.php:177 +#: ../../include/identity.php:667 ../../include/identity.php:911 +#: ../../mod/directory.php:178 msgid "Status:" msgstr "" -#: ../../include/identity.php:667 ../../include/identity.php:914 -#: ../../mod/directory.php:179 +#: ../../include/identity.php:668 ../../include/identity.php:922 +#: ../../mod/directory.php:180 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:730 ../../include/identity.php:810 +#: ../../include/identity.php:735 ../../include/identity.php:815 #: ../../mod/ping.php:230 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:731 ../../include/identity.php:811 +#: ../../include/identity.php:736 ../../include/identity.php:816 msgid "F d" msgstr "" -#: ../../include/identity.php:776 ../../include/identity.php:851 +#: ../../include/identity.php:781 ../../include/identity.php:856 #: ../../mod/ping.php:252 msgid "[today]" msgstr "" -#: ../../include/identity.php:788 +#: ../../include/identity.php:793 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:789 +#: ../../include/identity.php:794 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:844 +#: ../../include/identity.php:849 msgid "[No description]" msgstr "" -#: ../../include/identity.php:862 +#: ../../include/identity.php:867 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:863 +#: ../../include/identity.php:868 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:873 ../../include/identity.php:984 -#: ../../mod/profperm.php:112 +#: ../../include/identity.php:881 ../../include/identity.php:992 +#: ../../mod/profperm.php:103 msgid "Profile" msgstr "" -#: ../../include/identity.php:881 ../../mod/settings.php:1013 +#: ../../include/identity.php:889 ../../mod/settings.php:1013 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:888 +#: ../../include/identity.php:896 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:889 +#: ../../include/identity.php:897 msgid "j F" msgstr "" -#: ../../include/identity.php:896 +#: ../../include/identity.php:904 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:900 +#: ../../include/identity.php:908 msgid "Age:" msgstr "" -#: ../../include/identity.php:909 +#: ../../include/identity.php:917 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:912 ../../mod/profiles.php:549 +#: ../../include/identity.php:920 ../../mod/profiles.php:538 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:916 ../../mod/profiles.php:551 +#: ../../include/identity.php:924 ../../mod/profiles.php:540 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:918 +#: ../../include/identity.php:926 msgid "Tags:" msgstr "" -#: ../../include/identity.php:920 ../../mod/profiles.php:552 +#: ../../include/identity.php:928 ../../mod/profiles.php:541 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:922 +#: ../../include/identity.php:930 msgid "Religion:" msgstr "" -#: ../../include/identity.php:924 ../../mod/directory.php:181 +#: ../../include/identity.php:932 ../../mod/directory.php:182 msgid "About:" msgstr "" -#: ../../include/identity.php:926 +#: ../../include/identity.php:934 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:928 ../../mod/profiles.php:555 +#: ../../include/identity.php:936 ../../mod/profiles.php:544 msgid "Likes:" msgstr "" -#: ../../include/identity.php:930 ../../mod/profiles.php:556 +#: ../../include/identity.php:938 ../../mod/profiles.php:545 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:933 +#: ../../include/identity.php:941 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:935 +#: ../../include/identity.php:943 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:937 +#: ../../include/identity.php:945 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:939 +#: ../../include/identity.php:947 msgid "Television:" msgstr "" -#: ../../include/identity.php:941 +#: ../../include/identity.php:949 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:943 +#: ../../include/identity.php:951 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:945 +#: ../../include/identity.php:953 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:947 +#: ../../include/identity.php:955 msgid "School/education:" msgstr "" @@ -2921,138 +3026,116 @@ msgid "" msgstr "" #: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74 -#: ../../mod/profperm.php:28 ../../index.php:339 +#: ../../mod/profperm.php:19 ../../index.php:345 msgid "Permission denied" msgstr "" -#: ../../include/items.php:3350 ../../mod/admin.php:150 -#: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3367 ../../mod/admin.php:150 +#: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3533 -msgid "Archives" -msgstr "" - -#: ../../include/items.php:3699 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3718 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3715 ../../mod/network.php:288 -msgid "Group is empty" -msgstr "" - -#: ../../include/items.php:3731 -msgid "Connection not found." -msgstr "" - -#: ../../include/dir_fns.php:15 -msgid "Sort Options" -msgstr "" - -#: ../../include/dir_fns.php:16 -msgid "Alphabetic" -msgstr "" - -#: ../../include/dir_fns.php:17 -msgid "Reverse Alphabetic" -msgstr "" - -#: ../../include/dir_fns.php:18 -msgid "Newest to Oldest" +#: ../../include/items.php:3733 +msgid "Collection is empty." msgstr "" -#: ../../include/dir_fns.php:29 -msgid "Enable Safe Search" +#: ../../include/items.php:3740 +#, php-format +msgid "Collection: %s" msgstr "" -#: ../../include/dir_fns.php:31 -msgid "Disable Safe Search" +#: ../../include/items.php:3751 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../include/dir_fns.php:33 -msgid "Safe Mode" +#: ../../include/items.php:3754 +msgid "Connection not found." msgstr "" #: ../../mod/common.php:10 msgid "No channel." msgstr "" -#: ../../mod/common.php:47 +#: ../../mod/common.php:39 msgid "Common connections" msgstr "" -#: ../../mod/common.php:52 +#: ../../mod/common.php:44 msgid "No connections in common." msgstr "" -#: ../../mod/events.php:71 +#: ../../mod/events.php:72 msgid "Event title and start time are required." msgstr "" -#: ../../mod/events.php:286 +#: ../../mod/events.php:287 msgid "l, F j" msgstr "" -#: ../../mod/events.php:308 +#: ../../mod/events.php:309 msgid "Edit event" msgstr "" -#: ../../mod/events.php:354 +#: ../../mod/events.php:355 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:355 +#: ../../mod/events.php:356 msgid "Previous" msgstr "" -#: ../../mod/events.php:356 ../../mod/setup.php:256 +#: ../../mod/events.php:357 ../../mod/setup.php:256 msgid "Next" msgstr "" -#: ../../mod/events.php:428 +#: ../../mod/events.php:429 msgid "hour:minute" msgstr "" -#: ../../mod/events.php:447 +#: ../../mod/events.php:448 msgid "Event details" msgstr "" -#: ../../mod/events.php:448 +#: ../../mod/events.php:449 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "" -#: ../../mod/events.php:450 +#: ../../mod/events.php:451 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:450 ../../mod/events.php:464 +#: ../../mod/events.php:451 ../../mod/events.php:465 msgid "Required" msgstr "" -#: ../../mod/events.php:453 +#: ../../mod/events.php:454 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:455 +#: ../../mod/events.php:456 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:458 +#: ../../mod/events.php:459 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:460 +#: ../../mod/events.php:461 msgid "Description:" msgstr "" -#: ../../mod/events.php:464 +#: ../../mod/events.php:465 msgid "Title:" msgstr "" -#: ../../mod/events.php:466 +#: ../../mod/events.php:467 msgid "Share this event" msgstr "" @@ -3139,7 +3222,7 @@ msgid "Enter email addresses, one per line:" msgstr "" #: ../../mod/invite.php:141 ../../mod/message.php:326 -#: ../../mod/message.php:508 +#: ../../mod/message.php:476 msgid "Your message:" msgstr "" @@ -3184,7 +3267,7 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/webpages.php:104 ../../mod/layouts.php:105 +#: ../../mod/webpages.php:121 ../../mod/layouts.php:105 #: ../../mod/blocks.php:96 msgid "View" msgstr "" @@ -3208,19 +3291,15 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:506 +#: ../../mod/profiles.php:495 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:507 +#: ../../mod/profiles.php:496 msgid "No" msgstr "" -#: ../../mod/lastpost.php:16 ../../mod/channel.php:25 -msgid "You must be logged in to see this page." -msgstr "" - #: ../../mod/apps.php:8 msgid "No installed applications." msgstr "" @@ -3697,7 +3776,7 @@ msgid "Cancel" msgstr "" #: ../../mod/settings.php:611 ../../mod/settings.php:637 -#: ../../mod/admin.php:686 ../../mod/crepair.php:148 +#: ../../mod/admin.php:689 msgid "Name" msgstr "" @@ -3810,7 +3889,7 @@ msgstr "" msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:802 ../../mod/admin.php:369 +#: ../../mod/settings.php:802 ../../mod/admin.php:371 msgid "No special theme for mobile devices" msgstr "" @@ -3878,7 +3957,7 @@ msgstr "" msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:976 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288 msgid "or" msgstr "" @@ -3950,7 +4029,7 @@ msgstr "" msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180 msgid "(click to open/close)" msgstr "" @@ -4026,22 +4105,22 @@ msgstr "" msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/viewconnections.php:28 ../../mod/search.php:80 +#: ../../mod/viewconnections.php:17 ../../mod/search.php:80 #: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18 -#: ../../mod/directory.php:32 +#: ../../mod/directory.php:33 msgid "Public access denied." msgstr "" -#: ../../mod/viewconnections.php:57 +#: ../../mod/viewconnections.php:43 msgid "No connections." msgstr "" -#: ../../mod/viewconnections.php:69 +#: ../../mod/viewconnections.php:55 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/viewconnections.php:84 +#: ../../mod/viewconnections.php:70 msgid "View Connnections" msgstr "" @@ -4198,23 +4277,23 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:87 ../../mod/admin.php:417 +#: ../../mod/admin.php:87 ../../mod/admin.php:419 msgid "Site" msgstr "" -#: ../../mod/admin.php:88 ../../mod/admin.php:682 ../../mod/admin.php:694 +#: ../../mod/admin.php:88 ../../mod/admin.php:685 ../../mod/admin.php:697 msgid "Users" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:780 ../../mod/admin.php:822 +#: ../../mod/admin.php:89 ../../mod/admin.php:783 ../../mod/admin.php:825 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:90 ../../mod/admin.php:985 ../../mod/admin.php:1021 +#: ../../mod/admin.php:90 ../../mod/admin.php:988 ../../mod/admin.php:1024 msgid "Themes" msgstr "" -#: ../../mod/admin.php:91 ../../mod/admin.php:475 +#: ../../mod/admin.php:91 ../../mod/admin.php:478 msgid "Server" msgstr "" @@ -4222,7 +4301,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1111 msgid "Logs" msgstr "" @@ -4238,9 +4317,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474 -#: ../../mod/admin.php:681 ../../mod/admin.php:779 ../../mod/admin.php:821 -#: ../../mod/admin.php:984 ../../mod/admin.php:1020 ../../mod/admin.php:1107 +#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:477 +#: ../../mod/admin.php:684 ../../mod/admin.php:782 ../../mod/admin.php:824 +#: ../../mod/admin.php:987 ../../mod/admin.php:1023 ../../mod/admin.php:1110 msgid "Administration" msgstr "" @@ -4252,7 +4331,7 @@ msgstr "" msgid "Registered users" msgstr "" -#: ../../mod/admin.php:198 ../../mod/admin.php:478 +#: ../../mod/admin.php:198 ../../mod/admin.php:481 msgid "Pending registrations" msgstr "" @@ -4260,567 +4339,581 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:201 ../../mod/admin.php:479 +#: ../../mod/admin.php:201 ../../mod/admin.php:482 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:342 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:371 +#: ../../mod/admin.php:373 msgid "No special theme for accessibility" msgstr "" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:398 msgid "Closed" msgstr "" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:399 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:400 msgid "Open" msgstr "" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:405 msgid "Private" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:406 msgid "Paid Access" msgstr "" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:407 msgid "Free Access" msgstr "" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:408 msgid "Tiered Access" msgstr "" -#: ../../mod/admin.php:419 ../../mod/register.php:180 +#: ../../mod/admin.php:421 ../../mod/register.php:180 msgid "Registration" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "File upload" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "Policies" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Site name" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "System language" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "System theme" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Accessibility system theme" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Accessibility theme" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "Channel to use for this website's static pages" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "Site Channel" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:438 msgid "Access policy" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Register text" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "Block public" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:444 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:444 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:444 -msgid "Proxy user" +#: ../../mod/admin.php:445 +msgid "No login on Homepage" msgstr "" #: ../../mod/admin.php:445 +msgid "" +"Check to hide the login form from your sites homepage when visitors arrive " +"who are not logged in (e.g. when you put the content of the homepage in via " +"the site channel)." +msgstr "" + +#: ../../mod/admin.php:447 +msgid "Proxy user" +msgstr "" + +#: ../../mod/admin.php:448 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 msgid "No server found" msgstr "" -#: ../../mod/admin.php:473 ../../mod/admin.php:695 +#: ../../mod/admin.php:476 ../../mod/admin.php:698 msgid "ID" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "for channel" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "on server" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "Status" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:503 +#: ../../mod/admin.php:506 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:509 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:510 +#: ../../mod/admin.php:513 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:516 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:528 +#: ../../mod/admin.php:531 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:535 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:534 +#: ../../mod/admin.php:537 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:538 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:561 +#: ../../mod/admin.php:564 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:568 +#: ../../mod/admin.php:571 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:599 +#: ../../mod/admin.php:602 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:610 +#: ../../mod/admin.php:613 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:619 +#: ../../mod/admin.php:622 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:619 +#: ../../mod/admin.php:622 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:684 +#: ../../mod/admin.php:687 msgid "select all" msgstr "" -#: ../../mod/admin.php:685 +#: ../../mod/admin.php:688 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:686 +#: ../../mod/admin.php:689 msgid "Request date" msgstr "" -#: ../../mod/admin.php:687 +#: ../../mod/admin.php:690 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:688 ../../mod/intro.php:11 ../../mod/intro.php:98 -#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 +#: ../../mod/admin.php:691 msgid "Approve" msgstr "" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:692 msgid "Deny" msgstr "" -#: ../../mod/admin.php:691 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:348 ../../mod/connections.php:490 +#: ../../mod/admin.php:694 ../../mod/connections.php:352 +#: ../../mod/connections.php:494 msgid "Block" msgstr "" -#: ../../mod/admin.php:692 ../../mod/connections.php:348 -#: ../../mod/connections.php:490 +#: ../../mod/admin.php:695 ../../mod/connections.php:352 +#: ../../mod/connections.php:494 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Register date" msgstr "" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Last login" msgstr "" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Expires" msgstr "" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:697 +#: ../../mod/admin.php:700 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:701 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:739 +#: ../../mod/admin.php:742 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:743 +#: ../../mod/admin.php:746 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:753 ../../mod/admin.php:955 +#: ../../mod/admin.php:756 ../../mod/admin.php:958 msgid "Disable" msgstr "" -#: ../../mod/admin.php:755 ../../mod/admin.php:957 +#: ../../mod/admin.php:758 ../../mod/admin.php:960 msgid "Enable" msgstr "" -#: ../../mod/admin.php:781 ../../mod/admin.php:986 +#: ../../mod/admin.php:784 ../../mod/admin.php:989 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:789 ../../mod/admin.php:996 +#: ../../mod/admin.php:792 ../../mod/admin.php:999 msgid "Author: " msgstr "" -#: ../../mod/admin.php:790 ../../mod/admin.php:997 +#: ../../mod/admin.php:793 ../../mod/admin.php:1000 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:919 +#: ../../mod/admin.php:922 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:978 +#: ../../mod/admin.php:981 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1026 +#: ../../mod/admin.php:1029 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1027 +#: ../../mod/admin.php:1030 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1054 +#: ../../mod/admin.php:1057 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1110 +#: ../../mod/admin.php:1113 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1116 +#: ../../mod/admin.php:1119 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1117 +#: ../../mod/admin.php:1120 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1117 +#: ../../mod/admin.php:1120 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1118 +#: ../../mod/admin.php:1121 msgid "Log level" msgstr "" -#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +#: ../../mod/mitem.php:14 ../../mod/menu.php:87 msgid "Menu not found." msgstr "" -#: ../../mod/mitem.php:66 +#: ../../mod/mitem.php:47 msgid "Menu element updated." msgstr "" -#: ../../mod/mitem.php:70 +#: ../../mod/mitem.php:51 msgid "Unable to update menu element." msgstr "" -#: ../../mod/mitem.php:76 +#: ../../mod/mitem.php:57 msgid "Menu element added." msgstr "" -#: ../../mod/mitem.php:80 +#: ../../mod/mitem.php:61 msgid "Unable to add menu element." msgstr "" -#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 +#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113 msgid "Not found." msgstr "" -#: ../../mod/mitem.php:116 +#: ../../mod/mitem.php:99 msgid "Manage Menu Elements" msgstr "" -#: ../../mod/mitem.php:119 +#: ../../mod/mitem.php:102 msgid "Edit menu" msgstr "" -#: ../../mod/mitem.php:122 +#: ../../mod/mitem.php:105 msgid "Edit element" msgstr "" -#: ../../mod/mitem.php:123 +#: ../../mod/mitem.php:106 msgid "Drop element" msgstr "" -#: ../../mod/mitem.php:124 +#: ../../mod/mitem.php:107 msgid "New element" msgstr "" -#: ../../mod/mitem.php:125 +#: ../../mod/mitem.php:108 msgid "Edit this menu container" msgstr "" -#: ../../mod/mitem.php:126 +#: ../../mod/mitem.php:109 msgid "Add menu element" msgstr "" -#: ../../mod/mitem.php:127 +#: ../../mod/mitem.php:110 msgid "Delete this menu item" msgstr "" -#: ../../mod/mitem.php:128 +#: ../../mod/mitem.php:111 msgid "Edit this menu item" msgstr "" -#: ../../mod/mitem.php:141 +#: ../../mod/mitem.php:134 msgid "New Menu Element" msgstr "" -#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 +#: ../../mod/mitem.php:136 ../../mod/mitem.php:179 +msgid "Menu Item Permissions" +msgstr "" + +#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 msgid "Link text" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +#: ../../mod/mitem.php:140 ../../mod/mitem.php:184 msgid "URL of link" msgstr "" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +#: ../../mod/mitem.php:142 ../../mod/mitem.php:186 msgid "Open link in new window" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +#: ../../mod/mitem.php:144 ../../mod/mitem.php:188 msgid "Order in list" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +#: ../../mod/mitem.php:144 ../../mod/mitem.php:188 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +#: ../../mod/mitem.php:145 ../../mod/menu.php:79 ../../mod/new_channel.php:117 msgid "Create" msgstr "" -#: ../../mod/mitem.php:161 +#: ../../mod/mitem.php:157 msgid "Menu item not found." msgstr "" -#: ../../mod/mitem.php:170 +#: ../../mod/mitem.php:166 msgid "Menu item deleted." msgstr "" -#: ../../mod/mitem.php:172 +#: ../../mod/mitem.php:168 msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/mitem.php:181 +#: ../../mod/mitem.php:177 msgid "Edit Menu Element" msgstr "" -#: ../../mod/mitem.php:190 ../../mod/menu.php:107 +#: ../../mod/mitem.php:189 ../../mod/menu.php:107 msgid "Modify" msgstr "" @@ -4872,10 +4965,6 @@ msgstr "" msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/search.php:20 ../../mod/network.php:113 -msgid "Remove term" -msgstr "" - #: ../../mod/photos.php:83 msgid "Page owner information could not be retrieved." msgstr "" @@ -5129,7 +5218,7 @@ msgstr "" msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/message.php:223 ../../mod/notifications.php:101 +#: ../../mod/message.php:223 msgid "Messages" msgstr "" @@ -5149,11 +5238,11 @@ msgstr "" msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:317 ../../mod/message.php:503 +#: ../../mod/message.php:317 ../../mod/message.php:471 msgid "To:" msgstr "" -#: ../../mod/message.php:322 ../../mod/message.php:505 +#: ../../mod/message.php:322 ../../mod/message.php:473 msgid "Subject:" msgstr "" @@ -5161,7 +5250,7 @@ msgstr "" msgid "No messages." msgstr "" -#: ../../mod/message.php:375 ../../mod/message.php:472 +#: ../../mod/message.php:375 ../../mod/message.php:440 msgid "Delete message" msgstr "" @@ -5173,34 +5262,30 @@ msgstr "" msgid "Message not found." msgstr "" -#: ../../mod/message.php:473 +#: ../../mod/message.php:441 msgid "Recall message" msgstr "" -#: ../../mod/message.php:475 +#: ../../mod/message.php:443 msgid "Message has been recalled." msgstr "" -#: ../../mod/message.php:492 +#: ../../mod/message.php:460 msgid "Private Conversation" msgstr "" -#: ../../mod/message.php:496 +#: ../../mod/message.php:464 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:498 +#: ../../mod/message.php:466 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:502 -msgid "Send Reply" -msgstr "" - -#: ../../mod/hcard.php:10 -msgid "No profile" +#: ../../mod/message.php:470 +msgid "Send Reply" msgstr "" #: ../../mod/layouts.php:52 @@ -5235,101 +5320,30 @@ msgstr "" msgid "Authenticate" msgstr "" -#: ../../mod/network.php:172 +#: ../../mod/network.php:79 msgid "No such group" msgstr "" -#: ../../mod/network.php:212 -msgid "Refresh" -msgstr "" - -#: ../../mod/network.php:213 ../../mod/connections.php:404 -msgid "Me" -msgstr "" - -#: ../../mod/network.php:214 ../../mod/connections.php:406 -msgid "Best Friends" -msgstr "" - -#: ../../mod/network.php:216 -msgid "Co-workers" -msgstr "" - -#: ../../mod/network.php:217 ../../mod/connections.php:408 -msgid "Former Friends" -msgstr "" - -#: ../../mod/network.php:218 ../../mod/connections.php:409 -msgid "Acquaintances" -msgstr "" - -#: ../../mod/network.php:219 -msgid "Everybody" +#: ../../mod/network.php:118 +msgid "Search Results For:" msgstr "" -#: ../../mod/network.php:234 -msgid "Search Results For:" +#: ../../mod/network.php:172 +msgid "Collection is empty" msgstr "" -#: ../../mod/network.php:296 +#: ../../mod/network.php:180 msgid "Collection: " msgstr "" -#: ../../mod/network.php:309 +#: ../../mod/network.php:193 msgid "Connection: " msgstr "" -#: ../../mod/network.php:312 +#: ../../mod/network.php:196 msgid "Invalid connection." msgstr "" -#: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:355 ../../mod/connections.php:491 -#: ../../mod/notifications.php:51 ../../mod/notifications.php:162 -#: ../../mod/notifications.php:208 -msgid "Ignore" -msgstr "" - -#: ../../mod/intro.php:29 ../../mod/connections.php:122 -msgid "Connection updated." -msgstr "" - -#: ../../mod/intro.php:31 -msgid "Connection update failed." -msgstr "" - -#: ../../mod/intro.php:56 -msgid "Introductions and Connection Requests" -msgstr "" - -#: ../../mod/intro.php:67 -msgid "No pending introductions." -msgstr "" - -#: ../../mod/intro.php:72 -msgid "System error. Please try again later." -msgstr "" - -#: ../../mod/intro.php:95 ../../mod/connections.php:496 -#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 -msgid "Hide this contact from others" -msgstr "" - -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "Post a new friend activity" -msgstr "" - -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "if applicable" -msgstr "" - -#: ../../mod/intro.php:101 ../../mod/notifications.php:35 -#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 -msgid "Discard" -msgstr "" - #: ../../mod/post.php:222 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " @@ -5358,7 +5372,7 @@ msgid "Hub not found." msgstr "" #: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 +#: ../../mod/profiles.php:168 ../../mod/profiles.php:475 msgid "Profile not found." msgstr "" @@ -5378,226 +5392,226 @@ msgstr "" msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:189 +#: ../../mod/profiles.php:178 msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:317 +#: ../../mod/profiles.php:306 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:321 +#: ../../mod/profiles.php:310 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:325 +#: ../../mod/profiles.php:314 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:329 +#: ../../mod/profiles.php:318 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:333 +#: ../../mod/profiles.php:322 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:336 +#: ../../mod/profiles.php:325 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:340 +#: ../../mod/profiles.php:329 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:344 +#: ../../mod/profiles.php:333 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:348 +#: ../../mod/profiles.php:337 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:352 +#: ../../mod/profiles.php:341 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:356 +#: ../../mod/profiles.php:345 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:360 +#: ../../mod/profiles.php:349 msgid "Address" msgstr "" -#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 +#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31 msgid "Location" msgstr "" -#: ../../mod/profiles.php:450 +#: ../../mod/profiles.php:439 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:505 +#: ../../mod/profiles.php:494 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:517 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:519 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:520 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:532 +#: ../../mod/profiles.php:521 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:533 +#: ../../mod/profiles.php:522 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:523 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:535 +#: ../../mod/profiles.php:524 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:536 +#: ../../mod/profiles.php:525 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:537 +#: ../../mod/profiles.php:526 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:538 +#: ../../mod/profiles.php:527 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:539 +#: ../../mod/profiles.php:528 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:540 +#: ../../mod/profiles.php:529 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:541 +#: ../../mod/profiles.php:530 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:542 +#: ../../mod/profiles.php:531 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:543 +#: ../../mod/profiles.php:532 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:544 +#: ../../mod/profiles.php:533 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:545 +#: ../../mod/profiles.php:534 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:546 +#: ../../mod/profiles.php:535 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:547 +#: ../../mod/profiles.php:536 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:548 +#: ../../mod/profiles.php:537 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:550 +#: ../../mod/profiles.php:539 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:553 +#: ../../mod/profiles.php:542 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:554 +#: ../../mod/profiles.php:543 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:546 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:547 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:548 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:560 +#: ../../mod/profiles.php:549 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:561 +#: ../../mod/profiles.php:550 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:551 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:552 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:553 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:565 +#: ../../mod/profiles.php:554 msgid "Television" msgstr "" -#: ../../mod/profiles.php:566 +#: ../../mod/profiles.php:555 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:567 +#: ../../mod/profiles.php:556 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:568 +#: ../../mod/profiles.php:557 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:569 +#: ../../mod/profiles.php:558 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:574 +#: ../../mod/profiles.php:563 msgid "" "This is your public profile.
    It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:584 ../../mod/directory.php:160 +#: ../../mod/profiles.php:573 ../../mod/directory.php:161 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:612 msgid "Edit/Manage Profiles" msgstr "" @@ -5634,385 +5648,394 @@ msgid "" "Or import an existing channel from another location" msgstr "" -#: ../../mod/connections.php:67 +#: ../../mod/connections.php:71 msgid "Could not access contact record." msgstr "" -#: ../../mod/connections.php:81 +#: ../../mod/connections.php:85 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:124 +#: ../../mod/connections.php:126 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connections.php:128 msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:219 +#: ../../mod/connections.php:223 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:237 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:240 +#: ../../mod/connections.php:244 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connections.php:241 +#: ../../mod/connections.php:245 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connections.php:245 ../../mod/connections.php:257 -#: ../../mod/connections.php:269 ../../mod/connections.php:281 -#: ../../mod/connections.php:296 +#: ../../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:252 +#: ../../mod/connections.php:256 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connections.php:253 +#: ../../mod/connections.php:257 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connections.php:264 +#: ../../mod/connections.php:268 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connections.php:265 +#: ../../mod/connections.php:269 msgid "Channel has been archived" msgstr "" -#: ../../mod/connections.php:276 +#: ../../mod/connections.php:280 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connections.php:277 +#: ../../mod/connections.php:281 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connections.php:291 +#: ../../mod/connections.php:295 msgid "Channel has been approved" msgstr "" -#: ../../mod/connections.php:292 +#: ../../mod/connections.php:296 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connections.php:310 +#: ../../mod/connections.php:314 msgid "Contact has been removed." msgstr "" -#: ../../mod/connections.php:330 +#: ../../mod/connections.php:334 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connections.php:334 +#: ../../mod/connections.php:338 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connections.php:337 +#: ../../mod/connections.php:341 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:345 msgid "Recent Activity" msgstr "" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:348 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connections.php:351 +#: ../../mod/connections.php:355 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:355 ../../mod/connections.php:491 +#: ../../mod/connections.php:359 ../../mod/connections.php:495 msgid "Unignore" msgstr "" -#: ../../mod/connections.php:358 +#: ../../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:361 +#: ../../mod/connections.php:365 msgid "Unarchive" msgstr "" -#: ../../mod/connections.php:361 +#: ../../mod/connections.php:365 msgid "Archive" msgstr "" -#: ../../mod/connections.php:364 +#: ../../mod/connections.php:368 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connections.php:367 +#: ../../mod/connections.php:371 msgid "Unhide" msgstr "" -#: ../../mod/connections.php:367 +#: ../../mod/connections.php:371 msgid "Hide" msgstr "" -#: ../../mod/connections.php:370 +#: ../../mod/connections.php:374 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connections.php:377 +#: ../../mod/connections.php:381 msgid "Delete this connection" msgstr "" -#: ../../mod/connections.php:410 +#: ../../mod/connections.php:414 msgid "Unknown" msgstr "" -#: ../../mod/connections.php:420 ../../mod/connections.php:449 +#: ../../mod/connections.php:424 ../../mod/connections.php:453 msgid "Approve this connection" msgstr "" -#: ../../mod/connections.php:420 +#: ../../mod/connections.php:424 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:440 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:440 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:440 +#: ../../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:442 +#: ../../mod/connections.php:446 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:448 +#: ../../mod/connections.php:452 msgid "inherited" msgstr "" -#: ../../mod/connections.php:450 +#: ../../mod/connections.php:454 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:451 +#: ../../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:453 +#: ../../mod/connections.php:457 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:454 +#: ../../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:455 +#: ../../mod/connections.php:459 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:460 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:458 +#: ../../mod/connections.php:462 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:459 +#: ../../mod/connections.php:463 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:461 +#: ../../mod/connections.php:465 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:466 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:463 +#: ../../mod/connections.php:467 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:464 +#: ../../mod/connections.php:468 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:465 +#: ../../mod/connections.php:469 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:470 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:467 +#: ../../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:468 +#: ../../mod/connections.php:472 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:469 +#: ../../mod/connections.php:473 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:473 +#: ../../mod/connections.php:477 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:474 +#: ../../mod/connections.php:478 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:475 +#: ../../mod/connections.php:479 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:476 +#: ../../mod/connections.php:480 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:477 +#: ../../mod/connections.php:481 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:479 +#: ../../mod/connections.php:483 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:482 +#: ../../mod/connections.php:486 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:484 +#: ../../mod/connections.php:488 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:486 +#: ../../mod/connections.php:490 msgid "Update now" msgstr "" -#: ../../mod/connections.php:492 +#: ../../mod/connections.php:496 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:493 +#: ../../mod/connections.php:497 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:494 +#: ../../mod/connections.php:498 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:495 +#: ../../mod/connections.php:499 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:496 +#: ../../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:532 ../../mod/connections.php:604 +#: ../../mod/connections.php:536 ../../mod/connections.php:608 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:537 ../../mod/connections.php:611 +#: ../../mod/connections.php:541 ../../mod/connections.php:615 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:542 ../../mod/connections.php:625 +#: ../../mod/connections.php:546 ../../mod/connections.php:629 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:547 ../../mod/connections.php:618 +#: ../../mod/connections.php:551 ../../mod/connections.php:622 msgid "Archived" msgstr "" -#: ../../mod/connections.php:558 +#: ../../mod/connections.php:562 msgid "All" msgstr "" -#: ../../mod/connections.php:579 -msgid "Suggestions" -msgstr "" - -#: ../../mod/connections.php:582 +#: ../../mod/connections.php:586 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:588 +#: ../../mod/connections.php:592 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:591 +#: ../../mod/connections.php:595 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:594 +#: ../../mod/connections.php:598 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:597 +#: ../../mod/connections.php:601 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:600 +#: ../../mod/connections.php:604 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:607 +#: ../../mod/connections.php:611 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:614 +#: ../../mod/connections.php:618 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:621 +#: ../../mod/connections.php:625 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:628 +#: ../../mod/connections.php:632 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:670 +#: ../../mod/connections.php:674 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:671 +#: ../../mod/connections.php:675 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:694 +#: ../../mod/connections.php:698 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:695 +#: ../../mod/connections.php:699 msgid "Finding: " msgstr "" @@ -6239,71 +6262,6 @@ msgstr "" msgid "No matches" msgstr "" -#: ../../mod/crepair.php:102 -msgid "Contact settings applied." -msgstr "" - -#: ../../mod/crepair.php:104 -msgid "Contact update failed." -msgstr "" - -#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 -#: ../../mod/fsuggest.php:92 -msgid "Contact not found." -msgstr "" - -#: ../../mod/crepair.php:135 -msgid "Repair Contact Settings" -msgstr "" - -#: ../../mod/crepair.php:137 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." -msgstr "" - -#: ../../mod/crepair.php:138 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "" - -#: ../../mod/crepair.php:144 -msgid "Return to contact editor" -msgstr "" - -#: ../../mod/crepair.php:149 -msgid "Account Nickname" -msgstr "" - -#: ../../mod/crepair.php:150 -msgid "@Tagname - overrides Name/Nickname" -msgstr "" - -#: ../../mod/crepair.php:151 -msgid "Account URL" -msgstr "" - -#: ../../mod/crepair.php:152 -msgid "Friend Request URL" -msgstr "" - -#: ../../mod/crepair.php:153 -msgid "Friend Confirm URL" -msgstr "" - -#: ../../mod/crepair.php:154 -msgid "Notification Endpoint URL" -msgstr "" - -#: ../../mod/crepair.php:155 -msgid "Poll/Feed URL" -msgstr "" - -#: ../../mod/crepair.php:156 -msgid "New photo from this URL" -msgstr "" - #: ../../mod/zfinger.php:23 msgid "invalid target signature" msgstr "" @@ -6312,7 +6270,7 @@ msgstr "" msgid "Channel added." msgstr "" -#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:30 +#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:32 #: ../../mod/editpost.php:20 ../../mod/editblock.php:36 msgid "Item not found" msgstr "" @@ -6321,17 +6279,17 @@ msgstr "" msgid "Edit Layout" msgstr "" -#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123 +#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:147 #: ../../mod/editpost.php:101 ../../mod/editblock.php:118 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:148 #: ../../mod/editpost.php:102 ../../mod/editblock.php:119 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:149 #: ../../mod/editpost.php:103 ../../mod/editblock.php:120 msgid "Insert Vorbis [.ogg] audio" msgstr "" @@ -6340,87 +6298,87 @@ msgstr "" msgid "Delete Layout" msgstr "" -#: ../../mod/profile_photo.php:54 +#: ../../mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/profile_photo.php:107 +#: ../../mod/profile_photo.php:97 msgid "Image resize failed." msgstr "" -#: ../../mod/profile_photo.php:151 +#: ../../mod/profile_photo.php:141 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../mod/profile_photo.php:173 +#: ../../mod/profile_photo.php:163 #, php-format msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/profile_photo.php:182 +#: ../../mod/profile_photo.php:172 msgid "Unable to process image." msgstr "" -#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272 +#: ../../mod/profile_photo.php:214 ../../mod/profile_photo.php:262 msgid "Photo not available." msgstr "" -#: ../../mod/profile_photo.php:291 +#: ../../mod/profile_photo.php:281 msgid "Upload File:" msgstr "" -#: ../../mod/profile_photo.php:292 +#: ../../mod/profile_photo.php:282 msgid "Select a profile:" msgstr "" -#: ../../mod/profile_photo.php:293 +#: ../../mod/profile_photo.php:283 msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:294 +#: ../../mod/profile_photo.php:284 msgid "Upload" msgstr "" -#: ../../mod/profile_photo.php:298 +#: ../../mod/profile_photo.php:288 msgid "skip this step" msgstr "" -#: ../../mod/profile_photo.php:298 +#: ../../mod/profile_photo.php:288 msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/profile_photo.php:312 +#: ../../mod/profile_photo.php:302 msgid "Crop Image" msgstr "" -#: ../../mod/profile_photo.php:313 +#: ../../mod/profile_photo.php:303 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/profile_photo.php:315 +#: ../../mod/profile_photo.php:305 msgid "Done Editing" msgstr "" -#: ../../mod/profile_photo.php:350 +#: ../../mod/profile_photo.php:340 msgid "Image uploaded successfully." msgstr "" -#: ../../mod/profile_photo.php:352 +#: ../../mod/profile_photo.php:342 msgid "Image upload failed." msgstr "" -#: ../../mod/profile_photo.php:361 +#: ../../mod/profile_photo.php:351 #, php-format msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:87 +#: ../../mod/editwebpage.php:106 msgid "Edit Webpage" msgstr "" -#: ../../mod/editwebpage.php:162 +#: ../../mod/editwebpage.php:188 msgid "Delete Webpage" msgstr "" @@ -6428,136 +6386,18 @@ msgstr "" msgid "Invalid request identifier." msgstr "" -#: ../../mod/notifications.php:76 -msgid "System" -msgstr "" - -#: ../../mod/notifications.php:96 -msgid "Introductions" -msgstr "" - -#: ../../mod/notifications.php:121 -msgid "Show Ignored Requests" -msgstr "" - -#: ../../mod/notifications.php:121 -msgid "Hide Ignored Requests" -msgstr "" - -#: ../../mod/notifications.php:147 ../../mod/notifications.php:193 -msgid "Notification type: " -msgstr "" - -#: ../../mod/notifications.php:148 -msgid "Friend Suggestion" -msgstr "" - -#: ../../mod/notifications.php:150 -#, php-format -msgid "suggested by %s" -msgstr "" - -#: ../../mod/notifications.php:179 -msgid "Claims to be known to you: " -msgstr "" - -#: ../../mod/notifications.php:179 -msgid "yes" -msgstr "" - -#: ../../mod/notifications.php:179 -msgid "no" -msgstr "" - -#: ../../mod/notifications.php:186 -msgid "Approve as: " -msgstr "" - -#: ../../mod/notifications.php:187 -msgid "Friend" -msgstr "" - -#: ../../mod/notifications.php:188 -msgid "Sharer" -msgstr "" - -#: ../../mod/notifications.php:188 -msgid "Fan/Admirer" -msgstr "" - -#: ../../mod/notifications.php:194 -msgid "Friend/Connect Request" -msgstr "" - -#: ../../mod/notifications.php:194 -msgid "New Follower" -msgstr "" - -#: ../../mod/notifications.php:215 -msgid "No introductions." -msgstr "" - -#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 -#: ../../mod/notifications.php:465 -#, php-format -msgid "%s liked %s's post" -msgstr "" - -#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 -#: ../../mod/notifications.php:474 -#, php-format -msgid "%s disliked %s's post" -msgstr "" - -#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 -#: ../../mod/notifications.php:488 -#, php-format -msgid "%s is now friends with %s" -msgstr "" - -#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 -#, php-format -msgid "%s created a new post" -msgstr "" - -#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 -#: ../../mod/notifications.php:497 -#, php-format -msgid "%s commented on %s's post" -msgstr "" - -#: ../../mod/notifications.php:302 -msgid "No more network notifications." -msgstr "" - -#: ../../mod/notifications.php:306 -msgid "Network Notifications" +#: ../../mod/notifications.php:35 +msgid "Discard" msgstr "" -#: ../../mod/notifications.php:332 ../../mod/notify.php:54 +#: ../../mod/notifications.php:93 ../../mod/notify.php:54 msgid "No more system notifications." msgstr "" -#: ../../mod/notifications.php:336 ../../mod/notify.php:58 +#: ../../mod/notifications.php:97 ../../mod/notify.php:58 msgid "System Notifications" msgstr "" -#: ../../mod/notifications.php:427 -msgid "No more personal notifications." -msgstr "" - -#: ../../mod/notifications.php:431 -msgid "Personal Notifications" -msgstr "" - -#: ../../mod/notifications.php:504 -msgid "No more home notifications." -msgstr "" - -#: ../../mod/notifications.php:508 -msgid "Home Notifications" -msgstr "" - #: ../../mod/blocks.php:65 msgid "Block Name" msgstr "" @@ -6574,7 +6414,7 @@ msgstr "" msgid "Item is not editable" msgstr "" -#: ../../mod/profile.php:112 +#: ../../mod/profile.php:64 ../../mod/profile.php:72 msgid "Access to this profile has been restricted." msgstr "" @@ -6598,11 +6438,15 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077 msgid "Wall Photos" msgstr "" -#: ../../mod/channel.php:107 +#: ../../mod/channel.php:25 +msgid "You must be logged in to see this page." +msgstr "" + +#: ../../mod/channel.php:83 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" @@ -6622,6 +6466,10 @@ msgstr "" msgid "Files" msgstr "" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "" + #: ../../mod/fsuggest.php:63 msgid "Friend suggestion sent." msgstr "" @@ -6643,23 +6491,23 @@ msgstr "" msgid "Delete Block" msgstr "" -#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 +#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 msgid "Invalid profile identifier." msgstr "" -#: ../../mod/profperm.php:110 +#: ../../mod/profperm.php:101 msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:114 +#: ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/profperm.php:123 +#: ../../mod/profperm.php:114 msgid "Visible To" msgstr "" -#: ../../mod/profperm.php:139 +#: ../../mod/profperm.php:130 msgid "All Contacts (with secure profile access)" msgstr "" @@ -6679,12 +6527,12 @@ msgstr "" msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1153 +#: ../../mod/item.php:1156 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1159 +#: ../../mod/item.php:1162 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6732,16 +6580,12 @@ msgid "" "librelist - dot com" msgstr "" -#: ../../mod/suggest.php:41 +#: ../../mod/suggest.php:42 msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." msgstr "" -#: ../../mod/suggest.php:58 -msgid "Ignore/Hide" -msgstr "" - #: ../../mod/pubsites.php:22 msgid "Public Sites" msgstr "" @@ -6865,23 +6709,23 @@ msgstr "" msgid "Remove My Account" msgstr "" -#: ../../mod/directory.php:163 +#: ../../mod/directory.php:164 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:222 +#: ../../mod/directory.php:225 msgid "Finding:" msgstr "" -#: ../../mod/directory.php:230 +#: ../../mod/directory.php:233 msgid "next page" msgstr "" -#: ../../mod/directory.php:230 +#: ../../mod/directory.php:233 msgid "previous page" msgstr "" -#: ../../mod/directory.php:237 +#: ../../mod/directory.php:240 msgid "No entries (some entries may be hidden)." msgstr "" @@ -7173,6 +7017,6 @@ msgstr "" msgid "Got Zot?" msgstr "" -#: ../../boot.php:1902 +#: ../../boot.php:1907 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 64336785f..3c6be6e54 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-12.525 +2013-12-13.526 -- cgit v1.2.3 From 1975fa50da5f418e293e0f018cf1ed2bf0f43930 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Dec 2013 01:14:15 -0800 Subject: doc additions --- doc/html/notes_8php.html | 137 +++++++++++++++++++++++++++++++++++++++++++++++ doc/html/notes_8php.js | 4 ++ 2 files changed, 141 insertions(+) create mode 100644 doc/html/notes_8php.html create mode 100644 doc/html/notes_8php.js diff --git a/doc/html/notes_8php.html b/doc/html/notes_8php.html new file mode 100644 index 000000000..55c8c2cae --- /dev/null +++ b/doc/html/notes_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/notes.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    notes.php File Reference
    +
    +
    + + + + +

    +Functions

     notes_init (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    notes_init (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/notes_8php.js b/doc/html/notes_8php.js new file mode 100644 index 000000000..d0433afa8 --- /dev/null +++ b/doc/html/notes_8php.js @@ -0,0 +1,4 @@ +var notes_8php = +[ + [ "notes_init", "notes_8php.html#a4dbd7b1f906440746af48b484d66535a", null ] +]; \ No newline at end of file -- cgit v1.2.3 From 94975f8d3081051df48b6fdd73be3f4be5484cf6 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Dec 2013 12:30:44 -0800 Subject: categories should already be html encoded - ensure this is the case but don't double encode --- include/text.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 042a972d1..f808fb0a0 100755 --- a/include/text.php +++ b/include/text.php @@ -1095,7 +1095,7 @@ function format_categories(&$item,$writeable) { if($terms) { $categories = array(); foreach($terms as $t) { - $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8') ; + $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8',false) ; if(! trim($term)) continue; $removelink = (($writeable) ? z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) : ''); @@ -1117,7 +1117,7 @@ function format_filer(&$item) { if($terms) { $categories = array(); foreach($terms as $t) { - $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8') ; + $term = htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8',false) ; if(! trim($term)) continue; $removelink = z_root() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']); -- cgit v1.2.3 From 0215043826c2c036c3a2c88fa6e42089138c7c52 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Dec 2013 13:30:33 -0800 Subject: prepare for Comanchification of mod_photos --- include/Contact.php | 13 +++++++++++++ include/photos.php | 12 ++++++++++-- mod/photos.php | 5 ++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 5725e06f0..20dd04d17 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -77,6 +77,19 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { $a = get_app(); + if(! $xchan) { + if($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) + return; + +// FIXME - show connect button to observer if appropriate $connect = false; if(local_user()) { $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", diff --git a/include/photos.php b/include/photos.php index ea4b494e0..9828140b8 100644 --- a/include/photos.php +++ b/include/photos.php @@ -279,8 +279,16 @@ function photos_album_widget($channelx,$observer,$albums = null) { $o = ''; - if(! $albums) - $albums = photos_albums_list($channelx,$observer); + // If we weren't passed an album list, see if the photos module + // dropped one for us to find in $a->data['albums']. + // If all else fails, load it. + + if(! $albums) { + if(array_key_exists('albums', get_app()->data)) + $albums = get_app()->data['albums']; + else + $albums = photos_albums_list($channelx,$observer); + } if($albums) { $o = replace_macros(get_markup_template('photo_albums.tpl'),array( diff --git a/mod/photos.php b/mod/photos.php index 64ca86941..0e23aa5bf 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -19,6 +19,9 @@ function photos_init(&$a) { if(argc() > 1) { $nick = argv(1); + + profile_load($a,$nick); + $channelx = channelx_by_nick($nick); if(! $channelx) @@ -35,7 +38,7 @@ function photos_init(&$a) { - $a->set_widget('vcard',vcard_from_xchan($a->data['channel'],$observer)); + $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); -- cgit v1.2.3 From c00f0d4b282f2242b9c2e154a5381029cf0dc812 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Dec 2013 13:26:40 -0800 Subject: a couple more comanche conversions --- include/widgets.php | 132 ++++++++++++++++++++++++++++++++++++++++++++++ mod/allfriends.php | 60 --------------------- mod/message.php | 23 -------- mod/settings.php | 4 +- version.inc | 2 +- view/pdl/mod_message.pdl | 3 ++ view/pdl/mod_settings.pdl | 4 ++ 7 files changed, 142 insertions(+), 86 deletions(-) delete mode 100644 mod/allfriends.php create mode 100644 view/pdl/mod_message.pdl create mode 100644 view/pdl/mod_settings.pdl diff --git a/include/widgets.php b/include/widgets.php index f53998b23..888da37a2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -362,4 +362,136 @@ function widget_affinity($arr) { return $arr['html']; } return ''; +} + + +function widget_settings_menu($arr) { + + if(! local_user()) + return; + + $a = get_app(); + $channel = $a->get_channel(); + + $abook_self_id = 0; + + // Retrieve the 'self' address book entry for use in the auto-permissions link + + $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) . '/connections/' . $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"); + return replace_macros($tabtpl, array( + '$title' => t('Settings'), + '$class' => 'settings-widget', + '$items' => $tabs, + )); + +} + + +function widget_mailmenu($arr) { + if (! local_user()) + return; + + $a = get_app(); + return replace_macros(get_markup_template('message_side.tpl'), array( + '$tabs'=> array(), + + '$check'=>array( + 'label' => t('Check Mail'), + 'url' => $a->get_baseurl(true) . '/message', + 'sel' => (argv(1) == ''), + ), + '$new'=>array( + 'label' => t('New Message'), + 'url' => $a->get_baseurl(true) . '/message/new', + 'sel'=> (argv(1) == 'new'), + ) + + )); + } \ No newline at end of file diff --git a/mod/allfriends.php b/mod/allfriends.php deleted file mode 100644 index bb4df30be..000000000 --- a/mod/allfriends.php +++ /dev/null @@ -1,60 +0,0 @@ - 1) - $cid = intval(argv(1)); - if(! $cid) - return; - - $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1", - intval($cid), - intval(local_user()) - ); - - $a->page['aside'] .= '
    ' - . '
    ' . $c[0]['name'] . '
    ' - . '
    ' - . '' . $c[0]['name'] . '
    ' - . '
    '; - - - if(! count($c)) - return; - - $o .= '

    ' . sprintf( t('Friends of %s'), $c[0]['name']) . '

    '; - - - $r = all_friends(local_user(),$cid); - - if(! count($r)) { - $o .= t('No friends to display.'); - return $o; - } - - $tpl = get_markup_template('common_friends.tpl'); - - foreach($r as $rr) { - - $o .= replace_macros($tpl,array( - '$url' => $rr['url'], - '$name' => $rr['name'], - '$photo' => $rr['photo'], - '$tags' => '' - )); - } - - $o .= cleardiv(); -// $o .= paginate($a); - return $o; -} diff --git a/mod/message.php b/mod/message.php index b5420e5b3..6a33f1db7 100644 --- a/mod/message.php +++ b/mod/message.php @@ -7,29 +7,6 @@ require_once("include/bbcode.php"); require_once('include/Contact.php'); -function message_aside(&$a) { - - if (! local_user()) - return; - - $a->set_widget('msgaside',replace_macros(get_markup_template('message_side.tpl'), array( - '$tabs'=> array(), - - '$check'=>array( - 'label' => t('Check Mail'), - 'url' => $a->get_baseurl(true) . '/message', - 'sel' => (argv(1) == ''), - ), - '$new'=>array( - 'label' => t('New Message'), - 'url' => $a->get_baseurl(true) . '/message/new', - 'sel'=> (argv(1) == 'new'), - ) - - ))); - -} - function message_post(&$a) { if(! local_user()) diff --git a/mod/settings.php b/mod/settings.php index 4d95f75b3..c2a540063 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -32,7 +32,7 @@ if (! local_user()) $a->argc = 2; $a->argv[] = 'channel'; } - +/* $channel = $a->get_channel(); $abook_self_id = 0; @@ -132,7 +132,7 @@ if (! local_user()) '$class' => 'settings-widget', '$items' => $tabs, )); - +*/ } diff --git a/version.inc b/version.inc index 3c6be6e54..2aa2a72b7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-13.526 +2013-12-14.527 diff --git a/view/pdl/mod_message.pdl b/view/pdl/mod_message.pdl new file mode 100644 index 000000000..2efb3de79 --- /dev/null +++ b/view/pdl/mod_message.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=mailmenu][/widget] +[/region] diff --git a/view/pdl/mod_settings.pdl b/view/pdl/mod_settings.pdl new file mode 100644 index 000000000..0b0a99638 --- /dev/null +++ b/view/pdl/mod_settings.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=settings_menu][/widget] +[/region] + -- cgit v1.2.3 From d14e2db6b436b3190db0c506cf5f907bd1a7fcc9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Dec 2013 17:03:37 -0800 Subject: make home.html fullpage mode - make directory search work for non-logged in, but leave off suggest and invite --- include/contact_widgets.php | 3 ++- mod/directory.php | 10 ++++------ mod/home.php | 8 ++++---- view/tpl/peoplefind.tpl | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index cc0a3d617..482bbed78 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -25,7 +25,8 @@ function findpeople_widget() { '$suggest' => t('Channel Suggestions'), '$similar' => '', // FIXME and uncomment when mod/match working // t('Similar Interests'), '$random' => t('Random Profile'), - '$inv' => t('Invite Friends') + '$inv' => t('Invite Friends'), + '$loggedin' => local_user() )); } diff --git a/mod/directory.php b/mod/directory.php index 616035339..92fb36ea7 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -11,15 +11,13 @@ function directory_init(&$a) { function directory_aside(&$a) { - if(local_user()) { - require_once('include/contact_widgets.php'); - $a->set_widget('find_people',findpeople_widget()); - } - 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()); diff --git a/mod/home.php b/mod/home.php index edcaa938d..3f862b596 100644 --- a/mod/home.php +++ b/mod/home.php @@ -1,6 +1,6 @@
    {{if $similar}}    {{$similar}}
    {{/if}} - {{$suggest}}
    + {{if $loggedin}}{{$suggest}}
    {{/if}} {{$random}}
    - {{if $inv}}{{$inv}}{{/if}} + {{if $loggedin}}{{if $inv}}{{$inv}}{{/if}}{{/if}} -- cgit v1.2.3 From db11f5af78e86278463e40a02cde841b5c01208c Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Dec 2013 17:06:50 -0800 Subject: missed this --- mod/home.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mod/home.php b/mod/home.php index 3f862b596..2b8e83c30 100644 --- a/mod/home.php +++ b/mod/home.php @@ -1,6 +1,6 @@ ' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . ''; - if(file_exists('home.html')) - $o .= file_get_contents('home.html'); -} + if(file_exists('home.html')) { + $o .= file_get_contents('home.html'); + $a->page['template'] = 'full'; + } + } if (!$a->config['system']['no_login_on_homepage']) $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); @@ -85,4 +87,4 @@ require_once('include/conversation.php'); return $o; } - +} -- cgit v1.2.3 From 950bd72e020daf887ac487c95d6f4f2e42b1dee9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Dec 2013 21:37:37 -0800 Subject: use sitename for the banner if nothing else has been set --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nav.php b/include/nav.php index f89de2de0..7e99c782e 100644 --- a/include/nav.php +++ b/include/nav.php @@ -196,7 +196,7 @@ EOT; $banner = get_config('system','banner'); if($banner === false) - $banner = 'red'; + $banner = get_config('system','sitename'); $x = array('nav' => $nav, 'usermenu' => $userinfo ); call_hooks('nav', $x); -- cgit v1.2.3 From 0272ab4cd9a6428396489d88c7a1a89be76e5810 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 14:36:43 -0800 Subject: Provide a fallback channel to probe for magic-auth when we have no prior communications with a site. This will be a system channel if one exists, otherwise any channel will do. We'll try to use the first valid channel on the site because that was probably created when the site was installed and is the closest thing to a system channel we've got. --- boot.php | 6 +++++- mod/magic.php | 37 ++++++++++++++++++++++--------------- mod/zfinger.php | 32 +++++++++++++++++++++++++++----- version.inc | 2 +- view/css/mod_profiles.css | 6 ++++-- view/tpl/profile_edit.tpl | 2 ++ 6 files changed, 61 insertions(+), 24 deletions(-) diff --git a/boot.php b/boot.php index 4134ce3fa..0cde9419d 100755 --- a/boot.php +++ b/boot.php @@ -205,6 +205,7 @@ define ( 'PAGE_DIRECTORY_CHANNEL', 0x0008 ); // system channel used for director define ( 'PAGE_PREMIUM', 0x0010 ); define ( 'PAGE_ADULT', 0x0020 ); +define ( 'PAGE_SYSTEM', 0x1000 ); define ( 'PAGE_REMOVED', 0x8000 ); @@ -367,6 +368,7 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); define ( 'XCHAN_FLAGS_ORPHAN', 0x0002); define ( 'XCHAN_FLAGS_CENSORED', 0x0004); define ( 'XCHAN_FLAGS_SELFCENSORED', 0x0008); +define ( 'XCHAN_FLAGS_SYSTEM', 0x0010); define ( 'XCHAN_FLAGS_DELETED', 0x1000); /* * Traficlights for Administration of HubLoc @@ -478,8 +480,10 @@ define ( 'ACCOUNT_PENDING', 0x0010 ); * Account roles */ -define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 ); define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 ); +define ( 'ACCOUNT_ROLE_SYSTEM', 0x0002 ); + +define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 ); /** * Item visibility diff --git a/mod/magic.php b/mod/magic.php index 03d09e70d..aead559a7 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -33,21 +33,28 @@ function magic_init(&$a) { if(! $x) { - // Somebody new? Finger them if they've never been seen here before - - if($addr) { - $ret = zot_finger($addr,null); - if($ret['success']) { - $j = json_decode($ret['body'],true); - if($j) - import_xchan($j); - - // Now try again - - $x = q("select * from hubloc where hubloc_url = '%s' order by hubloc_connected desc limit 1", - dbesc($basepath) - ); - } + /* + * We have no records for, or prior communications with this hub. + * If an address was supplied, let's finger them to create a hub record. + * Otherwise we'll use the special address '[system]' which will return + * either a system channel or the first available normal channel. We don't + * really care about what channel is returned - we need the hub information + * from that response so that we can create signed auth packets destined + * for that hub. + * + */ + + $ret = zot_finger((($addr) ? $addr : '[system]@' . $parsed['host']),null); + if($ret['success']) { + $j = json_decode($ret['body'],true); + if($j) + import_xchan($j); + + // Now try again + + $x = q("select * from hubloc where hubloc_url = '%s' order by hubloc_connected desc limit 1", + dbesc($basepath) + ); } } diff --git a/mod/zfinger.php b/mod/zfinger.php index 0827f3424..aad8e224d 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -52,11 +52,33 @@ function zfinger_init(&$a) { ); } elseif(strlen($zaddr)) { - $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash - where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1", - dbesc($zaddr), - dbesc($zaddr) - ); + if(strpos($zaddr,'[system]') === false) { /* normal address lookup */ + $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1", + dbesc($zaddr), + dbesc($zaddr) + ); + } + + else { + + /** + * 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. + * + */ + + $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where (( channel_pageflags & %d ) or not ( channel_pageflags & %d )) order by channel_id limit 1", + intval(PAGE_SYSTEM), + intval(PAGE_REMOVED) + ); + } } else { $ret['message'] = 'Invalid request'; diff --git a/version.inc b/version.inc index 2aa2a72b7..d967ddd6a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-14.527 +2013-12-15.528 diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css index 8378245d2..6d935ee4d 100644 --- a/view/css/mod_profiles.css +++ b/view/css/mod_profiles.css @@ -35,9 +35,11 @@ margin-top: 10px; } -#profile-edit-with-label { +#profile-edit-with-label, #profile-edit-howlong-label { + width: 175px; - margin-left: 20px; + margin-left: 50px; + margin-bottom: 20px; } #profile-edit-profile-name-label, diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 183389b9b..196b3ac6d 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -108,8 +108,10 @@ {{$marital}} +
    +
    -- cgit v1.2.3 From 731ab80ac2ea78f595730ecb8f4d62d7b468d084 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 15:37:51 -0800 Subject: set system.projecthome to 1 if you want the project page for a home page. There was a bit of re-org of mod/home, which might alter the behaviour for some existing sites. Basically we're not showing a login box at all if you've got home.html - there should be a login link in th nav bar. If you haven't defined anything at all we'll fall back to the old behaviour but still allow the home contents to be set via plugin. --- assets/.htaccess | 4 + assets/diamondlattice.png | Bin 0 -> 534585 bytes assets/home.html | 204 ++++++++++++++++++++++++ assets/logo_antiprism.png | Bin 0 -> 62321 bytes assets/narrow.css | 218 +++++++++++++++++++++++++ assets/redmatrixlogo.png | Bin 0 -> 105403 bytes assets/wide.css | 395 ++++++++++++++++++++++++++++++++++++++++++++++ mod/home.php | 92 ++++++----- 8 files changed, 870 insertions(+), 43 deletions(-) create mode 100644 assets/.htaccess create mode 100644 assets/diamondlattice.png create mode 100644 assets/home.html create mode 100644 assets/logo_antiprism.png create mode 100644 assets/narrow.css create mode 100644 assets/redmatrixlogo.png create mode 100644 assets/wide.css diff --git a/assets/.htaccess b/assets/.htaccess new file mode 100644 index 000000000..ebba3d779 --- /dev/null +++ b/assets/.htaccess @@ -0,0 +1,4 @@ +Options -Indexes +Deny from all + + diff --git a/assets/diamondlattice.png b/assets/diamondlattice.png new file mode 100644 index 000000000..f1ed7dbd0 Binary files /dev/null and b/assets/diamondlattice.png differ diff --git a/assets/home.html b/assets/home.html new file mode 100644 index 000000000..978139893 --- /dev/null +++ b/assets/home.html @@ -0,0 +1,204 @@ + + + + + + + + + +
    +
    +
    +
    + + +
    +The internet is broken. We're fixing it.
    + +
    +
    +
    +ma·trix: something within or from which something else originates, develops, or takes form +
    +
    + +
    +

    Imagine an internet slightly different than what we have today. Imagine if you had an internet where the people using it could create new services and communicate freely and privately - and where you didn't need a different account on every website in the network in order to use each website. Where you had your own space and could share anything you wanted with anybody you wanted, any time you wanted. Where the things you share in private stay private instead of being under constant surveillance from advertising corporations and government intelligence agencies. +

    +
    + +
    +Decentralise +Identity +Freedom +Access Control +Privacy +Got Zot? +
    + +
    +
    +
    +
    Decentralised
    +
    + +
    +
    +
    +
    +
    +
    Nomadic Identity
    +
    + +
    +
    +
    + +
    +
    +
    Freedom
    +
    + +
    +
    +
    +
    +
    +
    Access Control
    +
    + +
    +
    +
    +
    +
    +
    +
    +

    Got Zot?

    +
    +
    +
    +
    +
    +
    Privacy
    +

    Privacy and encryption to suit your needs.

    +
    +
    +
    + + + +
    + +
    Decentralise. Build a more robust network.
    +
    +

    +Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. +

    +

    +The Red Matrix is a decentralised network where people are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. +

    +

    +And the Red Matrix has Got Zot. +

    +

    +So what the heck is Zot? I'm glad you asked... +

    +
    + +
    +
    + +
    Your identity is your own. One identity across the network.
    +
    + +

    +Zot is a revolutionary protocol which provides decentralised communications and identity management across the matrix. The resulting platform can provide web services comparable to those offered by large corporate providers, but without the large corporate provider and their associated privacy issues. Communications and social networking are an integral part of the matrix. Any channel (and any services provided by that channel) can make full use of feature-rich social communications on a global scale. +

    +

    +We use the full power of the matrix to offer friend suggestions and directory services. You can also perform other things which would typically only be possibly on a centralised provider - such as "wall to wall" posts and private/multiple profiles and web content which can be tailored to the viewer. You won't find these features at all on other decentralised communication services. The difference is that Zot also provides decentralised identity services. This is what separates the men from the boys, and what makes life in the matrix so awesome. +

    +
    + +
    +

    +Zot's identity layer is unique. It's like OpenID on steroids. It provides invisible single sign-on across all sites in the matrix; as well as nomadic identity so that your communications with friends, family, and business partners won't be affected by the loss of your primary communication node - either temporarily or permanently. The important bits of your identity and relationships can be backed up to a thumb drive and may appear at any node in the matrix at any time - with all your friends and preferences intact. These nomadic instances are kept in sync so any instance can take over if another one is compromised or damaged. This protects you against not only major system failure, but also temporary site overloads and governmental manipulation. You cannot be silenced. You cannot be removed from the matrix. +

    +

    +As you browse the matrix viewing channels and their unique content, you are seamlessly authenticated as you go, even across completely different server hubs. No password dialogues. Nothing to type. You're just greeted by name on every new site you visit. How does Zot do that? We call it "magic-auth" because it really is technology that is so advanced as to be indistinguishable from magic. You login only once on your home hub (or any nomadic backup hub you have chosen). This allows you to access any authenticated services provided anywhere in the matrix - such as shopping and access to private information. This is just like the services offered by large corporate providers with huge user databases; however you can be a member of this community and a server on this network using a "plug computer" like a Rasberry Pi. Your password isn't stored on a thousand different sites where it can be stolen and used to clean out your bank accounts. +

    +
    +
    +
    + +
    You control your data. Red Matrix enforces your permissions.
    +
    + +

    +Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. +

    +

    +Example: you want a photo to be visible to your family and three select friends, but not your work colleagues. In the matrix this is easy. Even if your family members, work colleagues, and friends have accounts on different hubs. +

    +

    +Currently the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control. +

    +

    +Again, this type of control is available on large corporate providers, because they own the user database. Within the matrix, there is no need for a huge user database on your machine - because the matrix is your user database and for all intents and purposes has infinite capacity and is spread amongst hundreds, and potentially millions of computers. Access can be granted or denied for any resource, to any channel or any group of channels; anywhere within the matrix. They do not need to have an account on your hub. +

    +
    +
    +
    + +
    + +
    Reclaim your privacy. Red Matrix is built for you, not governments and corporations.
    +
    +

    +Your communications may be public or private - and we allow your private communications to be as private as you wish them to be. Private communications comprise not only fully encrypted transport, but also encrypted storage to help protect against accidental snooping and disclosure by rogue system administrators and internet service providers. +

    +

    +Want more? You can fully encrypt your messages "end to end" using your choice of encryption ciphers and using a passphrase that only you and the recipient(s) know - in addition to our standard multi-layer encryption. +

    +

    +Want more? Our end to end encryption is pluggable. You can define your own chain of multiple encryption steps with multiple keys, and include algorithms known only to you and the recipient. At some point even the US National Security Agency will have to throw up their hands. There won't be enough computational power available in the universe to decode your private message. +

    +

    +We also provide optional message expiration as a standard feature. When the expiration date/time passes, your message is removed from the network. +

    +
    +
    +
    + + + +
    + +
    + +
    +
    + + + + + + diff --git a/assets/logo_antiprism.png b/assets/logo_antiprism.png new file mode 100644 index 000000000..b72e2a211 Binary files /dev/null and b/assets/logo_antiprism.png differ diff --git a/assets/narrow.css b/assets/narrow.css new file mode 100644 index 000000000..a1c12dcc4 --- /dev/null +++ b/assets/narrow.css @@ -0,0 +1,218 @@ +body { + font-family: 'Ubuntu',Tahoma,Helvetica,Arial,sans-serif; + color: #111111; + text-align: center; + padding:0 0 22px 0; +} + + div#header{ + position:absolute; + z-index: 100; + top:0; + left:0; + width:100%; + height: 55px; + background: rgba(100, 0, 0, 0.8); + background-size:3000px 55px; + color: #fff; + display:none; + } + + @media screen{ + body>div#header{ + position: fixed; + } + body>div#footer{ + position:fixed; + } + + } + + + div#footer{ + position:absolute; + bottom:0; + left:0; + width:100%; + height:22px; + background: #AD002C; + color: #fff; +} + +#intro-text { +color:#c60032;font-size:1.2em;width:70%;margin-right:auto;margin-left:auto;text-align:justify; +} +div.section-text { +color:#c60032;font-size:1em;width:80%;margin-right:auto;margin-left:auto;text-align:justify; +} + +#tagline { + color: #c60032; + width:80%; + margin-top:0px; + margin-bottom:20px; + margin-left: auto; + margin-right: auto; +} + +div.red-button { + width:150px; + margin-left: auto; + margin-right: auto; + font-weight: 500; + font-size: larger; + background-color: #c60032; + border: 2px solid lightgray; + border-radius: 5px; + padding: 12px; +} +div.red-button a { + text-decoration: none; + color:#FFFFFF; +} +div.red-button a:hover { + text-decoration: none; + font-weight:600; + +} + +#footer { + font-size: 12px; + color:#fff; + padding-top: 4px; +} + +#footer a { + text-decoration: none; + color:#fff; +} +.bg { + display:none; +} +.bg2 { + display:none; +} +.bg-mask { + display:none; +} + +#bg-narrow { + background: url('diamondlattice.png') center center no-repeat ; + opacity: 0.05; + position:absolute; + top:0; + left:0; + z-index: -1; + width:100%; + height:300%; + display:none; +} + +div.summary-nodes-container { + display:none; +} +div.summary-menu-container { + display:block; +} +a.summary-menu-item { + display: block; + width:70%; + margin-left:auto;margin-right:auto; + border-radius:10px; + color:#FFFFFF; + font-size:1.2em; + text-align:center; + background:#c60032; + margin-bottom:5px; +} +a.summary-menu-item:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} + + +div#menubutton1 { + position: fixed; + top:10px; + left:200px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#c60032; + display: none; + z-index:200; +} +div#menubutton1:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div#menubutton2 { + position: fixed; + top:10px; + left:350px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#c60032; + display: none; + z-index:200; +} +div#menubutton2:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div#menubutton3 { + position: fixed; + top:10px; + right:350px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#c60032; + display: none; + z-index:200; +} +div#menubutton3:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div#menubutton4 { + position: fixed; + top:10px; + right:200px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#c60032; + display: none; + z-index:200; +} +div#menubutton4:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.section-heading { + font-size:2.0em; + color:#c60032; +} +div.section-subtitle { + font-size:1.5em; + color:#c60032; +} \ No newline at end of file diff --git a/assets/redmatrixlogo.png b/assets/redmatrixlogo.png new file mode 100644 index 000000000..6929ae14f Binary files /dev/null and b/assets/redmatrixlogo.png differ diff --git a/assets/wide.css b/assets/wide.css new file mode 100644 index 000000000..4574526b4 --- /dev/null +++ b/assets/wide.css @@ -0,0 +1,395 @@ +body { + font-family: 'Ubuntu',Tahoma,Helvetica,Arial,sans-serif; + color: #111111; + /*color: rgba(0,0,0,0.0); */ + text-align: center; + /* background-image: url("redmatrixbkgd.jpg"); */ + /*background: #ececec;*/ + padding:0 0 22px 0; + /* background: url(redmatrixbkgd.jpg) no-repeat center center scroll; */ + /* + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + */ +} + +#intro-text { +color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; +} +div.section-text { +color:#C60032;font-size:1em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; +} + + + div#header{ + display:none; + position:absolute; + z-index: 100; + top:0; + left:0; + width:100%; + height: 55px; + /* background-image: url("redmatrixbkgd.jpg"); */ + background: rgba(198, 0, 50, 0.8); + background-size:3000px 55px; + /* background: #afafaf;*/ + color: #fff; + } + @media screen{ + body>div#header{ + position: fixed; + } + body>div#footer{ + position:fixed; + } + + } + + div#footer{ + position:absolute; + bottom:0; + left:0; + width:100%; + height:22px; + background: #AD002C; + color: #fff; + } + + + +#tagline { + color: #880000; + width:600px; + margin-top:0px; + margin-bottom:20px; + margin-left: auto; + margin-right: auto; +} + + +.clear { + clear: both; +} + +div.red-button { + width:150px; + margin-left: auto; + margin-right: auto; + font-weight: 500; + font-size: larger; + background-color: #C60032; + border: 2px solid lightgray; + border-radius: 5px; + padding: 12px; +} +div.red-button a { + text-decoration: none; + color:#FFFFFF; +} +div.red-button a:hover { + text-decoration: none; + font-weight:600; +} + +#footer { + font-size: 12px; + color:#fff; + padding-top: 4px; +} + +#footer a { + text-decoration: none; + color:#fff; +} + +.bg { + background: url('diamondlattice.png') center center no-repeat ; + position: fixed; + width: 100%; + height: 1350px; + + top:0px; + left:0px; + opacity: 1.0; + z-index: -1; +} +.bg2 { + background: url('diamondlattice.png') center center no-repeat; + position: fixed; + + width: 100%; + height: 1350px; + top:0px; + left:0px; + opacity: 1.0; + z-index: -1; +} +.bg-mask { + background: rgba(255, 255, 255, 0.95) center center no-repeat; + position: fixed; + width: 100%; + height: 1350px; + top:0; + left:0px; + z-index: -1; + +} +.bg-narrow { + display:none; +} +div.summary-menu-container { + display:none; +} +div.summary-node { + position: fixed; + width: 50px; + text-align: center ; + font-size:1em; + + +} +div.summary-node-header { + font-size: 1.2em; + color:#FFFFFF; + font-weight:bold; +} +div.summary-node-1 { + position: absolute; + top:0px; + left:0px; + width:200px; + height:200px; + border-radius:100px; + color:#CCCCCC; + /* line-height:100px; */ + text-align:center; + background:#C60032; +} +div.summary-node-1:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.summary-node-1-text { + margin-top:25%; + width: 150px; + margin-left:auto; + margin-right:auto; +} +div.summary-node-2 { + position: absolute; + top:50px; + left:170px; + width:220px; + height:220px; + border-radius:200px; + color:#CCCCCC; + /* line-height:100px; */ + text-align:center; + background:#C60032; +} +div.summary-node-2:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.summary-node-2-text { + margin-top:30%; + width: 150px; + margin-left:auto; + margin-right:auto; +} +div.summary-node-3 { + position: absolute; + top:0px; + right:20px; + width:250px; + height:250px; + border-radius:200px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; +} +div.summary-node-3:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.summary-node-3-text { + margin-top:25%; + width: 200px; + margin-left:auto; + margin-right:auto; +} + +div.summary-node-4 { + position: absolute; + top:200px; + right:180px; + width:200px; + height:200px; + border-radius:200px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; +} +div.summary-node-4:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.summary-node-4-text { + margin-top:25%; + width: 150px; + margin-left:auto; + margin-right:auto; +} +div.summary-node-5 { + position: absolute; + top:250px; + left:120px; + width:150px; + height:150px; + border-radius:150px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; +} +div.summary-node-5:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.summary-node-5-text { + margin-top:55px; + width: 150px; + margin-left:auto; + margin-right:auto; + font-size:2.0em; + +} +div.summary-node-6 { + position: absolute; + top:20px; + right:270px; + width:150px; + height:150px; + border-radius:150px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; +} +div.summary-node-6:hover{ + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.summary-node-6-text { + margin-top:30px; + width: 100px; + margin-left:auto; + margin-right:auto; +} +div.summary-nodes-container { + position: relative; + margin-left: auto ; + margin-right: auto ; + margin-top:30px; + margin-bottom:30px; + width: 800px; + height: 400px; + text-align: center ; +} +div#menubutton1 { + position: fixed; + top:10px; + left:200px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; + display: none; + z-index:200; +} +div#menubutton1:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div#menubutton2 { + position: fixed; + top:10px; + left:350px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; + display: none; + z-index:200; +} +div#menubutton2:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div#menubutton3 { + position: fixed; + top:10px; + right:350px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; + display: none; + z-index:200; +} +div#menubutton3:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div#menubutton4 { + position: fixed; + top:10px; + right:200px; + width:150px; + height:30px; + border-radius:10px; + color:#FFFFFF; + /* line-height:100px; */ + text-align:center; + background:#C60032; + display: none; + z-index:200; +} +div#menubutton4:hover { + color:#FFFFFF; + text-decoration:none; + background:#550000 +} +div.section-heading { + font-size:2.0em; + color:#C60032; + width:700px; + margin-left:auto; + margin-right:auto; +} +div.section-subtitle { + font-size:1.5em; + color:#BB0000; +} \ No newline at end of file diff --git a/mod/home.php b/mod/home.php index 2b8e83c30..05626dcb5 100644 --- a/mod/home.php +++ b/mod/home.php @@ -1,6 +1,9 @@ profile = array('profile_uid' => $u[0]['channel_id']); + $o .= prepare_page($r[0]); + return $o; } - $r = q("select item.* from item left join item_id on item.id = item_id.iid - where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and - item_restrict = %d limit 1", - intval($u[0]['channel_id']), - dbesc($page_id), - intval(ITEM_WEBPAGE) - ); - - if(! $r) { - notice( t('Item not found.') . EOL); - return; + if(get_config('system','projecthome')) { + $o .= file_get_contents('assets/home.html'); + $a->page['template'] = 'full'; + return $o; } - xchan_query($r); - $r = fetch_post_tags($r,true); - $a->profile = array('profile_uid' => $u[0]['channel_id']); - $o .= prepare_page($r[0]); + if(file_exists('home.html')) { + $o .= file_get_contents('home.html'); + } + else { -} + // If there's no site channel or home contents configured, fallback to the old behaviour -// If there's no site channel specified, fallback to the old behaviour - else { $o .= '

    ' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '

    '; - if(file_exists('home.html')) { - $o .= file_get_contents('home.html'); - $a->page['template'] = 'full'; - } + $sitename = get_config('system','sitename'); + if($sitename) + $o .= '

    ' . sprintf( t("Welcome to %s") ,$sitename) . '

    '; + if (! $a->config['system']['no_login_on_homepage']) + $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); } - - if (!$a->config['system']['no_login_on_homepage']) - $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); - - call_hooks("home_content",$o); - return $o; -} + call_hooks('home_content',$o); + return $o; } -- cgit v1.2.3 From 46fd10a29d40d3448b8d23756bbf3ae11f4dd565 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 15:44:36 -0800 Subject: can't use an access file or we can't see the assets --- assets/.htaccess | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 assets/.htaccess diff --git a/assets/.htaccess b/assets/.htaccess deleted file mode 100644 index ebba3d779..000000000 --- a/assets/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -Options -Indexes -Deny from all - - -- cgit v1.2.3 From 6c2d29f73f47fcc45f1d6023f55a35cdf8d1179a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 16:02:07 -0800 Subject: change the top margin so the headline gets in. --- assets/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/home.html b/assets/home.html index 978139893..773ca53c5 100644 --- a/assets/home.html +++ b/assets/home.html @@ -30,7 +30,7 @@ $(window).scroll(function(e){
    -
    +
    The internet is broken. We're fixing it.
    -- cgit v1.2.3 From 936845089bc0ff8d7e639f361c1de330efb74658 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 16:27:39 -0800 Subject: improve the flow of the message a bit --- assets/home.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/home.html b/assets/home.html index 773ca53c5..7ea2c400c 100644 --- a/assets/home.html +++ b/assets/home.html @@ -41,7 +41,9 @@ The internet is broken. We're fixing it.
    -

    Imagine an internet slightly different than what we have today. Imagine if you had an internet where the people using it could create new services and communicate freely and privately - and where you didn't need a different account on every website in the network in order to use each website. Where you had your own space and could share anything you wanted with anybody you wanted, any time you wanted. Where the things you share in private stay private instead of being under constant surveillance from advertising corporations and government intelligence agencies. +

    Imagine an internet slightly different than what we have today. The internet of the future won't require logging in with passwords on every site you wish to access. It will just know who you are. An internet where you need to keep track of hundreds/thousands of passwords on hundreds/thousands of websites is fundamentally broken. But an internet with no privacy and where all your online activities are monitored and tracked is likewise broken. +

    +

    Imagine if you had an internet where the people using it could create new services and communicate freely and privately - and where you didn't need a different account on every website in the network in order to use each website. Where you had your own space and could share anything you wanted with anybody you wanted, any time you wanted. Where the things you share in private stay private instead of being under constant surveillance from advertising corporations and government intelligence agencies.

    @@ -111,7 +113,7 @@ The internet is broken. We're fixing it.
    Decentralise. Build a more robust network.

    -Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. +Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.

    The Red Matrix is a decentralised network where people are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. @@ -156,7 +158,7 @@ As you browse the matrix viewing channels and their unique content, you are seam Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create.

    -Example: you want a photo to be visible to your family and three select friends, but not your work colleagues. In the matrix this is easy. Even if your family members, work colleagues, and friends have accounts on different hubs. +Example: you want a photo to be visible to your family and three select friends, but not your work colleagues. In the matrix this is easy. Even if your family members, work colleagues, and friends all have accounts on different hubs.

    Currently the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control. -- cgit v1.2.3 From 5837ab69b9abf872c7eaa20ccc6a1f908bcb563b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 16:31:58 -0800 Subject: use consistent font-size for text --- assets/narrow.css | 2 +- assets/wide.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/narrow.css b/assets/narrow.css index a1c12dcc4..dc47c6984 100644 --- a/assets/narrow.css +++ b/assets/narrow.css @@ -43,7 +43,7 @@ body { color:#c60032;font-size:1.2em;width:70%;margin-right:auto;margin-left:auto;text-align:justify; } div.section-text { -color:#c60032;font-size:1em;width:80%;margin-right:auto;margin-left:auto;text-align:justify; +color:#c60032;font-size:1.2em;width:80%;margin-right:auto;margin-left:auto;text-align:justify; } #tagline { diff --git a/assets/wide.css b/assets/wide.css index 4574526b4..dd7322d90 100644 --- a/assets/wide.css +++ b/assets/wide.css @@ -19,7 +19,7 @@ body { color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; } div.section-text { -color:#C60032;font-size:1em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; +color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; } @@ -146,7 +146,7 @@ div.summary-node { position: fixed; width: 50px; text-align: center ; - font-size:1em; + font-size:1.2em; } -- cgit v1.2.3 From a6987134e5ca957a3ea923cf678a3c4b6df69e41 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 17:19:02 -0800 Subject: headline spacing --- assets/home.html | 4 ++-- assets/wide.css | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/home.html b/assets/home.html index 7ea2c400c..cbeae1fd2 100644 --- a/assets/home.html +++ b/assets/home.html @@ -113,7 +113,7 @@ The internet is broken. We're fixing it.

    Decentralise. Build a more robust network.

    -Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now. +Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.

    The Red Matrix is a decentralised network where people are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. @@ -122,7 +122,7 @@ The Red Matrix is a decentralised network where people are in c And the Red Matrix has Got Zot.

    -So what the heck is Zot? I'm glad you asked... +So what the heck is Zot? I'm glad you asked...

    diff --git a/assets/wide.css b/assets/wide.css index dd7322d90..84dbc47a2 100644 --- a/assets/wide.css +++ b/assets/wide.css @@ -386,6 +386,7 @@ div.section-heading { font-size:2.0em; color:#C60032; width:700px; + margin-bottom: 1em; margin-left:auto; margin-right:auto; } -- cgit v1.2.3 From 817d1461236acf9067ab7ff79d116832f18c282b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 18:30:10 -0800 Subject: bloody hell... php version incompatibility with openssl - openssl no longer accepts a string as an algorithm. Earlier versions didn't recognise sha256. So we'll look to see if the algorithm constant for sha256 is defined and if so we'll use that instead of the string. --- boot.php | 9 ++++++++- include/crypto.php | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 0cde9419d..9c0fb8919 100755 --- a/boot.php +++ b/boot.php @@ -1392,7 +1392,14 @@ function fix_system_urls($oldurl,$newurl) { dbesc($rr['xchan_hash']), dbesc($oldurl) ); - + + + $z = q("update profile set photo = '%s', thumb = '%s' where uid = %d", + dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_l'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_m'])), + intval($rr['channel_id']) + ); + proc_run('php', 'include/notifier.php', 'refresh_all', $rr['channel_id']); } diff --git a/include/crypto.php b/include/crypto.php index e9372fbb4..339d5fe17 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -4,6 +4,8 @@ function rsa_sign($data,$key,$alg = 'sha256') { if(! $key) return 'no key'; $sig = ''; + if(defined(OPENSSL_ALGO_SHA256) && $alg === 'sha256') + $alg = OPENSSL_ALGO_SHA256; openssl_sign($data,$sig,$key,$alg); return $sig; } @@ -13,6 +15,8 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { if(! $key) return false; + if(defined(OPENSSL_ALGO_SHA256) && $alg === 'sha256') + $alg = OPENSSL_ALGO_SHA256; $verify = openssl_verify($data,$sig,$key,$alg); return $verify; } -- cgit v1.2.3 From 065300f7c352dc74e52a09804b7aeb858df1db0a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 18:43:54 -0800 Subject: bloody hell - it isn't defined either. --- include/crypto.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/crypto.php b/include/crypto.php index 339d5fe17..33cdc10c0 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -4,7 +4,7 @@ function rsa_sign($data,$key,$alg = 'sha256') { if(! $key) return 'no key'; $sig = ''; - if(defined(OPENSSL_ALGO_SHA256) && $alg === 'sha256') + if(intval(OPENSSL_ALGO_SHA256) && $alg === 'sha256') $alg = OPENSSL_ALGO_SHA256; openssl_sign($data,$sig,$key,$alg); return $sig; @@ -15,7 +15,7 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { if(! $key) return false; - if(defined(OPENSSL_ALGO_SHA256) && $alg === 'sha256') + if(intval(OPENSSL_ALGO_SHA256) && $alg === 'sha256') $alg = OPENSSL_ALGO_SHA256; $verify = openssl_verify($data,$sig,$key,$alg); return $verify; -- cgit v1.2.3 From 61a7bfb9426c36b7cac0058f5fe5a0c5c6d4ae71 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 20:30:37 -0800 Subject: use 'a' ACL search instead of 'm' ACL search for mod_sources --- view/js/mod_sources.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js index fda952cae..2efc7ad5d 100644 --- a/view/js/mod_sources.js +++ b/view/js/mod_sources.js @@ -10,4 +10,6 @@ $(document).ready(function() { } }); + a.setOptions({ autoSubmit: true, params: { type: 'a' }}); + }); -- cgit v1.2.3 From 5a3a72604bf0e1c7ec04fbdbdee7a08c2a340c5a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Dec 2013 20:59:52 -0800 Subject: some re-work of mod_sources --- mod/sources.php | 21 +++++++++++++++++++++ view/js/mod_sources.js | 4 ++-- view/tpl/sources_edit.tpl | 2 +- view/tpl/sources_new.tpl | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/mod/sources.php b/mod/sources.php index 125184d47..87bab60df 100644 --- a/mod/sources.php +++ b/mod/sources.php @@ -9,11 +9,25 @@ function sources_post(&$a) { $source = intval($_REQUEST['source']); $xchan = $_REQUEST['xchan']; + $abook = intval($_REQUEST['abook']); $words = $_REQUEST['words']; $frequency = $_REQUEST['frequency']; $channel = $a->get_channel(); + if($abook) { + $r = q("select abook_xchan from abook where abook_id = %d and abook_channel = %d limit 1", + intval($abook), + intval(local_user()) + ); + if($r) + $xchan = $r[0]['abook_xchan']; + } + + if(! $xchan) { + notice ( t('Failed to create source. No channel selected.') . EOL); + return; + } if(! $source) { $r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt ) @@ -92,6 +106,12 @@ function sources_content(&$a) { intval(argv(1)), intval(local_user()) ); + if($r) { + $x = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($r[0]['src_xchan']), + intval(local_user()) + ); + } if(! $r) { notice( t('Source not found.') . EOL); return ''; @@ -106,6 +126,7 @@ function sources_content(&$a) { '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), '$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')), '$xchan' => $r[0]['src_xchan'], + '$abook' => $x[0]['abook_id'], '$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''), '$submit' => t('Submit') )); diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js index 2efc7ad5d..49880b38f 100644 --- a/view/js/mod_sources.js +++ b/view/js/mod_sources.js @@ -6,10 +6,10 @@ $(document).ready(function() { width: 250, id: 'id-name-ac', onSelect: function(value,data) { - $("#id_xchan").val(data); + $("#id_abook").val(data); } }); - a.setOptions({ autoSubmit: true, params: { type: 'a' }}); + a.setOptions({ params: { type: 'a' }}); }); diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index 6e9cee32b..34023e03f 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -4,7 +4,7 @@
    - + {{include file="field_input.tpl" field=$name}} {{include file="field_textarea.tpl" field=$words}} diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index 267245ae4..3c6a4be30 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -3,7 +3,7 @@
    {{$desc}}
    - + {{include file="field_input.tpl" field=$name}} {{include file="field_textarea.tpl" field=$words}} -- cgit v1.2.3 From a7a775a718ef92c9bd623849baab1e386071d70b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Dec 2013 00:25:08 -0800 Subject: install redbasic during setup so that at least one theme is registered. Otherwise none of the display settings seem to work very well. --- mod/setup.php | 2 ++ version.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/setup.php b/mod/setup.php index 0198f1f09..245508683 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -577,6 +577,8 @@ function load_database($db) { function what_next() { $a = get_app(); + // install the standard theme + set_config('system','allowed_themes','redbasic'); $baseurl = $a->get_baseurl(); return t('

    What next

    ') diff --git a/version.inc b/version.inc index d967ddd6a..663647728 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-15.528 +2013-12-16.529 -- cgit v1.2.3 From ae95269c6dd5b354d5f807c96a4b237b543a9b53 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 16 Dec 2013 15:41:23 +0100 Subject: remove some cruft and a typo --- view/theme/redbasic/css/style.css | 61 +++------------------------------------ 1 file changed, 4 insertions(+), 57 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0db9caa4e..7c7d450aa 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -234,7 +234,7 @@ header #banner #logo-text { background-color: #aec0d3; color: #565854; -moz-border-radius: $radiuspx; - border-radius: $radiuspx;; + border-radius: $radiuspx; } nav .nav-link { @@ -327,8 +327,8 @@ footer { margin-bottom: 15px; } -/*TODO: we should use one class for all this, nets-selected probably obsolete */ -.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { +/*TODO: we should use one class for all this. */ +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -676,7 +676,7 @@ footer { list-style: none; } -/* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -734,23 +734,6 @@ footer { #netsearch-box { margin-bottom: 5px; } -/* might be obsolete -.nets-ul { - list-style-type: none; -} - -.nets-ul li { - margin-top: 10px; -} - -.nets-link { - margin-left: 24px; -} -.nets-all { - margin-left: 42px; -} -*/ - #search-save { margin-left: 5px; } @@ -2002,13 +1985,6 @@ ul.menu-popup { .reshared-content { margin-left: 30px; } .shared_header img { margin-right: 10px; } -/* might be obsolete -span.mail-delete { -float: left; -width: 30px; -} -*/ - .tag1 { font-size : 1.0em !important; } @@ -2488,12 +2464,6 @@ img.mail-list-sender-photo { margin-bottom: 10px; } -/* seems oblolete -.contact-entry-photo img { - border: none; -} -*/ - .contact-entry-photo-end { clear: both; } @@ -2506,29 +2476,6 @@ img.mail-list-sender-photo { overflow: hidden; } -/* seems obsolete -.contact-entry-edit-links { - margin-top: 6px; - margin-left: 10px; - width: 16px; -} - -.contact-entry-nav-wrapper { - float: left; - margin-left: 10px; -} - -.contact-entry-edit-links img { - border: none; - margin-right: 15px; -} - -.contact-entry-photo { - float: left; - position: relative; -} -*/ - .contact-entry-end { clear: both; } -- cgit v1.2.3 From afc86875d242027434cb4ffca10e086d53cbbbb8 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 16 Dec 2013 15:46:18 +0100 Subject: move some stuff back to mod_connections.css --- view/css/mod_connections.css | 31 +++++++++++++++++++++++++++++++ view/theme/redbasic/css/style.css | 34 ---------------------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index d133a1b99..c460fec28 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -104,3 +104,34 @@ margin-top: 20px; } +.contact-entry-wrapper { + float: left; + width: 120px; + height: 120px; + padding: 10px; +} + +#contacts-search { + font-size: 1em; + width: 300px; +} + +#contacts-search-end { + margin-bottom: 10px; +} + +.contact-entry-photo-end { + clear: both; +} + +.contact-entry-name { + float: left; + margin-left: 0px; + margin-right: 10px; + width: 120px; + overflow: hidden; +} + +.contact-entry-end { + clear: both; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7c7d450aa..9ac021a54 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2445,37 +2445,3 @@ img.mail-list-sender-photo { #sidebar-group-list ul { list-style-type: none; } - -/* need to put these back in the theme for now - used in more than one module */ - -.contact-entry-wrapper { - float: left; - width: 120px; - height: 120px; - padding: 10px; -} - -#contacts-search { - font-size: 1em; - width: 300px; -} - -#contacts-search-end { - margin-bottom: 10px; -} - -.contact-entry-photo-end { - clear: both; -} - -.contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - width: 120px; - overflow: hidden; -} - -.contact-entry-end { - clear: both; -} -- cgit v1.2.3 From 50731fa6a6edbd5d4223de239ae791cc03efe9be Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Dec 2013 13:34:34 -0800 Subject: bring back the collection edit sidebar widget on the connection edit page until I sort out Comanche on that page. --- mod/connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/connections.php b/mod/connections.php index d1bb33748..cb859e4a6 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -39,10 +39,10 @@ function connections_aside(&$a) { 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'])); } else { $a->set_widget('follow', widget_follow(array())); - $a->set_widget('collections', group_side('connections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_xchan'] : ''))); } -- cgit v1.2.3 From 7b5a42568a7f4cf90e81036b4ed5d93ec3f6e3e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Dec 2013 18:07:41 -0800 Subject: Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully the fix will have no undesired side effects. --- include/items.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 2cec6bc36..b328ca2d1 100755 --- a/include/items.php +++ b/include/items.php @@ -2362,12 +2362,13 @@ function tgroup_check($uid,$item) { $mention = false; // check that the message originated elsewhere and is a top-level post - // or is a followup and we have already accepted the top level post + // or is a followup and we have already accepted the top level post as an uplink if($item['mid'] != $item['parent_mid']) { - $r = q("select id from item where mid = '%s' and uid = %d limit 1", + $r = q("select id from item where mid = '%s' and uid = %d and ( item_flags & %d ) limit 1", dbesc($item['parent_mid']), - intval($uid) + intval($uid), + intval(ITEM_UPLINK) ); if($r) return true; -- cgit v1.2.3 From 9728a1303d4cd6b6cb8866eb79194b2d698b9961 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Dec 2013 20:54:03 -0800 Subject: There's always more to do... --- doc/To-Do-Code.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 60b94e6da..df8a476b9 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -11,6 +11,8 @@ We need much more than this, but here are areas where developers can help. Pleas * Finish the anti-spam bayesian engine +* Integrate the "open site" list with the register page + * Write more webpage layouts * Write more webpage widgets -- cgit v1.2.3 From b3e3073b991c2ee898b0d8f4edd2df221a538631 Mon Sep 17 00:00:00 2001 From: zottel Date: Tue, 17 Dec 2013 12:23:39 +0100 Subject: JS-less display --- mod/display.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mod/display.php b/mod/display.php index 9aafec8c3..65114272a 100644 --- a/mod/display.php +++ b/mod/display.php @@ -139,13 +139,13 @@ function display_content(&$a, $update = 0, $load = false) { $sql_extra = public_permissions_sql(get_observer_hash()); - if($update && $load) { + if(($update && $load) || ($_COOKIE['jsAvailable'] != 1)) { $updateable = false; $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); - if($load) { + if($load || ($_COOKIE['jsAvailable'] != 1)) { $r = null; if(local_user()) { $r = q("SELECT * from item @@ -202,8 +202,11 @@ function display_content(&$a, $update = 0, $load = false) { } - - $o .= conversation($a, $items, 'display', $update, 'client'); + if ($_COOKIE['jsAvailable'] == 1) { + $o .= conversation($a, $items, 'display', $update, 'client'); + } else { + $o .= conversation($a, $items, 'display', $update, 'traditional'); + } if($updateable) { $x = q("UPDATE item SET item_flags = ( item_flags ^ %d ) -- cgit v1.2.3 From 44ead61339745b975d4cff60894afb18b83fa55f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Dec 2013 16:35:22 -0800 Subject: authtest: do a better job of success/failure indication --- mod/authtest.php | 7 ++++++- mod/post.php | 2 +- version.inc | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mod/authtest.php b/mod/authtest.php index 2c8d7b4b4..7747ea504 100644 --- a/mod/authtest.php +++ b/mod/authtest.php @@ -6,7 +6,7 @@ require_once('mod/magic.php'); function authtest_content(&$a) { - + $auth_success = false; $o .= '

    Magic-Auth Diagnostic

    '; if(! local_user()) { @@ -34,11 +34,16 @@ function authtest_content(&$a) { if(! $j) $o .= 'json_decode failure from remote site. ' . print_r($z['body'],true); $o .= 'Remote site responded: ' . print_r($j,true); + if(strpos($j,'Authentication Success')) + $auth_success = true; } else { $o .= 'fetch url failure.' . print_r($z,true); } } + + if(! $auth_success) + $o .= 'Authentication Failed!' . EOL; } return str_replace("\n",'
    ',$o); diff --git a/mod/post.php b/mod/post.php index 73345c4e9..7f495140e 100644 --- a/mod/post.php +++ b/mod/post.php @@ -232,7 +232,7 @@ function post_init(&$a) { if($test) { $ret['success'] = true; - $ret['message'] .= 'Success' . EOL; + $ret['message'] .= 'Authentication Success!' . EOL; json_return_and_die($ret); } diff --git a/version.inc b/version.inc index 663647728..50e01fa2c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-16.529 +2013-12-17.530 -- cgit v1.2.3 From 98b0e0221d66fe93104328e7027efe77f9c84008 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Dec 2013 20:03:45 -0800 Subject: more comanche stuff --- view/pdl/mod_new_channel.pdl | 1 + view/pdl/mod_register.pdl | 1 + view/php/mod_new_channel.php | 3 --- view/php/mod_register.php | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 view/pdl/mod_new_channel.pdl create mode 100644 view/pdl/mod_register.pdl delete mode 100644 view/php/mod_new_channel.php delete mode 100644 view/php/mod_register.php diff --git a/view/pdl/mod_new_channel.pdl b/view/pdl/mod_new_channel.pdl new file mode 100644 index 000000000..733bc248a --- /dev/null +++ b/view/pdl/mod_new_channel.pdl @@ -0,0 +1 @@ +[layout]full[/layout] diff --git a/view/pdl/mod_register.pdl b/view/pdl/mod_register.pdl new file mode 100644 index 000000000..733bc248a --- /dev/null +++ b/view/pdl/mod_register.pdl @@ -0,0 +1 @@ +[layout]full[/layout] diff --git a/view/php/mod_new_channel.php b/view/php/mod_new_channel.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_new_channel.php +++ /dev/null @@ -1,3 +0,0 @@ -page['template'] = 'full'; diff --git a/view/php/mod_register.php b/view/php/mod_register.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_register.php +++ /dev/null @@ -1,3 +0,0 @@ -page['template'] = 'full'; -- cgit v1.2.3 From 1780684c57a068f0278ad576703e044c64a70aa5 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Dec 2013 20:26:08 -0800 Subject: split mod/connections for comanchification --- mod/connedit.php | 708 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 708 insertions(+) create mode 100644 mod/connedit.php diff --git a/mod/connedit.php b/mod/connedit.php new file mode 100644 index 000000000..777127c4f --- /dev/null +++ b/mod/connedit.php @@ -0,0 +1,708 @@ +data['abook'] = $r[0]; + } + } + + $channel = $a->get_channel(); + if($channel) + head_set_icon($channel['xchan_photo_s']); + +} + +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'])); + } + else { + $a->set_widget('follow', widget_follow(array())); + } + + + $a->set_widget('suggest',widget_suggestions(array())); + $a->set_widget('findpeople',findpeople_widget()); + +} + + + +function connedit_post(&$a) { + + if(! local_user()) + return; + + $contact_id = intval(argv(1)); + if(! $contact_id) + return; + + $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", + intval($contact_id), + intval(local_user()) + ); + + if(! $orig_record) { + notice( t('Could not access contact record.') . EOL); + goaway($a->get_baseurl(true) . '/connections'); + return; // NOTREACHED + } + + call_hooks('contact_edit_post', $_POST); + + $profile_id = $_POST['profile-assign']; + if($profile_id) { + $r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND `uid` = %d LIMIT 1", + dbesc($profile_id), + intval(local_user()) + ); + if(! count($r)) { + notice( t('Could not locate selected profile.') . EOL); + return; + } + } + + $hidden = intval($_POST['hidden']); + + $priority = intval($_POST['poll']); + if($priority > 5 || $priority < 0) + $priority = 0; + + $closeness = intval($_POST['closeness']); + if($closeness < 0) + $closeness = 99; + + $abook_my_perms = 0; + + foreach($_POST as $k => $v) { + if(strpos($k,'perms_') === 0) { + $abook_my_perms += $v; + } + } + + $abook_flags = $orig_record[0]['abook_flags']; + $new_friend = false; + + if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) { + $abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING ); + $new_friend = true; + } + + $r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_flags = %d + where abook_id = %d AND abook_channel = %d LIMIT 1", + dbesc($profile_id), + intval($abook_my_perms), + intval($closeness), + intval($abook_flags), + intval($contact_id), + intval(local_user()) + ); + if($r) + info( t('Connection updated.') . EOL); + 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))) { + proc_run('php', 'include/notifier.php', 'permission_update', $contact_id); + } + + if($new_friend) { + $channel = $a->get_channel(); + $default_group = $channel['channel_default_group']; + if($default_group) { + 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']); + } + + + + // Check if settings permit ("post new friend activity" is allowed, and + // friends in general or this friend in particular aren't hidden) + // and send out a new friend activity + // TODO + + // pull in a bit of content if there is any to pull in + proc_run('php','include/onepoll.php',$contact_id); + + } + + // Refresh the structure in memory with the new data + + $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($contact_id) + ); + if($r) { + $a->data['abook'] = $r[0]; + } + + if($new_friend) { + $arr = array('channel_id' => local_user(), 'abook' => $a->data['abook']); + call_hooks('accept_follow', $arr); + } + + connedit_clone($a); + + return; + +} + +function connedit_clone(&$a) { + + if(! array_key_exists('abook',$a->data)) + return; + $clone = $a->data['abook']; + + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone))); +} + + +function connedit_content(&$a) { + + $sort_type = 0; + $o = ''; + + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + return login(); + } + + if(argc() == 3) { + + $contact_id = intval(argv(1)); + if(! $contact_id) + return; + + $cmd = argv(2); + + $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_id = %d AND abook_channel = %d AND NOT ( abook_flags & %d ) and not ( abook_flags & %d ) LIMIT 1", + intval($contact_id), + intval(local_user()), + intval(ABOOK_FLAG_SELF), + // allow drop even if pending, just duplicate the self query + intval(($cmd === 'drop') ? ABOOK_FLAG_SELF : ABOOK_FLAG_PENDING) + ); + + if(! count($orig_record)) { + notice( t('Could not access address book record.') . EOL); + goaway($a->get_baseurl(true) . '/connections'); + } + + if($cmd === 'update') { + + // pull feed and consume it, which should subscribe to the hub. + proc_run('php',"include/poller.php","$contact_id"); + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + + } + + if($cmd === 'refresh') { + if(! zot_refresh($orig_record[0],get_app()->get_channel())) + notice( t('Refresh failed - channel is currently unavailable.') ); + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + } + + if($cmd === 'block') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED)) { + info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) + ? t('Channel has been unblocked') + : t('Channel has been blocked')) . EOL ); + connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + } + + if($cmd === 'ignore') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED)) { + info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_IGNORED) + ? t('Channel has been unignored') + : t('Channel has been ignored')) . EOL ); + connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + } + + if($cmd === 'archive') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED)) { + info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_ARCHIVED) + ? t('Channel has been unarchived') + : t('Channel has been archived')) . EOL ); + connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + } + + if($cmd === 'hide') { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN)) { + info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_HIDDEN) + ? t('Channel has been unhidden') + : t('Channel has been hidden')) . EOL ); + connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + } + + // We'll prevent somebody from unapproving a contact. + + if($cmd === 'approve') { + if($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING) { + if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING)) { + info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING) + ? t('Channel has been approved') + : t('Channel has been unapproved')) . EOL ); + connedit_clone($a); + } + else + notice(t('Unable to set address book parameters.') . EOL); + } + goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + } + + + if($cmd === 'drop') { + + require_once('include/Contact.php'); +// FIXME +// terminate_friendship($a->get_channel(),$orig_record[0]); + + contact_remove(local_user(), $orig_record[0]['abook_id']); +// FIXME - send to clones + info( t('Contact has been removed.') . EOL ); + if(x($_SESSION,'return_url')) + goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); + goaway($a->get_baseurl(true) . '/contacts'); + + } + } + + if((x($a->data,'abook')) && (is_array($a->data['abook']))) { + + $contact_id = $a->data['abook']['abook_id']; + $contact = $a->data['abook']; + + + $tabs = array( + + array( + 'label' => t('View Profile'), + 'url' => $a->get_baseurl(true) . '/chanview/?f=&cid=' . $contact['abook_id'], + 'sel' => '', + 'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']), + ), + + array( + 'label' => t('Refresh Permissions'), + 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/refresh', + 'sel' => '', + 'title' => t('Fetch updated permissions'), + ), + + array( + 'label' => t('Recent Activity'), + 'url' => $a->get_baseurl(true) . '/network/?f=&cid=' . $contact['abook_id'], + 'sel' => '', + 'title' => t('View recent posts and comments'), + ), + + array( + 'label' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? t('Unblock') : t('Block')), + 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/block', + 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? 'active' : ''), + 'title' => t('Block or Unblock this connection'), + ), + + array( + 'label' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? t('Unignore') : t('Ignore')), + 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/ignore', + 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? 'active' : ''), + 'title' => t('Ignore or Unignore this connection'), + ), + array( + 'label' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? t('Unarchive') : t('Archive')), + 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/archive', + 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? 'active' : ''), + 'title' => t('Archive or Unarchive this connection'), + ), + array( + 'label' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? t('Unhide') : t('Hide')), + 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/hide', + 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? 'active' : ''), + 'title' => t('Hide or Unhide this connection'), + ), + + array( + 'label' => t('Delete'), + 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/drop', + 'sel' => '', + 'title' => t('Delete this connection'), + ), + + ); + + $self = false; + + if(! ($contact['abook_flags'] & ABOOK_FLAG_SELF)) { + $tab_tpl = get_markup_template('common_tabs.tpl'); + $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); + } + else + $self = true; + + $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array( + '$baseurl' => $a->get_baseurl(true), + '$editselect' => $editselect + )); + + require_once('include/contact_selectors.php'); + + $tpl = get_markup_template("abook_edit.tpl"); + + if(feature_enabled(local_user(),'affinity')) { + + $slider_tpl = get_markup_template('contact_slider.tpl'); + $slide = replace_macros($slider_tpl,array( + '$me' => t('Me'), + '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), + '$intimate' => t('Best Friends'), + '$friends' => t('Friends'), + '$oldfriends' => t('Former Friends'), + '$acquaintances' => t('Acquaintances'), + '$world' => t('Unknown') + )); + } + + $perms = array(); + $channel = $a->get_channel(); + + $global_perms = get_perms(); + $existing = get_all_perms(local_user(),$contact['abook_xchan']); + + $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication')); + + foreach($global_perms as $k => $v) { + $thisperm = (($contact['abook_my_perms'] & $v[1]) ? "1" : ''); + + // For auto permissions (when $self is true) we don't want to look at existing + // permissions because they are enabled for the channel owner + + if((! $self) && ($existing[$k])) + $thisperm = "1"; + + $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]); + } + + $o .= replace_macros($tpl,array( + + '$header' => (($self) ? t('Automatic Permissions Settings') : sprintf( t('Connections: settings for %s'),$contact['xchan_name'])), + '$addr' => $contact['xchan_addr'], + '$notself' => (($self) ? '' : '1'), + '$self' => (($self) ? '1' : ''), + '$autolbl' => t('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.'), + '$viewprof' => t('View Profile'), + '$lbl_slider' => t('Slide to adjust your degree of friendship'), + '$slide' => $slide, + '$tabs' => $t, + '$tab_str' => $tab_str, + '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), + '$unapproved' => $unapproved, + '$inherited' => t('inherited'), + '$approve' => t('Approve this connection'), + '$noperms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no individual permissions!') : ''), + '$noperm_desc' => (((! $self) && (! $contact['abook_my_perms'])) ? t('This may be appropriate based on your privacy settings, though you may wish to review the "Advanced Permissions".') : ''), + '$submit' => t('Submit'), + '$lbl_vis1' => t('Profile Visibility'), + '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), + '$lbl_info1' => t('Contact Information / Notes'), + '$infedit' => t('Edit contact notes'), + '$close' => $contact['abook_closeness'], + '$them' => t('Their Settings'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$forum' => t('Forum Members'), + '$soapbox' => t('Soapbox'), + '$full' => t('Full Sharing'), + '$cautious' => t('Cautious Sharing'), + '$follow' => t('Follow Only'), + '$permlbl' => t('Individual Permissions'), + '$permnote' => t('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.'), + '$advanced' => t('Advanced Permissions'), + '$quick' => t('Quick Links'), + '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], + '$all_friends' => $all_friends, + '$relation_text' => $relation_text, + '$visit' => sprintf( t('Visit %s\'s profile - %s'),$contact['xchan_name'],$contact['xchan_url']), + '$blockunblock' => t('Block/Unblock contact'), + '$ignorecont' => t('Ignore contact'), + '$lblcrepair' => t("Repair URL settings"), + '$lblrecent' => t('View conversations'), + '$lblsuggest' => $lblsuggest, + '$delete' => t('Delete contact'), + '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)), + '$poll_enabled' => $poll_enabled, + '$lastupdtext' => t('Last update:'), + '$lost_contact' => $lost_contact, + '$updpub' => t('Update public posts'), + '$last_update' => $last_update, + '$udnow' => t('Update now'), + '$profile_select' => contact_profile_assign($contact['abook_profile']), + '$multiprofs' => feature_enabled(local_user(),'multi_profiles'), + '$contact_id' => $contact['abook_id'], + '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), + '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), + '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''), + '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''), + '$archived' => (($contact['archive']) ? t('Currently archived') : ''), + '$pending' => (($contact['archive']) ? t('Currently pending') : ''), + '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts may still be visible')), + '$photo' => $contact['photo'], + '$name' => $contact['name'], + '$dir_icon' => $dir_icon, + '$alt_text' => $alt_text, + '$sparkle' => $sparkle, + '$url' => $url + + )); + + $arr = array('contact' => $contact,'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; + + } + + $blocked = false; + $hidden = false; + $ignored = false; + $archived = false; + $unblocked = false; + $pending = false; + + $all = false; + + $_SESSION['return_url'] = $a->query_string; + + $search_flags = 0; + $head = ''; + + if(argc() == 2) { + switch(argv(1)) { + case 'blocked': + $search_flags = ABOOK_FLAG_BLOCKED; + $head = t('Blocked'); + $blocked = true; + break; + case 'ignored': + $search_flags = ABOOK_FLAG_IGNORED; + $head = t('Ignored'); + $ignored = true; + break; + case 'hidden': + $search_flags = ABOOK_FLAG_HIDDEN; + $head = t('Hidden'); + $hidden = true; + break; + case 'archived': + $search_flags = ABOOK_FLAG_ARCHIVED; + $head = t('Archived'); + $archived = true; + break; + case 'pending': + $search_flags = ABOOK_FLAG_PENDING; + $head = t('New'); + $pending = true; + nav_set_selected('intros'); + break; + + case 'all': + $head = t('All'); + default: + $search_flags = 0; + $all = true; + break; + + } + + $sql_extra = (($search_flags) ? " and ( abook_flags & " . $search_flags . " ) " : ""); + + + } + else { + $sql_extra = " and not ( abook_flags & " . ABOOK_FLAG_BLOCKED . " ) "; + $unblocked = true; + } + + $search = ((x($_REQUEST,'search')) ? notags(trim($_REQUEST['search'])) : ''); + + $tabs = array( + array( + 'label' => t('Suggestions'), + 'url' => $a->get_baseurl(true) . '/suggest', + 'sel' => '', + 'title' => t('Suggest new connections'), + ), + array( + 'label' => t('New Connections'), + 'url' => $a->get_baseurl(true) . '/connections/pending', + 'sel' => ($pending) ? 'active' : '', + 'title' => t('Show pending (new) connections'), + ), + array( + 'label' => t('All Connections'), + 'url' => $a->get_baseurl(true) . '/connections/all', + 'sel' => ($all) ? 'active' : '', + 'title' => t('Show all connections'), + ), + array( + 'label' => t('Unblocked'), + 'url' => $a->get_baseurl(true) . '/connections', + 'sel' => (($unblocked) && (! $search) && (! $nets)) ? 'active' : '', + 'title' => t('Only show unblocked connections'), + ), + + array( + 'label' => t('Blocked'), + 'url' => $a->get_baseurl(true) . '/connections/blocked', + 'sel' => ($blocked) ? 'active' : '', + 'title' => t('Only show blocked connections'), + ), + + array( + 'label' => t('Ignored'), + 'url' => $a->get_baseurl(true) . '/connections/ignored', + 'sel' => ($ignored) ? 'active' : '', + 'title' => t('Only show ignored connections'), + ), + + array( + 'label' => t('Archived'), + 'url' => $a->get_baseurl(true) . '/connections/archived', + 'sel' => ($archived) ? 'active' : '', + 'title' => t('Only show archived connections'), + ), + + array( + 'label' => t('Hidden'), + 'url' => $a->get_baseurl(true) . '/connections/hidden', + 'sel' => ($hidden) ? 'active' : '', + 'title' => t('Only show hidden connections'), + ), + + ); + + $tab_tpl = get_markup_template('common_tabs.tpl'); + $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); + + $searching = false; + if($search) { + $search_hdr = $search; + $search_txt = dbesc(protect_sprintf(preg_quote($search))); + $searching = true; + } + $sql_extra .= (($searching) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : ""); + + + $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 ", + intval(local_user()), + intval(ABOOK_FLAG_SELF) + ); + if(count($r)) { + $a->set_pager_total($r[0]['total']); + $total = $r[0]['total']; + } + + $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 ", + intval(local_user()), + intval(ABOOK_FLAG_SELF), + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + + $contacts = array(); + + if(count($r)) { + + foreach($r as $rr) { + if($rr['xchan_url']) { + $contacts[] = array( + 'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']), + 'edit_hover' => t('Edit contact'), + 'id' => $rr['abook_id'], + 'alt_text' => $alt_text, + 'dir_icon' => $dir_icon, + 'thumb' => $rr['xchan_photo_m'], + 'name' => $rr['xchan_name'], + 'username' => $rr['xchan_name'], + 'sparkle' => $sparkle, + 'link' => z_root() . '/connections/' . $rr['abook_id'], + 'url' => $rr['xchan_url'], + 'network' => network_to_name($rr['network']), + ); + } + } + } + + + $tpl = get_markup_template("contacts-template.tpl"); + $o .= replace_macros($tpl,array( + '$header' => t('Connections') . (($head) ? ' - ' . $head : ''), + '$tabs' => $t, + '$total' => $total, + '$search' => $search_hdr, + '$desc' => t('Search your connections'), + '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""), + '$submit' => t('Find'), + '$cmd' => $a->cmd, + '$contacts' => $contacts, + '$paginate' => paginate($a), + + )); + + return $o; +} -- cgit v1.2.3 From 38fd8410eb5c66928cb24bb87ad38657f53aec3a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 01:00:08 -0800 Subject: split off mod_connections into mod_connections & mod_connedit - lots of links to fix --- include/api.php | 3 +- include/conversation.php | 2 +- include/widgets.php | 2 +- mod/connections.php | 336 +--------------------------------------------- mod/connedit.php | 219 ++---------------------------- mod/follow.php | 2 +- mod/settings.php | 2 +- view/css/mod_connedit.css | 137 +++++++++++++++++++ view/tpl/abook_edit.tpl | 2 +- 9 files changed, 160 insertions(+), 545 deletions(-) create mode 100644 view/css/mod_connedit.css diff --git a/include/api.php b/include/api.php index 093839875..463d29cf8 100644 --- a/include/api.php +++ b/include/api.php @@ -362,7 +362,8 @@ require_once('include/photos.php'); 'location' => ($usr) ? $usr[0]['channel_location'] : '', 'profile_image_url' => $uinfo[0]['xchan_photo_l'], 'url' => $uinfo[0]['xchan_url'], - 'contact_url' => $a->get_baseurl()."/connections/".$uinfo[0]['abook_id'], +//FIXME + 'contact_url' => $a->get_baseurl() . "/connections/".$uinfo[0]['abook_id'], 'protected' => false, 'friends_count' => intval($countfriends), 'created_at' => api_date($uinfo[0]['abook_created']), diff --git a/include/conversation.php b/include/conversation.php index 29fb8a163..2ba3948bf 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -915,7 +915,7 @@ function item_photo_menu($item){ if($contact) { $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $contact['abook_id']; - $contact_url = $a->get_baseurl($ssl_state) . '/connections/' . $contact['abook_id']; + $contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id']; $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $contact['abook_id']; $clean_url = normalise_link($item['author-link']); diff --git a/include/widgets.php b/include/widgets.php index 888da37a2..9d6617aa2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -436,7 +436,7 @@ function widget_settings_menu($arr) { array( 'label' => t('Automatic Permissions (Advanced)'), - 'url' => $a->get_baseurl(true) . '/connections/' . $abook_self_id, + 'url' => $a->get_baseurl(true) . '/connedit/' . $abook_self_id, 'selected' => '' ), diff --git a/mod/connections.php b/mod/connections.php index cb859e4a6..10f0468b6 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -13,18 +13,6 @@ function connections_init(&$a) { if(! local_user()) return; - if((argc() == 2) && intval(argv(1))) { - $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(1)) - ); - if($r) { - $a->data['abook'] = $r[0]; - } - } - $channel = $a->get_channel(); if($channel) head_set_icon($channel['xchan_photo_s']); @@ -37,13 +25,8 @@ function connections_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'])); - } - else { - $a->set_widget('follow', widget_follow(array())); - } + + $a->set_widget('follow', widget_follow(array())); $a->set_widget('suggest',widget_suggestions(array())); @@ -202,319 +185,6 @@ function connections_content(&$a) { return login(); } - if(argc() == 3) { - - $contact_id = intval(argv(1)); - if(! $contact_id) - return; - - $cmd = argv(2); - - $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_id = %d AND abook_channel = %d AND NOT ( abook_flags & %d ) and not ( abook_flags & %d ) LIMIT 1", - intval($contact_id), - intval(local_user()), - intval(ABOOK_FLAG_SELF), - // allow drop even if pending, just duplicate the self query - intval(($cmd === 'drop') ? ABOOK_FLAG_SELF : ABOOK_FLAG_PENDING) - ); - - if(! count($orig_record)) { - notice( t('Could not access address book record.') . EOL); - goaway($a->get_baseurl(true) . '/connections'); - } - - if($cmd === 'update') { - - // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/poller.php","$contact_id"); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - - } - - if($cmd === 'refresh') { - if(! zot_refresh($orig_record[0],get_app()->get_channel())) - notice( t('Refresh failed - channel is currently unavailable.') ); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - } - - if($cmd === 'block') { - if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED)) { - info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) - ? t('Channel has been unblocked') - : t('Channel has been blocked')) . EOL ); - connections_clone($a); - } - else - notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - } - - if($cmd === 'ignore') { - if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED)) { - info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_IGNORED) - ? t('Channel has been unignored') - : t('Channel has been ignored')) . EOL ); - connections_clone($a); - } - else - notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - } - - if($cmd === 'archive') { - if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED)) { - info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_ARCHIVED) - ? t('Channel has been unarchived') - : t('Channel has been archived')) . EOL ); - connections_clone($a); - } - else - notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - } - - if($cmd === 'hide') { - if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN)) { - info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_HIDDEN) - ? t('Channel has been unhidden') - : t('Channel has been hidden')) . EOL ); - connections_clone($a); - } - else - notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - } - - // We'll prevent somebody from unapproving a contact. - - if($cmd === 'approve') { - if($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING) { - if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING)) { - info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING) - ? t('Channel has been approved') - : t('Channel has been unapproved')) . EOL ); - connections_clone($a); - } - else - notice(t('Unable to set address book parameters.') . EOL); - } - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); - } - - - if($cmd === 'drop') { - - require_once('include/Contact.php'); -// FIXME -// terminate_friendship($a->get_channel(),$orig_record[0]); - - contact_remove(local_user(), $orig_record[0]['abook_id']); -// FIXME - send to clones - info( t('Contact has been removed.') . EOL ); - if(x($_SESSION,'return_url')) - goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); - goaway($a->get_baseurl(true) . '/contacts'); - - } - } - - if((x($a->data,'abook')) && (is_array($a->data['abook']))) { - - $contact_id = $a->data['abook']['abook_id']; - $contact = $a->data['abook']; - - - $tabs = array( - - array( - 'label' => t('View Profile'), - 'url' => $a->get_baseurl(true) . '/chanview/?f=&cid=' . $contact['abook_id'], - 'sel' => '', - 'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']), - ), - - array( - 'label' => t('Refresh Permissions'), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/refresh', - 'sel' => '', - 'title' => t('Fetch updated permissions'), - ), - - array( - 'label' => t('Recent Activity'), - 'url' => $a->get_baseurl(true) . '/network/?f=&cid=' . $contact['abook_id'], - 'sel' => '', - 'title' => t('View recent posts and comments'), - ), - - array( - 'label' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? t('Unblock') : t('Block')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/block', - 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? 'active' : ''), - 'title' => t('Block or Unblock this connection'), - ), - - array( - 'label' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? t('Unignore') : t('Ignore')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/ignore', - 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? 'active' : ''), - 'title' => t('Ignore or Unignore this connection'), - ), - array( - 'label' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? t('Unarchive') : t('Archive')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/archive', - 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? 'active' : ''), - 'title' => t('Archive or Unarchive this connection'), - ), - array( - 'label' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? t('Unhide') : t('Hide')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/hide', - 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? 'active' : ''), - 'title' => t('Hide or Unhide this connection'), - ), - - array( - 'label' => t('Delete'), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/drop', - 'sel' => '', - 'title' => t('Delete this connection'), - ), - - ); - - $self = false; - - if(! ($contact['abook_flags'] & ABOOK_FLAG_SELF)) { - $tab_tpl = get_markup_template('common_tabs.tpl'); - $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); - } - else - $self = true; - - $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array( - '$baseurl' => $a->get_baseurl(true), - '$editselect' => $editselect - )); - - require_once('include/contact_selectors.php'); - - $tpl = get_markup_template("abook_edit.tpl"); - - if(feature_enabled(local_user(),'affinity')) { - - $slider_tpl = get_markup_template('contact_slider.tpl'); - $slide = replace_macros($slider_tpl,array( - '$me' => t('Me'), - '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), - '$intimate' => t('Best Friends'), - '$friends' => t('Friends'), - '$oldfriends' => t('Former Friends'), - '$acquaintances' => t('Acquaintances'), - '$world' => t('Unknown') - )); - } - - $perms = array(); - $channel = $a->get_channel(); - - $global_perms = get_perms(); - $existing = get_all_perms(local_user(),$contact['abook_xchan']); - - $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication')); - - foreach($global_perms as $k => $v) { - $thisperm = (($contact['abook_my_perms'] & $v[1]) ? "1" : ''); - - // For auto permissions (when $self is true) we don't want to look at existing - // permissions because they are enabled for the channel owner - - if((! $self) && ($existing[$k])) - $thisperm = "1"; - - $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]); - } - - $o .= replace_macros($tpl,array( - - '$header' => (($self) ? t('Automatic Permissions Settings') : sprintf( t('Connections: settings for %s'),$contact['xchan_name'])), - '$addr' => $contact['xchan_addr'], - '$notself' => (($self) ? '' : '1'), - '$self' => (($self) ? '1' : ''), - '$autolbl' => t('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.'), - '$viewprof' => t('View Profile'), - '$lbl_slider' => t('Slide to adjust your degree of friendship'), - '$slide' => $slide, - '$tabs' => $t, - '$tab_str' => $tab_str, - '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), - '$unapproved' => $unapproved, - '$inherited' => t('inherited'), - '$approve' => t('Approve this connection'), - '$noperms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no individual permissions!') : ''), - '$noperm_desc' => (((! $self) && (! $contact['abook_my_perms'])) ? t('This may be appropriate based on your privacy settings, though you may wish to review the "Advanced Permissions".') : ''), - '$submit' => t('Submit'), - '$lbl_vis1' => t('Profile Visibility'), - '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), - '$lbl_info1' => t('Contact Information / Notes'), - '$infedit' => t('Edit contact notes'), - '$close' => $contact['abook_closeness'], - '$them' => t('Their Settings'), - '$me' => t('My Settings'), - '$perms' => $perms, - '$forum' => t('Forum Members'), - '$soapbox' => t('Soapbox'), - '$full' => t('Full Sharing'), - '$cautious' => t('Cautious Sharing'), - '$follow' => t('Follow Only'), - '$permlbl' => t('Individual Permissions'), - '$permnote' => t('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.'), - '$advanced' => t('Advanced Permissions'), - '$quick' => t('Quick Links'), - '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], - '$all_friends' => $all_friends, - '$relation_text' => $relation_text, - '$visit' => sprintf( t('Visit %s\'s profile - %s'),$contact['xchan_name'],$contact['xchan_url']), - '$blockunblock' => t('Block/Unblock contact'), - '$ignorecont' => t('Ignore contact'), - '$lblcrepair' => t("Repair URL settings"), - '$lblrecent' => t('View conversations'), - '$lblsuggest' => $lblsuggest, - '$delete' => t('Delete contact'), - '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)), - '$poll_enabled' => $poll_enabled, - '$lastupdtext' => t('Last update:'), - '$lost_contact' => $lost_contact, - '$updpub' => t('Update public posts'), - '$last_update' => $last_update, - '$udnow' => t('Update now'), - '$profile_select' => contact_profile_assign($contact['abook_profile']), - '$multiprofs' => feature_enabled(local_user(),'multi_profiles'), - '$contact_id' => $contact['abook_id'], - '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), - '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), - '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''), - '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''), - '$archived' => (($contact['archive']) ? t('Currently archived') : ''), - '$pending' => (($contact['archive']) ? t('Currently pending') : ''), - '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts may still be visible')), - '$photo' => $contact['photo'], - '$name' => $contact['name'], - '$dir_icon' => $dir_icon, - '$alt_text' => $alt_text, - '$sparkle' => $sparkle, - '$url' => $url - - )); - - $arr = array('contact' => $contact,'output' => $o); - - call_hooks('contact_edit', $arr); - - return $arr['output']; - - } - $blocked = false; $hidden = false; $ignored = false; @@ -680,7 +350,7 @@ function connections_content(&$a) { 'name' => $rr['xchan_name'], 'username' => $rr['xchan_name'], 'sparkle' => $sparkle, - 'link' => z_root() . '/connections/' . $rr['abook_id'], + 'link' => z_root() . '/connedit/' . $rr['abook_id'], 'url' => $rr['xchan_url'], 'network' => network_to_name($rr['network']), ); diff --git a/mod/connedit.php b/mod/connedit.php index 777127c4f..7fc4bfaf8 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -41,10 +41,6 @@ function connedit_aside(&$a) { $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'])); } - else { - $a->set_widget('follow', widget_follow(array())); - } - $a->set_widget('suggest',widget_suggestions(array())); $a->set_widget('findpeople',findpeople_widget()); @@ -228,14 +224,14 @@ function connedit_content(&$a) { // pull feed and consume it, which should subscribe to the hub. proc_run('php',"include/poller.php","$contact_id"); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } if($cmd === 'refresh') { if(! zot_refresh($orig_record[0],get_app()->get_channel())) notice( t('Refresh failed - channel is currently unavailable.') ); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } if($cmd === 'block') { @@ -247,7 +243,7 @@ function connedit_content(&$a) { } else notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } if($cmd === 'ignore') { @@ -259,7 +255,7 @@ function connedit_content(&$a) { } else notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } if($cmd === 'archive') { @@ -271,7 +267,7 @@ function connedit_content(&$a) { } else notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } if($cmd === 'hide') { @@ -283,7 +279,7 @@ function connedit_content(&$a) { } else notice(t('Unable to set address book parameters.') . EOL); - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } // We'll prevent somebody from unapproving a contact. @@ -299,7 +295,7 @@ function connedit_content(&$a) { else notice(t('Unable to set address book parameters.') . EOL); } - goaway($a->get_baseurl(true) . '/connections/' . $contact_id); + goaway($a->get_baseurl(true) . '/connedit/' . $contact_id); } @@ -336,7 +332,7 @@ function connedit_content(&$a) { array( 'label' => t('Refresh Permissions'), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/refresh', + 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/refresh', 'sel' => '', 'title' => t('Fetch updated permissions'), ), @@ -350,33 +346,33 @@ function connedit_content(&$a) { array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? t('Unblock') : t('Block')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/block', + 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/block', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? 'active' : ''), 'title' => t('Block or Unblock this connection'), ), array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? t('Unignore') : t('Ignore')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/ignore', + 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/ignore', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? 'active' : ''), 'title' => t('Ignore or Unignore this connection'), ), array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? t('Unarchive') : t('Archive')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/archive', + 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/archive', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? 'active' : ''), 'title' => t('Archive or Unarchive this connection'), ), array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? t('Unhide') : t('Hide')), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/hide', + 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/hide', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? 'active' : ''), 'title' => t('Hide or Unhide this connection'), ), array( 'label' => t('Delete'), - 'url' => $a->get_baseurl(true) . '/connections/' . $contact['abook_id'] . '/drop', + 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/drop', 'sel' => '', 'title' => t('Delete this connection'), ), @@ -515,194 +511,5 @@ function connedit_content(&$a) { } - $blocked = false; - $hidden = false; - $ignored = false; - $archived = false; - $unblocked = false; - $pending = false; - - $all = false; - - $_SESSION['return_url'] = $a->query_string; - - $search_flags = 0; - $head = ''; - - if(argc() == 2) { - switch(argv(1)) { - case 'blocked': - $search_flags = ABOOK_FLAG_BLOCKED; - $head = t('Blocked'); - $blocked = true; - break; - case 'ignored': - $search_flags = ABOOK_FLAG_IGNORED; - $head = t('Ignored'); - $ignored = true; - break; - case 'hidden': - $search_flags = ABOOK_FLAG_HIDDEN; - $head = t('Hidden'); - $hidden = true; - break; - case 'archived': - $search_flags = ABOOK_FLAG_ARCHIVED; - $head = t('Archived'); - $archived = true; - break; - case 'pending': - $search_flags = ABOOK_FLAG_PENDING; - $head = t('New'); - $pending = true; - nav_set_selected('intros'); - break; - - case 'all': - $head = t('All'); - default: - $search_flags = 0; - $all = true; - break; - - } - - $sql_extra = (($search_flags) ? " and ( abook_flags & " . $search_flags . " ) " : ""); - - - } - else { - $sql_extra = " and not ( abook_flags & " . ABOOK_FLAG_BLOCKED . " ) "; - $unblocked = true; - } - - $search = ((x($_REQUEST,'search')) ? notags(trim($_REQUEST['search'])) : ''); - - $tabs = array( - array( - 'label' => t('Suggestions'), - 'url' => $a->get_baseurl(true) . '/suggest', - 'sel' => '', - 'title' => t('Suggest new connections'), - ), - array( - 'label' => t('New Connections'), - 'url' => $a->get_baseurl(true) . '/connections/pending', - 'sel' => ($pending) ? 'active' : '', - 'title' => t('Show pending (new) connections'), - ), - array( - 'label' => t('All Connections'), - 'url' => $a->get_baseurl(true) . '/connections/all', - 'sel' => ($all) ? 'active' : '', - 'title' => t('Show all connections'), - ), - array( - 'label' => t('Unblocked'), - 'url' => $a->get_baseurl(true) . '/connections', - 'sel' => (($unblocked) && (! $search) && (! $nets)) ? 'active' : '', - 'title' => t('Only show unblocked connections'), - ), - - array( - 'label' => t('Blocked'), - 'url' => $a->get_baseurl(true) . '/connections/blocked', - 'sel' => ($blocked) ? 'active' : '', - 'title' => t('Only show blocked connections'), - ), - - array( - 'label' => t('Ignored'), - 'url' => $a->get_baseurl(true) . '/connections/ignored', - 'sel' => ($ignored) ? 'active' : '', - 'title' => t('Only show ignored connections'), - ), - - array( - 'label' => t('Archived'), - 'url' => $a->get_baseurl(true) . '/connections/archived', - 'sel' => ($archived) ? 'active' : '', - 'title' => t('Only show archived connections'), - ), - - array( - 'label' => t('Hidden'), - 'url' => $a->get_baseurl(true) . '/connections/hidden', - 'sel' => ($hidden) ? 'active' : '', - 'title' => t('Only show hidden connections'), - ), - - ); - - $tab_tpl = get_markup_template('common_tabs.tpl'); - $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); - - $searching = false; - if($search) { - $search_hdr = $search; - $search_txt = dbesc(protect_sprintf(preg_quote($search))); - $searching = true; - } - $sql_extra .= (($searching) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : ""); - - - $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 ", - intval(local_user()), - intval(ABOOK_FLAG_SELF) - ); - if(count($r)) { - $a->set_pager_total($r[0]['total']); - $total = $r[0]['total']; - } - - $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 ", - intval(local_user()), - intval(ABOOK_FLAG_SELF), - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); - - $contacts = array(); - - if(count($r)) { - - foreach($r as $rr) { - if($rr['xchan_url']) { - $contacts[] = array( - 'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']), - 'edit_hover' => t('Edit contact'), - 'id' => $rr['abook_id'], - 'alt_text' => $alt_text, - 'dir_icon' => $dir_icon, - 'thumb' => $rr['xchan_photo_m'], - 'name' => $rr['xchan_name'], - 'username' => $rr['xchan_name'], - 'sparkle' => $sparkle, - 'link' => z_root() . '/connections/' . $rr['abook_id'], - 'url' => $rr['xchan_url'], - 'network' => network_to_name($rr['network']), - ); - } - } - } - - $tpl = get_markup_template("contacts-template.tpl"); - $o .= replace_macros($tpl,array( - '$header' => t('Connections') . (($head) ? ' - ' . $head : ''), - '$tabs' => $t, - '$total' => $total, - '$search' => $search_hdr, - '$desc' => t('Search your connections'), - '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""), - '$submit' => t('Find'), - '$cmd' => $a->cmd, - '$contacts' => $contacts, - '$paginate' => paginate($a), - - )); - - return $o; } diff --git a/mod/follow.php b/mod/follow.php index 364fe76b9..962bb71a7 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -30,7 +30,7 @@ function follow_init(&$a) { proc_run('php','include/onepoll.php',$result['abook']['abook_id']); - goaway(z_root() . '/connections/' . $result['abook']['abook_id']); + goaway(z_root() . '/connedit/' . $result['abook']['abook_id']); } diff --git a/mod/settings.php b/mod/settings.php index c2a540063..7fb6f8317 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -99,7 +99,7 @@ if (! local_user()) array( 'label' => t('Automatic Permissions (Advanced)'), - 'url' => $a->get_baseurl(true) . '/connections/' . $abook_self_id, + 'url' => $a->get_baseurl(true) . '/connedit/' . $abook_self_id, 'selected' => '' ), diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css new file mode 100644 index 000000000..c460fec28 --- /dev/null +++ b/view/css/mod_connedit.css @@ -0,0 +1,137 @@ + +.field_abook_help { + color: #000; +} +.abook-them { + margin-left: 375px; + margin-bottom: 15px; +} +.abook-me { + margin-left: 36px; + margin-bottom: 15px; +} +.acheckbox { + margin-bottom: 5px !important; +} + +.abook-pending-contact { + background: orange; + font-weight: bold; + margin: 10px; + padding: 20px 5px 10px; +} + +#contact-slider { + width: 600px !important; +} + +.abook-edit-them, .abook-edit-me { + float: left; + width: 100px !important; +} +.field_abook_help { + float: left; +} + +#contacts-main { + margin-top: 20px; + margin-bottom: 20px; +} + + + +#contact-edit-wrapper { + margin-top: 10px; +} + +#contact-edit-banner-name { + font-size: 1.4em; + font-weight: bold; +} + +#contact-edit-poll-wrapper { + margin-top: 15px; +} + +#contact-edit-poll-text { + margin-top: 15px; + margin-bottom: 5px; +} + +#contact-edit-update-now { + margin-top: 15px; +} + +#contact-edit-links{ + clear: both; +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; + margin-left: 0px; + padding-left: 0px; +} + +#contact-edit-links li { + margin-top: 5px; +} + +#contact-edit-drop-link { + float: right; + margin-right: 20px; +} + +#contact-edit-nav-end { + clear: both; +} + +#contact-edit-wrapper { + width: 100%; +} + +#contact-edit-end { + clear: both; + margin-top: 15px; +} + +#contact-profile-selector { + width: 175px; + margin-left: 175px; +} + +.contact-edit-submit { + margin-top: 20px; +} + +.contact-entry-wrapper { + float: left; + width: 120px; + height: 120px; + padding: 10px; +} + +#contacts-search { + font-size: 1em; + width: 300px; +} + +#contacts-search-end { + margin-bottom: 10px; +} + +.contact-entry-photo-end { + clear: both; +} + +.contact-entry-name { + float: left; + margin-left: 0px; + margin-right: 10px; + width: 120px; + overflow: hidden; +} + +.contact-entry-end { + clear: both; +} diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 30abcc6b3..23368f2f7 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -30,7 +30,7 @@

    {{$permlbl}}

    {{$permnote}}
    - + -- cgit v1.2.3 From b6bb3c02525843caeaee3f6409f1b97b160ea8a2 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 19:47:00 +0100 Subject: 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; } -- cgit v1.2.3 From 6e28c40c2732daa40d4e54ad3231af5798964fa2 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 20:22:22 +0100 Subject: 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 +}); -- cgit v1.2.3 From 176fe3256428c8a2226030c4e1de89723e37cca7 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 21:13:48 +0100 Subject: 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; } -- cgit v1.2.3 From 1a4c91ccf5f95d03badd57f655d4feced50d39d2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 14:53:18 -0800 Subject: 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'); -- cgit v1.2.3 From 22973357985bfa3a4803fe5c3e53d99117e615b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 15:53:40 -0800 Subject: 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 = '') { -- cgit v1.2.3 From 2089a1379a57ba5c27e220e664cb76ffb0acc1dd Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 18:29:53 -0800 Subject: 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}}

    -- cgit v1.2.3 From 125543adedfe00b3d5cea8548d1a66096a173a6b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:16:14 -0800 Subject: more comanche migration --- include/text.php | 23 ++++---- 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, 59 insertions(+), 128 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) { - $a->profile_uid = local_user(); -} - - -function settings_aside(&$a) { + if(! local_user()) + return; -if (! local_user()) - return; + $a->profile_uid = local_user(); // 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 @@ -- cgit v1.2.3 From b28a37c38e3fc68b1d0a59e4f5e6054ce13cb680 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:25:44 -0800 Subject: 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 -- cgit v1.2.3 From 825492407e3e064b6cd806b3ed7d484d2cc9f50e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:35:45 -0800 Subject: 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] -- cgit v1.2.3 From e6dc916915af631effc790f1cadf740666168049 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 13:52:23 -0800 Subject: 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; -- cgit v1.2.3 From f8042cc4677227aca8999c875c4f6d4c7acef96c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 15:23:36 -0800 Subject: 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; } -- cgit v1.2.3 From 7c81889b3397f09dfba4f17bba99f6d1dad9d0b2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 16:33:36 -0800 Subject: 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 images/default_profile_photos/red_koala/175.jpg | Bin 0 -> 22969 bytes images/default_profile_photos/red_koala/48.jpg | Bin 0 -> 4856 bytes images/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 000000000..4024d6e88 Binary files /dev/null and b/images/default_profile_photos/blank/175.jpg differ diff --git a/images/default_profile_photos/blank/48.jpg b/images/default_profile_photos/blank/48.jpg new file mode 100644 index 000000000..e7c44fcff Binary files /dev/null and b/images/default_profile_photos/blank/48.jpg differ diff --git a/images/default_profile_photos/blank/80.jpg b/images/default_profile_photos/blank/80.jpg new file mode 100644 index 000000000..767e1ee66 Binary files /dev/null and b/images/default_profile_photos/blank/80.jpg differ 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 000000000..e49343b1d Binary files /dev/null and b/images/default_profile_photos/red_koala/175.jpg differ diff --git a/images/default_profile_photos/red_koala/48.jpg b/images/default_profile_photos/red_koala/48.jpg new file mode 100644 index 000000000..90e6d3a10 Binary files /dev/null and b/images/default_profile_photos/red_koala/48.jpg differ 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 000000000..efab04c26 Binary files /dev/null and b/images/default_profile_photos/red_koala/80.jpg differ 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()); -} -- cgit v1.2.3 From 564f431551672d706136559a4fed3a3c4f98c0ec Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 17:36:31 -0800 Subject: 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] -- cgit v1.2.3 From 6c2ea59cde5ddce4f26fedccb99c2ea2a40ff451 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 17:44:30 -0800 Subject: 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); + } } -- cgit v1.2.3 From 648a7a5735148479fc8d97bfaa1f3d3cca249276 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 18:33:02 -0800 Subject: 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
      + + + +
    + + + -- cgit v1.2.3 From bccc20f38c3919d453b0dee1ed354aa4eb13b398 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 19:16:46 -0800 Subject: 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}}

    -- cgit v1.2.3 From cd78f9d13df721ea218cc8ba023470899b64a151 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 20:23:19 -0800 Subject: 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) -- cgit v1.2.3 From 2c0fbc508e44ebc96b00e4e8a5e166324fbcf9b3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 23:56:37 -0800 Subject: 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] -- cgit v1.2.3 From 916f3e9afc0dcf7f4255bac917ed6236595c7e07 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 20 Dec 2013 01:39:05 -0800 Subject: 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 +- doc/html/dir_817f6d302394b98e59575acdb59998bc.html | 4 - doc/html/dir_817f6d302394b98e59575acdb59998bc.js | 2 - doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 8 +- doc/html/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 | 125 ++++++++-- doc/html/widgets_8php.js | 9 +- doc/html/zfinger_8php.html | 2 + doc/html/zot_8php.html | 4 +- 122 files changed, 1288 insertions(+), 909 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
    -

    Referenced by chanview_content(), connections_aside(), message_content(), and photos_init().

    +

    Referenced by chanview_content(), message_content(), and widget_vcard().

    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
    -

    Referenced by bb2diaspora(), construct_activity_object(), construct_activity_target(), events_content(), format_event_html(), format_notification(), get_events(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), and tagrm_content().

    +

    Referenced by bb2diaspora(), construct_activity_object(), construct_activity_target(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), and tagrm_content().

    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
    -

    Referenced by api_user(), change_channel(), channel_content(), events_post(), feed_init(), import_content(), import_post(), item_post(), manage_content(), mimetype_select(), mood_init(), nav(), new_channel_content(), new_channel_post(), new_contact(), profile_content(), profile_photo_post(), profiles_init(), settings_post(), z_input_filter(), and zotfeed_init().

    +

    Referenced by api_user(), change_channel(), channel_content(), events_post(), feed_init(), home_init(), import_content(), import_post(), item_post(), manage_content(), mimetype_select(), mood_init(), nav(), new_channel_content(), new_channel_post(), new_contact(), profile_content(), profile_photo_post(), profiles_init(), settings_post(), z_input_filter(), and zotfeed_init().

    @@ -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
    -

    Referenced by connections_init(), message_content(), network_init(), page_init(), photos_init(), and profile_sidebar().

    +

    Referenced by connections_init(), connedit_init(), message_content(), network_init(), page_init(), photos_init(), and profile_sidebar().

    @@ -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
    -

    Referenced by admin_content(), api_content(), channel_content(), connections_content(), follow_content(), login_content(), message_content(), network_content(), notify_content(), oexchange_content(), post_to_red_displayAdminContent(), profile_content(), regmod_content(), and rpost_content().

    +

    Referenced by admin_content(), api_content(), channel_content(), connections_content(), connedit_content(), follow_content(), home_content(), login_content(), message_content(), network_content(), notify_content(), oexchange_content(), post_to_red_displayAdminContent(), profile_content(), regmod_content(), and rpost_content().

    @@ -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
    -

    Referenced by channel_content(), community_content(), directory_aside(), directory_content(), display_content(), drop_items(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), redir_init(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().

    +

    Referenced by channel_content(), community_content(), directory_aside(), directory_content(), display_content(), drop_items(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().

    @@ -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
    -

    Referenced by acl_init(), collect_recipients(), connections_content(), contact_remove(), and poller_run().

    +

    Referenced by acl_init(), collect_recipients(), connections_content(), connedit_content(), contact_remove(), and poller_run().

    @@ -1368,7 +1374,7 @@ Variables
    -

    Referenced by acl_init(), channel_content(), connections_content(), get_all_perms(), group_content(), group_get_members(), items_fetch(), network_content(), perm_is_allowed(), and search_content().

    +

    Referenced by acl_init(), channel_content(), connections_content(), connedit_content(), get_all_perms(), group_content(), group_get_members(), items_fetch(), network_content(), perm_is_allowed(), and search_content().

    @@ -1382,7 +1388,7 @@ Variables
    -

    Referenced by connections_content(), onepoll_run(), and poller_run().

    +

    Referenced by connections_content(), connedit_content(), onepoll_run(), and poller_run().

    @@ -1396,7 +1402,7 @@ Variables
    -

    Referenced by connections_content(), get_all_perms(), and perm_is_allowed().

    +

    Referenced by connections_content(), connedit_content(), get_all_perms(), and perm_is_allowed().

    @@ -1410,7 +1416,7 @@ Variables
    -

    Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().

    +

    Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), connedit_content(), connedit_post(), get_all_perms(), group_content(), group_get_members(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().

    @@ -1424,7 +1430,7 @@ Variables
    -

    Referenced by abook_connections(), abook_self(), acl_init(), Conversation\add_thread(), api_get_user(), channel_remove(), collect_recipients(), connections_content(), connections_post(), contact_remove(), contact_select(), contactgroup_content(), create_identity(), get_all_perms(), group_content(), group_get_members(), item_post(), load_contact_links(), new_contact(), notifier_run(), perm_is_allowed(), ping_init(), poco_init(), settings_aside(), widget_follow(), and zot_refresh().

    +

    Referenced by abook_connections(), abook_self(), acl_init(), Conversation\add_thread(), api_get_user(), channel_remove(), collect_recipients(), connections_content(), connections_post(), connedit_content(), connedit_post(), contact_remove(), contact_select(), contactgroup_content(), create_identity(), get_all_perms(), group_content(), group_get_members(), item_post(), load_contact_links(), new_contact(), notifier_run(), perm_is_allowed(), ping_init(), poco_init(), widget_follow(), widget_settings_menu(), and zot_refresh().

    @@ -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
    -

    Referenced by item_store(), notifier_run(), and tag_deliver().

    +

    Referenced by item_store(), notifier_run(), tag_deliver(), and tgroup_check().

    @@ -2675,7 +2693,7 @@ Variables
    -

    Referenced by display_content(), item_check_service_class(), item_expire(), item_post(), items_fetch(), notifier_run(), page_content(), webpages_content(), and widget_tagcloud().

    +

    Referenced by display_content(), home_content(), item_check_service_class(), item_expire(), item_post(), items_fetch(), notifier_run(), page_content(), webpages_content(), and widget_tagcloud().

    @@ -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

    Network and protocol family types

    -

    Referenced by best_link_url(), consume_feed(), delegate_content(), get_birthdays(), network_to_name(), redir_init(), and terminate_friendship().

    +

    Referenced by best_link_url(), consume_feed(), delegate_content(), get_birthdays(), network_to_name(), and terminate_friendship().

    @@ -3567,7 +3585,21 @@ Variables
    -

    Referenced by change_channel(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), manage_content(), post_init(), and profile_load().

    +

    Referenced by change_channel(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), manage_content(), post_init(), profile_load(), and zfinger_init().

    + +
    + + +
    +
    + + + + +
    const PAGE_SYSTEM 0x1000
    +
    + +

    Referenced by zfinger_init().

    @@ -3750,7 +3782,7 @@ Variables
    -

    Referenced by connections_content(), get_all_perms(), perm_is_allowed(), public_recips(), and site_default_perms().

    +

    Referenced by connedit_content(), get_all_perms(), perm_is_allowed(), public_recips(), and site_default_perms().

    @@ -4060,7 +4092,7 @@ Variables

    registration policies

    -

    Referenced by admin_page_site(), api_statusnet_config(), import_site(), login_content(), register_content(), register_post(), regmod_content(), and zfinger_init().

    +

    Referenced by admin_page_site(), api_statusnet_config(), home_content(), import_site(), login_content(), register_content(), register_post(), regmod_content(), and zfinger_init().

    @@ -4400,7 +4432,7 @@ Variables
    -

    Referenced by channel_remove(), dirsearch_content(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().

    +

    Referenced by channel_remove(), connections_content(), dirsearch_content(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().

    @@ -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 +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    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
    -

    Referenced by connections_aside(), directory_aside(), and suggest_aside().

    +

    Referenced by directory_aside(), and widget_findpeople().

    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
    -

    Referenced by advanced_profile(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

    +

    Referenced by advanced_profile(), connedit_content(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

    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
    -

    Referenced by apw_form(), categories_widget(), connections_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), message_content(), message_post(), nav(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), search_saved_searches(), searchbox(), settings_aside(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_suggestions(), and widget_tagcloud_wall().

    +

    Referenced by apw_form(), categories_widget(), connedit_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), message_content(), message_post(), nav(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), search_saved_searches(), searchbox(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), and widget_tagcloud_wall().

    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','');});
      +
      +Functions
      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
      -

      Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), api_content(), check_config(), create_account(), hostxrd_init(), poller_run(), and theme_admin_post().

      +

      Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), api_content(), check_config(), create_account(), hostxrd_init(), poller_run(), theme_admin_post(), and what_next().

      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
      -

      Referenced by connections_post(), contactgroup_content(), group_content(), and new_contact().

      +

      Referenced by connections_post(), connedit_post(), contactgroup_content(), group_content(), and new_contact().

      @@ -300,7 +300,7 @@ Functions
      -

      Referenced by connections_post(), items_fetch(), network_content(), and new_contact().

      +

      Referenced by connections_post(), connedit_post(), items_fetch(), network_content(), and new_contact().

      @@ -366,7 +366,7 @@ Functions - +
      @@ -374,7 +374,7 @@ Functions - + @@ -414,7 +414,7 @@ Functions
      group_side (  $every = "contacts", $every = "connections",
      -

      Referenced by connections_aside(), group_aside(), and widget_collections().

      +

      Referenced by widget_collections().

      @@ -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
      -

      Referenced by api_albums(), photos_album_widget(), and photos_init().

      +

      Referenced by api_albums(), and photos_album_widget().

      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
      -

      Referenced by channel_content(), display_content(), editpost_content(), events_content(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().

      +

      Referenced by channel_content(), display_content(), editpost_content(), events_content(), home_content(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().

      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
      -

      Referenced by connections_content(), create_identity(), get_all_perms(), message_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().

      +

      Referenced by connedit_content(), create_identity(), get_all_perms(), message_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().

      @@ -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
      -

      Referenced by construct_page(), format_css_if_exists(), format_js_if_exists(), FriendicaSmartyEngine\get_intltext_template(), FriendicaSmartyEngine\get_markup_template(), Template\get_markup_template(), and App\set_widget().

      +

      Referenced by construct_page(), format_css_if_exists(), format_js_if_exists(), FriendicaSmartyEngine\get_intltext_template(), FriendicaSmartyEngine\get_markup_template(), and Template\get_markup_template().

      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
      -

      Referenced by allfriends_content(), common_content(), and match_content().

      +

      Referenced by common_content(), and match_content().

      @@ -634,7 +634,7 @@ Variables
      -

      Referenced by blocks_content(), layouts_content(), menu_content(), mitem_content(), and webpages_content().

      +

      Referenced by mitem_content(), and widget_design_tools().

      @@ -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
      -

      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), redir_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

      +

      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

      @@ -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
      -

      Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), channel_content(), display_content(), events_content(), item_post(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), and zot_feed().

      +

      Referenced by api_format_items(), api_statuses_home_timeline(), api_statuses_public_timeline(), api_statuses_show(), channel_content(), display_content(), events_content(), home_content(), item_post(), items_fetch(), network_content(), notification(), notifier_run(), page_content(), ping_init(), search_content(), share_init(), and zot_feed().

      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,16 +138,29 @@ 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 widget_affinity () $arr)
      @@ -157,12 +168,12 @@ Functions
      - +
      - + @@ -173,12 +184,12 @@ Functions - +
      widget_affinity widget_archive (   $arr)
      - + @@ -189,15 +200,15 @@ Functions - +
      widget_archive widget_categories (   $arr)
      - + - +
      widget_categories widget_collections (  $arr)$args)
      @@ -205,15 +216,15 @@ Functions
      - +
      - + - +
      widget_collections widget_design_tools (  $args)$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().

      -- cgit v1.2.3 From a084a3fa47879f00a535501f14f32c3ff55f7d29 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 20 Dec 2013 01:39:42 -0800 Subject: 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 | 2326 +++++++++++++++++++++++------------------------ version.inc | 2 +- view/pdl/mod_search.pdl | 3 + 4 files changed, 1158 insertions(+), 1297 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,856 +3279,750 @@ msgid "" "com" msgstr "" -#: ../../mod/allfriends.php:35 -#, php-format -msgid "Friends of %s" -msgstr "" - -#: ../../mod/allfriends.php:41 -msgid "No friends to display." +#: ../../mod/connedit.php:49 ../../mod/connections.php:37 +msgid "Could not access contact record." msgstr "" -#: ../../mod/webpages.php:121 ../../mod/layouts.php:105 -#: ../../mod/blocks.php:96 -msgid "View" +#: ../../mod/connedit.php:63 ../../mod/connections.php:51 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" +#: ../../mod/connedit.php:104 ../../mod/connections.php:92 +msgid "Connection updated." msgstr "" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +#: ../../mod/connedit.php:106 ../../mod/connections.php:94 +msgid "Failed to update connection record." msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." +#: ../../mod/connedit.php:201 +msgid "Could not access address book record." msgstr "" -#: ../../mod/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../mod/connedit.php:215 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:495 -msgid "Yes" +#: ../../mod/connedit.php:222 +msgid "Channel has been unblocked" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:496 -msgid "No" +#: ../../mod/connedit.php:223 +msgid "Channel has been blocked" msgstr "" -#: ../../mod/apps.php:8 -msgid "No installed applications." +#: ../../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/apps.php:13 -msgid "Applications" +#: ../../mod/connedit.php:234 +msgid "Channel has been unignored" msgstr "" -#: ../../mod/page.php:35 -msgid "Invalid item." +#: ../../mod/connedit.php:235 +msgid "Channel has been ignored" msgstr "" -#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 -#: ../../mod/wall_upload.php:35 -msgid "Channel not found." +#: ../../mod/connedit.php:246 +msgid "Channel has been unarchived" msgstr "" -#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100 -#: ../../index.php:229 -msgid "Page not found." +#: ../../mod/connedit.php:247 +msgid "Channel has been archived" msgstr "" -#: ../../mod/attach.php:9 -msgid "Item not available." +#: ../../mod/connedit.php:258 +msgid "Channel has been unhidden" msgstr "" -#: ../../mod/setup.php:161 -msgid "Red Matrix Server - Setup" +#: ../../mod/connedit.php:259 +msgid "Channel has been hidden" msgstr "" -#: ../../mod/setup.php:167 -msgid "Could not connect to database." +#: ../../mod/connedit.php:273 +msgid "Channel has been approved" msgstr "" -#: ../../mod/setup.php:171 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." +#: ../../mod/connedit.php:274 +msgid "Channel has been unapproved" msgstr "" -#: ../../mod/setup.php:176 -msgid "Could not create table." +#: ../../mod/connedit.php:292 +msgid "Contact has been removed." msgstr "" -#: ../../mod/setup.php:182 -msgid "Your site database has been installed." +#: ../../mod/connedit.php:312 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../mod/setup.php:187 -msgid "" -"You may need to import the file \"install/database.sql\" manually using " -"phpmyadmin or mysql." +#: ../../mod/connedit.php:316 +msgid "Refresh Permissions" msgstr "" -#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 -msgid "Please see the file \"install/INSTALL.txt\"." +#: ../../mod/connedit.php:319 +msgid "Fetch updated permissions" msgstr "" -#: ../../mod/setup.php:252 -msgid "System check" +#: ../../mod/connedit.php:323 +msgid "Recent Activity" msgstr "" -#: ../../mod/setup.php:257 -msgid "Check again" +#: ../../mod/connedit.php:326 +msgid "View recent posts and comments" msgstr "" -#: ../../mod/setup.php:279 -msgid "Database connection" +#: ../../mod/connedit.php:330 ../../mod/connedit.php:472 +#: ../../mod/admin.php:695 +msgid "Unblock" msgstr "" -#: ../../mod/setup.php:280 -msgid "" -"In order to install Red Matrix we need to know how to connect to your " -"database." +#: ../../mod/connedit.php:330 ../../mod/connedit.php:472 +#: ../../mod/admin.php:694 +msgid "Block" msgstr "" -#: ../../mod/setup.php:281 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../mod/connedit.php:333 +msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/setup.php:282 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +#: ../../mod/connedit.php:337 ../../mod/connedit.php:473 +msgid "Unignore" msgstr "" -#: ../../mod/setup.php:286 -msgid "Database Server Name" +#: ../../mod/connedit.php:337 ../../mod/connedit.php:473 +#: ../../mod/notifications.php:51 +msgid "Ignore" msgstr "" -#: ../../mod/setup.php:286 -msgid "Default is localhost" +#: ../../mod/connedit.php:340 +msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/setup.php:287 -msgid "Database Port" +#: ../../mod/connedit.php:343 +msgid "Unarchive" msgstr "" -#: ../../mod/setup.php:287 -msgid "Communication port number - use 0 for default" +#: ../../mod/connedit.php:343 +msgid "Archive" msgstr "" -#: ../../mod/setup.php:288 -msgid "Database Login Name" +#: ../../mod/connedit.php:346 +msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/setup.php:289 -msgid "Database Login Password" +#: ../../mod/connedit.php:349 +msgid "Unhide" msgstr "" -#: ../../mod/setup.php:290 -msgid "Database Name" +#: ../../mod/connedit.php:349 +msgid "Hide" msgstr "" -#: ../../mod/setup.php:292 ../../mod/setup.php:334 -msgid "Site administrator email address" +#: ../../mod/connedit.php:352 +msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/setup.php:292 ../../mod/setup.php:334 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." +#: ../../mod/connedit.php:359 +msgid "Delete this connection" msgstr "" -#: ../../mod/setup.php:293 ../../mod/setup.php:336 -msgid "Website URL" +#: ../../mod/connedit.php:392 +msgid "Unknown" msgstr "" -#: ../../mod/setup.php:293 ../../mod/setup.php:336 -msgid "Please use SSL (https) URL if available." +#: ../../mod/connedit.php:402 ../../mod/connedit.php:431 +msgid "Approve this connection" msgstr "" -#: ../../mod/setup.php:296 ../../mod/setup.php:339 -msgid "Please select a default timezone for your website" +#: ../../mod/connedit.php:402 +msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/setup.php:323 -msgid "Site settings" +#: ../../mod/connedit.php:418 +msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/setup.php:379 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../mod/connedit.php:418 +#, php-format +msgid "Connections: settings for %s" msgstr "" -#: ../../mod/setup.php:380 +#: ../../mod/connedit.php:422 msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." +"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/setup.php:384 -msgid "PHP executable path" +#: ../../mod/connedit.php:424 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/setup.php:384 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." +#: ../../mod/connedit.php:430 +msgid "inherited" msgstr "" -#: ../../mod/setup.php:389 -msgid "Command line PHP" +#: ../../mod/connedit.php:432 +msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/setup.php:398 +#: ../../mod/connedit.php:433 msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/setup.php:399 -msgid "This is required for message delivery to work." +#: ../../mod/connedit.php:435 +msgid "Profile Visibility" msgstr "" -#: ../../mod/setup.php:401 -msgid "PHP register_argc_argv" +#: ../../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/setup.php:422 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +#: ../../mod/connedit.php:437 +msgid "Contact Information / Notes" msgstr "" -#: ../../mod/setup.php:423 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." +#: ../../mod/connedit.php:438 +msgid "Edit contact notes" msgstr "" -#: ../../mod/setup.php:425 -msgid "Generate encryption keys" -msgstr "" - -#: ../../mod/setup.php:432 -msgid "libCurl PHP module" -msgstr "" - -#: ../../mod/setup.php:433 -msgid "GD graphics PHP module" -msgstr "" - -#: ../../mod/setup.php:434 -msgid "OpenSSL PHP module" -msgstr "" - -#: ../../mod/setup.php:435 -msgid "mysqli PHP module" +#: ../../mod/connedit.php:440 +msgid "Their Settings" msgstr "" -#: ../../mod/setup.php:436 -msgid "mb_string PHP module" +#: ../../mod/connedit.php:441 +msgid "My Settings" msgstr "" -#: ../../mod/setup.php:437 -msgid "mcrypt PHP module" +#: ../../mod/connedit.php:443 +msgid "Forum Members" msgstr "" -#: ../../mod/setup.php:442 ../../mod/setup.php:444 -msgid "Apache mod_rewrite module" +#: ../../mod/connedit.php:444 +msgid "Soapbox" msgstr "" -#: ../../mod/setup.php:442 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../mod/connedit.php:445 +msgid "Full Sharing" msgstr "" -#: ../../mod/setup.php:448 ../../mod/setup.php:451 -msgid "proc_open" +#: ../../mod/connedit.php:446 +msgid "Cautious Sharing" msgstr "" -#: ../../mod/setup.php:448 -msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" +#: ../../mod/connedit.php:447 +msgid "Follow Only" msgstr "" -#: ../../mod/setup.php:456 -msgid "Error: libCURL PHP module required but not installed." +#: ../../mod/connedit.php:448 +msgid "Individual Permissions" msgstr "" -#: ../../mod/setup.php:460 +#: ../../mod/connedit.php:449 msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +"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/setup.php:464 -msgid "Error: openssl PHP module required but not installed." +#: ../../mod/connedit.php:450 +msgid "Advanced Permissions" msgstr "" -#: ../../mod/setup.php:468 -msgid "Error: mysqli PHP module required but not installed." +#: ../../mod/connedit.php:451 +msgid "Quick Links" msgstr "" -#: ../../mod/setup.php:472 -msgid "Error: mb_string PHP module required but not installed." +#: ../../mod/connedit.php:455 +#, php-format +msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/setup.php:476 -msgid "Error: mcrypt PHP module required but not installed." +#: ../../mod/connedit.php:456 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/setup.php:492 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." +#: ../../mod/connedit.php:457 +msgid "Ignore contact" msgstr "" -#: ../../mod/setup.php:493 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." +#: ../../mod/connedit.php:458 +msgid "Repair URL settings" msgstr "" -#: ../../mod/setup.php:494 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." +#: ../../mod/connedit.php:459 +msgid "View conversations" msgstr "" -#: ../../mod/setup.php:495 -msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"install/INSTALL.txt\" for instructions." +#: ../../mod/connedit.php:461 +msgid "Delete contact" msgstr "" -#: ../../mod/setup.php:498 -msgid ".htconfig.php is writable" +#: ../../mod/connedit.php:464 +msgid "Last update:" msgstr "" -#: ../../mod/setup.php:508 -msgid "" -"Red uses the Smarty3 template engine to render its web views. Smarty3 " -"compiles templates to PHP to speed up rendering." +#: ../../mod/connedit.php:466 +msgid "Update public posts" msgstr "" -#: ../../mod/setup.php:509 -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory view/tpl/smarty3/ under the Red top level " -"folder." +#: ../../mod/connedit.php:468 +msgid "Update now" msgstr "" -#: ../../mod/setup.php:510 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has " -"write access to this folder." +#: ../../mod/connedit.php:474 +msgid "Currently blocked" msgstr "" -#: ../../mod/setup.php:511 -msgid "" -"Note: as a security measure, you should give the web server write access to " -"view/tpl/smarty3/ only--not the template files (.tpl) that it contains." +#: ../../mod/connedit.php:475 +msgid "Currently ignored" msgstr "" -#: ../../mod/setup.php:514 -msgid "view/tpl/smarty3 is writable" +#: ../../mod/connedit.php:476 +msgid "Currently archived" msgstr "" -#: ../../mod/setup.php:528 -msgid "SSL certificate validation" +#: ../../mod/connedit.php:477 +msgid "Currently pending" msgstr "" -#: ../../mod/setup.php:528 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." +#: ../../mod/connedit.php:478 +msgid "Hide this contact from others" msgstr "" -#: ../../mod/setup.php:535 +#: ../../mod/connedit.php:478 msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." +"Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/setup.php:537 -msgid "Url rewrite is working" +#: ../../mod/webpages.php:121 ../../mod/layouts.php:105 +#: ../../mod/blocks.php:96 +msgid "View" msgstr "" -#: ../../mod/setup.php:547 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" msgstr "" -#: ../../mod/setup.php:571 -msgid "Errors encountered creating database tables." +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../mod/setup.php:582 -msgid "

      What next

      " +#: ../../mod/api.php:89 +msgid "Please login to continue." msgstr "" -#: ../../mod/setup.php:583 +#: ../../mod/api.php:104 msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." -msgstr "" - -#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 -msgid "Edit post" -msgstr "" - -#: ../../mod/subthread.php:105 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "" - -#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43 -#: ../../mod/update_search.php:46 ../../mod/update_display.php:25 -#: ../../mod/update_community.php:18 -msgid "[Embedded content - reload page to view]" -msgstr "" - -#: ../../mod/chanview.php:98 -msgid "toggle full screen mode" -msgstr "" - -#: ../../mod/tagger.php:98 -#, php-format -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." +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../mod/settings.php:339 -msgid "System failure storing new email. Please try again." +#: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865 +#: ../../mod/settings.php:870 +msgid "Yes" msgstr "" -#: ../../mod/settings.php:537 -msgid "Settings updated." +#: ../../mod/api.php:106 ../../mod/profiles.php:496 ../../mod/settings.php:865 +#: ../../mod/settings.php:870 +msgid "No" msgstr "" -#: ../../mod/settings.php:608 ../../mod/settings.php:634 -#: ../../mod/settings.php:670 -msgid "Add application" +#: ../../mod/apps.php:8 +msgid "No installed applications." 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" +#: ../../mod/apps.php:13 +msgid "Applications" msgstr "" -#: ../../mod/settings.php:611 ../../mod/settings.php:637 -#: ../../mod/admin.php:689 -msgid "Name" +#: ../../mod/page.php:35 +msgid "Invalid item." msgstr "" -#: ../../mod/settings.php:611 -msgid "Name of application" +#: ../../mod/page.php:47 ../../mod/chanview.php:77 ../../mod/home.php:50 +#: ../../mod/wall_upload.php:35 +msgid "Channel not found." msgstr "" -#: ../../mod/settings.php:612 ../../mod/settings.php:638 -msgid "Consumer Key" +#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100 +#: ../../index.php:229 +msgid "Page not found." msgstr "" -#: ../../mod/settings.php:612 ../../mod/settings.php:613 -msgid "Automatically generated - change if desired. Max length 20" +#: ../../mod/attach.php:9 +msgid "Item not available." msgstr "" -#: ../../mod/settings.php:613 ../../mod/settings.php:639 -msgid "Consumer Secret" +#: ../../mod/setup.php:161 +msgid "Red Matrix Server - Setup" msgstr "" -#: ../../mod/settings.php:614 ../../mod/settings.php:640 -msgid "Redirect" +#: ../../mod/setup.php:167 +msgid "Could not connect to database." msgstr "" -#: ../../mod/settings.php:614 +#: ../../mod/setup.php:171 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" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." msgstr "" -#: ../../mod/settings.php:626 -msgid "You can't edit this application." +#: ../../mod/setup.php:176 +msgid "Could not create table." msgstr "" -#: ../../mod/settings.php:669 -msgid "Connected Apps" +#: ../../mod/setup.php:182 +msgid "Your site database has been installed." msgstr "" -#: ../../mod/settings.php:673 -msgid "Client key starts with" +#: ../../mod/setup.php:187 +msgid "" +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." msgstr "" -#: ../../mod/settings.php:674 -msgid "No name" +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:586 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../mod/settings.php:675 -msgid "Remove authorization" +#: ../../mod/setup.php:252 +msgid "System check" msgstr "" -#: ../../mod/settings.php:686 -msgid "No feature settings configured" +#: ../../mod/setup.php:257 +msgid "Check again" msgstr "" -#: ../../mod/settings.php:694 -msgid "Feature Settings" +#: ../../mod/setup.php:279 +msgid "Database connection" msgstr "" -#: ../../mod/settings.php:717 -msgid "Account Settings" +#: ../../mod/setup.php:280 +msgid "" +"In order to install Red Matrix we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/settings.php:718 -msgid "Password Settings" +#: ../../mod/setup.php:281 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../mod/settings.php:719 -msgid "New Password:" +#: ../../mod/setup.php:282 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../mod/settings.php:720 -msgid "Confirm:" +#: ../../mod/setup.php:286 +msgid "Database Server Name" msgstr "" -#: ../../mod/settings.php:720 -msgid "Leave password fields blank unless changing" +#: ../../mod/setup.php:286 +msgid "Default is localhost" msgstr "" -#: ../../mod/settings.php:722 ../../mod/settings.php:1014 -msgid "Email Address:" +#: ../../mod/setup.php:287 +msgid "Database Port" msgstr "" -#: ../../mod/settings.php:723 -msgid "Remove Account" +#: ../../mod/setup.php:287 +msgid "Communication port number - use 0 for default" msgstr "" -#: ../../mod/settings.php:724 -msgid "Warning: This action is permanent and cannot be reversed." +#: ../../mod/setup.php:288 +msgid "Database Login Name" msgstr "" -#: ../../mod/settings.php:740 -msgid "Off" +#: ../../mod/setup.php:289 +msgid "Database Login Password" msgstr "" -#: ../../mod/settings.php:740 -msgid "On" +#: ../../mod/setup.php:290 +msgid "Database Name" msgstr "" -#: ../../mod/settings.php:747 -msgid "Additional Features" +#: ../../mod/setup.php:292 ../../mod/setup.php:334 +msgid "Site administrator email address" msgstr "" -#: ../../mod/settings.php:772 -msgid "Connector Settings" +#: ../../mod/setup.php:292 ../../mod/setup.php:334 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../mod/settings.php:802 ../../mod/admin.php:371 -msgid "No special theme for mobile devices" +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Website URL" msgstr "" -#: ../../mod/settings.php:842 -msgid "Display Settings" +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/settings.php:848 -msgid "Display Theme:" +#: ../../mod/setup.php:296 ../../mod/setup.php:339 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/settings.php:849 -msgid "Mobile Theme:" +#: ../../mod/setup.php:323 +msgid "Site settings" msgstr "" -#: ../../mod/settings.php:850 -msgid "Update browser every xx seconds" +#: ../../mod/setup.php:379 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/settings.php:850 -msgid "Minimum of 10 seconds, no maximum" +#: ../../mod/setup.php:380 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." msgstr "" -#: ../../mod/settings.php:851 -msgid "Maximum number of conversations to load at any time:" +#: ../../mod/setup.php:384 +msgid "PHP executable path" msgstr "" -#: ../../mod/settings.php:851 -msgid "Maximum of 100 items" +#: ../../mod/setup.php:384 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../mod/settings.php:852 -msgid "Don't show emoticons" +#: ../../mod/setup.php:389 +msgid "Command line PHP" msgstr "" -#: ../../mod/settings.php:888 -msgid "Nobody except yourself" +#: ../../mod/setup.php:398 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/settings.php:889 -msgid "Only those you specifically allow" +#: ../../mod/setup.php:399 +msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/settings.php:890 -msgid "Anybody in your address book" +#: ../../mod/setup.php:401 +msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/settings.php:891 -msgid "Anybody on this website" +#: ../../mod/setup.php:422 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../mod/settings.php:892 -msgid "Anybody in this network" +#: ../../mod/setup.php:423 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../mod/settings.php:893 -msgid "Anybody on the internet" +#: ../../mod/setup.php:425 +msgid "Generate encryption keys" msgstr "" -#: ../../mod/settings.php:967 -msgid "Publish your default profile in the network directory" +#: ../../mod/setup.php:432 +msgid "libCurl PHP module" msgstr "" -#: ../../mod/settings.php:972 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../mod/setup.php:433 +msgid "GD graphics PHP module" msgstr "" -#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288 -msgid "or" +#: ../../mod/setup.php:434 +msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/settings.php:981 -msgid "Your channel address is" +#: ../../mod/setup.php:435 +msgid "mysqli PHP module" msgstr "" -#: ../../mod/settings.php:1003 -msgid "Channel Settings" +#: ../../mod/setup.php:436 +msgid "mb_string PHP module" msgstr "" -#: ../../mod/settings.php:1012 -msgid "Basic Settings" +#: ../../mod/setup.php:437 +msgid "mcrypt PHP module" msgstr "" -#: ../../mod/settings.php:1015 -msgid "Your Timezone:" +#: ../../mod/setup.php:442 ../../mod/setup.php:444 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/settings.php:1016 -msgid "Default Post Location:" +#: ../../mod/setup.php:442 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/settings.php:1017 -msgid "Use Browser Location:" +#: ../../mod/setup.php:448 ../../mod/setup.php:451 +msgid "proc_open" msgstr "" -#: ../../mod/settings.php:1019 -msgid "Adult Content" +#: ../../mod/setup.php:448 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" msgstr "" -#: ../../mod/settings.php:1019 -msgid "This channel publishes adult content." +#: ../../mod/setup.php:456 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:1021 -msgid "Security and Privacy Settings" +#: ../../mod/setup.php:460 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/settings.php:1023 -msgid "Quick Privacy Settings:" +#: ../../mod/setup.php:464 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:1024 -msgid "Very Public - extremely permissive" +#: ../../mod/setup.php:468 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:1025 -msgid "Typical - default public, privacy when desired" +#: ../../mod/setup.php:472 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:1026 -msgid "Private - default private, rarely open or public" +#: ../../mod/setup.php:476 +msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:1027 -msgid "Blocked - default blocked to/from everybody" +#: ../../mod/setup.php:492 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/settings.php:1030 -msgid "Maximum Friend Requests/Day:" +#: ../../mod/setup.php:493 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." msgstr "" -#: ../../mod/settings.php:1030 -msgid "May reduce spam activity" +#: ../../mod/setup.php:494 +msgid "" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Red top folder." msgstr "" -#: ../../mod/settings.php:1031 -msgid "Default Post Permissions" +#: ../../mod/setup.php:495 +msgid "" +"You can alternatively skip this procedure and perform a manual installation. " +"Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180 -msgid "(click to open/close)" +#: ../../mod/setup.php:498 +msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/settings.php:1043 -msgid "Maximum private messages per day from unknown people:" +#: ../../mod/setup.php:508 +msgid "" +"Red uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." msgstr "" -#: ../../mod/settings.php:1043 -msgid "Useful to reduce spamming" +#: ../../mod/setup.php:509 +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory view/tpl/smarty3/ under the Red top level " +"folder." msgstr "" -#: ../../mod/settings.php:1046 -msgid "Notification Settings" +#: ../../mod/setup.php:510 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." msgstr "" -#: ../../mod/settings.php:1047 -msgid "By default post a status message when:" +#: ../../mod/setup.php:511 +msgid "" +"Note: as a security measure, you should give the web server write access to " +"view/tpl/smarty3/ only--not the template files (.tpl) that it contains." msgstr "" -#: ../../mod/settings.php:1048 -msgid "accepting a friend request" +#: ../../mod/setup.php:514 +msgid "view/tpl/smarty3 is writable" msgstr "" -#: ../../mod/settings.php:1049 -msgid "joining a forum/community" +#: ../../mod/setup.php:528 +msgid "SSL certificate validation" msgstr "" -#: ../../mod/settings.php:1050 -msgid "making an interesting profile change" +#: ../../mod/setup.php:528 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." msgstr "" -#: ../../mod/settings.php:1051 -msgid "Send a notification email when:" +#: ../../mod/setup.php:535 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../mod/settings.php:1052 -msgid "You receive an introduction" +#: ../../mod/setup.php:537 +msgid "Url rewrite is working" msgstr "" -#: ../../mod/settings.php:1053 -msgid "Your introductions are confirmed" +#: ../../mod/setup.php:547 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." msgstr "" -#: ../../mod/settings.php:1054 -msgid "Someone writes on your profile wall" +#: ../../mod/setup.php:571 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/settings.php:1055 -msgid "Someone writes a followup comment" +#: ../../mod/setup.php:584 +msgid "

      What next

      " msgstr "" -#: ../../mod/settings.php:1056 -msgid "You receive a private message" +#: ../../mod/setup.php:585 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/settings.php:1057 -msgid "You receive a friend suggestion" +#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 +msgid "Edit post" msgstr "" -#: ../../mod/settings.php:1058 -msgid "You are tagged in a post" +#: ../../mod/subthread.php:105 +#, php-format +msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../mod/settings.php:1059 -msgid "You are poked/prodded/etc. in a post" +#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43 +#: ../../mod/update_search.php:46 ../../mod/update_display.php:25 +#: ../../mod/update_community.php:18 +msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../mod/settings.php:1062 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/chanview.php:97 +msgid "toggle full screen mode" msgstr "" -#: ../../mod/settings.php:1063 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/tagger.php:98 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" 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,99 +5121,172 @@ 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" +#: ../../mod/message.php:33 +msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/message.php:56 -msgid "Unable to lookup recipient." +#: ../../mod/message.php:41 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../mod/message.php:48 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../mod/message.php:74 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + +#: ../../mod/message.php:200 +msgid "Messages" +msgstr "" + +#: ../../mod/message.php:211 +msgid "Message deleted." +msgstr "" + +#: ../../mod/message.php:218 +msgid "Conversation removed." +msgstr "" + +#: ../../mod/message.php:235 +msgid "Message recalled." +msgstr "" + +#: ../../mod/message.php:293 +msgid "Send Private Message" +msgstr "" + +#: ../../mod/message.php:294 ../../mod/message.php:447 +msgid "To:" +msgstr "" + +#: ../../mod/message.php:299 ../../mod/message.php:449 +msgid "Subject:" +msgstr "" + +#: ../../mod/message.php:336 +msgid "No messages." +msgstr "" + +#: ../../mod/message.php:352 ../../mod/message.php:416 +msgid "Delete message" +msgstr "" + +#: ../../mod/message.php:354 +msgid "D, d M Y - g:i A" +msgstr "" + +#: ../../mod/message.php:373 +msgid "Message not found." +msgstr "" + +#: ../../mod/message.php:417 +msgid "Recall message" +msgstr "" + +#: ../../mod/message.php:419 +msgid "Message has been recalled." +msgstr "" + +#: ../../mod/message.php:436 +msgid "Private Conversation" +msgstr "" + +#: ../../mod/message.php:440 +msgid "Delete conversation" +msgstr "" + +#: ../../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:64 -msgid "Unable to communicate with requested channel." +#: ../../mod/message.php:446 +msgid "Send Reply" msgstr "" -#: ../../mod/message.php:71 -msgid "Cannot verify requested channel." +#: ../../mod/connections.php:189 ../../mod/connections.php:261 +msgid "Blocked" msgstr "" -#: ../../mod/message.php:97 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../mod/connections.php:194 ../../mod/connections.php:268 +msgid "Ignored" msgstr "" -#: ../../mod/message.php:223 -msgid "Messages" +#: ../../mod/connections.php:199 ../../mod/connections.php:282 +msgid "Hidden" msgstr "" -#: ../../mod/message.php:234 -msgid "Message deleted." +#: ../../mod/connections.php:204 ../../mod/connections.php:275 +msgid "Archived" msgstr "" -#: ../../mod/message.php:241 -msgid "Conversation removed." +#: ../../mod/connections.php:215 +msgid "All" msgstr "" -#: ../../mod/message.php:258 -msgid "Message recalled." +#: ../../mod/connections.php:239 +msgid "Suggest new connections" msgstr "" -#: ../../mod/message.php:316 -msgid "Send Private Message" +#: ../../mod/connections.php:245 +msgid "Show pending (new) connections" msgstr "" -#: ../../mod/message.php:317 ../../mod/message.php:471 -msgid "To:" +#: ../../mod/connections.php:248 +msgid "All Connections" msgstr "" -#: ../../mod/message.php:322 ../../mod/message.php:473 -msgid "Subject:" +#: ../../mod/connections.php:251 +msgid "Show all connections" msgstr "" -#: ../../mod/message.php:359 -msgid "No messages." +#: ../../mod/connections.php:254 +msgid "Unblocked" msgstr "" -#: ../../mod/message.php:375 ../../mod/message.php:440 -msgid "Delete message" +#: ../../mod/connections.php:257 +msgid "Only show unblocked connections" msgstr "" -#: ../../mod/message.php:377 -msgid "D, d M Y - g:i A" +#: ../../mod/connections.php:264 +msgid "Only show blocked connections" msgstr "" -#: ../../mod/message.php:396 -msgid "Message not found." +#: ../../mod/connections.php:271 +msgid "Only show ignored connections" msgstr "" -#: ../../mod/message.php:441 -msgid "Recall message" +#: ../../mod/connections.php:278 +msgid "Only show archived connections" msgstr "" -#: ../../mod/message.php:443 -msgid "Message has been recalled." +#: ../../mod/connections.php:285 +msgid "Only show hidden connections" msgstr "" -#: ../../mod/message.php:460 -msgid "Private Conversation" +#: ../../mod/connections.php:329 +#, php-format +msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/message.php:464 -msgid "Delete conversation" +#: ../../mod/connections.php:330 +msgid "Edit contact" msgstr "" -#: ../../mod/message.php:466 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." +#: ../../mod/connections.php:353 +msgid "Search your connections" msgstr "" -#: ../../mod/message.php:470 -msgid "Send Reply" +#: ../../mod/connections.php:354 +msgid "Finding: " msgstr "" #: ../../mod/layouts.php:52 @@ -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,626 +5653,597 @@ 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." +#: ../../mod/filestorage.php:35 +msgid "Permission Denied." msgstr "" -#: ../../mod/connections.php:128 -msgid "Failed to update connection record." +#: ../../mod/filestorage.php:42 +msgid "Permission denied. VS." msgstr "" -#: ../../mod/connections.php:223 -msgid "Could not access address book record." +#: ../../mod/filestorage.php:79 +msgid "Download" msgstr "" -#: ../../mod/connections.php:237 -msgid "Refresh failed - channel is currently unavailable." +#: ../../mod/filestorage.php:84 +msgid "Used: " msgstr "" -#: ../../mod/connections.php:244 -msgid "Channel has been unblocked" +#: ../../mod/filestorage.php:86 +msgid "Limit: " msgstr "" -#: ../../mod/connections.php:245 -msgid "Channel has been blocked" +#: ../../mod/lostpass.php:15 +msgid "No valid account found." 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." +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/connections.php:256 -msgid "Channel has been unignored" +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" msgstr "" -#: ../../mod/connections.php:257 -msgid "Channel has been ignored" +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/connections.php:268 -msgid "Channel has been unarchived" +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/connections.php:269 -msgid "Channel has been archived" +#: ../../mod/lostpass.php:85 ../../boot.php:1426 +msgid "Password Reset" msgstr "" -#: ../../mod/connections.php:280 -msgid "Channel has been unhidden" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/connections.php:281 -msgid "Channel has been hidden" +#: ../../mod/lostpass.php:87 +msgid "Your new password is" msgstr "" -#: ../../mod/connections.php:295 -msgid "Channel has been approved" +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/connections.php:296 -msgid "Channel has been unapproved" +#: ../../mod/lostpass.php:89 +msgid "click here to login" msgstr "" -#: ../../mod/connections.php:314 -msgid "Contact has been removed." +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." msgstr "" -#: ../../mod/connections.php:334 +#: ../../mod/lostpass.php:107 #, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../mod/connections.php:338 -msgid "Refresh Permissions" +msgid "Your password has changed at %s" msgstr "" -#: ../../mod/connections.php:341 -msgid "Fetch updated permissions" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/connections.php:345 -msgid "Recent Activity" +#: ../../mod/lostpass.php:123 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../mod/connections.php:348 -msgid "View recent posts and comments" +#: ../../mod/lostpass.php:124 +msgid "Email Address" msgstr "" -#: ../../mod/connections.php:355 -msgid "Block or Unblock this connection" +#: ../../mod/lostpass.php:125 +msgid "Reset" msgstr "" -#: ../../mod/connections.php:359 ../../mod/connections.php:495 -msgid "Unignore" +#: ../../mod/import.php:36 +msgid "Nothing to import." msgstr "" -#: ../../mod/connections.php:359 ../../mod/connections.php:495 -#: ../../mod/notifications.php:51 -msgid "Ignore" +#: ../../mod/import.php:58 +msgid "Unable to download data from old server" msgstr "" -#: ../../mod/connections.php:362 -msgid "Ignore or Unignore this connection" +#: ../../mod/import.php:64 +msgid "Imported file is empty." msgstr "" -#: ../../mod/connections.php:365 -msgid "Unarchive" +#: ../../mod/import.php:88 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/connections.php:365 -msgid "Archive" +#: ../../mod/import.php:106 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/connections.php:368 -msgid "Archive or Unarchive this connection" +#: ../../mod/import.php:116 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/connections.php:371 -msgid "Unhide" +#: ../../mod/import.php:358 +msgid "Import completed." msgstr "" -#: ../../mod/connections.php:371 -msgid "Hide" +#: ../../mod/import.php:371 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/connections.php:374 -msgid "Hide or Unhide this connection" +#: ../../mod/import.php:376 +msgid "Import Channel" msgstr "" -#: ../../mod/connections.php:381 -msgid "Delete this connection" +#: ../../mod/import.php:377 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." msgstr "" -#: ../../mod/connections.php:414 -msgid "Unknown" +#: ../../mod/import.php:378 +msgid "File to Upload" msgstr "" -#: ../../mod/connections.php:424 ../../mod/connections.php:453 -msgid "Approve this connection" +#: ../../mod/import.php:379 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/connections.php:424 -msgid "Accept connection to allow communication" +#: ../../mod/import.php:380 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/connections.php:440 -msgid "Automatic Permissions Settings" +#: ../../mod/import.php:381 +msgid "Your old login email address" msgstr "" -#: ../../mod/connections.php:440 -#, php-format -msgid "Connections: settings for %s" +#: ../../mod/import.php:382 +msgid "Your old login password" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/import.php:383 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" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../mod/connections.php:452 -msgid "inherited" +#: ../../mod/import.php:384 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/connections.php:454 -msgid "Connection has no individual permissions!" +#: ../../mod/manage.php:63 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../mod/connections.php:455 -msgid "" -"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +#: ../../mod/manage.php:71 +msgid "Create a new channel" msgstr "" -#: ../../mod/connections.php:457 -msgid "Profile Visibility" +#: ../../mod/manage.php:76 +msgid "Channel Manager" msgstr "" -#: ../../mod/connections.php:458 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../mod/manage.php:77 +msgid "Current Channel" msgstr "" -#: ../../mod/connections.php:459 -msgid "Contact Information / Notes" +#: ../../mod/manage.php:79 +msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../mod/connections.php:460 -msgid "Edit contact notes" +#: ../../mod/manage.php:80 +msgid "Default Channel" msgstr "" -#: ../../mod/connections.php:462 -msgid "Their Settings" +#: ../../mod/manage.php:81 +msgid "Make Default" msgstr "" -#: ../../mod/connections.php:463 -msgid "My Settings" +#: ../../mod/vote.php:97 +msgid "Total votes" msgstr "" -#: ../../mod/connections.php:465 -msgid "Forum Members" +#: ../../mod/vote.php:98 +msgid "Average Rating" msgstr "" -#: ../../mod/connections.php:466 -msgid "Soapbox" +#: ../../mod/match.php:16 +msgid "Profile Match" msgstr "" -#: ../../mod/connections.php:467 -msgid "Full Sharing" +#: ../../mod/match.php:24 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/connections.php:468 -msgid "Cautious Sharing" +#: ../../mod/match.php:61 +msgid "is interested in:" msgstr "" -#: ../../mod/connections.php:469 -msgid "Follow Only" +#: ../../mod/match.php:69 +msgid "No matches" msgstr "" -#: ../../mod/connections.php:470 -msgid "Individual Permissions" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" 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." +#: ../../mod/settings.php:71 +msgid "Name is required" msgstr "" -#: ../../mod/connections.php:472 -msgid "Advanced Permissions" +#: ../../mod/settings.php:75 +msgid "Key and Secret are required" msgstr "" -#: ../../mod/connections.php:473 -msgid "Quick Links" +#: ../../mod/settings.php:79 ../../mod/settings.php:533 +msgid "Update" msgstr "" -#: ../../mod/connections.php:477 -#, php-format -msgid "Visit %s's profile - %s" +#: ../../mod/settings.php:192 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/connections.php:478 -msgid "Block/Unblock contact" +#: ../../mod/settings.php:196 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/connections.php:479 -msgid "Ignore contact" +#: ../../mod/settings.php:209 +msgid "Password changed." msgstr "" -#: ../../mod/connections.php:480 -msgid "Repair URL settings" +#: ../../mod/settings.php:211 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/connections.php:481 -msgid "View conversations" +#: ../../mod/settings.php:225 +msgid "Not valid email." msgstr "" -#: ../../mod/connections.php:483 -msgid "Delete contact" +#: ../../mod/settings.php:228 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/connections.php:486 -msgid "Last update:" +#: ../../mod/settings.php:237 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/connections.php:488 -msgid "Update public posts" +#: ../../mod/settings.php:435 +msgid "Settings updated." msgstr "" -#: ../../mod/connections.php:490 -msgid "Update now" +#: ../../mod/settings.php:506 ../../mod/settings.php:532 +#: ../../mod/settings.php:568 +msgid "Add application" msgstr "" -#: ../../mod/connections.php:496 -msgid "Currently blocked" +#: ../../mod/settings.php:509 +msgid "Name of application" msgstr "" -#: ../../mod/connections.php:497 -msgid "Currently ignored" +#: ../../mod/settings.php:510 ../../mod/settings.php:536 +msgid "Consumer Key" msgstr "" -#: ../../mod/connections.php:498 -msgid "Currently archived" +#: ../../mod/settings.php:510 ../../mod/settings.php:511 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/connections.php:499 -msgid "Currently pending" +#: ../../mod/settings.php:511 ../../mod/settings.php:537 +msgid "Consumer Secret" msgstr "" -#: ../../mod/connections.php:500 -msgid "Hide this contact from others" +#: ../../mod/settings.php:512 ../../mod/settings.php:538 +msgid "Redirect" msgstr "" -#: ../../mod/connections.php:500 +#: ../../mod/settings.php:512 msgid "" -"Replies/likes to your public posts may still be visible" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/connections.php:536 ../../mod/connections.php:608 -msgid "Blocked" +#: ../../mod/settings.php:513 ../../mod/settings.php:539 +msgid "Icon url" msgstr "" -#: ../../mod/connections.php:541 ../../mod/connections.php:615 -msgid "Ignored" +#: ../../mod/settings.php:513 +msgid "Optional" msgstr "" -#: ../../mod/connections.php:546 ../../mod/connections.php:629 -msgid "Hidden" +#: ../../mod/settings.php:524 +msgid "You can't edit this application." msgstr "" -#: ../../mod/connections.php:551 ../../mod/connections.php:622 -msgid "Archived" +#: ../../mod/settings.php:567 +msgid "Connected Apps" msgstr "" -#: ../../mod/connections.php:562 -msgid "All" +#: ../../mod/settings.php:571 +msgid "Client key starts with" msgstr "" -#: ../../mod/connections.php:586 -msgid "Suggest new connections" +#: ../../mod/settings.php:572 +msgid "No name" msgstr "" -#: ../../mod/connections.php:592 -msgid "Show pending (new) connections" +#: ../../mod/settings.php:573 +msgid "Remove authorization" msgstr "" -#: ../../mod/connections.php:595 -msgid "All Connections" +#: ../../mod/settings.php:584 +msgid "No feature settings configured" msgstr "" -#: ../../mod/connections.php:598 -msgid "Show all connections" +#: ../../mod/settings.php:592 +msgid "Feature Settings" msgstr "" -#: ../../mod/connections.php:601 -msgid "Unblocked" +#: ../../mod/settings.php:615 +msgid "Account Settings" msgstr "" -#: ../../mod/connections.php:604 -msgid "Only show unblocked connections" +#: ../../mod/settings.php:616 +msgid "Password Settings" msgstr "" -#: ../../mod/connections.php:611 -msgid "Only show blocked connections" +#: ../../mod/settings.php:617 +msgid "New Password:" msgstr "" -#: ../../mod/connections.php:618 -msgid "Only show ignored connections" +#: ../../mod/settings.php:618 +msgid "Confirm:" msgstr "" -#: ../../mod/connections.php:625 -msgid "Only show archived connections" +#: ../../mod/settings.php:618 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/connections.php:632 -msgid "Only show hidden connections" +#: ../../mod/settings.php:620 ../../mod/settings.php:912 +msgid "Email Address:" msgstr "" -#: ../../mod/connections.php:674 -#, php-format -msgid "%1$s [%2$s]" +#: ../../mod/settings.php:621 +msgid "Remove Account" msgstr "" -#: ../../mod/connections.php:675 -msgid "Edit contact" +#: ../../mod/settings.php:622 +msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/connections.php:698 -msgid "Search your connections" +#: ../../mod/settings.php:638 +msgid "Off" msgstr "" -#: ../../mod/connections.php:699 -msgid "Finding: " +#: ../../mod/settings.php:638 +msgid "On" msgstr "" -#: ../../mod/filestorage.php:35 -msgid "Permission Denied." +#: ../../mod/settings.php:645 +msgid "Additional Features" msgstr "" -#: ../../mod/filestorage.php:42 -msgid "Permission denied. VS." +#: ../../mod/settings.php:670 +msgid "Connector Settings" msgstr "" -#: ../../mod/filestorage.php:79 -msgid "Download" +#: ../../mod/settings.php:740 +msgid "Display Settings" msgstr "" -#: ../../mod/filestorage.php:84 -msgid "Used: " +#: ../../mod/settings.php:746 +msgid "Display Theme:" msgstr "" -#: ../../mod/filestorage.php:86 -msgid "Limit: " +#: ../../mod/settings.php:747 +msgid "Mobile Theme:" msgstr "" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." +#: ../../mod/settings.php:748 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." +#: ../../mod/settings.php:748 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" +#: ../../mod/settings.php:749 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" +#: ../../mod/settings.php:749 +msgid "Maximum of 100 items" msgstr "" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." +#: ../../mod/settings.php:750 +msgid "Don't show emoticons" msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1450 -msgid "Password Reset" +#: ../../mod/settings.php:786 +msgid "Nobody except yourself" msgstr "" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." +#: ../../mod/settings.php:787 +msgid "Only those you specifically allow" msgstr "" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" +#: ../../mod/settings.php:788 +msgid "Anybody in your address book" msgstr "" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" +#: ../../mod/settings.php:789 +msgid "Anybody on this website" msgstr "" -#: ../../mod/lostpass.php:89 -msgid "click here to login" +#: ../../mod/settings.php:790 +msgid "Anybody in this network" msgstr "" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." +#: ../../mod/settings.php:791 +msgid "Anybody on the internet" msgstr "" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" +#: ../../mod/settings.php:865 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" +#: ../../mod/settings.php:870 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/lostpass.php:123 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." +#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288 +msgid "or" msgstr "" -#: ../../mod/lostpass.php:124 -msgid "Email Address" +#: ../../mod/settings.php:879 +msgid "Your channel address is" msgstr "" -#: ../../mod/lostpass.php:125 -msgid "Reset" +#: ../../mod/settings.php:901 +msgid "Channel Settings" msgstr "" -#: ../../mod/import.php:36 -msgid "Nothing to import." +#: ../../mod/settings.php:910 +msgid "Basic Settings" msgstr "" -#: ../../mod/import.php:58 -msgid "Unable to download data from old server" +#: ../../mod/settings.php:913 +msgid "Your Timezone:" msgstr "" -#: ../../mod/import.php:64 -msgid "Imported file is empty." +#: ../../mod/settings.php:914 +msgid "Default Post Location:" msgstr "" -#: ../../mod/import.php:88 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../mod/settings.php:915 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/import.php:106 -msgid "Channel clone failed. Import failed." +#: ../../mod/settings.php:917 +msgid "Adult Content" msgstr "" -#: ../../mod/import.php:116 -msgid "Cloned channel not found. Import failed." +#: ../../mod/settings.php:917 +msgid "This channel publishes adult content." msgstr "" -#: ../../mod/import.php:358 -msgid "Import completed." +#: ../../mod/settings.php:919 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/import.php:371 -msgid "You must be logged in to use this feature." +#: ../../mod/settings.php:921 +msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/import.php:376 -msgid "Import Channel" +#: ../../mod/settings.php:922 +msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/import.php:377 -msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file. Only identity and connections/relationships will be " -"imported. Importation of content is not yet available." +#: ../../mod/settings.php:923 +msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/import.php:378 -msgid "File to Upload" +#: ../../mod/settings.php:924 +msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/import.php:379 -msgid "Or provide the old server/hub details" +#: ../../mod/settings.php:925 +msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/import.php:380 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/settings.php:928 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/import.php:381 -msgid "Your old login email address" +#: ../../mod/settings.php:928 +msgid "May reduce spam activity" msgstr "" -#: ../../mod/import.php:382 -msgid "Your old login password" +#: ../../mod/settings.php:929 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/import.php:383 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../mod/settings.php:941 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/import.php:384 -msgid "Make this hub my primary location" +#: ../../mod/settings.php:941 +msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/manage.php:63 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../mod/settings.php:944 +msgid "Notification Settings" msgstr "" -#: ../../mod/manage.php:71 -msgid "Create a new channel" +#: ../../mod/settings.php:945 +msgid "By default post a status message when:" msgstr "" -#: ../../mod/manage.php:76 -msgid "Channel Manager" +#: ../../mod/settings.php:946 +msgid "accepting a friend request" msgstr "" -#: ../../mod/manage.php:77 -msgid "Current Channel" +#: ../../mod/settings.php:947 +msgid "joining a forum/community" msgstr "" -#: ../../mod/manage.php:79 -msgid "Attach to one of your channels by selecting it." +#: ../../mod/settings.php:948 +msgid "making an interesting profile change" msgstr "" -#: ../../mod/manage.php:80 -msgid "Default Channel" +#: ../../mod/settings.php:949 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/manage.php:81 -msgid "Make Default" +#: ../../mod/settings.php:950 +msgid "You receive an introduction" msgstr "" -#: ../../mod/vote.php:97 -msgid "Total votes" +#: ../../mod/settings.php:951 +msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/vote.php:98 -msgid "Average Rating" +#: ../../mod/settings.php:952 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/match.php:16 -msgid "Profile Match" +#: ../../mod/settings.php:953 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/match.php:24 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/settings.php:954 +msgid "You receive a private message" msgstr "" -#: ../../mod/match.php:61 -msgid "is interested in:" +#: ../../mod/settings.php:955 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/match.php:69 -msgid "No matches" +#: ../../mod/settings.php:956 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" +#: ../../mod/settings.php:957 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/follow.php:25 -msgid "Channel added." +#: ../../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] -- cgit v1.2.3 From aa312f72bf48f3ffeb62606541b39e5243ce819e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 20 Dec 2013 12:43:04 -0800 Subject: 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] -- cgit v1.2.3 From d32bbaf599c77aa415ee403a896b77f091f0e9fc Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 21 Dec 2013 23:47:44 -0800 Subject: 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(! 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((argc() == 3) && (argv(1) === 'dropconv')) { 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}} -- cgit v1.2.3 From 0366991b45a9b54da66850bce44b4b9dc1d939a7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 02:04:55 -0800 Subject: 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 -- cgit v1.2.3 From 7e7b5bfa4930493a8feae10b0550e29797956c70 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 02:16:45 -0800 Subject: 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] -- cgit v1.2.3 From 25a533bd72c34e9775af71c010a39db6caf7b633 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:21:57 +0100 Subject: New modal dialog for item expiry --- include/conversation.php | 2 + .../css/bootstrap-datetimepicker.css | 174 + .../css/bootstrap-datetimepicker.min.css | 8 + .../js/bootstrap-datetimepicker.min.js | 28 + library/bootstrap-datetimepicker/js/moment.js | 7063 ++++++++++++++++++++ mod/editpost.php | 2 + view/php/theme_init.php | 8 +- view/tpl/jot-header.tpl | 24 +- view/tpl/jot.tpl | 35 +- 9 files changed, 7340 insertions(+), 4 deletions(-) create mode 100755 library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css create mode 100755 library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css create mode 100755 library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js create mode 100644 library/bootstrap-datetimepicker/js/moment.js diff --git a/include/conversation.php b/include/conversation.php index a2eeda25b..bb9440313 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1138,6 +1138,8 @@ function status_editor($a,$x,$popup=false) { '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, + '$expiryModalOK' => t('OK'), + '$expiryModalCANCEL' => t('Cancel'), )); diff --git a/library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css b/library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css new file mode 100755 index 000000000..e5eb7a65c --- /dev/null +++ b/library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css @@ -0,0 +1,174 @@ +/** + * Build file for the dist version of datetimepicker.css + */ +/*! + * Datetimepicker for Bootstrap v3 + * https://github.com/Eonasdan/bootstrap-datetimepicker/ + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */ +.bootstrap-datetimepicker-widget { + top: 0; + left: 0; + width: 250px; + padding: 4px; + margin-top: 1px; + z-index: 9999; + border-radius: 4px; + /*.dow { + border-top: 1px solid #ddd !important; + }*/ +} +.bootstrap-datetimepicker-widget .btn { + padding: 6px; +} +.bootstrap-datetimepicker-widget:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, 0.2); + position: absolute; + top: -7px; + left: 6px; +} +.bootstrap-datetimepicker-widget:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid white; + position: absolute; + top: -6px; + left: 7px; +} +.bootstrap-datetimepicker-widget.pull-right:before { + left: auto; + right: 6px; +} +.bootstrap-datetimepicker-widget.pull-right:after { + left: auto; + right: 7px; +} +.bootstrap-datetimepicker-widget > ul { + list-style-type: none; + margin: 0; +} +.bootstrap-datetimepicker-widget .timepicker-hour, +.bootstrap-datetimepicker-widget .timepicker-minute, +.bootstrap-datetimepicker-widget .timepicker-second { + width: 100%; + font-weight: bold; + font-size: 1.2em; +} +.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator { + width: 4px; + padding: 0; + margin: 0; +} +.bootstrap-datetimepicker-widget .datepicker > div { + display: none; +} +.bootstrap-datetimepicker-widget .picker-switch { + text-align: center; +} +.bootstrap-datetimepicker-widget table { + width: 100%; + margin: 0; +} +.bootstrap-datetimepicker-widget td, +.bootstrap-datetimepicker-widget th { + text-align: center; + width: 20px; + height: 20px; + border-radius: 4px; +} +.bootstrap-datetimepicker-widget td.day:hover, +.bootstrap-datetimepicker-widget td.hour:hover, +.bootstrap-datetimepicker-widget td.minute:hover, +.bootstrap-datetimepicker-widget td.second:hover { + background: #eeeeee; + cursor: pointer; +} +.bootstrap-datetimepicker-widget td.old, +.bootstrap-datetimepicker-widget td.new { + color: #999999; +} +.bootstrap-datetimepicker-widget td.active, +.bootstrap-datetimepicker-widget td.active:hover { + background-color: #428bca; + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.bootstrap-datetimepicker-widget td.disabled, +.bootstrap-datetimepicker-widget td.disabled:hover { + background: none; + color: #999999; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget td span { + display: block; + width: 47px; + height: 54px; + line-height: 54px; + float: left; + margin: 2px; + cursor: pointer; + border-radius: 4px; +} +.bootstrap-datetimepicker-widget td span:hover { + background: #eeeeee; +} +.bootstrap-datetimepicker-widget td span.active { + background-color: #428bca; + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.bootstrap-datetimepicker-widget td span.old { + color: #999999; +} +.bootstrap-datetimepicker-widget td span.disabled, +.bootstrap-datetimepicker-widget td span.disabled:hover { + background: none; + color: #999999; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget th.switch { + width: 145px; +} +.bootstrap-datetimepicker-widget th.next, +.bootstrap-datetimepicker-widget th.prev { + font-size: 21px; +} +.bootstrap-datetimepicker-widget th.disabled, +.bootstrap-datetimepicker-widget th.disabled:hover { + background: none; + color: #999999; + cursor: not-allowed; +} +.bootstrap-datetimepicker-widget thead tr:first-child th { + cursor: pointer; +} +.bootstrap-datetimepicker-widget thead tr:first-child th:hover { + background: #eeeeee; +} +.input-group.date .input-group-addon span { + display: block; + cursor: pointer; + width: 16px; + height: 16px; +} +.bootstrap-datetimepicker-widget.left-oriented:before { + left: auto; + right: 6px; +} +.bootstrap-datetimepicker-widget.left-oriented:after { + left: auto; + right: 7px; +} +.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td { + padding: 0px !important; +} diff --git a/library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css b/library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css new file mode 100755 index 000000000..00b768767 --- /dev/null +++ b/library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css @@ -0,0 +1,8 @@ +/*! + * Datetimepicker for Bootstrap v3 + * https://github.com/Eonasdan/bootstrap-datetimepicker/ + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */.bootstrap-datetimepicker-widget{top:0;left:0;width:250px;padding:4px;margin-top:1px;z-index:9999;border-radius:4px}.bootstrap-datetimepicker-widget .btn{padding:6px}.bootstrap-datetimepicker-widget:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.bootstrap-datetimepicker-widget:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.bootstrap-datetimepicker-widget.pull-right:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.pull-right:after{left:auto;right:7px}.bootstrap-datetimepicker-widget>ul{list-style-type:none;margin:0}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:100%;font-weight:bold;font-size:1.2em}.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator{width:4px;padding:0;margin:0}.bootstrap-datetimepicker-widget .datepicker>div{display:none}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget td,.bootstrap-datetimepicker-widget th{text-align:center;width:20px;height:20px;border-radius:4px}.bootstrap-datetimepicker-widget td.day:hover,.bootstrap-datetimepicker-widget td.hour:hover,.bootstrap-datetimepicker-widget td.minute:hover,.bootstrap-datetimepicker-widget td.second:hover{background:#eee;cursor:pointer}.bootstrap-datetimepicker-widget td.old,.bootstrap-datetimepicker-widget td.new{color:#999}.bootstrap-datetimepicker-widget td.active,.bootstrap-datetimepicker-widget td.active:hover{background-color:#428bca;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget td.disabled,.bootstrap-datetimepicker-widget td.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget td span{display:block;width:47px;height:54px;line-height:54px;float:left;margin:2px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget td span:hover{background:#eee}.bootstrap-datetimepicker-widget td span.active{background-color:#428bca;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget td span.old{color:#999}.bootstrap-datetimepicker-widget td span.disabled,.bootstrap-datetimepicker-widget td span.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget th.switch{width:145px}.bootstrap-datetimepicker-widget th.next,.bootstrap-datetimepicker-widget th.prev{font-size:21px}.bootstrap-datetimepicker-widget th.disabled,.bootstrap-datetimepicker-widget th.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget thead tr:first-child th:hover{background:#eee}.input-group.date .input-group-addon span{display:block;cursor:pointer;width:16px;height:16px}.bootstrap-datetimepicker-widget.left-oriented:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.left-oriented:after{left:auto;right:7px}.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody>tr>td{padding:0 !important} \ No newline at end of file diff --git a/library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js b/library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js new file mode 100755 index 000000000..3bc74fcbb --- /dev/null +++ b/library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js @@ -0,0 +1,28 @@ +/** + * version 2.1.11 + * @license + * ========================================================= + * bootstrap-datetimepicker.js + * http://www.eyecon.ro/bootstrap-datepicker + * ========================================================= + * Copyright 2012 Stefan Petre + * + * Contributions: + * - updated for Bootstrap v3 by Jonathan Peterson (@Eonasdan) and (almost) + * completely rewritten to use Momentjs + * - based on tarruda's bootstrap-datepicker + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= + */ +(function($){if(typeof moment==="undefined"){alert("momentjs is requried");throw new Error("momentjs is requried")}var dpgId=0,pMoment=moment,DateTimePicker=function(element,options){var defaults={pickDate:true,pickTime:true,startDate:new pMoment({y:1970}),endDate:(new pMoment).add(50,"y"),collapse:true,language:"en",defaultDate:"",disabledDates:[],icons:{},useStrict:false},icons={time:"glyphicon glyphicon-time",date:"glyphicon glyphicon-calendar",up:"glyphicon glyphicon-chevron-up",down:"glyphicon glyphicon-chevron-down"},picker=this,init=function(){var icon=false,i,dDate,longDateFormat;picker.options=$.extend({},defaults,options);picker.options.icons=$.extend({},icons,picker.options.icons);if(!(picker.options.pickTime||picker.options.pickDate))throw new Error("Must choose at least one picker");picker.id=dpgId++;pMoment.lang(picker.options.language);picker.date=pMoment();picker.element=$(element);picker.unset=false;picker.isInput=picker.element.is("input");picker.component=false;if(picker.element.hasClass("input-group")){if(picker.element.find(".datepickerbutton").size()==0){picker.component=picker.element.find(".input-group-addon")}else{picker.component=picker.element.find(".datepickerbutton")}}picker.format=picker.options.format;longDateFormat=pMoment()._lang._longDateFormat;if(!picker.format){if(picker.isInput)picker.format=picker.element.data("format");else picker.format=picker.element.find("input").data("format");if(!picker.format){picker.format=picker.options.pickDate?longDateFormat.L:"";if(picker.options.pickDate&&picker.options.pickTime)picker.format+=" ";picker.format+=picker.options.pickTime?longDateFormat.LT:""}}picker.use24hours=picker.format.toLowerCase().indexOf("a")<1;if(picker.component)icon=picker.component.find("span");if(picker.options.pickTime){if(icon)icon.addClass(picker.options.icons.time)}if(picker.options.pickDate){if(icon){icon.removeClass(picker.options.icons.time);icon.addClass(picker.options.icons.date)}}picker.widget=$(getTemplate(picker.options.pickDate,picker.options.pickTime,picker.options.collapse)).appendTo("body");picker.minViewMode=picker.options.minViewMode||picker.element.data("date-minviewmode")||0;if(typeof picker.minViewMode==="string"){switch(picker.minViewMode){case"months":picker.minViewMode=1;break;case"years":picker.minViewMode=2;break;default:picker.minViewMode=0;break}}picker.viewMode=picker.options.viewMode||picker.element.data("date-viewmode")||0;if(typeof picker.viewMode==="string"){switch(picker.viewMode){case"months":picker.viewMode=1;break;case"years":picker.viewMode=2;break;default:picker.viewMode=0;break}}for(i=0;i"),weekdaysMin=pMoment.weekdaysMin(),i;if(pMoment()._lang._week.dow==0){for(i=0;i<7;i++){html.append(''+weekdaysMin[i]+"")}}else{for(i=1;i<8;i++){if(i==7){html.append(''+weekdaysMin[0]+"")}else{html.append(''+weekdaysMin[i]+"")}}}picker.widget.find(".datepicker-days thead").append(html)},fillMonths=function(){pMoment.lang(picker.options.language);var html="",i=0,monthsShort=pMoment.monthsShort();while(i<12){html+=''+monthsShort[i++]+""}picker.widget.find(".datepicker-months td").append(html)},fillDate=function(){pMoment.lang(picker.options.language);var year=picker.viewDate.year(),month=picker.viewDate.month(),startYear=picker.options.startDate.year(),startMonth=picker.options.startDate.month(),endYear=picker.options.endDate.year(),endMonth=picker.options.endDate.month(),prevMonth,nextMonth,html=[],row,clsName,i,days,yearCont,currentYear,months=pMoment.months();picker.widget.find(".datepicker-days").find(".disabled").removeClass("disabled");picker.widget.find(".datepicker-months").find(".disabled").removeClass("disabled");picker.widget.find(".datepicker-years").find(".disabled").removeClass("disabled");picker.widget.find(".datepicker-days th:eq(1)").text(months[month]+" "+year);prevMonth=pMoment(picker.viewDate).subtract("months",1);days=prevMonth.daysInMonth();prevMonth.date(days).startOf("week");if(year==startYear&&month<=startMonth||year=endMonth||year>endYear){picker.widget.find(".datepicker-days th:eq(2)").addClass("disabled")}nextMonth=pMoment(prevMonth).add(42,"d");while(prevMonth.isBefore(nextMonth)){if(prevMonth.weekday()===pMoment().startOf("week").weekday()){row=$("");html.push(row)}clsName="";if(prevMonth.year()year||prevMonth.year()==year&&prevMonth.month()>month){clsName+=" new"}if(prevMonth.isSame(pMoment({y:picker.date.year(),M:picker.date.month(),d:picker.date.date()}))){clsName+=" active"}if(pMoment(prevMonth).add(1,"d")<=picker.options.startDate||prevMonth>picker.options.endDate||isInDisableDates(prevMonth)){clsName+=" disabled"}row.append(''+prevMonth.date()+"");prevMonth.add(1,"d")}picker.widget.find(".datepicker-days tbody").empty().append(html);currentYear=pMoment().year(),months=picker.widget.find(".datepicker-months").find("th:eq(1)").text(year).end().find("span").removeClass("active");if(currentYear===year){months.eq(pMoment().month()).addClass("active")}if(currentYear-1endYear){picker.widget.find(".datepicker-months th:eq(2)").addClass("disabled")}for(i=0;i<12;i++){if(year==startYear&&startMonth>i||yearendYear){$(months[i]).addClass("disabled")}}html="";year=parseInt(year/10,10)*10;yearCont=picker.widget.find(".datepicker-years").find("th:eq(1)").text(year+"-"+(year+9)).end().find("td");picker.widget.find(".datepicker-years").find("th").removeClass("disabled");if(startYear>year){picker.widget.find(".datepicker-years").find("th:eq(0)").addClass("disabled")}if(endYearendYear?" disabled":"")+'">'+year+"";year+=1}yearCont.html(html)},fillHours=function(){pMoment.lang(picker.options.language);var table=picker.widget.find(".timepicker .timepicker-hours table"),html="",current,i,j;table.parent().hide();if(picker.use24hours){current=0;for(i=0;i<6;i+=1){html+="";for(j=0;j<4;j+=1){html+=''+padLeft(current.toString())+"";current++}html+=""}}else{current=1;for(i=0;i<3;i+=1){html+="";for(j=0;j<4;j+=1){html+=''+padLeft(current.toString())+"";current++}html+=""}}table.html(html)},fillMinutes=function(){var table=picker.widget.find(".timepicker .timepicker-minutes table"),html="",current=0,i,j;table.parent().hide();for(i=0;i<5;i++){html+="";for(j=0;j<4;j+=1){html+=''+padLeft(current.toString())+"";current+=3}html+=""}table.html(html)},fillTime=function(){if(!picker.date)return;var timeComponents=picker.widget.find(".timepicker span[data-time-component]"),hour=picker.date.hours(),period="AM";if(!picker.use24hours){if(hour>=12)period="PM";if(hour===0)hour=12;else if(hour!=12)hour=hour%12;picker.widget.find(".timepicker [data-action=togglePeriod]").text(period)}timeComponents.filter("[data-time-component=hours]").text(padLeft(hour));timeComponents.filter("[data-time-component=minutes]").text(padLeft(picker.date.minutes()))},click=function(e){e.stopPropagation();e.preventDefault();picker.unset=false;var target=$(e.target).closest("span, td, th"),month,year,step,day,oldDate=picker.date;if(target.length===1){if(!target.is(".disabled")){switch(target[0].nodeName.toLowerCase()){case"th":switch(target[0].className){case"switch":showMode(1);break;case"prev":case"next":step=dpGlobal.modes[picker.viewMode].navStep;if(target[0].className==="prev")step=step*-1;picker.viewDate.add(step,dpGlobal.modes[picker.viewMode].navFnc);fillDate();break}break;case"span":if(target.is(".month")){month=target.parent().find("span").index(target);picker.viewDate.month(month)}else{year=parseInt(target.text(),10)||0;picker.viewDate.year(year)}if(picker.viewMode!==0){picker.date=pMoment({y:picker.viewDate.year(),M:picker.viewDate.month(),d:picker.viewDate.date(),h:picker.date.hours(),m:picker.date.minutes()});notifyChange(oldDate)}showMode(-1);fillDate();break;case"td":if(target.is(".day")){day=parseInt(target.text(),10)||1;month=picker.viewDate.month();year=picker.viewDate.year();if(target.is(".old")){if(month===0){month=11;year-=1}else{month-=1}}else if(target.is(".new")){if(month==11){month=0;year+=1}else{month+=1}}picker.date=pMoment({y:year,M:month,d:day,h:picker.date.hours(),m:picker.date.minutes()});picker.viewDate=pMoment({y:year,M:month,d:Math.min(28,day)});fillDate();set();notifyChange(oldDate)}break}}}},actions={incrementHours:function(){checkDate("add","hours")},incrementMinutes:function(){checkDate("add","minutes")},decrementHours:function(){checkDate("subtract","hours")},decrementMinutes:function(){checkDate("subtract","minutes")},togglePeriod:function(){var hour=picker.date.hours();if(hour>=12)hour-=12;else hour+=12;picker.date.hours(hour)},showPicker:function(){picker.widget.find(".timepicker > div:not(.timepicker-picker)").hide();picker.widget.find(".timepicker .timepicker-picker").show()},showHours:function(){picker.widget.find(".timepicker .timepicker-picker").hide();picker.widget.find(".timepicker .timepicker-hours").show()},showMinutes:function(){picker.widget.find(".timepicker .timepicker-picker").hide();picker.widget.find(".timepicker .timepicker-minutes").show()},selectHour:function(e){picker.date.hours(parseInt($(e.target).text(),10));actions.showPicker.call(picker)},selectMinute:function(e){picker.date.minutes(parseInt($(e.target).text(),10));actions.showPicker.call(picker)}},doAction=function(e){var action=$(e.currentTarget).data("action"),rv=actions[action].apply(picker,arguments),oldDate=picker.date;stopEvent(e);if(!picker.date)picker.date=pMoment({y:1970});set();fillTime();notifyChange(oldDate);return rv},stopEvent=function(e){e.stopPropagation();e.preventDefault()},change=function(e){pMoment.lang(picker.options.language);var input=$(e.target),oldDate=picker.date,d=pMoment(input.val(),picker.format,picker.options.useStrict);if(d.isValid()){update();picker.setValue(d);notifyChange(oldDate);set()}else{picker.viewDate=oldDate;notifyChange(oldDate);notifyError(d);picker.unset=true;input.val("")}},showMode=function(dir){if(dir){picker.viewMode=Math.max(picker.minViewMode,Math.min(2,picker.viewMode+dir))}picker.widget.find(".datepicker > div").hide().filter(".datepicker-"+dpGlobal.modes[picker.viewMode].clsName).show()},attachDatePickerEvents=function(){var $this,$parent,expanded,closed,collapseData;picker.widget.on("click",".datepicker *",$.proxy(click,this));picker.widget.on("click","[data-action]",$.proxy(doAction,this));picker.widget.on("mousedown",$.proxy(stopEvent,this));if(picker.options.pickDate&&picker.options.pickTime){picker.widget.on("click.togglePicker",".accordion-toggle",function(e){e.stopPropagation();$this=$(this);$parent=$this.closest("ul");expanded=$parent.find(".in");closed=$parent.find(".collapse:not(.in)");if(expanded&&expanded.length){collapseData=expanded.data("collapse");if(collapseData&&collapseData.transitioning)return;expanded.collapse("hide");closed.collapse("show");$this.find("span").toggleClass(picker.options.icons.time+" "+picker.options.icons.date);picker.element.find(".input-group-addon span").toggleClass(picker.options.icons.time+" "+picker.options.icons.date)}})}if(picker.isInput){picker.element.on({focus:$.proxy(picker.show,this),change:$.proxy(change,this),blur:$.proxy(picker.hide,this)})}else{picker.element.on({change:$.proxy(change,this)},"input");if(picker.component){picker.component.on("click",$.proxy(picker.show,this))}else{picker.element.on("click",$.proxy(picker.show,this))}}},attachDatePickerGlobalEvents=function(){$(window).on("resize.datetimepicker"+picker.id,$.proxy(place,this));if(!picker.isInput){$(document).on("mousedown.datetimepicker"+picker.id,$.proxy(picker.hide,this))}},detachDatePickerEvents=function(){picker.widget.off("click",".datepicker *",picker.click);picker.widget.off("click","[data-action]");picker.widget.off("mousedown",picker.stopEvent);if(picker.options.pickDate&&picker.options.pickTime){picker.widget.off("click.togglePicker")}if(picker.isInput){picker.element.off({focus:picker.show,change:picker.change})}else{picker.element.off({change:picker.change},"input");if(picker.component){picker.component.off("click",picker.show)}else{picker.element.off("click",picker.show)}}},detachDatePickerGlobalEvents=function(){$(window).off("resize.datetimepicker"+picker.id);if(!picker.isInput){$(document).off("mousedown.datetimepicker"+picker.id)}},isInFixed=function(){if(picker.element){var parents=picker.element.parents(),inFixed=false,i;for(i=0;i=2)return string;else return"0"+string},getTemplate=function(pickDate,pickTime,collapse){if(pickDate&&pickTime){return'
      '+'
        '+""+'
        '+dpGlobal.template+"
        "+""+'
        • '+""+'
        '+tpGlobal.getTemplate()+"
        "+""+"
      "+"
      "}else if(pickTime){return'
      '+'
      '+tpGlobal.getTemplate()+"
      "+"
      "}else{return'
      '+'
      '+dpGlobal.template+"
      "+"
      "}},dpGlobal={modes:[{clsName:"days",navFnc:"month",navStep:1},{clsName:"months",navFnc:"year",navStep:1},{clsName:"years",navFnc:"year",navStep:10}],headTemplate:""+""+'‹›'+""+"",contTemplate:''},tpGlobal={hourTemplate:'',minuteTemplate:''};dpGlobal.template='
      '+''+dpGlobal.headTemplate+"
      "+"
      "+'
      '+''+dpGlobal.headTemplate+dpGlobal.contTemplate+"
      "+"
      "+'
      '+''+dpGlobal.headTemplate+dpGlobal.contTemplate+"
      "+"
      ";tpGlobal.getTemplate=function(){return'
      '+''+""+''+''+''+(!picker.use24hours?'':"")+""+""+" "+''+" "+(!picker.use24hours?''+'':"")+""+""+''+''+''+(!picker.use24hours?'':"")+""+"
      "+tpGlobal.hourTemplate+":"+tpGlobal.minuteTemplate+"
      "+"
      "+'
      '+'
      '+"
      "+'
      '+'
      '+"
      "};picker.destroy=function(){detachDatePickerEvents();detachDatePickerGlobalEvents();picker.widget.remove();picker.element.removeData("DateTimePicker");if(picker.component)picker.component.removeData("DateTimePicker")};picker.show=function(e){picker.widget.show();picker.height=picker.component?picker.component.outerHeight():picker.element.outerHeight();place();picker.element.trigger({type:"show.dp",date:picker.date});attachDatePickerGlobalEvents();if(e){stopEvent(e)}},picker.disable=function(){picker.element.find("input").prop("disabled",true);detachDatePickerEvents()},picker.enable=function(){picker.element.find("input").prop("disabled",false);attachDatePickerEvents()},picker.hide=function(){var collapse=picker.widget.find(".collapse"),i,collapseData;for(i=0;i ["10", "00"] or "-1530" > ["-15", "30"] + parseTimezoneChunker = /([\+\-]|\d\d)/gi, + + // getter and setter names + proxyGettersAndSetters = 'Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), + unitMillisecondFactors = { + 'Milliseconds' : 1, + 'Seconds' : 1e3, + 'Minutes' : 6e4, + 'Hours' : 36e5, + 'Days' : 864e5, + 'Months' : 2592e6, + 'Years' : 31536e6 + }, + + unitAliases = { + ms : 'millisecond', + s : 'second', + m : 'minute', + h : 'hour', + d : 'day', + D : 'date', + w : 'week', + W : 'isoWeek', + M : 'month', + y : 'year', + DDD : 'dayOfYear', + e : 'weekday', + E : 'isoWeekday', + gg: 'weekYear', + GG: 'isoWeekYear' + }, + + camelFunctions = { + dayofyear : 'dayOfYear', + isoweekday : 'isoWeekday', + isoweek : 'isoWeek', + weekyear : 'weekYear', + isoweekyear : 'isoWeekYear' + }, + + // format function strings + formatFunctions = {}, + + // tokens to ordinalize and pad + ordinalizeTokens = 'DDD w W M D d'.split(' '), + paddedTokens = 'M D H h m s w W'.split(' '), + + formatTokenFunctions = { + M : function () { + return this.month() + 1; + }, + MMM : function (format) { + return this.lang().monthsShort(this, format); + }, + MMMM : function (format) { + return this.lang().months(this, format); + }, + D : function () { + return this.date(); + }, + DDD : function () { + return this.dayOfYear(); + }, + d : function () { + return this.day(); + }, + dd : function (format) { + return this.lang().weekdaysMin(this, format); + }, + ddd : function (format) { + return this.lang().weekdaysShort(this, format); + }, + dddd : function (format) { + return this.lang().weekdays(this, format); + }, + w : function () { + return this.week(); + }, + W : function () { + return this.isoWeek(); + }, + YY : function () { + return leftZeroFill(this.year() % 100, 2); + }, + YYYY : function () { + return leftZeroFill(this.year(), 4); + }, + YYYYY : function () { + return leftZeroFill(this.year(), 5); + }, + gg : function () { + return leftZeroFill(this.weekYear() % 100, 2); + }, + gggg : function () { + return this.weekYear(); + }, + ggggg : function () { + return leftZeroFill(this.weekYear(), 5); + }, + GG : function () { + return leftZeroFill(this.isoWeekYear() % 100, 2); + }, + GGGG : function () { + return this.isoWeekYear(); + }, + GGGGG : function () { + return leftZeroFill(this.isoWeekYear(), 5); + }, + e : function () { + return this.weekday(); + }, + E : function () { + return this.isoWeekday(); + }, + a : function () { + return this.lang().meridiem(this.hours(), this.minutes(), true); + }, + A : function () { + return this.lang().meridiem(this.hours(), this.minutes(), false); + }, + H : function () { + return this.hours(); + }, + h : function () { + return this.hours() % 12 || 12; + }, + m : function () { + return this.minutes(); + }, + s : function () { + return this.seconds(); + }, + S : function () { + return toInt(this.milliseconds() / 100); + }, + SS : function () { + return leftZeroFill(toInt(this.milliseconds() / 10), 2); + }, + SSS : function () { + return leftZeroFill(this.milliseconds(), 3); + }, + SSSS : function () { + return leftZeroFill(this.milliseconds(), 3); + }, + Z : function () { + var a = -this.zone(), + b = "+"; + if (a < 0) { + a = -a; + b = "-"; + } + return b + leftZeroFill(toInt(a / 60), 2) + ":" + leftZeroFill(toInt(a) % 60, 2); + }, + ZZ : function () { + var a = -this.zone(), + b = "+"; + if (a < 0) { + a = -a; + b = "-"; + } + return b + leftZeroFill(toInt(10 * a / 6), 4); + }, + z : function () { + return this.zoneAbbr(); + }, + zz : function () { + return this.zoneName(); + }, + X : function () { + return this.unix(); + } + }, + + lists = ['months', 'monthsShort', 'weekdays', 'weekdaysShort', 'weekdaysMin']; + + function padToken(func, count) { + return function (a) { + return leftZeroFill(func.call(this, a), count); + }; + } + function ordinalizeToken(func, period) { + return function (a) { + return this.lang().ordinal(func.call(this, a), period); + }; + } + + while (ordinalizeTokens.length) { + i = ordinalizeTokens.pop(); + formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i], i); + } + while (paddedTokens.length) { + i = paddedTokens.pop(); + formatTokenFunctions[i + i] = padToken(formatTokenFunctions[i], 2); + } + formatTokenFunctions.DDDD = padToken(formatTokenFunctions.DDD, 3); + + + /************************************ + Constructors + ************************************/ + + function Language() { + + } + + // Moment prototype object + function Moment(config) { + checkOverflow(config); + extend(this, config); + } + + // Duration Constructor + function Duration(duration) { + var normalizedInput = normalizeObjectUnits(duration), + years = normalizedInput.year || 0, + months = normalizedInput.month || 0, + weeks = normalizedInput.week || 0, + days = normalizedInput.day || 0, + hours = normalizedInput.hour || 0, + minutes = normalizedInput.minute || 0, + seconds = normalizedInput.second || 0, + milliseconds = normalizedInput.millisecond || 0; + + // store reference to input for deterministic cloning + this._input = duration; + + // representation for dateAddRemove + this._milliseconds = +milliseconds + + seconds * 1e3 + // 1000 + minutes * 6e4 + // 1000 * 60 + hours * 36e5; // 1000 * 60 * 60 + // Because of dateAddRemove treats 24 hours as different from a + // day when working around DST, we need to store them separately + this._days = +days + + weeks * 7; + // It is impossible translate months into days without knowing + // which months you are are talking about, so we have to store + // it separately. + this._months = +months + + years * 12; + + this._data = {}; + + this._bubble(); + } + + /************************************ + Helpers + ************************************/ + + + function extend(a, b) { + for (var i in b) { + if (b.hasOwnProperty(i)) { + a[i] = b[i]; + } + } + + if (b.hasOwnProperty("toString")) { + a.toString = b.toString; + } + + if (b.hasOwnProperty("valueOf")) { + a.valueOf = b.valueOf; + } + + return a; + } + + function absRound(number) { + if (number < 0) { + return Math.ceil(number); + } else { + return Math.floor(number); + } + } + + // left zero fill a number + // see http://jsperf.com/left-zero-filling for performance comparison + function leftZeroFill(number, targetLength) { + var output = number + ''; + while (output.length < targetLength) { + output = '0' + output; + } + return output; + } + + // helper function for _.addTime and _.subtractTime + function addOrSubtractDurationFromMoment(mom, duration, isAdding, ignoreUpdateOffset) { + var milliseconds = duration._milliseconds, + days = duration._days, + months = duration._months, + minutes, + hours; + + if (milliseconds) { + mom._d.setTime(+mom._d + milliseconds * isAdding); + } + // store the minutes and hours so we can restore them + if (days || months) { + minutes = mom.minute(); + hours = mom.hour(); + } + if (days) { + mom.date(mom.date() + days * isAdding); + } + if (months) { + mom.month(mom.month() + months * isAdding); + } + if (milliseconds && !ignoreUpdateOffset) { + moment.updateOffset(mom); + } + // restore the minutes and hours after possibly changing dst + if (days || months) { + mom.minute(minutes); + mom.hour(hours); + } + } + + // check if is an array + function isArray(input) { + return Object.prototype.toString.call(input) === '[object Array]'; + } + + function isDate(input) { + return Object.prototype.toString.call(input) === '[object Date]' || + input instanceof Date; + } + + // compare two arrays, return the number of differences + function compareArrays(array1, array2, dontConvert) { + var len = Math.min(array1.length, array2.length), + lengthDiff = Math.abs(array1.length - array2.length), + diffs = 0, + i; + for (i = 0; i < len; i++) { + if ((dontConvert && array1[i] !== array2[i]) || + (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) { + diffs++; + } + } + return diffs + lengthDiff; + } + + function normalizeUnits(units) { + if (units) { + var lowered = units.toLowerCase().replace(/(.)s$/, '$1'); + units = unitAliases[units] || camelFunctions[lowered] || lowered; + } + return units; + } + + function normalizeObjectUnits(inputObject) { + var normalizedInput = {}, + normalizedProp, + prop, + index; + + for (prop in inputObject) { + if (inputObject.hasOwnProperty(prop)) { + normalizedProp = normalizeUnits(prop); + if (normalizedProp) { + normalizedInput[normalizedProp] = inputObject[prop]; + } + } + } + + return normalizedInput; + } + + function makeList(field) { + var count, setter; + + if (field.indexOf('week') === 0) { + count = 7; + setter = 'day'; + } + else if (field.indexOf('month') === 0) { + count = 12; + setter = 'month'; + } + else { + return; + } + + moment[field] = function (format, index) { + var i, getter, + method = moment.fn._lang[field], + results = []; + + if (typeof format === 'number') { + index = format; + format = undefined; + } + + getter = function (i) { + var m = moment().utc().set(setter, i); + return method.call(moment.fn._lang, m, format || ''); + }; + + if (index != null) { + return getter(index); + } + else { + for (i = 0; i < count; i++) { + results.push(getter(i)); + } + return results; + } + }; + } + + function toInt(argumentForCoercion) { + var coercedNumber = +argumentForCoercion, + value = 0; + + if (coercedNumber !== 0 && isFinite(coercedNumber)) { + if (coercedNumber >= 0) { + value = Math.floor(coercedNumber); + } else { + value = Math.ceil(coercedNumber); + } + } + + return value; + } + + function daysInMonth(year, month) { + return new Date(Date.UTC(year, month + 1, 0)).getUTCDate(); + } + + function daysInYear(year) { + return isLeapYear(year) ? 366 : 365; + } + + function isLeapYear(year) { + return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + } + + function checkOverflow(m) { + var overflow; + if (m._a && m._pf.overflow === -2) { + overflow = + m._a[MONTH] < 0 || m._a[MONTH] > 11 ? MONTH : + m._a[DATE] < 1 || m._a[DATE] > daysInMonth(m._a[YEAR], m._a[MONTH]) ? DATE : + m._a[HOUR] < 0 || m._a[HOUR] > 23 ? HOUR : + m._a[MINUTE] < 0 || m._a[MINUTE] > 59 ? MINUTE : + m._a[SECOND] < 0 || m._a[SECOND] > 59 ? SECOND : + m._a[MILLISECOND] < 0 || m._a[MILLISECOND] > 999 ? MILLISECOND : + -1; + + if (m._pf._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) { + overflow = DATE; + } + + m._pf.overflow = overflow; + } + } + + function initializeParsingFlags(config) { + config._pf = { + empty : false, + unusedTokens : [], + unusedInput : [], + overflow : -2, + charsLeftOver : 0, + nullInput : false, + invalidMonth : null, + invalidFormat : false, + userInvalidated : false, + iso: false + }; + } + + function isValid(m) { + if (m._isValid == null) { + m._isValid = !isNaN(m._d.getTime()) && + m._pf.overflow < 0 && + !m._pf.empty && + !m._pf.invalidMonth && + !m._pf.nullInput && + !m._pf.invalidFormat && + !m._pf.userInvalidated; + + if (m._strict) { + m._isValid = m._isValid && + m._pf.charsLeftOver === 0 && + m._pf.unusedTokens.length === 0; + } + } + return m._isValid; + } + + function normalizeLanguage(key) { + return key ? key.toLowerCase().replace('_', '-') : key; + } + + /************************************ + Languages + ************************************/ + + + extend(Language.prototype, { + + set : function (config) { + var prop, i; + for (i in config) { + prop = config[i]; + if (typeof prop === 'function') { + this[i] = prop; + } else { + this['_' + i] = prop; + } + } + }, + + _months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), + months : function (m) { + return this._months[m.month()]; + }, + + _monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + monthsShort : function (m) { + return this._monthsShort[m.month()]; + }, + + monthsParse : function (monthName) { + var i, mom, regex; + + if (!this._monthsParse) { + this._monthsParse = []; + } + + for (i = 0; i < 12; i++) { + // make the regex if we don't have it already + if (!this._monthsParse[i]) { + mom = moment.utc([2000, i]); + regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); + this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (this._monthsParse[i].test(monthName)) { + return i; + } + } + }, + + _weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), + weekdays : function (m) { + return this._weekdays[m.day()]; + }, + + _weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + weekdaysShort : function (m) { + return this._weekdaysShort[m.day()]; + }, + + _weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + weekdaysMin : function (m) { + return this._weekdaysMin[m.day()]; + }, + + weekdaysParse : function (weekdayName) { + var i, mom, regex; + + if (!this._weekdaysParse) { + this._weekdaysParse = []; + } + + for (i = 0; i < 7; i++) { + // make the regex if we don't have it already + if (!this._weekdaysParse[i]) { + mom = moment([2000, 1]).day(i); + regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, ''); + this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (this._weekdaysParse[i].test(weekdayName)) { + return i; + } + } + }, + + _longDateFormat : { + LT : "h:mm A", + L : "MM/DD/YYYY", + LL : "MMMM D YYYY", + LLL : "MMMM D YYYY LT", + LLLL : "dddd, MMMM D YYYY LT" + }, + longDateFormat : function (key) { + var output = this._longDateFormat[key]; + if (!output && this._longDateFormat[key.toUpperCase()]) { + output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) { + return val.slice(1); + }); + this._longDateFormat[key] = output; + } + return output; + }, + + isPM : function (input) { + // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays + // Using charAt should be more compatible. + return ((input + '').toLowerCase().charAt(0) === 'p'); + }, + + _meridiemParse : /[ap]\.?m?\.?/i, + meridiem : function (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'pm' : 'PM'; + } else { + return isLower ? 'am' : 'AM'; + } + }, + + _calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[Last] dddd [at] LT', + sameElse : 'L' + }, + calendar : function (key, mom) { + var output = this._calendar[key]; + return typeof output === 'function' ? output.apply(mom) : output; + }, + + _relativeTime : { + future : "in %s", + past : "%s ago", + s : "a few seconds", + m : "a minute", + mm : "%d minutes", + h : "an hour", + hh : "%d hours", + d : "a day", + dd : "%d days", + M : "a month", + MM : "%d months", + y : "a year", + yy : "%d years" + }, + relativeTime : function (number, withoutSuffix, string, isFuture) { + var output = this._relativeTime[string]; + return (typeof output === 'function') ? + output(number, withoutSuffix, string, isFuture) : + output.replace(/%d/i, number); + }, + pastFuture : function (diff, output) { + var format = this._relativeTime[diff > 0 ? 'future' : 'past']; + return typeof format === 'function' ? format(output) : format.replace(/%s/i, output); + }, + + ordinal : function (number) { + return this._ordinal.replace("%d", number); + }, + _ordinal : "%d", + + preparse : function (string) { + return string; + }, + + postformat : function (string) { + return string; + }, + + week : function (mom) { + return weekOfYear(mom, this._week.dow, this._week.doy).week; + }, + + _week : { + dow : 0, // Sunday is the first day of the week. + doy : 6 // The week that contains Jan 1st is the first week of the year. + }, + + _invalidDate: 'Invalid date', + invalidDate: function () { + return this._invalidDate; + } + }); + + // Loads a language definition into the `languages` cache. The function + // takes a key and optionally values. If not in the browser and no values + // are provided, it will load the language file module. As a convenience, + // this function also returns the language values. + function loadLang(key, values) { + values.abbr = key; + if (!languages[key]) { + languages[key] = new Language(); + } + languages[key].set(values); + return languages[key]; + } + + // Remove a language from the `languages` cache. Mostly useful in tests. + function unloadLang(key) { + delete languages[key]; + } + + // Determines which language definition to use and returns it. + // + // With no parameters, it will return the global language. If you + // pass in a language key, such as 'en', it will return the + // definition for 'en', so long as 'en' has already been loaded using + // moment.lang. + function getLangDefinition(key) { + var i = 0, j, lang, next, split, + get = function (k) { + if (!languages[k] && hasModule) { + try { + require('./lang/' + k); + } catch (e) { } + } + return languages[k]; + }; + + if (!key) { + return moment.fn._lang; + } + + if (!isArray(key)) { + //short-circuit everything else + lang = get(key); + if (lang) { + return lang; + } + key = [key]; + } + + //pick the language from the array + //try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each + //substring from most specific to least, but move to the next array item if it's a more specific variant than the current root + while (i < key.length) { + split = normalizeLanguage(key[i]).split('-'); + j = split.length; + next = normalizeLanguage(key[i + 1]); + next = next ? next.split('-') : null; + while (j > 0) { + lang = get(split.slice(0, j).join('-')); + if (lang) { + return lang; + } + if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) { + //the next array item is better than a shallower substring of this one + break; + } + j--; + } + i++; + } + return moment.fn._lang; + } + + /************************************ + Formatting + ************************************/ + + + function removeFormattingTokens(input) { + if (input.match(/\[[\s\S]/)) { + return input.replace(/^\[|\]$/g, ""); + } + return input.replace(/\\/g, ""); + } + + function makeFormatFunction(format) { + var array = format.match(formattingTokens), i, length; + + for (i = 0, length = array.length; i < length; i++) { + if (formatTokenFunctions[array[i]]) { + array[i] = formatTokenFunctions[array[i]]; + } else { + array[i] = removeFormattingTokens(array[i]); + } + } + + return function (mom) { + var output = ""; + for (i = 0; i < length; i++) { + output += array[i] instanceof Function ? array[i].call(mom, format) : array[i]; + } + return output; + }; + } + + // format date using native date object + function formatMoment(m, format) { + + if (!m.isValid()) { + return m.lang().invalidDate(); + } + + format = expandFormat(format, m.lang()); + + if (!formatFunctions[format]) { + formatFunctions[format] = makeFormatFunction(format); + } + + return formatFunctions[format](m); + } + + function expandFormat(format, lang) { + var i = 5; + + function replaceLongDateFormatTokens(input) { + return lang.longDateFormat(input) || input; + } + + localFormattingTokens.lastIndex = 0; + while (i >= 0 && localFormattingTokens.test(format)) { + format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); + localFormattingTokens.lastIndex = 0; + i -= 1; + } + + return format; + } + + + /************************************ + Parsing + ************************************/ + + + // get the regex to find the next token + function getParseRegexForToken(token, config) { + var a; + switch (token) { + case 'DDDD': + return parseTokenThreeDigits; + case 'YYYY': + case 'GGGG': + case 'gggg': + return parseTokenFourDigits; + case 'YYYYY': + case 'GGGGG': + case 'ggggg': + return parseTokenSixDigits; + case 'S': + case 'SS': + case 'SSS': + case 'DDD': + return parseTokenOneToThreeDigits; + case 'MMM': + case 'MMMM': + case 'dd': + case 'ddd': + case 'dddd': + return parseTokenWord; + case 'a': + case 'A': + return getLangDefinition(config._l)._meridiemParse; + case 'X': + return parseTokenTimestampMs; + case 'Z': + case 'ZZ': + return parseTokenTimezone; + case 'T': + return parseTokenT; + case 'SSSS': + return parseTokenDigits; + case 'MM': + case 'DD': + case 'YY': + case 'GG': + case 'gg': + case 'HH': + case 'hh': + case 'mm': + case 'ss': + case 'M': + case 'D': + case 'd': + case 'H': + case 'h': + case 'm': + case 's': + case 'w': + case 'ww': + case 'W': + case 'WW': + case 'e': + case 'E': + return parseTokenOneOrTwoDigits; + default : + a = new RegExp(regexpEscape(unescapeFormat(token.replace('\\', '')), "i")); + return a; + } + } + + function timezoneMinutesFromString(string) { + var tzchunk = (parseTokenTimezone.exec(string) || [])[0], + parts = (tzchunk + '').match(parseTimezoneChunker) || ['-', 0, 0], + minutes = +(parts[1] * 60) + toInt(parts[2]); + + return parts[0] === '+' ? -minutes : minutes; + } + + // function to convert string input to date + function addTimeToArrayFromToken(token, input, config) { + var a, datePartArray = config._a; + + switch (token) { + // MONTH + case 'M' : // fall through to MM + case 'MM' : + if (input != null) { + datePartArray[MONTH] = toInt(input) - 1; + } + break; + case 'MMM' : // fall through to MMMM + case 'MMMM' : + a = getLangDefinition(config._l).monthsParse(input); + // if we didn't find a month name, mark the date as invalid. + if (a != null) { + datePartArray[MONTH] = a; + } else { + config._pf.invalidMonth = input; + } + break; + // DAY OF MONTH + case 'D' : // fall through to DD + case 'DD' : + if (input != null) { + datePartArray[DATE] = toInt(input); + } + break; + // DAY OF YEAR + case 'DDD' : // fall through to DDDD + case 'DDDD' : + if (input != null) { + config._dayOfYear = toInt(input); + } + + break; + // YEAR + case 'YY' : + datePartArray[YEAR] = toInt(input) + (toInt(input) > 68 ? 1900 : 2000); + break; + case 'YYYY' : + case 'YYYYY' : + datePartArray[YEAR] = toInt(input); + break; + // AM / PM + case 'a' : // fall through to A + case 'A' : + config._isPm = getLangDefinition(config._l).isPM(input); + break; + // 24 HOUR + case 'H' : // fall through to hh + case 'HH' : // fall through to hh + case 'h' : // fall through to hh + case 'hh' : + datePartArray[HOUR] = toInt(input); + break; + // MINUTE + case 'm' : // fall through to mm + case 'mm' : + datePartArray[MINUTE] = toInt(input); + break; + // SECOND + case 's' : // fall through to ss + case 'ss' : + datePartArray[SECOND] = toInt(input); + break; + // MILLISECOND + case 'S' : + case 'SS' : + case 'SSS' : + case 'SSSS' : + datePartArray[MILLISECOND] = toInt(('0.' + input) * 1000); + break; + // UNIX TIMESTAMP WITH MS + case 'X': + config._d = new Date(parseFloat(input) * 1000); + break; + // TIMEZONE + case 'Z' : // fall through to ZZ + case 'ZZ' : + config._useUTC = true; + config._tzm = timezoneMinutesFromString(input); + break; + case 'w': + case 'ww': + case 'W': + case 'WW': + case 'd': + case 'dd': + case 'ddd': + case 'dddd': + case 'e': + case 'E': + token = token.substr(0, 1); + /* falls through */ + case 'gg': + case 'gggg': + case 'GG': + case 'GGGG': + case 'GGGGG': + token = token.substr(0, 2); + if (input) { + config._w = config._w || {}; + config._w[token] = input; + } + break; + } + } + + // convert an array to a date. + // the array should mirror the parameters below + // note: all values past the year are optional and will default to the lowest possible value. + // [year, month, day , hour, minute, second, millisecond] + function dateFromConfig(config) { + var i, date, input = [], currentDate, + yearToUse, fixYear, w, temp, lang, weekday, week; + + if (config._d) { + return; + } + + currentDate = currentDateArray(config); + + //compute day of the year from weeks and weekdays + if (config._w && config._a[DATE] == null && config._a[MONTH] == null) { + fixYear = function (val) { + return val ? + (val.length < 3 ? (parseInt(val, 10) > 68 ? '19' + val : '20' + val) : val) : + (config._a[YEAR] == null ? moment().weekYear() : config._a[YEAR]); + }; + + w = config._w; + if (w.GG != null || w.W != null || w.E != null) { + temp = dayOfYearFromWeeks(fixYear(w.GG), w.W || 1, w.E, 4, 1); + } + else { + lang = getLangDefinition(config._l); + weekday = w.d != null ? parseWeekday(w.d, lang) : + (w.e != null ? parseInt(w.e, 10) + lang._week.dow : 0); + + week = parseInt(w.w, 10) || 1; + + //if we're parsing 'd', then the low day numbers may be next week + if (w.d != null && weekday < lang._week.dow) { + week++; + } + + temp = dayOfYearFromWeeks(fixYear(w.gg), week, weekday, lang._week.doy, lang._week.dow); + } + + config._a[YEAR] = temp.year; + config._dayOfYear = temp.dayOfYear; + } + + //if the day of the year is set, figure out what it is + if (config._dayOfYear) { + yearToUse = config._a[YEAR] == null ? currentDate[YEAR] : config._a[YEAR]; + + if (config._dayOfYear > daysInYear(yearToUse)) { + config._pf._overflowDayOfYear = true; + } + + date = makeUTCDate(yearToUse, 0, config._dayOfYear); + config._a[MONTH] = date.getUTCMonth(); + config._a[DATE] = date.getUTCDate(); + } + + // Default to current date. + // * if no year, month, day of month are given, default to today + // * if day of month is given, default month and year + // * if month is given, default only year + // * if year is given, don't default anything + for (i = 0; i < 3 && config._a[i] == null; ++i) { + config._a[i] = input[i] = currentDate[i]; + } + + // Zero out whatever was not defaulted, including time + for (; i < 7; i++) { + config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; + } + + // add the offsets to the time to be parsed so that we can have a clean array for checking isValid + input[HOUR] += toInt((config._tzm || 0) / 60); + input[MINUTE] += toInt((config._tzm || 0) % 60); + + config._d = (config._useUTC ? makeUTCDate : makeDate).apply(null, input); + } + + function dateFromObject(config) { + var normalizedInput; + + if (config._d) { + return; + } + + normalizedInput = normalizeObjectUnits(config._i); + config._a = [ + normalizedInput.year, + normalizedInput.month, + normalizedInput.day, + normalizedInput.hour, + normalizedInput.minute, + normalizedInput.second, + normalizedInput.millisecond + ]; + + dateFromConfig(config); + } + + function currentDateArray(config) { + var now = new Date(); + if (config._useUTC) { + return [ + now.getUTCFullYear(), + now.getUTCMonth(), + now.getUTCDate() + ]; + } else { + return [now.getFullYear(), now.getMonth(), now.getDate()]; + } + } + + // date from string and format string + function makeDateFromStringAndFormat(config) { + + config._a = []; + config._pf.empty = true; + + // This array is used to make a Date, either with `new Date` or `Date.UTC` + var lang = getLangDefinition(config._l), + string = '' + config._i, + i, parsedInput, tokens, token, skipped, + stringLength = string.length, + totalParsedInputLength = 0; + + tokens = expandFormat(config._f, lang).match(formattingTokens) || []; + + for (i = 0; i < tokens.length; i++) { + token = tokens[i]; + parsedInput = (getParseRegexForToken(token, config).exec(string) || [])[0]; + if (parsedInput) { + skipped = string.substr(0, string.indexOf(parsedInput)); + if (skipped.length > 0) { + config._pf.unusedInput.push(skipped); + } + string = string.slice(string.indexOf(parsedInput) + parsedInput.length); + totalParsedInputLength += parsedInput.length; + } + // don't parse if it's not a known token + if (formatTokenFunctions[token]) { + if (parsedInput) { + config._pf.empty = false; + } + else { + config._pf.unusedTokens.push(token); + } + addTimeToArrayFromToken(token, parsedInput, config); + } + else if (config._strict && !parsedInput) { + config._pf.unusedTokens.push(token); + } + } + + // add remaining unparsed input length to the string + config._pf.charsLeftOver = stringLength - totalParsedInputLength; + if (string.length > 0) { + config._pf.unusedInput.push(string); + } + + // handle am pm + if (config._isPm && config._a[HOUR] < 12) { + config._a[HOUR] += 12; + } + // if is 12 am, change hours to 0 + if (config._isPm === false && config._a[HOUR] === 12) { + config._a[HOUR] = 0; + } + + dateFromConfig(config); + checkOverflow(config); + } + + function unescapeFormat(s) { + return s.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) { + return p1 || p2 || p3 || p4; + }); + } + + // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript + function regexpEscape(s) { + return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); + } + + // date from string and array of format strings + function makeDateFromStringAndArray(config) { + var tempConfig, + bestMoment, + + scoreToBeat, + i, + currentScore; + + if (config._f.length === 0) { + config._pf.invalidFormat = true; + config._d = new Date(NaN); + return; + } + + for (i = 0; i < config._f.length; i++) { + currentScore = 0; + tempConfig = extend({}, config); + initializeParsingFlags(tempConfig); + tempConfig._f = config._f[i]; + makeDateFromStringAndFormat(tempConfig); + + if (!isValid(tempConfig)) { + continue; + } + + // if there is any input that was not parsed add a penalty for that format + currentScore += tempConfig._pf.charsLeftOver; + + //or tokens + currentScore += tempConfig._pf.unusedTokens.length * 10; + + tempConfig._pf.score = currentScore; + + if (scoreToBeat == null || currentScore < scoreToBeat) { + scoreToBeat = currentScore; + bestMoment = tempConfig; + } + } + + extend(config, bestMoment || tempConfig); + } + + // date from iso format + function makeDateFromString(config) { + var i, + string = config._i, + match = isoRegex.exec(string); + + if (match) { + config._pf.iso = true; + for (i = 4; i > 0; i--) { + if (match[i]) { + // match[5] should be "T" or undefined + config._f = isoDates[i - 1] + (match[6] || " "); + break; + } + } + for (i = 0; i < 4; i++) { + if (isoTimes[i][1].exec(string)) { + config._f += isoTimes[i][0]; + break; + } + } + if (parseTokenTimezone.exec(string)) { + config._f += "Z"; + } + makeDateFromStringAndFormat(config); + } + else { + config._d = new Date(string); + } + } + + function makeDateFromInput(config) { + var input = config._i, + matched = aspNetJsonRegex.exec(input); + + if (input === undefined) { + config._d = new Date(); + } else if (matched) { + config._d = new Date(+matched[1]); + } else if (typeof input === 'string') { + makeDateFromString(config); + } else if (isArray(input)) { + config._a = input.slice(0); + dateFromConfig(config); + } else if (isDate(input)) { + config._d = new Date(+input); + } else if (typeof(input) === 'object') { + dateFromObject(config); + } else { + config._d = new Date(input); + } + } + + function makeDate(y, m, d, h, M, s, ms) { + //can't just apply() to create a date: + //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply + var date = new Date(y, m, d, h, M, s, ms); + + //the date constructor doesn't accept years < 1970 + if (y < 1970) { + date.setFullYear(y); + } + return date; + } + + function makeUTCDate(y) { + var date = new Date(Date.UTC.apply(null, arguments)); + if (y < 1970) { + date.setUTCFullYear(y); + } + return date; + } + + function parseWeekday(input, language) { + if (typeof input === 'string') { + if (!isNaN(input)) { + input = parseInt(input, 10); + } + else { + input = language.weekdaysParse(input); + if (typeof input !== 'number') { + return null; + } + } + } + return input; + } + + /************************************ + Relative Time + ************************************/ + + + // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize + function substituteTimeAgo(string, number, withoutSuffix, isFuture, lang) { + return lang.relativeTime(number || 1, !!withoutSuffix, string, isFuture); + } + + function relativeTime(milliseconds, withoutSuffix, lang) { + var seconds = round(Math.abs(milliseconds) / 1000), + minutes = round(seconds / 60), + hours = round(minutes / 60), + days = round(hours / 24), + years = round(days / 365), + args = seconds < 45 && ['s', seconds] || + minutes === 1 && ['m'] || + minutes < 45 && ['mm', minutes] || + hours === 1 && ['h'] || + hours < 22 && ['hh', hours] || + days === 1 && ['d'] || + days <= 25 && ['dd', days] || + days <= 45 && ['M'] || + days < 345 && ['MM', round(days / 30)] || + years === 1 && ['y'] || ['yy', years]; + args[2] = withoutSuffix; + args[3] = milliseconds > 0; + args[4] = lang; + return substituteTimeAgo.apply({}, args); + } + + + /************************************ + Week of Year + ************************************/ + + + // firstDayOfWeek 0 = sun, 6 = sat + // the day of the week that starts the week + // (usually sunday or monday) + // firstDayOfWeekOfYear 0 = sun, 6 = sat + // the first week is the week that contains the first + // of this day of the week + // (eg. ISO weeks use thursday (4)) + function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) { + var end = firstDayOfWeekOfYear - firstDayOfWeek, + daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(), + adjustedMoment; + + + if (daysToDayOfWeek > end) { + daysToDayOfWeek -= 7; + } + + if (daysToDayOfWeek < end - 7) { + daysToDayOfWeek += 7; + } + + adjustedMoment = moment(mom).add('d', daysToDayOfWeek); + return { + week: Math.ceil(adjustedMoment.dayOfYear() / 7), + year: adjustedMoment.year() + }; + } + + //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday + function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) { + var d = new Date(Date.UTC(year, 0)).getUTCDay(), + daysToAdd, dayOfYear; + + weekday = weekday != null ? weekday : firstDayOfWeek; + daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0); + dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1; + + return { + year: dayOfYear > 0 ? year : year - 1, + dayOfYear: dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear + }; + } + + /************************************ + Top Level Functions + ************************************/ + + function makeMoment(config) { + var input = config._i, + format = config._f; + + if (typeof config._pf === 'undefined') { + initializeParsingFlags(config); + } + + if (input === null) { + return moment.invalid({nullInput: true}); + } + + if (typeof input === 'string') { + config._i = input = getLangDefinition().preparse(input); + } + + if (moment.isMoment(input)) { + config = extend({}, input); + + config._d = new Date(+input._d); + } else if (format) { + if (isArray(format)) { + makeDateFromStringAndArray(config); + } else { + makeDateFromStringAndFormat(config); + } + } else { + makeDateFromInput(config); + } + + return new Moment(config); + } + + moment = function (input, format, lang, strict) { + if (typeof(lang) === "boolean") { + strict = lang; + lang = undefined; + } + return makeMoment({ + _i : input, + _f : format, + _l : lang, + _strict : strict, + _isUTC : false + }); + }; + + // creating with utc + moment.utc = function (input, format, lang, strict) { + var m; + + if (typeof(lang) === "boolean") { + strict = lang; + lang = undefined; + } + m = makeMoment({ + _useUTC : true, + _isUTC : true, + _l : lang, + _i : input, + _f : format, + _strict : strict + }).utc(); + + return m; + }; + + // creating with unix timestamp (in seconds) + moment.unix = function (input) { + return moment(input * 1000); + }; + + // duration + moment.duration = function (input, key) { + var isDuration = moment.isDuration(input), + isNumber = (typeof input === 'number'), + duration = (isDuration ? input._input : (isNumber ? {} : input)), + // matching against regexp is expensive, do it on demand + match = null, + sign, + ret, + parseIso, + timeEmpty, + dateTimeEmpty; + + if (isNumber) { + if (key) { + duration[key] = input; + } else { + duration.milliseconds = input; + } + } else if (!!(match = aspNetTimeSpanJsonRegex.exec(input))) { + sign = (match[1] === "-") ? -1 : 1; + duration = { + y: 0, + d: toInt(match[DATE]) * sign, + h: toInt(match[HOUR]) * sign, + m: toInt(match[MINUTE]) * sign, + s: toInt(match[SECOND]) * sign, + ms: toInt(match[MILLISECOND]) * sign + }; + } else if (!!(match = isoDurationRegex.exec(input))) { + sign = (match[1] === "-") ? -1 : 1; + parseIso = function (inp) { + // We'd normally use ~~inp for this, but unfortunately it also + // converts floats to ints. + // inp may be undefined, so careful calling replace on it. + var res = inp && parseFloat(inp.replace(',', '.')); + // apply sign while we're at it + return (isNaN(res) ? 0 : res) * sign; + }; + duration = { + y: parseIso(match[2]), + M: parseIso(match[3]), + d: parseIso(match[4]), + h: parseIso(match[5]), + m: parseIso(match[6]), + s: parseIso(match[7]), + w: parseIso(match[8]) + }; + } + + ret = new Duration(duration); + + if (isDuration && input.hasOwnProperty('_lang')) { + ret._lang = input._lang; + } + + return ret; + }; + + // version number + moment.version = VERSION; + + // default format + moment.defaultFormat = isoFormat; + + // This function will be called whenever a moment is mutated. + // It is intended to keep the offset in sync with the timezone. + moment.updateOffset = function () {}; + + // This function will load languages and then set the global language. If + // no arguments are passed in, it will simply return the current global + // language key. + moment.lang = function (key, values) { + var r; + if (!key) { + return moment.fn._lang._abbr; + } + if (values) { + loadLang(normalizeLanguage(key), values); + } else if (values === null) { + unloadLang(key); + key = 'en'; + } else if (!languages[key]) { + getLangDefinition(key); + } + r = moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); + return r._abbr; + }; + + // returns language data + moment.langData = function (key) { + if (key && key._lang && key._lang._abbr) { + key = key._lang._abbr; + } + return getLangDefinition(key); + }; + + // compare moment object + moment.isMoment = function (obj) { + return obj instanceof Moment; + }; + + // for typechecking Duration objects + moment.isDuration = function (obj) { + return obj instanceof Duration; + }; + + for (i = lists.length - 1; i >= 0; --i) { + makeList(lists[i]); + } + + moment.normalizeUnits = function (units) { + return normalizeUnits(units); + }; + + moment.invalid = function (flags) { + var m = moment.utc(NaN); + if (flags != null) { + extend(m._pf, flags); + } + else { + m._pf.userInvalidated = true; + } + + return m; + }; + + moment.parseZone = function (input) { + return moment(input).parseZone(); + }; + + /************************************ + Moment Prototype + ************************************/ + + + extend(moment.fn = Moment.prototype, { + + clone : function () { + return moment(this); + }, + + valueOf : function () { + return +this._d + ((this._offset || 0) * 60000); + }, + + unix : function () { + return Math.floor(+this / 1000); + }, + + toString : function () { + return this.clone().lang('en').format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); + }, + + toDate : function () { + return this._offset ? new Date(+this) : this._d; + }, + + toISOString : function () { + return formatMoment(moment(this).utc(), 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + }, + + toArray : function () { + var m = this; + return [ + m.year(), + m.month(), + m.date(), + m.hours(), + m.minutes(), + m.seconds(), + m.milliseconds() + ]; + }, + + isValid : function () { + return isValid(this); + }, + + isDSTShifted : function () { + + if (this._a) { + return this.isValid() && compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()) > 0; + } + + return false; + }, + + parsingFlags : function () { + return extend({}, this._pf); + }, + + invalidAt: function () { + return this._pf.overflow; + }, + + utc : function () { + return this.zone(0); + }, + + local : function () { + this.zone(0); + this._isUTC = false; + return this; + }, + + format : function (inputString) { + var output = formatMoment(this, inputString || moment.defaultFormat); + return this.lang().postformat(output); + }, + + add : function (input, val) { + var dur; + // switch args to support add('s', 1) and add(1, 's') + if (typeof input === 'string') { + dur = moment.duration(+val, input); + } else { + dur = moment.duration(input, val); + } + addOrSubtractDurationFromMoment(this, dur, 1); + return this; + }, + + subtract : function (input, val) { + var dur; + // switch args to support subtract('s', 1) and subtract(1, 's') + if (typeof input === 'string') { + dur = moment.duration(+val, input); + } else { + dur = moment.duration(input, val); + } + addOrSubtractDurationFromMoment(this, dur, -1); + return this; + }, + + diff : function (input, units, asFloat) { + var that = this._isUTC ? moment(input).zone(this._offset || 0) : moment(input).local(), + zoneDiff = (this.zone() - that.zone()) * 6e4, + diff, output; + + units = normalizeUnits(units); + + if (units === 'year' || units === 'month') { + // average number of days in the months in the given dates + diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2 + // difference in months + output = ((this.year() - that.year()) * 12) + (this.month() - that.month()); + // adjust by taking difference in days, average number of days + // and dst in the given months. + output += ((this - moment(this).startOf('month')) - + (that - moment(that).startOf('month'))) / diff; + // same as above but with zones, to negate all dst + output -= ((this.zone() - moment(this).startOf('month').zone()) - + (that.zone() - moment(that).startOf('month').zone())) * 6e4 / diff; + if (units === 'year') { + output = output / 12; + } + } else { + diff = (this - that); + output = units === 'second' ? diff / 1e3 : // 1000 + units === 'minute' ? diff / 6e4 : // 1000 * 60 + units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60 + units === 'day' ? (diff - zoneDiff) / 864e5 : // 1000 * 60 * 60 * 24, negate dst + units === 'week' ? (diff - zoneDiff) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst + diff; + } + return asFloat ? output : absRound(output); + }, + + from : function (time, withoutSuffix) { + return moment.duration(this.diff(time)).lang(this.lang()._abbr).humanize(!withoutSuffix); + }, + + fromNow : function (withoutSuffix) { + return this.from(moment(), withoutSuffix); + }, + + calendar : function () { + var diff = this.diff(moment().zone(this.zone()).startOf('day'), 'days', true), + format = diff < -6 ? 'sameElse' : + diff < -1 ? 'lastWeek' : + diff < 0 ? 'lastDay' : + diff < 1 ? 'sameDay' : + diff < 2 ? 'nextDay' : + diff < 7 ? 'nextWeek' : 'sameElse'; + return this.format(this.lang().calendar(format, this)); + }, + + isLeapYear : function () { + return isLeapYear(this.year()); + }, + + isDST : function () { + return (this.zone() < this.clone().month(0).zone() || + this.zone() < this.clone().month(5).zone()); + }, + + day : function (input) { + var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); + if (input != null) { + input = parseWeekday(input, this.lang()); + return this.add({ d : input - day }); + } else { + return day; + } + }, + + month : function (input) { + var utc = this._isUTC ? 'UTC' : '', + dayOfMonth; + + if (input != null) { + if (typeof input === 'string') { + input = this.lang().monthsParse(input); + if (typeof input !== 'number') { + return this; + } + } + + dayOfMonth = this.date(); + this.date(1); + this._d['set' + utc + 'Month'](input); + this.date(Math.min(dayOfMonth, this.daysInMonth())); + + moment.updateOffset(this); + return this; + } else { + return this._d['get' + utc + 'Month'](); + } + }, + + startOf: function (units) { + units = normalizeUnits(units); + // the following switch intentionally omits break keywords + // to utilize falling through the cases. + switch (units) { + case 'year': + this.month(0); + /* falls through */ + case 'month': + this.date(1); + /* falls through */ + case 'week': + case 'isoWeek': + case 'day': + this.hours(0); + /* falls through */ + case 'hour': + this.minutes(0); + /* falls through */ + case 'minute': + this.seconds(0); + /* falls through */ + case 'second': + this.milliseconds(0); + /* falls through */ + } + + // weeks are a special case + if (units === 'week') { + this.weekday(0); + } else if (units === 'isoWeek') { + this.isoWeekday(1); + } + + return this; + }, + + endOf: function (units) { + units = normalizeUnits(units); + return this.startOf(units).add((units === 'isoWeek' ? 'week' : units), 1).subtract('ms', 1); + }, + + isAfter: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) > +moment(input).startOf(units); + }, + + isBefore: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) < +moment(input).startOf(units); + }, + + isSame: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) === +moment(input).startOf(units); + }, + + min: function (other) { + other = moment.apply(null, arguments); + return other < this ? this : other; + }, + + max: function (other) { + other = moment.apply(null, arguments); + return other > this ? this : other; + }, + + zone : function (input) { + var offset = this._offset || 0; + if (input != null) { + if (typeof input === "string") { + input = timezoneMinutesFromString(input); + } + if (Math.abs(input) < 16) { + input = input * 60; + } + this._offset = input; + this._isUTC = true; + if (offset !== input) { + addOrSubtractDurationFromMoment(this, moment.duration(offset - input, 'm'), 1, true); + } + } else { + return this._isUTC ? offset : this._d.getTimezoneOffset(); + } + return this; + }, + + zoneAbbr : function () { + return this._isUTC ? "UTC" : ""; + }, + + zoneName : function () { + return this._isUTC ? "Coordinated Universal Time" : ""; + }, + + parseZone : function () { + if (typeof this._i === 'string') { + this.zone(this._i); + } + return this; + }, + + hasAlignedHourOffset : function (input) { + if (!input) { + input = 0; + } + else { + input = moment(input).zone(); + } + + return (this.zone() - input) % 60 === 0; + }, + + daysInMonth : function () { + return daysInMonth(this.year(), this.month()); + }, + + dayOfYear : function (input) { + var dayOfYear = round((moment(this).startOf('day') - moment(this).startOf('year')) / 864e5) + 1; + return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); + }, + + weekYear : function (input) { + var year = weekOfYear(this, this.lang()._week.dow, this.lang()._week.doy).year; + return input == null ? year : this.add("y", (input - year)); + }, + + isoWeekYear : function (input) { + var year = weekOfYear(this, 1, 4).year; + return input == null ? year : this.add("y", (input - year)); + }, + + week : function (input) { + var week = this.lang().week(this); + return input == null ? week : this.add("d", (input - week) * 7); + }, + + isoWeek : function (input) { + var week = weekOfYear(this, 1, 4).week; + return input == null ? week : this.add("d", (input - week) * 7); + }, + + weekday : function (input) { + var weekday = (this.day() + 7 - this.lang()._week.dow) % 7; + return input == null ? weekday : this.add("d", input - weekday); + }, + + isoWeekday : function (input) { + // behaves the same as moment#day except + // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6) + // as a setter, sunday should belong to the previous week. + return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7); + }, + + get : function (units) { + units = normalizeUnits(units); + return this[units](); + }, + + set : function (units, value) { + units = normalizeUnits(units); + if (typeof this[units] === 'function') { + this[units](value); + } + return this; + }, + + // If passed a language key, it will set the language for this + // instance. Otherwise, it will return the language configuration + // variables for this instance. + lang : function (key) { + if (key === undefined) { + return this._lang; + } else { + this._lang = getLangDefinition(key); + return this; + } + } + }); + + // helper for adding shortcuts + function makeGetterAndSetter(name, key) { + moment.fn[name] = moment.fn[name + 's'] = function (input) { + var utc = this._isUTC ? 'UTC' : ''; + if (input != null) { + this._d['set' + utc + key](input); + moment.updateOffset(this); + return this; + } else { + return this._d['get' + utc + key](); + } + }; + } + + // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds) + for (i = 0; i < proxyGettersAndSetters.length; i ++) { + makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]); + } + + // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') + makeGetterAndSetter('year', 'FullYear'); + + // add plural methods + moment.fn.days = moment.fn.day; + moment.fn.months = moment.fn.month; + moment.fn.weeks = moment.fn.week; + moment.fn.isoWeeks = moment.fn.isoWeek; + + // add aliased format methods + moment.fn.toJSON = moment.fn.toISOString; + + /************************************ + Duration Prototype + ************************************/ + + + extend(moment.duration.fn = Duration.prototype, { + + _bubble : function () { + var milliseconds = this._milliseconds, + days = this._days, + months = this._months, + data = this._data, + seconds, minutes, hours, years; + + // The following code bubbles up values, see the tests for + // examples of what that means. + data.milliseconds = milliseconds % 1000; + + seconds = absRound(milliseconds / 1000); + data.seconds = seconds % 60; + + minutes = absRound(seconds / 60); + data.minutes = minutes % 60; + + hours = absRound(minutes / 60); + data.hours = hours % 24; + + days += absRound(hours / 24); + data.days = days % 30; + + months += absRound(days / 30); + data.months = months % 12; + + years = absRound(months / 12); + data.years = years; + }, + + weeks : function () { + return absRound(this.days() / 7); + }, + + valueOf : function () { + return this._milliseconds + + this._days * 864e5 + + (this._months % 12) * 2592e6 + + toInt(this._months / 12) * 31536e6; + }, + + humanize : function (withSuffix) { + var difference = +this, + output = relativeTime(difference, !withSuffix, this.lang()); + + if (withSuffix) { + output = this.lang().pastFuture(difference, output); + } + + return this.lang().postformat(output); + }, + + add : function (input, val) { + // supports only 2.0-style add(1, 's') or add(moment) + var dur = moment.duration(input, val); + + this._milliseconds += dur._milliseconds; + this._days += dur._days; + this._months += dur._months; + + this._bubble(); + + return this; + }, + + subtract : function (input, val) { + var dur = moment.duration(input, val); + + this._milliseconds -= dur._milliseconds; + this._days -= dur._days; + this._months -= dur._months; + + this._bubble(); + + return this; + }, + + get : function (units) { + units = normalizeUnits(units); + return this[units.toLowerCase() + 's'](); + }, + + as : function (units) { + units = normalizeUnits(units); + return this['as' + units.charAt(0).toUpperCase() + units.slice(1) + 's'](); + }, + + lang : moment.fn.lang, + + toIsoString : function () { + // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js + var years = Math.abs(this.years()), + months = Math.abs(this.months()), + days = Math.abs(this.days()), + hours = Math.abs(this.hours()), + minutes = Math.abs(this.minutes()), + seconds = Math.abs(this.seconds() + this.milliseconds() / 1000); + + if (!this.asSeconds()) { + // this is the same as C#'s (Noda) and python (isodate)... + // but not other JS (goog.date) + return 'P0D'; + } + + return (this.asSeconds() < 0 ? '-' : '') + + 'P' + + (years ? years + 'Y' : '') + + (months ? months + 'M' : '') + + (days ? days + 'D' : '') + + ((hours || minutes || seconds) ? 'T' : '') + + (hours ? hours + 'H' : '') + + (minutes ? minutes + 'M' : '') + + (seconds ? seconds + 'S' : ''); + } + }); + + function makeDurationGetter(name) { + moment.duration.fn[name] = function () { + return this._data[name]; + }; + } + + function makeDurationAsGetter(name, factor) { + moment.duration.fn['as' + name] = function () { + return +this / factor; + }; + } + + for (i in unitMillisecondFactors) { + if (unitMillisecondFactors.hasOwnProperty(i)) { + makeDurationAsGetter(i, unitMillisecondFactors[i]); + makeDurationGetter(i.toLowerCase()); + } + } + + makeDurationAsGetter('Weeks', 6048e5); + moment.duration.fn.asMonths = function () { + return (+this - this.years() * 31536e6) / 2592e6 + this.years() * 12; + }; + + + /************************************ + Default Lang + ************************************/ + + + // Set default language, other languages will inherit from English. + moment.lang('en', { + ordinal : function (number) { + var b = number % 10, + output = (toInt(number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + } + }); + + // moment.js language configuration +// language : Moroccan Arabic (ar-ma) +// author : ElFadili Yassine : https://github.com/ElFadiliY +// author : Abdel Said : https://github.com/abdelsaid + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ar-ma', { + months : "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"), + monthsShort : "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"), + weekdays : "الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"), + weekdaysShort : "احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"), + weekdaysMin : "ح_ن_ث_ر_خ_ج_س".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: "[اليوم على الساعة] LT", + nextDay: '[غدا على الساعة] LT', + nextWeek: 'dddd [على الساعة] LT', + lastDay: '[أمس على الساعة] LT', + lastWeek: 'dddd [على الساعة] LT', + sameElse: 'L' + }, + relativeTime : { + future : "في %s", + past : "منذ %s", + s : "ثوان", + m : "دقيقة", + mm : "%d دقائق", + h : "ساعة", + hh : "%d ساعات", + d : "يوم", + dd : "%d أيام", + M : "شهر", + MM : "%d أشهر", + y : "سنة", + yy : "%d سنوات" + }, + week : { + dow : 6, // Saturday is the first day of the week. + doy : 12 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Arabic (ar) +// author : Abdel Said : https://github.com/abdelsaid +// changes in months, weekdays : Ahmed Elkhatib + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ar', { + months : "يناير/ كانون الثاني_فبراير/ شباط_مارس/ آذار_أبريل/ نيسان_مايو/ أيار_يونيو/ حزيران_يوليو/ تموز_أغسطس/ آب_سبتمبر/ أيلول_أكتوبر/ تشرين الأول_نوفمبر/ تشرين الثاني_ديسمبر/ كانون الأول".split("_"), + monthsShort : "يناير/ كانون الثاني_فبراير/ شباط_مارس/ آذار_أبريل/ نيسان_مايو/ أيار_يونيو/ حزيران_يوليو/ تموز_أغسطس/ آب_سبتمبر/ أيلول_أكتوبر/ تشرين الأول_نوفمبر/ تشرين الثاني_ديسمبر/ كانون الأول".split("_"), + weekdays : "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"), + weekdaysShort : "الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"), + weekdaysMin : "ح_ن_ث_ر_خ_ج_س".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: "[اليوم على الساعة] LT", + nextDay: '[غدا على الساعة] LT', + nextWeek: 'dddd [على الساعة] LT', + lastDay: '[أمس على الساعة] LT', + lastWeek: 'dddd [على الساعة] LT', + sameElse: 'L' + }, + relativeTime : { + future : "في %s", + past : "منذ %s", + s : "ثوان", + m : "دقيقة", + mm : "%d دقائق", + h : "ساعة", + hh : "%d ساعات", + d : "يوم", + dd : "%d أيام", + M : "شهر", + MM : "%d أشهر", + y : "سنة", + yy : "%d سنوات" + }, + week : { + dow : 6, // Saturday is the first day of the week. + doy : 12 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : bulgarian (bg) +// author : Krasen Borisov : https://github.com/kraz + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('bg', { + months : "януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"), + monthsShort : "янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"), + weekdays : "неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"), + weekdaysShort : "нед_пон_вто_сря_чет_пет_съб".split("_"), + weekdaysMin : "нд_пн_вт_ср_чт_пт_сб".split("_"), + longDateFormat : { + LT : "H:mm", + L : "D.MM.YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay : '[Днес в] LT', + nextDay : '[Утре в] LT', + nextWeek : 'dddd [в] LT', + lastDay : '[Вчера в] LT', + lastWeek : function () { + switch (this.day()) { + case 0: + case 3: + case 6: + return '[В изминалата] dddd [в] LT'; + case 1: + case 2: + case 4: + case 5: + return '[В изминалия] dddd [в] LT'; + } + }, + sameElse : 'L' + }, + relativeTime : { + future : "след %s", + past : "преди %s", + s : "няколко секунди", + m : "минута", + mm : "%d минути", + h : "час", + hh : "%d часа", + d : "ден", + dd : "%d дни", + M : "месец", + MM : "%d месеца", + y : "година", + yy : "%d години" + }, + ordinal : function (number) { + var lastDigit = number % 10, + last2Digits = number % 100; + if (number === 0) { + return number + '-ев'; + } else if (last2Digits === 0) { + return number + '-ен'; + } else if (last2Digits > 10 && last2Digits < 20) { + return number + '-ти'; + } else if (lastDigit === 1) { + return number + '-ви'; + } else if (lastDigit === 2) { + return number + '-ри'; + } else if (lastDigit === 7 || lastDigit === 8) { + return number + '-ми'; + } else { + return number + '-ти'; + } + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : breton (br) +// author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou + +(function (factory) { + factory(moment); +}(function (moment) { + function relativeTimeWithMutation(number, withoutSuffix, key) { + var format = { + 'mm': "munutenn", + 'MM': "miz", + 'dd': "devezh" + }; + return number + ' ' + mutation(format[key], number); + } + + function specialMutationForYears(number) { + switch (lastNumber(number)) { + case 1: + case 3: + case 4: + case 5: + case 9: + return number + ' bloaz'; + default: + return number + ' vloaz'; + } + } + + function lastNumber(number) { + if (number > 9) { + return lastNumber(number % 10); + } + return number; + } + + function mutation(text, number) { + if (number === 2) { + return softMutation(text); + } + return text; + } + + function softMutation(text) { + var mutationTable = { + 'm': 'v', + 'b': 'v', + 'd': 'z' + }; + if (mutationTable[text.charAt(0)] === undefined) { + return text; + } + return mutationTable[text.charAt(0)] + text.substring(1); + } + + return moment.lang('br', { + months : "Genver_C'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"), + monthsShort : "Gen_C'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"), + weekdays : "Sul_Lun_Meurzh_Merc'her_Yaou_Gwener_Sadorn".split("_"), + weekdaysShort : "Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"), + weekdaysMin : "Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"), + longDateFormat : { + LT : "h[e]mm A", + L : "DD/MM/YYYY", + LL : "D [a viz] MMMM YYYY", + LLL : "D [a viz] MMMM YYYY LT", + LLLL : "dddd, D [a viz] MMMM YYYY LT" + }, + calendar : { + sameDay : '[Hiziv da] LT', + nextDay : '[Warc\'hoazh da] LT', + nextWeek : 'dddd [da] LT', + lastDay : '[Dec\'h da] LT', + lastWeek : 'dddd [paset da] LT', + sameElse : 'L' + }, + relativeTime : { + future : "a-benn %s", + past : "%s 'zo", + s : "un nebeud segondennoù", + m : "ur vunutenn", + mm : relativeTimeWithMutation, + h : "un eur", + hh : "%d eur", + d : "un devezh", + dd : relativeTimeWithMutation, + M : "ur miz", + MM : relativeTimeWithMutation, + y : "ur bloaz", + yy : specialMutationForYears + }, + ordinal : function (number) { + var output = (number === 1) ? 'añ' : 'vet'; + return number + output; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : bosnian (bs) +// author : Nedim Cholich : https://github.com/frontyard +// based on (hr) translation by Bojan Marković + +(function (factory) { + factory(moment); +}(function (moment) { + + function translate(number, withoutSuffix, key) { + var result = number + " "; + switch (key) { + case 'm': + return withoutSuffix ? 'jedna minuta' : 'jedne minute'; + case 'mm': + if (number === 1) { + result += 'minuta'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'minute'; + } else { + result += 'minuta'; + } + return result; + case 'h': + return withoutSuffix ? 'jedan sat' : 'jednog sata'; + case 'hh': + if (number === 1) { + result += 'sat'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'sata'; + } else { + result += 'sati'; + } + return result; + case 'dd': + if (number === 1) { + result += 'dan'; + } else { + result += 'dana'; + } + return result; + case 'MM': + if (number === 1) { + result += 'mjesec'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'mjeseca'; + } else { + result += 'mjeseci'; + } + return result; + case 'yy': + if (number === 1) { + result += 'godina'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'godine'; + } else { + result += 'godina'; + } + return result; + } + } + + return moment.lang('bs', { + months : "januar_februar_mart_april_maj_juni_juli_avgust_septembar_oktobar_novembar_decembar".split("_"), + monthsShort : "jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"), + weekdays : "nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"), + weekdaysShort : "ned._pon._uto._sri._čet._pet._sub.".split("_"), + weekdaysMin : "ne_po_ut_sr_če_pe_su".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD. MM. YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd, D. MMMM YYYY LT" + }, + calendar : { + sameDay : '[danas u] LT', + nextDay : '[sutra u] LT', + + nextWeek : function () { + switch (this.day()) { + case 0: + return '[u] [nedjelju] [u] LT'; + case 3: + return '[u] [srijedu] [u] LT'; + case 6: + return '[u] [subotu] [u] LT'; + case 1: + case 2: + case 4: + case 5: + return '[u] dddd [u] LT'; + } + }, + lastDay : '[jučer u] LT', + lastWeek : function () { + switch (this.day()) { + case 0: + case 3: + return '[prošlu] dddd [u] LT'; + case 6: + return '[prošle] [subote] [u] LT'; + case 1: + case 2: + case 4: + case 5: + return '[prošli] dddd [u] LT'; + } + }, + sameElse : 'L' + }, + relativeTime : { + future : "za %s", + past : "prije %s", + s : "par sekundi", + m : translate, + mm : translate, + h : translate, + hh : translate, + d : "dan", + dd : translate, + M : "mjesec", + MM : translate, + y : "godinu", + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : catalan (ca) +// author : Juan G. Hurtado : https://github.com/juanghurtado + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ca', { + months : "Gener_Febrer_Març_Abril_Maig_Juny_Juliol_Agost_Setembre_Octubre_Novembre_Desembre".split("_"), + monthsShort : "Gen._Febr._Mar._Abr._Mai._Jun._Jul._Ag._Set._Oct._Nov._Des.".split("_"), + weekdays : "Diumenge_Dilluns_Dimarts_Dimecres_Dijous_Divendres_Dissabte".split("_"), + weekdaysShort : "Dg._Dl._Dt._Dc._Dj._Dv._Ds.".split("_"), + weekdaysMin : "Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay : function () { + return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; + }, + nextDay : function () { + return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; + }, + nextWeek : function () { + return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; + }, + lastDay : function () { + return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; + }, + lastWeek : function () { + return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; + }, + sameElse : 'L' + }, + relativeTime : { + future : "en %s", + past : "fa %s", + s : "uns segons", + m : "un minut", + mm : "%d minuts", + h : "una hora", + hh : "%d hores", + d : "un dia", + dd : "%d dies", + M : "un mes", + MM : "%d mesos", + y : "un any", + yy : "%d anys" + }, + ordinal : '%dº', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : czech (cs) +// author : petrbela : https://github.com/petrbela + +(function (factory) { + factory(moment); +}(function (moment) { + var months = "leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_"), + monthsShort = "led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"); + + function plural(n) { + return (n > 1) && (n < 5) && (~~(n / 10) !== 1); + } + + function translate(number, withoutSuffix, key, isFuture) { + var result = number + " "; + switch (key) { + case 's': // a few seconds / in a few seconds / a few seconds ago + return (withoutSuffix || isFuture) ? 'pár vteřin' : 'pár vteřinami'; + case 'm': // a minute / in a minute / a minute ago + return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou'); + case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'minuty' : 'minut'); + } else { + return result + 'minutami'; + } + break; + case 'h': // an hour / in an hour / an hour ago + return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou'); + case 'hh': // 9 hours / in 9 hours / 9 hours ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'hodiny' : 'hodin'); + } else { + return result + 'hodinami'; + } + break; + case 'd': // a day / in a day / a day ago + return (withoutSuffix || isFuture) ? 'den' : 'dnem'; + case 'dd': // 9 days / in 9 days / 9 days ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'dny' : 'dní'); + } else { + return result + 'dny'; + } + break; + case 'M': // a month / in a month / a month ago + return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem'; + case 'MM': // 9 months / in 9 months / 9 months ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'měsíce' : 'měsíců'); + } else { + return result + 'měsíci'; + } + break; + case 'y': // a year / in a year / a year ago + return (withoutSuffix || isFuture) ? 'rok' : 'rokem'; + case 'yy': // 9 years / in 9 years / 9 years ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'roky' : 'let'); + } else { + return result + 'lety'; + } + break; + } + } + + return moment.lang('cs', { + months : months, + monthsShort : monthsShort, + monthsParse : (function (months, monthsShort) { + var i, _monthsParse = []; + for (i = 0; i < 12; i++) { + // use custom parser to solve problem with July (červenec) + _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i'); + } + return _monthsParse; + }(months, monthsShort)), + weekdays : "neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"), + weekdaysShort : "ne_po_út_st_čt_pá_so".split("_"), + weekdaysMin : "ne_po_út_st_čt_pá_so".split("_"), + longDateFormat : { + LT: "H:mm", + L : "DD.MM.YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd D. MMMM YYYY LT" + }, + calendar : { + sameDay: "[dnes v] LT", + nextDay: '[zítra v] LT', + nextWeek: function () { + switch (this.day()) { + case 0: + return '[v neděli v] LT'; + case 1: + case 2: + return '[v] dddd [v] LT'; + case 3: + return '[ve středu v] LT'; + case 4: + return '[ve čtvrtek v] LT'; + case 5: + return '[v pátek v] LT'; + case 6: + return '[v sobotu v] LT'; + } + }, + lastDay: '[včera v] LT', + lastWeek: function () { + switch (this.day()) { + case 0: + return '[minulou neděli v] LT'; + case 1: + case 2: + return '[minulé] dddd [v] LT'; + case 3: + return '[minulou středu v] LT'; + case 4: + case 5: + return '[minulý] dddd [v] LT'; + case 6: + return '[minulou sobotu v] LT'; + } + }, + sameElse: "L" + }, + relativeTime : { + future : "za %s", + past : "před %s", + s : translate, + m : translate, + mm : translate, + h : translate, + hh : translate, + d : translate, + dd : translate, + M : translate, + MM : translate, + y : translate, + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : chuvash (cv) +// author : Anatoly Mironov : https://github.com/mirontoli + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('cv', { + months : "кăрлач_нарăс_пуш_ака_май_çĕртме_утă_çурла_авăн_юпа_чӳк_раштав".split("_"), + monthsShort : "кăр_нар_пуш_ака_май_çĕр_утă_çур_ав_юпа_чӳк_раш".split("_"), + weekdays : "вырсарникун_тунтикун_ытларикун_юнкун_кĕçнерникун_эрнекун_шăматкун".split("_"), + weekdaysShort : "выр_тун_ытл_юн_кĕç_эрн_шăм".split("_"), + weekdaysMin : "вр_тн_ыт_юн_кç_эр_шм".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD-MM-YYYY", + LL : "YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ]", + LLL : "YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ], LT", + LLLL : "dddd, YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ], LT" + }, + calendar : { + sameDay: '[Паян] LT [сехетре]', + nextDay: '[Ыран] LT [сехетре]', + lastDay: '[Ĕнер] LT [сехетре]', + nextWeek: '[Çитес] dddd LT [сехетре]', + lastWeek: '[Иртнĕ] dddd LT [сехетре]', + sameElse: 'L' + }, + relativeTime : { + future : function (output) { + var affix = /сехет$/i.exec(output) ? "рен" : /çул$/i.exec(output) ? "тан" : "ран"; + return output + affix; + }, + past : "%s каялла", + s : "пĕр-ик çеккунт", + m : "пĕр минут", + mm : "%d минут", + h : "пĕр сехет", + hh : "%d сехет", + d : "пĕр кун", + dd : "%d кун", + M : "пĕр уйăх", + MM : "%d уйăх", + y : "пĕр çул", + yy : "%d çул" + }, + ordinal : '%d-мĕш', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Welsh (cy) +// author : Robert Allen + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang("cy", { + months: "Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"), + monthsShort: "Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"), + weekdays: "Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"), + weekdaysShort: "Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"), + weekdaysMin: "Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"), + // time formats are the same as en-gb + longDateFormat: { + LT: "HH:mm", + L: "DD/MM/YYYY", + LL: "D MMMM YYYY", + LLL: "D MMMM YYYY LT", + LLLL: "dddd, D MMMM YYYY LT" + }, + calendar: { + sameDay: '[Heddiw am] LT', + nextDay: '[Yfory am] LT', + nextWeek: 'dddd [am] LT', + lastDay: '[Ddoe am] LT', + lastWeek: 'dddd [diwethaf am] LT', + sameElse: 'L' + }, + relativeTime: { + future: "mewn %s", + past: "%s yn ôl", + s: "ychydig eiliadau", + m: "munud", + mm: "%d munud", + h: "awr", + hh: "%d awr", + d: "diwrnod", + dd: "%d diwrnod", + M: "mis", + MM: "%d mis", + y: "blwyddyn", + yy: "%d flynedd" + }, + // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh + ordinal: function (number) { + var b = number, + output = '', + lookup = [ + '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed + 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed + ]; + + if (b > 20) { + if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) { + output = 'fed'; // not 30ain, 70ain or 90ain + } else { + output = 'ain'; + } + } else if (b > 0) { + output = lookup[b]; + } + + return number + output; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : danish (da) +// author : Ulrik Nielsen : https://github.com/mrbase + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('da', { + months : "januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"), + monthsShort : "jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"), + weekdays : "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"), + weekdaysShort : "søn_man_tir_ons_tor_fre_lør".split("_"), + weekdaysMin : "sø_ma_ti_on_to_fr_lø".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D. MMMM, YYYY LT" + }, + calendar : { + sameDay : '[I dag kl.] LT', + nextDay : '[I morgen kl.] LT', + nextWeek : 'dddd [kl.] LT', + lastDay : '[I går kl.] LT', + lastWeek : '[sidste] dddd [kl] LT', + sameElse : 'L' + }, + relativeTime : { + future : "om %s", + past : "%s siden", + s : "få sekunder", + m : "et minut", + mm : "%d minutter", + h : "en time", + hh : "%d timer", + d : "en dag", + dd : "%d dage", + M : "en måned", + MM : "%d måneder", + y : "et år", + yy : "%d år" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : german (de) +// author : lluchs : https://github.com/lluchs +// author: Menelion Elensúle: https://github.com/Oire + +(function (factory) { + factory(moment); +}(function (moment) { + function processRelativeTime(number, withoutSuffix, key, isFuture) { + var format = { + 'm': ['eine Minute', 'einer Minute'], + 'h': ['eine Stunde', 'einer Stunde'], + 'd': ['ein Tag', 'einem Tag'], + 'dd': [number + ' Tage', number + ' Tagen'], + 'M': ['ein Monat', 'einem Monat'], + 'MM': [number + ' Monate', number + ' Monaten'], + 'y': ['ein Jahr', 'einem Jahr'], + 'yy': [number + ' Jahre', number + ' Jahren'] + }; + return withoutSuffix ? format[key][0] : format[key][1]; + } + + return moment.lang('de', { + months : "Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"), + monthsShort : "Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"), + weekdays : "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"), + weekdaysShort : "So._Mo._Di._Mi._Do._Fr._Sa.".split("_"), + weekdaysMin : "So_Mo_Di_Mi_Do_Fr_Sa".split("_"), + longDateFormat : { + LT: "H:mm [Uhr]", + L : "DD.MM.YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd, D. MMMM YYYY LT" + }, + calendar : { + sameDay: "[Heute um] LT", + sameElse: "L", + nextDay: '[Morgen um] LT', + nextWeek: 'dddd [um] LT', + lastDay: '[Gestern um] LT', + lastWeek: '[letzten] dddd [um] LT' + }, + relativeTime : { + future : "in %s", + past : "vor %s", + s : "ein paar Sekunden", + m : processRelativeTime, + mm : "%d Minuten", + h : processRelativeTime, + hh : "%d Stunden", + d : processRelativeTime, + dd : processRelativeTime, + M : processRelativeTime, + MM : processRelativeTime, + y : processRelativeTime, + yy : processRelativeTime + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : modern greek (el) +// author : Aggelos Karalias : https://github.com/mehiel + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('el', { + monthsNominativeEl : "Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"), + monthsGenitiveEl : "Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου".split("_"), + months : function (momentToFormat, format) { + if (/D/.test(format.substring(0, format.indexOf("MMMM")))) { // if there is a day number before 'MMMM' + return this._monthsGenitiveEl[momentToFormat.month()]; + } else { + return this._monthsNominativeEl[momentToFormat.month()]; + } + }, + monthsShort : "Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ".split("_"), + weekdays : "Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"), + weekdaysShort : "Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"), + weekdaysMin : "Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"), + meridiem : function (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'μμ' : 'ΜΜ'; + } else { + return isLower ? 'πμ' : 'ΠΜ'; + } + }, + longDateFormat : { + LT : "h:mm A", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendarEl : { + sameDay : '[Σήμερα {}] LT', + nextDay : '[Αύριο {}] LT', + nextWeek : 'dddd [{}] LT', + lastDay : '[Χθες {}] LT', + lastWeek : '[την προηγούμενη] dddd [{}] LT', + sameElse : 'L' + }, + calendar : function (key, mom) { + var output = this._calendarEl[key], + hours = mom && mom.hours(); + + return output.replace("{}", (hours % 12 === 1 ? "στη" : "στις")); + }, + relativeTime : { + future : "σε %s", + past : "%s πριν", + s : "δευτερόλεπτα", + m : "ένα λεπτό", + mm : "%d λεπτά", + h : "μία ώρα", + hh : "%d ώρες", + d : "μία μέρα", + dd : "%d μέρες", + M : "ένας μήνας", + MM : "%d μήνες", + y : "ένας χρόνος", + yy : "%d χρόνια" + }, + ordinal : function (number) { + return number + 'η'; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : australian english (en-au) + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('en-au', { + months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), + monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), + weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + longDateFormat : { + LT : "h:mm A", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[Last] dddd [at] LT', + sameElse : 'L' + }, + relativeTime : { + future : "in %s", + past : "%s ago", + s : "a few seconds", + m : "a minute", + mm : "%d minutes", + h : "an hour", + hh : "%d hours", + d : "a day", + dd : "%d days", + M : "a month", + MM : "%d months", + y : "a year", + yy : "%d years" + }, + ordinal : function (number) { + var b = number % 10, + output = (~~ (number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : canadian english (en-ca) +// author : Jonathan Abourbih : https://github.com/jonbca + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('en-ca', { + months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), + monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), + weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + longDateFormat : { + LT : "h:mm A", + L : "YYYY-MM-DD", + LL : "D MMMM, YYYY", + LLL : "D MMMM, YYYY LT", + LLLL : "dddd, D MMMM, YYYY LT" + }, + calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[Last] dddd [at] LT', + sameElse : 'L' + }, + relativeTime : { + future : "in %s", + past : "%s ago", + s : "a few seconds", + m : "a minute", + mm : "%d minutes", + h : "an hour", + hh : "%d hours", + d : "a day", + dd : "%d days", + M : "a month", + MM : "%d months", + y : "a year", + yy : "%d years" + }, + ordinal : function (number) { + var b = number % 10, + output = (~~ (number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + } + }); +})); +// moment.js language configuration +// language : great britain english (en-gb) +// author : Chris Gedrim : https://github.com/chrisgedrim + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('en-gb', { + months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), + monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), + weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[Last] dddd [at] LT', + sameElse : 'L' + }, + relativeTime : { + future : "in %s", + past : "%s ago", + s : "a few seconds", + m : "a minute", + mm : "%d minutes", + h : "an hour", + hh : "%d hours", + d : "a day", + dd : "%d days", + M : "a month", + MM : "%d months", + y : "a year", + yy : "%d years" + }, + ordinal : function (number) { + var b = number % 10, + output = (~~ (number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : esperanto (eo) +// author : Colin Dean : https://github.com/colindean +// komento: Mi estas malcerta se mi korekte traktis akuzativojn en tiu traduko. +// Se ne, bonvolu korekti kaj avizi min por ke mi povas lerni! + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('eo', { + months : "januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro".split("_"), + monthsShort : "jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec".split("_"), + weekdays : "Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato".split("_"), + weekdaysShort : "Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab".split("_"), + weekdaysMin : "Di_Lu_Ma_Me_Ĵa_Ve_Sa".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "YYYY-MM-DD", + LL : "D[-an de] MMMM, YYYY", + LLL : "D[-an de] MMMM, YYYY LT", + LLLL : "dddd, [la] D[-an de] MMMM, YYYY LT" + }, + meridiem : function (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'p.t.m.' : 'P.T.M.'; + } else { + return isLower ? 'a.t.m.' : 'A.T.M.'; + } + }, + calendar : { + sameDay : '[Hodiaŭ je] LT', + nextDay : '[Morgaŭ je] LT', + nextWeek : 'dddd [je] LT', + lastDay : '[Hieraŭ je] LT', + lastWeek : '[pasinta] dddd [je] LT', + sameElse : 'L' + }, + relativeTime : { + future : "je %s", + past : "antaŭ %s", + s : "sekundoj", + m : "minuto", + mm : "%d minutoj", + h : "horo", + hh : "%d horoj", + d : "tago",//ne 'diurno', ĉar estas uzita por proksimumo + dd : "%d tagoj", + M : "monato", + MM : "%d monatoj", + y : "jaro", + yy : "%d jaroj" + }, + ordinal : "%da", + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : spanish (es) +// author : Julio Napurí : https://github.com/julionc + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('es', { + months : "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"), + monthsShort : "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"), + weekdays : "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"), + weekdaysShort : "dom._lun._mar._mié._jue._vie._sáb.".split("_"), + weekdaysMin : "Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD/MM/YYYY", + LL : "D [de] MMMM [de] YYYY", + LLL : "D [de] MMMM [de] YYYY LT", + LLLL : "dddd, D [de] MMMM [de] YYYY LT" + }, + calendar : { + sameDay : function () { + return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + }, + nextDay : function () { + return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + }, + nextWeek : function () { + return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + }, + lastDay : function () { + return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + }, + lastWeek : function () { + return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + }, + sameElse : 'L' + }, + relativeTime : { + future : "en %s", + past : "hace %s", + s : "unos segundos", + m : "un minuto", + mm : "%d minutos", + h : "una hora", + hh : "%d horas", + d : "un día", + dd : "%d días", + M : "un mes", + MM : "%d meses", + y : "un año", + yy : "%d años" + }, + ordinal : '%dº', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : estonian (et) +// author : Henry Kehlmann : https://github.com/madhenry + +(function (factory) { + factory(moment); +}(function (moment) { + function translateSeconds(number, withoutSuffix, key, isFuture) { + return (isFuture || withoutSuffix) ? 'paari sekundi' : 'paar sekundit'; + } + + return moment.lang('et', { + months : "jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"), + monthsShort : "jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"), + weekdays : "pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"), + weekdaysShort : "P_E_T_K_N_R_L".split("_"), + weekdaysMin : "P_E_T_K_N_R_L".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD.MM.YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd, D. MMMM YYYY LT" + }, + calendar : { + sameDay : '[Täna,] LT', + nextDay : '[Homme,] LT', + nextWeek : '[Järgmine] dddd LT', + lastDay : '[Eile,] LT', + lastWeek : '[Eelmine] dddd LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s pärast", + past : "%s tagasi", + s : translateSeconds, + m : "minut", + mm : "%d minutit", + h : "tund", + hh : "%d tundi", + d : "päev", + dd : "%d päeva", + M : "kuu", + MM : "%d kuud", + y : "aasta", + yy : "%d aastat" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : euskara (eu) +// author : Eneko Illarramendi : https://github.com/eillarra + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('eu', { + months : "urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"), + monthsShort : "urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"), + weekdays : "igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"), + weekdaysShort : "ig._al._ar._az._og._ol._lr.".split("_"), + weekdaysMin : "ig_al_ar_az_og_ol_lr".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "YYYY-MM-DD", + LL : "YYYY[ko] MMMM[ren] D[a]", + LLL : "YYYY[ko] MMMM[ren] D[a] LT", + LLLL : "dddd, YYYY[ko] MMMM[ren] D[a] LT", + l : "YYYY-M-D", + ll : "YYYY[ko] MMM D[a]", + lll : "YYYY[ko] MMM D[a] LT", + llll : "ddd, YYYY[ko] MMM D[a] LT" + }, + calendar : { + sameDay : '[gaur] LT[etan]', + nextDay : '[bihar] LT[etan]', + nextWeek : 'dddd LT[etan]', + lastDay : '[atzo] LT[etan]', + lastWeek : '[aurreko] dddd LT[etan]', + sameElse : 'L' + }, + relativeTime : { + future : "%s barru", + past : "duela %s", + s : "segundo batzuk", + m : "minutu bat", + mm : "%d minutu", + h : "ordu bat", + hh : "%d ordu", + d : "egun bat", + dd : "%d egun", + M : "hilabete bat", + MM : "%d hilabete", + y : "urte bat", + yy : "%d urte" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Persian Language +// author : Ebrahim Byagowi : https://github.com/ebraminio + +(function (factory) { + factory(moment); +}(function (moment) { + var symbolMap = { + '1': '۱', + '2': '۲', + '3': '۳', + '4': '۴', + '5': '۵', + '6': '۶', + '7': '۷', + '8': '۸', + '9': '۹', + '0': '۰' + }, numberMap = { + '۱': '1', + '۲': '2', + '۳': '3', + '۴': '4', + '۵': '5', + '۶': '6', + '۷': '7', + '۸': '8', + '۹': '9', + '۰': '0' + }; + + return moment.lang('fa', { + months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'), + monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'), + weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'), + weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'), + weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'), + longDateFormat : { + LT : 'HH:mm', + L : 'DD/MM/YYYY', + LL : 'D MMMM YYYY', + LLL : 'D MMMM YYYY LT', + LLLL : 'dddd, D MMMM YYYY LT' + }, + meridiem : function (hour, minute, isLower) { + if (hour < 12) { + return "قبل از ظهر"; + } else { + return "بعد از ظهر"; + } + }, + calendar : { + sameDay : '[امروز ساعت] LT', + nextDay : '[فردا ساعت] LT', + nextWeek : 'dddd [ساعت] LT', + lastDay : '[دیروز ساعت] LT', + lastWeek : 'dddd [پیش] [ساعت] LT', + sameElse : 'L' + }, + relativeTime : { + future : 'در %s', + past : '%s پیش', + s : 'چندین ثانیه', + m : 'یک دقیقه', + mm : '%d دقیقه', + h : 'یک ساعت', + hh : '%d ساعت', + d : 'یک روز', + dd : '%d روز', + M : 'یک ماه', + MM : '%d ماه', + y : 'یک سال', + yy : '%d سال' + }, + preparse: function (string) { + return string.replace(/[۰-۹]/g, function (match) { + return numberMap[match]; + }).replace(/،/g, ','); + }, + postformat: function (string) { + return string.replace(/\d/g, function (match) { + return symbolMap[match]; + }).replace(/,/g, '،'); + }, + ordinal : '%dم', + week : { + dow : 6, // Saturday is the first day of the week. + doy : 12 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : finnish (fi) +// author : Tarmo Aidantausta : https://github.com/bleadof + +(function (factory) { + factory(moment); +}(function (moment) { + var numbers_past = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '), + numbers_future = ['nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden', + numbers_past[7], numbers_past[8], numbers_past[9]]; + + function translate(number, withoutSuffix, key, isFuture) { + var result = ""; + switch (key) { + case 's': + return isFuture ? 'muutaman sekunnin' : 'muutama sekunti'; + case 'm': + return isFuture ? 'minuutin' : 'minuutti'; + case 'mm': + result = isFuture ? 'minuutin' : 'minuuttia'; + break; + case 'h': + return isFuture ? 'tunnin' : 'tunti'; + case 'hh': + result = isFuture ? 'tunnin' : 'tuntia'; + break; + case 'd': + return isFuture ? 'päivän' : 'päivä'; + case 'dd': + result = isFuture ? 'päivän' : 'päivää'; + break; + case 'M': + return isFuture ? 'kuukauden' : 'kuukausi'; + case 'MM': + result = isFuture ? 'kuukauden' : 'kuukautta'; + break; + case 'y': + return isFuture ? 'vuoden' : 'vuosi'; + case 'yy': + result = isFuture ? 'vuoden' : 'vuotta'; + break; + } + result = verbal_number(number, isFuture) + " " + result; + return result; + } + + function verbal_number(number, isFuture) { + return number < 10 ? (isFuture ? numbers_future[number] : numbers_past[number]) : number; + } + + return moment.lang('fi', { + months : "tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"), + monthsShort : "tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"), + weekdays : "sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"), + weekdaysShort : "su_ma_ti_ke_to_pe_la".split("_"), + weekdaysMin : "su_ma_ti_ke_to_pe_la".split("_"), + longDateFormat : { + LT : "HH.mm", + L : "DD.MM.YYYY", + LL : "Do MMMM[ta] YYYY", + LLL : "Do MMMM[ta] YYYY, [klo] LT", + LLLL : "dddd, Do MMMM[ta] YYYY, [klo] LT", + l : "D.M.YYYY", + ll : "Do MMM YYYY", + lll : "Do MMM YYYY, [klo] LT", + llll : "ddd, Do MMM YYYY, [klo] LT" + }, + calendar : { + sameDay : '[tänään] [klo] LT', + nextDay : '[huomenna] [klo] LT', + nextWeek : 'dddd [klo] LT', + lastDay : '[eilen] [klo] LT', + lastWeek : '[viime] dddd[na] [klo] LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s päästä", + past : "%s sitten", + s : translate, + m : translate, + mm : translate, + h : translate, + hh : translate, + d : translate, + dd : translate, + M : translate, + MM : translate, + y : translate, + yy : translate + }, + ordinal : "%d.", + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : faroese (fo) +// author : Ragnar Johannesen : https://github.com/ragnar123 + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('fo', { + months : "januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember".split("_"), + monthsShort : "jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"), + weekdays : "sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur".split("_"), + weekdaysShort : "sun_mán_týs_mik_hós_frí_ley".split("_"), + weekdaysMin : "su_má_tý_mi_hó_fr_le".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D. MMMM, YYYY LT" + }, + calendar : { + sameDay : '[Í dag kl.] LT', + nextDay : '[Í morgin kl.] LT', + nextWeek : 'dddd [kl.] LT', + lastDay : '[Í gjár kl.] LT', + lastWeek : '[síðstu] dddd [kl] LT', + sameElse : 'L' + }, + relativeTime : { + future : "um %s", + past : "%s síðani", + s : "fá sekund", + m : "ein minutt", + mm : "%d minuttir", + h : "ein tími", + hh : "%d tímar", + d : "ein dagur", + dd : "%d dagar", + M : "ein mánaði", + MM : "%d mánaðir", + y : "eitt ár", + yy : "%d ár" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : canadian french (fr-ca) +// author : Jonathan Abourbih : https://github.com/jonbca + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('fr-ca', { + months : "janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"), + monthsShort : "janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"), + weekdays : "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"), + weekdaysShort : "dim._lun._mar._mer._jeu._ven._sam.".split("_"), + weekdaysMin : "Di_Lu_Ma_Me_Je_Ve_Sa".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "YYYY-MM-DD", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: "[Aujourd'hui à] LT", + nextDay: '[Demain à] LT', + nextWeek: 'dddd [à] LT', + lastDay: '[Hier à] LT', + lastWeek: 'dddd [dernier à] LT', + sameElse: 'L' + }, + relativeTime : { + future : "dans %s", + past : "il y a %s", + s : "quelques secondes", + m : "une minute", + mm : "%d minutes", + h : "une heure", + hh : "%d heures", + d : "un jour", + dd : "%d jours", + M : "un mois", + MM : "%d mois", + y : "un an", + yy : "%d ans" + }, + ordinal : function (number) { + return number + (number === 1 ? 'er' : ''); + } + }); +})); +// moment.js language configuration +// language : french (fr) +// author : John Fischer : https://github.com/jfroffice + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('fr', { + months : "janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"), + monthsShort : "janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"), + weekdays : "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"), + weekdaysShort : "dim._lun._mar._mer._jeu._ven._sam.".split("_"), + weekdaysMin : "Di_Lu_Ma_Me_Je_Ve_Sa".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: "[Aujourd'hui à] LT", + nextDay: '[Demain à] LT', + nextWeek: 'dddd [à] LT', + lastDay: '[Hier à] LT', + lastWeek: 'dddd [dernier à] LT', + sameElse: 'L' + }, + relativeTime : { + future : "dans %s", + past : "il y a %s", + s : "quelques secondes", + m : "une minute", + mm : "%d minutes", + h : "une heure", + hh : "%d heures", + d : "un jour", + dd : "%d jours", + M : "un mois", + MM : "%d mois", + y : "un an", + yy : "%d ans" + }, + ordinal : function (number) { + return number + (number === 1 ? 'er' : ''); + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : galician (gl) +// author : Juan G. Hurtado : https://github.com/juanghurtado + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('gl', { + months : "Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro".split("_"), + monthsShort : "Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.".split("_"), + weekdays : "Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado".split("_"), + weekdaysShort : "Dom._Lun._Mar._Mér._Xov._Ven._Sáb.".split("_"), + weekdaysMin : "Do_Lu_Ma_Mé_Xo_Ve_Sá".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay : function () { + return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT'; + }, + nextDay : function () { + return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT'; + }, + nextWeek : function () { + return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT'; + }, + lastDay : function () { + return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT'; + }, + lastWeek : function () { + return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT'; + }, + sameElse : 'L' + }, + relativeTime : { + future : function (str) { + if (str === "uns segundos") { + return "nuns segundos"; + } + return "en " + str; + }, + past : "hai %s", + s : "uns segundos", + m : "un minuto", + mm : "%d minutos", + h : "unha hora", + hh : "%d horas", + d : "un día", + dd : "%d días", + M : "un mes", + MM : "%d meses", + y : "un ano", + yy : "%d anos" + }, + ordinal : '%dº', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Hebrew (he) +// author : Tomer Cohen : https://github.com/tomer +// author : Moshe Simantov : https://github.com/DevelopmentIL +// author : Tal Ater : https://github.com/TalAter + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('he', { + months : "ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"), + monthsShort : "ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"), + weekdays : "ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"), + weekdaysShort : "א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"), + weekdaysMin : "א_ב_ג_ד_ה_ו_ש".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D [ב]MMMM YYYY", + LLL : "D [ב]MMMM YYYY LT", + LLLL : "dddd, D [ב]MMMM YYYY LT", + l : "D/M/YYYY", + ll : "D MMM YYYY", + lll : "D MMM YYYY LT", + llll : "ddd, D MMM YYYY LT" + }, + calendar : { + sameDay : '[היום ב־]LT', + nextDay : '[מחר ב־]LT', + nextWeek : 'dddd [בשעה] LT', + lastDay : '[אתמול ב־]LT', + lastWeek : '[ביום] dddd [האחרון בשעה] LT', + sameElse : 'L' + }, + relativeTime : { + future : "בעוד %s", + past : "לפני %s", + s : "מספר שניות", + m : "דקה", + mm : "%d דקות", + h : "שעה", + hh : function (number) { + if (number === 2) { + return "שעתיים"; + } + return number + " שעות"; + }, + d : "יום", + dd : function (number) { + if (number === 2) { + return "יומיים"; + } + return number + " ימים"; + }, + M : "חודש", + MM : function (number) { + if (number === 2) { + return "חודשיים"; + } + return number + " חודשים"; + }, + y : "שנה", + yy : function (number) { + if (number === 2) { + return "שנתיים"; + } + return number + " שנים"; + } + } + }); +})); +// moment.js language configuration +// language : hindi (hi) +// author : Mayank Singhal : https://github.com/mayanksinghal + +(function (factory) { + factory(moment); +}(function (moment) { + var symbolMap = { + '1': '१', + '2': '२', + '3': '३', + '4': '४', + '5': '५', + '6': '६', + '7': '७', + '8': '८', + '9': '९', + '0': '०' + }, + numberMap = { + '१': '1', + '२': '2', + '३': '3', + '४': '4', + '५': '5', + '६': '6', + '७': '7', + '८': '8', + '९': '9', + '०': '0' + }; + + return moment.lang('hi', { + months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split("_"), + monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split("_"), + weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split("_"), + weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split("_"), + weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split("_"), + longDateFormat : { + LT : "A h:mm बजे", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY, LT", + LLLL : "dddd, D MMMM YYYY, LT" + }, + calendar : { + sameDay : '[आज] LT', + nextDay : '[कल] LT', + nextWeek : 'dddd, LT', + lastDay : '[कल] LT', + lastWeek : '[पिछले] dddd, LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s में", + past : "%s पहले", + s : "कुछ ही क्षण", + m : "एक मिनट", + mm : "%d मिनट", + h : "एक घंटा", + hh : "%d घंटे", + d : "एक दिन", + dd : "%d दिन", + M : "एक महीने", + MM : "%d महीने", + y : "एक वर्ष", + yy : "%d वर्ष" + }, + preparse: function (string) { + return string.replace(/[१२३४५६७८९०]/g, function (match) { + return numberMap[match]; + }); + }, + postformat: function (string) { + return string.replace(/\d/g, function (match) { + return symbolMap[match]; + }); + }, + // Hindi notation for meridiems are quite fuzzy in practice. While there exists + // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi. + meridiem : function (hour, minute, isLower) { + if (hour < 4) { + return "रात"; + } else if (hour < 10) { + return "सुबह"; + } else if (hour < 17) { + return "दोपहर"; + } else if (hour < 20) { + return "शाम"; + } else { + return "रात"; + } + }, + week : { + dow : 0, // Sunday is the first day of the week. + doy : 6 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : hrvatski (hr) +// author : Bojan Marković : https://github.com/bmarkovic + +// based on (sl) translation by Robert Sedovšek + +(function (factory) { + factory(moment); +}(function (moment) { + + function translate(number, withoutSuffix, key) { + var result = number + " "; + switch (key) { + case 'm': + return withoutSuffix ? 'jedna minuta' : 'jedne minute'; + case 'mm': + if (number === 1) { + result += 'minuta'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'minute'; + } else { + result += 'minuta'; + } + return result; + case 'h': + return withoutSuffix ? 'jedan sat' : 'jednog sata'; + case 'hh': + if (number === 1) { + result += 'sat'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'sata'; + } else { + result += 'sati'; + } + return result; + case 'dd': + if (number === 1) { + result += 'dan'; + } else { + result += 'dana'; + } + return result; + case 'MM': + if (number === 1) { + result += 'mjesec'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'mjeseca'; + } else { + result += 'mjeseci'; + } + return result; + case 'yy': + if (number === 1) { + result += 'godina'; + } else if (number === 2 || number === 3 || number === 4) { + result += 'godine'; + } else { + result += 'godina'; + } + return result; + } + } + + return moment.lang('hr', { + months : "sječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_"), + monthsShort : "sje._vel._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"), + weekdays : "nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"), + weekdaysShort : "ned._pon._uto._sri._čet._pet._sub.".split("_"), + weekdaysMin : "ne_po_ut_sr_če_pe_su".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD. MM. YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd, D. MMMM YYYY LT" + }, + calendar : { + sameDay : '[danas u] LT', + nextDay : '[sutra u] LT', + + nextWeek : function () { + switch (this.day()) { + case 0: + return '[u] [nedjelju] [u] LT'; + case 3: + return '[u] [srijedu] [u] LT'; + case 6: + return '[u] [subotu] [u] LT'; + case 1: + case 2: + case 4: + case 5: + return '[u] dddd [u] LT'; + } + }, + lastDay : '[jučer u] LT', + lastWeek : function () { + switch (this.day()) { + case 0: + case 3: + return '[prošlu] dddd [u] LT'; + case 6: + return '[prošle] [subote] [u] LT'; + case 1: + case 2: + case 4: + case 5: + return '[prošli] dddd [u] LT'; + } + }, + sameElse : 'L' + }, + relativeTime : { + future : "za %s", + past : "prije %s", + s : "par sekundi", + m : translate, + mm : translate, + h : translate, + hh : translate, + d : "dan", + dd : translate, + M : "mjesec", + MM : translate, + y : "godinu", + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : hungarian (hu) +// author : Adam Brunner : https://github.com/adambrunner + +(function (factory) { + factory(moment); +}(function (moment) { + var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' '); + + function translate(number, withoutSuffix, key, isFuture) { + var num = number, + suffix; + + switch (key) { + case 's': + return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce'; + case 'm': + return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce'); + case 'mm': + return num + (isFuture || withoutSuffix ? ' perc' : ' perce'); + case 'h': + return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája'); + case 'hh': + return num + (isFuture || withoutSuffix ? ' óra' : ' órája'); + case 'd': + return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja'); + case 'dd': + return num + (isFuture || withoutSuffix ? ' nap' : ' napja'); + case 'M': + return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja'); + case 'MM': + return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja'); + case 'y': + return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve'); + case 'yy': + return num + (isFuture || withoutSuffix ? ' év' : ' éve'); + } + + return ''; + } + + function week(isFuture) { + return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]'; + } + + return moment.lang('hu', { + months : "január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"), + monthsShort : "jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"), + weekdays : "vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"), + weekdaysShort : "vas_hét_kedd_sze_csüt_pén_szo".split("_"), + weekdaysMin : "v_h_k_sze_cs_p_szo".split("_"), + longDateFormat : { + LT : "H:mm", + L : "YYYY.MM.DD.", + LL : "YYYY. MMMM D.", + LLL : "YYYY. MMMM D., LT", + LLLL : "YYYY. MMMM D., dddd LT" + }, + calendar : { + sameDay : '[ma] LT[-kor]', + nextDay : '[holnap] LT[-kor]', + nextWeek : function () { + return week.call(this, true); + }, + lastDay : '[tegnap] LT[-kor]', + lastWeek : function () { + return week.call(this, false); + }, + sameElse : 'L' + }, + relativeTime : { + future : "%s múlva", + past : "%s", + s : translate, + m : translate, + mm : translate, + h : translate, + hh : translate, + d : translate, + dd : translate, + M : translate, + MM : translate, + y : translate, + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Bahasa Indonesia (id) +// author : Mohammad Satrio Utomo : https://github.com/tyok +// reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('id', { + months : "Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"), + monthsShort : "Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"), + weekdays : "Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"), + weekdaysShort : "Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"), + weekdaysMin : "Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"), + longDateFormat : { + LT : "HH.mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY [pukul] LT", + LLLL : "dddd, D MMMM YYYY [pukul] LT" + }, + meridiem : function (hours, minutes, isLower) { + if (hours < 11) { + return 'pagi'; + } else if (hours < 15) { + return 'siang'; + } else if (hours < 19) { + return 'sore'; + } else { + return 'malam'; + } + }, + calendar : { + sameDay : '[Hari ini pukul] LT', + nextDay : '[Besok pukul] LT', + nextWeek : 'dddd [pukul] LT', + lastDay : '[Kemarin pukul] LT', + lastWeek : 'dddd [lalu pukul] LT', + sameElse : 'L' + }, + relativeTime : { + future : "dalam %s", + past : "%s yang lalu", + s : "beberapa detik", + m : "semenit", + mm : "%d menit", + h : "sejam", + hh : "%d jam", + d : "sehari", + dd : "%d hari", + M : "sebulan", + MM : "%d bulan", + y : "setahun", + yy : "%d tahun" + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : icelandic (is) +// author : Hinrik Örn Sigurðsson : https://github.com/hinrik + +(function (factory) { + factory(moment); +}(function (moment) { + function plural(n) { + if (n % 100 === 11) { + return true; + } else if (n % 10 === 1) { + return false; + } + return true; + } + + function translate(number, withoutSuffix, key, isFuture) { + var result = number + " "; + switch (key) { + case 's': + return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum'; + case 'm': + return withoutSuffix ? 'mínúta' : 'mínútu'; + case 'mm': + if (plural(number)) { + return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum'); + } else if (withoutSuffix) { + return result + 'mínúta'; + } + return result + 'mínútu'; + case 'hh': + if (plural(number)) { + return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum'); + } + return result + 'klukkustund'; + case 'd': + if (withoutSuffix) { + return 'dagur'; + } + return isFuture ? 'dag' : 'degi'; + case 'dd': + if (plural(number)) { + if (withoutSuffix) { + return result + 'dagar'; + } + return result + (isFuture ? 'daga' : 'dögum'); + } else if (withoutSuffix) { + return result + 'dagur'; + } + return result + (isFuture ? 'dag' : 'degi'); + case 'M': + if (withoutSuffix) { + return 'mánuður'; + } + return isFuture ? 'mánuð' : 'mánuði'; + case 'MM': + if (plural(number)) { + if (withoutSuffix) { + return result + 'mánuðir'; + } + return result + (isFuture ? 'mánuði' : 'mánuðum'); + } else if (withoutSuffix) { + return result + 'mánuður'; + } + return result + (isFuture ? 'mánuð' : 'mánuði'); + case 'y': + return withoutSuffix || isFuture ? 'ár' : 'ári'; + case 'yy': + if (plural(number)) { + return result + (withoutSuffix || isFuture ? 'ár' : 'árum'); + } + return result + (withoutSuffix || isFuture ? 'ár' : 'ári'); + } + } + + return moment.lang('is', { + months : "janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"), + monthsShort : "jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"), + weekdays : "sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"), + weekdaysShort : "sun_mán_þri_mið_fim_fös_lau".split("_"), + weekdaysMin : "Su_Má_Þr_Mi_Fi_Fö_La".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD/MM/YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY [kl.] LT", + LLLL : "dddd, D. MMMM YYYY [kl.] LT" + }, + calendar : { + sameDay : '[í dag kl.] LT', + nextDay : '[á morgun kl.] LT', + nextWeek : 'dddd [kl.] LT', + lastDay : '[í gær kl.] LT', + lastWeek : '[síðasta] dddd [kl.] LT', + sameElse : 'L' + }, + relativeTime : { + future : "eftir %s", + past : "fyrir %s síðan", + s : translate, + m : translate, + mm : translate, + h : "klukkustund", + hh : translate, + d : translate, + dd : translate, + M : translate, + MM : translate, + y : translate, + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : italian (it) +// author : Lorenzo : https://github.com/aliem +// author: Mattia Larentis: https://github.com/nostalgiaz + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('it', { + months : "Gennaio_Febbraio_Marzo_Aprile_Maggio_Giugno_Luglio_Agosto_Settembre_Ottobre_Novembre_Dicembre".split("_"), + monthsShort : "Gen_Feb_Mar_Apr_Mag_Giu_Lug_Ago_Set_Ott_Nov_Dic".split("_"), + weekdays : "Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"), + weekdaysShort : "Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"), + weekdaysMin : "D_L_Ma_Me_G_V_S".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay: '[Oggi alle] LT', + nextDay: '[Domani alle] LT', + nextWeek: 'dddd [alle] LT', + lastDay: '[Ieri alle] LT', + lastWeek: '[lo scorso] dddd [alle] LT', + sameElse: 'L' + }, + relativeTime : { + future : function (s) { + return ((/^[0-9].+$/).test(s) ? "tra" : "in") + " " + s; + }, + past : "%s fa", + s : "secondi", + m : "un minuto", + mm : "%d minuti", + h : "un'ora", + hh : "%d ore", + d : "un giorno", + dd : "%d giorni", + M : "un mese", + MM : "%d mesi", + y : "un anno", + yy : "%d anni" + }, + ordinal: '%dº', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : japanese (ja) +// author : LI Long : https://github.com/baryon + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ja', { + months : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"), + monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"), + weekdays : "日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"), + weekdaysShort : "日_月_火_水_木_金_土".split("_"), + weekdaysMin : "日_月_火_水_木_金_土".split("_"), + longDateFormat : { + LT : "Ah時m分", + L : "YYYY/MM/DD", + LL : "YYYY年M月D日", + LLL : "YYYY年M月D日LT", + LLLL : "YYYY年M月D日LT dddd" + }, + meridiem : function (hour, minute, isLower) { + if (hour < 12) { + return "午前"; + } else { + return "午後"; + } + }, + calendar : { + sameDay : '[今日] LT', + nextDay : '[明日] LT', + nextWeek : '[来週]dddd LT', + lastDay : '[昨日] LT', + lastWeek : '[前週]dddd LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s後", + past : "%s前", + s : "数秒", + m : "1分", + mm : "%d分", + h : "1時間", + hh : "%d時間", + d : "1日", + dd : "%d日", + M : "1ヶ月", + MM : "%dヶ月", + y : "1年", + yy : "%d年" + } + }); +})); +// moment.js language configuration +// language : Georgian (ka) +// author : Irakli Janiashvili : https://github.com/irakli-janiashvili + +(function (factory) { + factory(moment); +}(function (moment) { + + function monthsCaseReplace(m, format) { + var months = { + 'nominative': 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'), + 'accusative': 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_') + }, + + nounCase = (/D[oD] *MMMM?/).test(format) ? + 'accusative' : + 'nominative'; + + return months[nounCase][m.month()]; + } + + function weekdaysCaseReplace(m, format) { + var weekdays = { + 'nominative': 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'), + 'accusative': 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_') + }, + + nounCase = (/(წინა|შემდეგ)/).test(format) ? + 'accusative' : + 'nominative'; + + return weekdays[nounCase][m.day()]; + } + + return moment.lang('ka', { + months : monthsCaseReplace, + monthsShort : "იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ".split("_"), + weekdays : weekdaysCaseReplace, + weekdaysShort : "კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ".split("_"), + weekdaysMin : "კვ_ორ_სა_ოთ_ხუ_პა_შა".split("_"), + longDateFormat : { + LT : "h:mm A", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay : '[დღეს] LT[-ზე]', + nextDay : '[ხვალ] LT[-ზე]', + lastDay : '[გუშინ] LT[-ზე]', + nextWeek : '[შემდეგ] dddd LT[-ზე]', + lastWeek : '[წინა] dddd LT-ზე', + sameElse : 'L' + }, + relativeTime : { + future : function (s) { + return (/(წამი|წუთი|საათი|წელი)/).test(s) ? + s.replace(/ი$/, "ში") : + s + "ში"; + }, + past : function (s) { + if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) { + return s.replace(/(ი|ე)$/, "ის წინ"); + } + if ((/წელი/).test(s)) { + return s.replace(/წელი$/, "წლის წინ"); + } + }, + s : "რამდენიმე წამი", + m : "წუთი", + mm : "%d წუთი", + h : "საათი", + hh : "%d საათი", + d : "დღე", + dd : "%d დღე", + M : "თვე", + MM : "%d თვე", + y : "წელი", + yy : "%d წელი" + }, + ordinal : function (number) { + if (number === 0) { + return number; + } + + if (number === 1) { + return number + "-ლი"; + } + + if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) { + return "მე-" + number; + } + + return number + "-ე"; + }, + week : { + dow : 1, + doy : 7 + } + }); +})); +// moment.js language configuration +// language : korean (ko) +// author : Kyungwook, Park : https://github.com/kyungw00k + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ko', { + months : "1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"), + monthsShort : "1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"), + weekdays : "일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"), + weekdaysShort : "일_월_화_수_목_금_토".split("_"), + weekdaysMin : "일_월_화_수_목_금_토".split("_"), + longDateFormat : { + LT : "A h시 mm분", + L : "YYYY.MM.DD", + LL : "YYYY년 MMMM D일", + LLL : "YYYY년 MMMM D일 LT", + LLLL : "YYYY년 MMMM D일 dddd LT" + }, + meridiem : function (hour, minute, isUpper) { + return hour < 12 ? '오전' : '오후'; + }, + calendar : { + sameDay : '오늘 LT', + nextDay : '내일 LT', + nextWeek : 'dddd LT', + lastDay : '어제 LT', + lastWeek : '지난주 dddd LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s 후", + past : "%s 전", + s : "몇초", + ss : "%d초", + m : "일분", + mm : "%d분", + h : "한시간", + hh : "%d시간", + d : "하루", + dd : "%d일", + M : "한달", + MM : "%d달", + y : "일년", + yy : "%d년" + }, + ordinal : '%d일' + }); +})); +// moment.js language configuration +// language : Lithuanian (lt) +// author : Mindaugas Mozūras : https://github.com/mmozuras + +(function (factory) { + factory(moment); +}(function (moment) { + var units = { + "m" : "minutė_minutės_minutę", + "mm": "minutės_minučių_minutes", + "h" : "valanda_valandos_valandą", + "hh": "valandos_valandų_valandas", + "d" : "diena_dienos_dieną", + "dd": "dienos_dienų_dienas", + "M" : "mėnuo_mėnesio_mėnesį", + "MM": "mėnesiai_mėnesių_mėnesius", + "y" : "metai_metų_metus", + "yy": "metai_metų_metus" + }, + weekDays = "pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis_sekmadienis".split("_"); + + function translateSeconds(number, withoutSuffix, key, isFuture) { + if (withoutSuffix) { + return "kelios sekundės"; + } else { + return isFuture ? "kelių sekundžių" : "kelias sekundes"; + } + } + + function translateSingular(number, withoutSuffix, key, isFuture) { + return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]); + } + + function special(number) { + return number % 10 === 0 || (number > 10 && number < 20); + } + + function forms(key) { + return units[key].split("_"); + } + + function translate(number, withoutSuffix, key, isFuture) { + var result = number + " "; + if (number === 1) { + return result + translateSingular(number, withoutSuffix, key[0], isFuture); + } else if (withoutSuffix) { + return result + (special(number) ? forms(key)[1] : forms(key)[0]); + } else { + if (isFuture) { + return result + forms(key)[1]; + } else { + return result + (special(number) ? forms(key)[1] : forms(key)[2]); + } + } + } + + function relativeWeekDay(moment, format) { + var nominative = format.indexOf('dddd LT') === -1, + weekDay = weekDays[moment.weekday()]; + + return nominative ? weekDay : weekDay.substring(0, weekDay.length - 2) + "į"; + } + + return moment.lang("lt", { + months : "sausio_vasario_kovo_balandžio_gegužės_biržėlio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"), + monthsShort : "sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"), + weekdays : relativeWeekDay, + weekdaysShort : "Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"), + weekdaysMin : "S_P_A_T_K_Pn_Š".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "YYYY-MM-DD", + LL : "YYYY [m.] MMMM D [d.]", + LLL : "YYYY [m.] MMMM D [d.], LT [val.]", + LLLL : "YYYY [m.] MMMM D [d.], dddd, LT [val.]", + l : "YYYY-MM-DD", + ll : "YYYY [m.] MMMM D [d.]", + lll : "YYYY [m.] MMMM D [d.], LT [val.]", + llll : "YYYY [m.] MMMM D [d.], ddd, LT [val.]" + }, + calendar : { + sameDay : "[Šiandien] LT", + nextDay : "[Rytoj] LT", + nextWeek : "dddd LT", + lastDay : "[Vakar] LT", + lastWeek : "[Praėjusį] dddd LT", + sameElse : "L" + }, + relativeTime : { + future : "po %s", + past : "prieš %s", + s : translateSeconds, + m : translateSingular, + mm : translate, + h : translateSingular, + hh : translate, + d : translateSingular, + dd : translate, + M : translateSingular, + MM : translate, + y : translateSingular, + yy : translate + }, + ordinal : function (number) { + return number + '-oji'; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : latvian (lv) +// author : Kristaps Karlsons : https://github.com/skakri + +(function (factory) { + factory(moment); +}(function (moment) { + var units = { + 'mm': 'minūti_minūtes_minūte_minūtes', + 'hh': 'stundu_stundas_stunda_stundas', + 'dd': 'dienu_dienas_diena_dienas', + 'MM': 'mēnesi_mēnešus_mēnesis_mēneši', + 'yy': 'gadu_gadus_gads_gadi' + }; + + function format(word, number, withoutSuffix) { + var forms = word.split('_'); + if (withoutSuffix) { + return number % 10 === 1 && number !== 11 ? forms[2] : forms[3]; + } else { + return number % 10 === 1 && number !== 11 ? forms[0] : forms[1]; + } + } + + function relativeTimeWithPlural(number, withoutSuffix, key) { + return number + ' ' + format(units[key], number, withoutSuffix); + } + + return moment.lang('lv', { + months : "janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"), + monthsShort : "jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"), + weekdays : "svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"), + weekdaysShort : "Sv_P_O_T_C_Pk_S".split("_"), + weekdaysMin : "Sv_P_O_T_C_Pk_S".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD.MM.YYYY", + LL : "YYYY. [gada] D. MMMM", + LLL : "YYYY. [gada] D. MMMM, LT", + LLLL : "YYYY. [gada] D. MMMM, dddd, LT" + }, + calendar : { + sameDay : '[Šodien pulksten] LT', + nextDay : '[Rīt pulksten] LT', + nextWeek : 'dddd [pulksten] LT', + lastDay : '[Vakar pulksten] LT', + lastWeek : '[Pagājušā] dddd [pulksten] LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s vēlāk", + past : "%s agrāk", + s : "dažas sekundes", + m : "minūti", + mm : relativeTimeWithPlural, + h : "stundu", + hh : relativeTimeWithPlural, + d : "dienu", + dd : relativeTimeWithPlural, + M : "mēnesi", + MM : relativeTimeWithPlural, + y : "gadu", + yy : relativeTimeWithPlural + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : malayalam (ml) +// author : Floyd Pink : https://github.com/floydpink + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ml', { + months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split("_"), + monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split("_"), + weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split("_"), + weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split("_"), + weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split("_"), + longDateFormat : { + LT : "A h:mm -നു", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY, LT", + LLLL : "dddd, D MMMM YYYY, LT" + }, + calendar : { + sameDay : '[ഇന്ന്] LT', + nextDay : '[നാളെ] LT', + nextWeek : 'dddd, LT', + lastDay : '[ഇന്നലെ] LT', + lastWeek : '[കഴിഞ്ഞ] dddd, LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s കഴിഞ്ഞ്", + past : "%s മുൻപ്", + s : "അൽപ നിമിഷങ്ങൾ", + m : "ഒരു മിനിറ്റ്", + mm : "%d മിനിറ്റ്", + h : "ഒരു മണിക്കൂർ", + hh : "%d മണിക്കൂർ", + d : "ഒരു ദിവസം", + dd : "%d ദിവസം", + M : "ഒരു മാസം", + MM : "%d മാസം", + y : "ഒരു വർഷം", + yy : "%d വർഷം" + }, + meridiem : function (hour, minute, isLower) { + if (hour < 4) { + return "രാത്രി"; + } else if (hour < 12) { + return "രാവിലെ"; + } else if (hour < 17) { + return "ഉച്ച കഴിഞ്ഞ്"; + } else if (hour < 20) { + return "വൈകുന്നേരം"; + } else { + return "രാത്രി"; + } + } + }); +})); +// moment.js language configuration +// language : Marathi (mr) +// author : Harshad Kale : https://github.com/kalehv + +(function (factory) { + factory(moment); +}(function (moment) { + var symbolMap = { + '1': '१', + '2': '२', + '3': '३', + '4': '४', + '5': '५', + '6': '६', + '7': '७', + '8': '८', + '9': '९', + '0': '०' + }, + numberMap = { + '१': '1', + '२': '2', + '३': '3', + '४': '4', + '५': '5', + '६': '6', + '७': '7', + '८': '8', + '९': '9', + '०': '0' + }; + + return moment.lang('mr', { + months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split("_"), + monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split("_"), + weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split("_"), + weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split("_"), + weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split("_"), + longDateFormat : { + LT : "A h:mm वाजता", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY, LT", + LLLL : "dddd, D MMMM YYYY, LT" + }, + calendar : { + sameDay : '[आज] LT', + nextDay : '[उद्या] LT', + nextWeek : 'dddd, LT', + lastDay : '[काल] LT', + lastWeek: '[मागील] dddd, LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s नंतर", + past : "%s पूर्वी", + s : "सेकंद", + m: "एक मिनिट", + mm: "%d मिनिटे", + h : "एक तास", + hh : "%d तास", + d : "एक दिवस", + dd : "%d दिवस", + M : "एक महिना", + MM : "%d महिने", + y : "एक वर्ष", + yy : "%d वर्षे" + }, + preparse: function (string) { + return string.replace(/[१२३४५६७८९०]/g, function (match) { + return numberMap[match]; + }); + }, + postformat: function (string) { + return string.replace(/\d/g, function (match) { + return symbolMap[match]; + }); + }, + meridiem: function (hour, minute, isLower) + { + if (hour < 4) { + return "रात्री"; + } else if (hour < 10) { + return "सकाळी"; + } else if (hour < 17) { + return "दुपारी"; + } else if (hour < 20) { + return "सायंकाळी"; + } else { + return "रात्री"; + } + }, + week : { + dow : 0, // Sunday is the first day of the week. + doy : 6 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Bahasa Malaysia (ms-MY) +// author : Weldan Jamili : https://github.com/weldan + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ms-my', { + months : "Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"), + monthsShort : "Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"), + weekdays : "Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"), + weekdaysShort : "Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"), + weekdaysMin : "Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"), + longDateFormat : { + LT : "HH.mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY [pukul] LT", + LLLL : "dddd, D MMMM YYYY [pukul] LT" + }, + meridiem : function (hours, minutes, isLower) { + if (hours < 11) { + return 'pagi'; + } else if (hours < 15) { + return 'tengahari'; + } else if (hours < 19) { + return 'petang'; + } else { + return 'malam'; + } + }, + calendar : { + sameDay : '[Hari ini pukul] LT', + nextDay : '[Esok pukul] LT', + nextWeek : 'dddd [pukul] LT', + lastDay : '[Kelmarin pukul] LT', + lastWeek : 'dddd [lepas pukul] LT', + sameElse : 'L' + }, + relativeTime : { + future : "dalam %s", + past : "%s yang lepas", + s : "beberapa saat", + m : "seminit", + mm : "%d minit", + h : "sejam", + hh : "%d jam", + d : "sehari", + dd : "%d hari", + M : "sebulan", + MM : "%d bulan", + y : "setahun", + yy : "%d tahun" + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : norwegian bokmål (nb) +// authors : Espen Hovlandsdal : https://github.com/rexxars +// Sigurd Gartmann : https://github.com/sigurdga + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('nb', { + months : "januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"), + monthsShort : "jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"), + weekdays : "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"), + weekdaysShort : "sø._ma._ti._on._to._fr._lø.".split("_"), + weekdaysMin : "sø_ma_ti_on_to_fr_lø".split("_"), + longDateFormat : { + LT : "H.mm", + L : "DD.MM.YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY [kl.] LT", + LLLL : "dddd D. MMMM YYYY [kl.] LT" + }, + calendar : { + sameDay: '[i dag kl.] LT', + nextDay: '[i morgen kl.] LT', + nextWeek: 'dddd [kl.] LT', + lastDay: '[i går kl.] LT', + lastWeek: '[forrige] dddd [kl.] LT', + sameElse: 'L' + }, + relativeTime : { + future : "om %s", + past : "for %s siden", + s : "noen sekunder", + m : "ett minutt", + mm : "%d minutter", + h : "en time", + hh : "%d timer", + d : "en dag", + dd : "%d dager", + M : "en måned", + MM : "%d måneder", + y : "ett år", + yy : "%d år" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : nepali/nepalese +// author : suvash : https://github.com/suvash + +(function (factory) { + factory(moment); +}(function (moment) { + var symbolMap = { + '1': '१', + '2': '२', + '3': '३', + '4': '४', + '5': '५', + '6': '६', + '7': '७', + '8': '८', + '9': '९', + '0': '०' + }, + numberMap = { + '१': '1', + '२': '2', + '३': '3', + '४': '4', + '५': '5', + '६': '6', + '७': '7', + '८': '8', + '९': '9', + '०': '0' + }; + + return moment.lang('ne', { + months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split("_"), + monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split("_"), + weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split("_"), + weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split("_"), + weekdaysMin : 'आइ._सो._मङ्_बु._बि._शु._श.'.split("_"), + longDateFormat : { + LT : "Aको h:mm बजे", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY, LT", + LLLL : "dddd, D MMMM YYYY, LT" + }, + preparse: function (string) { + return string.replace(/[१२३४५६७८९०]/g, function (match) { + return numberMap[match]; + }); + }, + postformat: function (string) { + return string.replace(/\d/g, function (match) { + return symbolMap[match]; + }); + }, + meridiem : function (hour, minute, isLower) { + if (hour < 3) { + return "राती"; + } else if (hour < 10) { + return "बिहान"; + } else if (hour < 15) { + return "दिउँसो"; + } else if (hour < 18) { + return "बेलुका"; + } else if (hour < 20) { + return "साँझ"; + } else { + return "राती"; + } + }, + calendar : { + sameDay : '[आज] LT', + nextDay : '[भोली] LT', + nextWeek : '[आउँदो] dddd[,] LT', + lastDay : '[हिजो] LT', + lastWeek : '[गएको] dddd[,] LT', + sameElse : 'L' + }, + relativeTime : { + future : "%sमा", + past : "%s अगाडी", + s : "केही समय", + m : "एक मिनेट", + mm : "%d मिनेट", + h : "एक घण्टा", + hh : "%d घण्टा", + d : "एक दिन", + dd : "%d दिन", + M : "एक महिना", + MM : "%d महिना", + y : "एक बर्ष", + yy : "%d बर्ष" + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : dutch (nl) +// author : Joris Röling : https://github.com/jjupiter + +(function (factory) { + factory(moment); +}(function (moment) { + var monthsShortWithDots = "jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"), + monthsShortWithoutDots = "jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"); + + return moment.lang('nl', { + months : "januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"), + monthsShort : function (m, format) { + if (/-MMM-/.test(format)) { + return monthsShortWithoutDots[m.month()]; + } else { + return monthsShortWithDots[m.month()]; + } + }, + weekdays : "zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"), + weekdaysShort : "zo._ma._di._wo._do._vr._za.".split("_"), + weekdaysMin : "Zo_Ma_Di_Wo_Do_Vr_Za".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD-MM-YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: '[vandaag om] LT', + nextDay: '[morgen om] LT', + nextWeek: 'dddd [om] LT', + lastDay: '[gisteren om] LT', + lastWeek: '[afgelopen] dddd [om] LT', + sameElse: 'L' + }, + relativeTime : { + future : "over %s", + past : "%s geleden", + s : "een paar seconden", + m : "één minuut", + mm : "%d minuten", + h : "één uur", + hh : "%d uur", + d : "één dag", + dd : "%d dagen", + M : "één maand", + MM : "%d maanden", + y : "één jaar", + yy : "%d jaar" + }, + ordinal : function (number) { + return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : norwegian nynorsk (nn) +// author : https://github.com/mechuwind + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('nn', { + months : "januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"), + monthsShort : "jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"), + weekdays : "sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"), + weekdaysShort : "sun_mån_tys_ons_tor_fre_lau".split("_"), + weekdaysMin : "su_må_ty_on_to_fr_lø".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD.MM.YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: '[I dag klokka] LT', + nextDay: '[I morgon klokka] LT', + nextWeek: 'dddd [klokka] LT', + lastDay: '[I går klokka] LT', + lastWeek: '[Føregående] dddd [klokka] LT', + sameElse: 'L' + }, + relativeTime : { + future : "om %s", + past : "for %s siden", + s : "noen sekund", + m : "ett minutt", + mm : "%d minutt", + h : "en time", + hh : "%d timar", + d : "en dag", + dd : "%d dagar", + M : "en månad", + MM : "%d månader", + y : "ett år", + yy : "%d år" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : polish (pl) +// author : Rafal Hirsz : https://github.com/evoL + +(function (factory) { + factory(moment); +}(function (moment) { + var monthsNominative = "styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"), + monthsSubjective = "stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"); + + function plural(n) { + return (n % 10 < 5) && (n % 10 > 1) && (~~(n / 10) !== 1); + } + + function translate(number, withoutSuffix, key) { + var result = number + " "; + switch (key) { + case 'm': + return withoutSuffix ? 'minuta' : 'minutę'; + case 'mm': + return result + (plural(number) ? 'minuty' : 'minut'); + case 'h': + return withoutSuffix ? 'godzina' : 'godzinę'; + case 'hh': + return result + (plural(number) ? 'godziny' : 'godzin'); + case 'MM': + return result + (plural(number) ? 'miesiące' : 'miesięcy'); + case 'yy': + return result + (plural(number) ? 'lata' : 'lat'); + } + } + + return moment.lang('pl', { + months : function (momentToFormat, format) { + if (/D MMMM/.test(format)) { + return monthsSubjective[momentToFormat.month()]; + } else { + return monthsNominative[momentToFormat.month()]; + } + }, + monthsShort : "sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"), + weekdays : "niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"), + weekdaysShort : "nie_pon_wt_śr_czw_pt_sb".split("_"), + weekdaysMin : "N_Pn_Wt_Śr_Cz_Pt_So".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD.MM.YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay: '[Dziś o] LT', + nextDay: '[Jutro o] LT', + nextWeek: '[W] dddd [o] LT', + lastDay: '[Wczoraj o] LT', + lastWeek: function () { + switch (this.day()) { + case 0: + return '[W zeszłą niedzielę o] LT'; + case 3: + return '[W zeszłą środę o] LT'; + case 6: + return '[W zeszłą sobotę o] LT'; + default: + return '[W zeszły] dddd [o] LT'; + } + }, + sameElse: 'L' + }, + relativeTime : { + future : "za %s", + past : "%s temu", + s : "kilka sekund", + m : translate, + mm : translate, + h : translate, + hh : translate, + d : "1 dzień", + dd : '%d dni', + M : "miesiąc", + MM : translate, + y : "rok", + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : brazilian portuguese (pt-br) +// author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('pt-br', { + months : "Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"), + monthsShort : "Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"), + weekdays : "Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"), + weekdaysShort : "Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"), + weekdaysMin : "Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D [de] MMMM [de] YYYY", + LLL : "D [de] MMMM [de] YYYY LT", + LLLL : "dddd, D [de] MMMM [de] YYYY LT" + }, + calendar : { + sameDay: '[Hoje às] LT', + nextDay: '[Amanhã às] LT', + nextWeek: 'dddd [às] LT', + lastDay: '[Ontem às] LT', + lastWeek: function () { + return (this.day() === 0 || this.day() === 6) ? + '[Último] dddd [às] LT' : // Saturday + Sunday + '[Última] dddd [às] LT'; // Monday - Friday + }, + sameElse: 'L' + }, + relativeTime : { + future : "em %s", + past : "%s atrás", + s : "segundos", + m : "um minuto", + mm : "%d minutos", + h : "uma hora", + hh : "%d horas", + d : "um dia", + dd : "%d dias", + M : "um mês", + MM : "%d meses", + y : "um ano", + yy : "%d anos" + }, + ordinal : '%dº' + }); +})); +// moment.js language configuration +// language : portuguese (pt) +// author : Jefferson : https://github.com/jalex79 + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('pt', { + months : "Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"), + monthsShort : "Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"), + weekdays : "Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"), + weekdaysShort : "Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"), + weekdaysMin : "Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D [de] MMMM [de] YYYY", + LLL : "D [de] MMMM [de] YYYY LT", + LLLL : "dddd, D [de] MMMM [de] YYYY LT" + }, + calendar : { + sameDay: '[Hoje às] LT', + nextDay: '[Amanhã às] LT', + nextWeek: 'dddd [às] LT', + lastDay: '[Ontem às] LT', + lastWeek: function () { + return (this.day() === 0 || this.day() === 6) ? + '[Último] dddd [às] LT' : // Saturday + Sunday + '[Última] dddd [às] LT'; // Monday - Friday + }, + sameElse: 'L' + }, + relativeTime : { + future : "em %s", + past : "%s atrás", + s : "segundos", + m : "um minuto", + mm : "%d minutos", + h : "uma hora", + hh : "%d horas", + d : "um dia", + dd : "%d dias", + M : "um mês", + MM : "%d meses", + y : "um ano", + yy : "%d anos" + }, + ordinal : '%dº', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : romanian (ro) +// author : Vlad Gurdiga : https://github.com/gurdiga +// author : Valentin Agachi : https://github.com/avaly + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('ro', { + months : "Ianuarie_Februarie_Martie_Aprilie_Mai_Iunie_Iulie_August_Septembrie_Octombrie_Noiembrie_Decembrie".split("_"), + monthsShort : "Ian_Feb_Mar_Apr_Mai_Iun_Iul_Aug_Sep_Oct_Noi_Dec".split("_"), + weekdays : "Duminică_Luni_Marţi_Miercuri_Joi_Vineri_Sâmbătă".split("_"), + weekdaysShort : "Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"), + weekdaysMin : "Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY H:mm", + LLLL : "dddd, D MMMM YYYY H:mm" + }, + calendar : { + sameDay: "[azi la] LT", + nextDay: '[mâine la] LT', + nextWeek: 'dddd [la] LT', + lastDay: '[ieri la] LT', + lastWeek: '[fosta] dddd [la] LT', + sameElse: 'L' + }, + relativeTime : { + future : "peste %s", + past : "%s în urmă", + s : "câteva secunde", + m : "un minut", + mm : "%d minute", + h : "o oră", + hh : "%d ore", + d : "o zi", + dd : "%d zile", + M : "o lună", + MM : "%d luni", + y : "un an", + yy : "%d ani" + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : russian (ru) +// author : Viktorminator : https://github.com/Viktorminator +// Author : Menelion Elensúle : https://github.com/Oire + +(function (factory) { + factory(moment); +}(function (moment) { + function plural(word, num) { + var forms = word.split('_'); + return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]); + } + + function relativeTimeWithPlural(number, withoutSuffix, key) { + var format = { + 'mm': 'минута_минуты_минут', + 'hh': 'час_часа_часов', + 'dd': 'день_дня_дней', + 'MM': 'месяц_месяца_месяцев', + 'yy': 'год_года_лет' + }; + if (key === 'm') { + return withoutSuffix ? 'минута' : 'минуту'; + } + else { + return number + ' ' + plural(format[key], +number); + } + } + + function monthsCaseReplace(m, format) { + var months = { + 'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'), + 'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_') + }, + + nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ? + 'accusative' : + 'nominative'; + + return months[nounCase][m.month()]; + } + + function monthsShortCaseReplace(m, format) { + var monthsShort = { + 'nominative': 'янв_фев_мар_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'), + 'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_') + }, + + nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ? + 'accusative' : + 'nominative'; + + return monthsShort[nounCase][m.month()]; + } + + function weekdaysCaseReplace(m, format) { + var weekdays = { + 'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'), + 'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_') + }, + + nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую)? ?\] ?dddd/).test(format) ? + 'accusative' : + 'nominative'; + + return weekdays[nounCase][m.day()]; + } + + return moment.lang('ru', { + months : monthsCaseReplace, + monthsShort : monthsShortCaseReplace, + weekdays : weekdaysCaseReplace, + weekdaysShort : "вс_пн_вт_ср_чт_пт_сб".split("_"), + weekdaysMin : "вс_пн_вт_ср_чт_пт_сб".split("_"), + monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i], + longDateFormat : { + LT : "HH:mm", + L : "DD.MM.YYYY", + LL : "D MMMM YYYY г.", + LLL : "D MMMM YYYY г., LT", + LLLL : "dddd, D MMMM YYYY г., LT" + }, + calendar : { + sameDay: '[Сегодня в] LT', + nextDay: '[Завтра в] LT', + lastDay: '[Вчера в] LT', + nextWeek: function () { + return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT'; + }, + lastWeek: function () { + switch (this.day()) { + case 0: + return '[В прошлое] dddd [в] LT'; + case 1: + case 2: + case 4: + return '[В прошлый] dddd [в] LT'; + case 3: + case 5: + case 6: + return '[В прошлую] dddd [в] LT'; + } + }, + sameElse: 'L' + }, + relativeTime : { + future : "через %s", + past : "%s назад", + s : "несколько секунд", + m : relativeTimeWithPlural, + mm : relativeTimeWithPlural, + h : "час", + hh : relativeTimeWithPlural, + d : "день", + dd : relativeTimeWithPlural, + M : "месяц", + MM : relativeTimeWithPlural, + y : "год", + yy : relativeTimeWithPlural + }, + + // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason + + meridiem : function (hour, minute, isLower) { + if (hour < 4) { + return "ночи"; + } else if (hour < 12) { + return "утра"; + } else if (hour < 17) { + return "дня"; + } else { + return "вечера"; + } + }, + + ordinal: function (number, period) { + switch (period) { + case 'M': + case 'd': + case 'DDD': + return number + '-й'; + case 'D': + return number + '-го'; + case 'w': + case 'W': + return number + '-я'; + default: + return number; + } + }, + + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : slovak (sk) +// author : Martin Minka : https://github.com/k2s +// based on work of petrbela : https://github.com/petrbela + +(function (factory) { + factory(moment); +}(function (moment) { + var months = "január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_"), + monthsShort = "jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"); + + function plural(n) { + return (n > 1) && (n < 5); + } + + function translate(number, withoutSuffix, key, isFuture) { + var result = number + " "; + switch (key) { + case 's': // a few seconds / in a few seconds / a few seconds ago + return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami'; + case 'm': // a minute / in a minute / a minute ago + return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou'); + case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'minúty' : 'minút'); + } else { + return result + 'minútami'; + } + break; + case 'h': // an hour / in an hour / an hour ago + return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou'); + case 'hh': // 9 hours / in 9 hours / 9 hours ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'hodiny' : 'hodín'); + } else { + return result + 'hodinami'; + } + break; + case 'd': // a day / in a day / a day ago + return (withoutSuffix || isFuture) ? 'deň' : 'dňom'; + case 'dd': // 9 days / in 9 days / 9 days ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'dni' : 'dní'); + } else { + return result + 'dňami'; + } + break; + case 'M': // a month / in a month / a month ago + return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom'; + case 'MM': // 9 months / in 9 months / 9 months ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'mesiace' : 'mesiacov'); + } else { + return result + 'mesiacmi'; + } + break; + case 'y': // a year / in a year / a year ago + return (withoutSuffix || isFuture) ? 'rok' : 'rokom'; + case 'yy': // 9 years / in 9 years / 9 years ago + if (withoutSuffix || isFuture) { + return result + (plural(number) ? 'roky' : 'rokov'); + } else { + return result + 'rokmi'; + } + break; + } + } + + return moment.lang('sk', { + months : months, + monthsShort : monthsShort, + monthsParse : (function (months, monthsShort) { + var i, _monthsParse = []; + for (i = 0; i < 12; i++) { + // use custom parser to solve problem with July (červenec) + _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i'); + } + return _monthsParse; + }(months, monthsShort)), + weekdays : "nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"), + weekdaysShort : "ne_po_ut_st_št_pi_so".split("_"), + weekdaysMin : "ne_po_ut_st_št_pi_so".split("_"), + longDateFormat : { + LT: "H:mm", + L : "DD.MM.YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd D. MMMM YYYY LT" + }, + calendar : { + sameDay: "[dnes o] LT", + nextDay: '[zajtra o] LT', + nextWeek: function () { + switch (this.day()) { + case 0: + return '[v nedeľu o] LT'; + case 1: + case 2: + return '[v] dddd [o] LT'; + case 3: + return '[v stredu o] LT'; + case 4: + return '[vo štvrtok o] LT'; + case 5: + return '[v piatok o] LT'; + case 6: + return '[v sobotu o] LT'; + } + }, + lastDay: '[včera o] LT', + lastWeek: function () { + switch (this.day()) { + case 0: + return '[minulú nedeľu o] LT'; + case 1: + case 2: + return '[minulý] dddd [o] LT'; + case 3: + return '[minulú stredu o] LT'; + case 4: + case 5: + return '[minulý] dddd [o] LT'; + case 6: + return '[minulú sobotu o] LT'; + } + }, + sameElse: "L" + }, + relativeTime : { + future : "za %s", + past : "pred %s", + s : translate, + m : translate, + mm : translate, + h : translate, + hh : translate, + d : translate, + dd : translate, + M : translate, + MM : translate, + y : translate, + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : slovenian (sl) +// author : Robert Sedovšek : https://github.com/sedovsek + +(function (factory) { + factory(moment); +}(function (moment) { + function translate(number, withoutSuffix, key) { + var result = number + " "; + switch (key) { + case 'm': + return withoutSuffix ? 'ena minuta' : 'eno minuto'; + case 'mm': + if (number === 1) { + result += 'minuta'; + } else if (number === 2) { + result += 'minuti'; + } else if (number === 3 || number === 4) { + result += 'minute'; + } else { + result += 'minut'; + } + return result; + case 'h': + return withoutSuffix ? 'ena ura' : 'eno uro'; + case 'hh': + if (number === 1) { + result += 'ura'; + } else if (number === 2) { + result += 'uri'; + } else if (number === 3 || number === 4) { + result += 'ure'; + } else { + result += 'ur'; + } + return result; + case 'dd': + if (number === 1) { + result += 'dan'; + } else { + result += 'dni'; + } + return result; + case 'MM': + if (number === 1) { + result += 'mesec'; + } else if (number === 2) { + result += 'meseca'; + } else if (number === 3 || number === 4) { + result += 'mesece'; + } else { + result += 'mesecev'; + } + return result; + case 'yy': + if (number === 1) { + result += 'leto'; + } else if (number === 2) { + result += 'leti'; + } else if (number === 3 || number === 4) { + result += 'leta'; + } else { + result += 'let'; + } + return result; + } + } + + return moment.lang('sl', { + months : "januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"), + monthsShort : "jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"), + weekdays : "nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"), + weekdaysShort : "ned._pon._tor._sre._čet._pet._sob.".split("_"), + weekdaysMin : "ne_po_to_sr_če_pe_so".split("_"), + longDateFormat : { + LT : "H:mm", + L : "DD. MM. YYYY", + LL : "D. MMMM YYYY", + LLL : "D. MMMM YYYY LT", + LLLL : "dddd, D. MMMM YYYY LT" + }, + calendar : { + sameDay : '[danes ob] LT', + nextDay : '[jutri ob] LT', + + nextWeek : function () { + switch (this.day()) { + case 0: + return '[v] [nedeljo] [ob] LT'; + case 3: + return '[v] [sredo] [ob] LT'; + case 6: + return '[v] [soboto] [ob] LT'; + case 1: + case 2: + case 4: + case 5: + return '[v] dddd [ob] LT'; + } + }, + lastDay : '[včeraj ob] LT', + lastWeek : function () { + switch (this.day()) { + case 0: + case 3: + case 6: + return '[prejšnja] dddd [ob] LT'; + case 1: + case 2: + case 4: + case 5: + return '[prejšnji] dddd [ob] LT'; + } + }, + sameElse : 'L' + }, + relativeTime : { + future : "čez %s", + past : "%s nazaj", + s : "nekaj sekund", + m : translate, + mm : translate, + h : translate, + hh : translate, + d : "en dan", + dd : translate, + M : "en mesec", + MM : translate, + y : "eno leto", + yy : translate + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Albanian (sq) +// author : Flakërim Ismani : https://github.com/flakerimi +// author: Menelion Elensúle: https://github.com/Oire (tests) + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('sq', { + months : "Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor".split("_"), + monthsShort : "Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj".split("_"), + weekdays : "E Diel_E Hënë_E Marte_E Mërkure_E Enjte_E Premte_E Shtunë".split("_"), + weekdaysShort : "Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"), + weekdaysMin : "D_H_Ma_Më_E_P_Sh".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay : '[Sot në] LT', + nextDay : '[Neser në] LT', + nextWeek : 'dddd [në] LT', + lastDay : '[Dje në] LT', + lastWeek : 'dddd [e kaluar në] LT', + sameElse : 'L' + }, + relativeTime : { + future : "në %s", + past : "%s me parë", + s : "disa seconda", + m : "një minut", + mm : "%d minutea", + h : "një orë", + hh : "%d orë", + d : "një ditë", + dd : "%d ditë", + M : "një muaj", + MM : "%d muaj", + y : "një vit", + yy : "%d vite" + }, + ordinal : '%d.', + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : swedish (sv) +// author : Jens Alm : https://github.com/ulmus + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('sv', { + months : "januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"), + monthsShort : "jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"), + weekdays : "söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"), + weekdaysShort : "sön_mån_tis_ons_tor_fre_lör".split("_"), + weekdaysMin : "sö_må_ti_on_to_fr_lö".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "YYYY-MM-DD", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: '[Idag] LT', + nextDay: '[Imorgon] LT', + lastDay: '[Igår] LT', + nextWeek: 'dddd LT', + lastWeek: '[Förra] dddd[en] LT', + sameElse: 'L' + }, + relativeTime : { + future : "om %s", + past : "för %s sedan", + s : "några sekunder", + m : "en minut", + mm : "%d minuter", + h : "en timme", + hh : "%d timmar", + d : "en dag", + dd : "%d dagar", + M : "en månad", + MM : "%d månader", + y : "ett år", + yy : "%d år" + }, + ordinal : function (number) { + var b = number % 10, + output = (~~ (number % 100 / 10) === 1) ? 'e' : + (b === 1) ? 'a' : + (b === 2) ? 'a' : + (b === 3) ? 'e' : 'e'; + return number + output; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : thai (th) +// author : Kridsada Thanabulpong : https://github.com/sirn + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('th', { + months : "มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"), + monthsShort : "มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา".split("_"), + weekdays : "อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"), + weekdaysShort : "อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"), // yes, three characters difference + weekdaysMin : "อา._จ._อ._พ._พฤ._ศ._ส.".split("_"), + longDateFormat : { + LT : "H นาฬิกา m นาที", + L : "YYYY/MM/DD", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY เวลา LT", + LLLL : "วันddddที่ D MMMM YYYY เวลา LT" + }, + meridiem : function (hour, minute, isLower) { + if (hour < 12) { + return "ก่อนเที่ยง"; + } else { + return "หลังเที่ยง"; + } + }, + calendar : { + sameDay : '[วันนี้ เวลา] LT', + nextDay : '[พรุ่งนี้ เวลา] LT', + nextWeek : 'dddd[หน้า เวลา] LT', + lastDay : '[เมื่อวานนี้ เวลา] LT', + lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT', + sameElse : 'L' + }, + relativeTime : { + future : "อีก %s", + past : "%sที่แล้ว", + s : "ไม่กี่วินาที", + m : "1 นาที", + mm : "%d นาที", + h : "1 ชั่วโมง", + hh : "%d ชั่วโมง", + d : "1 วัน", + dd : "%d วัน", + M : "1 เดือน", + MM : "%d เดือน", + y : "1 ปี", + yy : "%d ปี" + } + }); +})); +// moment.js language configuration +// language : Tagalog/Filipino (tl-ph) +// author : Dan Hagman + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('tl-ph', { + months : "Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"), + monthsShort : "Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"), + weekdays : "Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"), + weekdaysShort : "Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"), + weekdaysMin : "Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "MM/D/YYYY", + LL : "MMMM D, YYYY", + LLL : "MMMM D, YYYY LT", + LLLL : "dddd, MMMM DD, YYYY LT" + }, + calendar : { + sameDay: "[Ngayon sa] LT", + nextDay: '[Bukas sa] LT', + nextWeek: 'dddd [sa] LT', + lastDay: '[Kahapon sa] LT', + lastWeek: 'dddd [huling linggo] LT', + sameElse: 'L' + }, + relativeTime : { + future : "sa loob ng %s", + past : "%s ang nakalipas", + s : "ilang segundo", + m : "isang minuto", + mm : "%d minuto", + h : "isang oras", + hh : "%d oras", + d : "isang araw", + dd : "%d araw", + M : "isang buwan", + MM : "%d buwan", + y : "isang taon", + yy : "%d taon" + }, + ordinal : function (number) { + return number; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : turkish (tr) +// authors : Erhan Gundogan : https://github.com/erhangundogan, +// Burak Yiğit Kaya: https://github.com/BYK + +(function (factory) { + factory(moment); +}(function (moment) { + + var suffixes = { + 1: "'inci", + 5: "'inci", + 8: "'inci", + 70: "'inci", + 80: "'inci", + + 2: "'nci", + 7: "'nci", + 20: "'nci", + 50: "'nci", + + 3: "'üncü", + 4: "'üncü", + 100: "'üncü", + + 6: "'ncı", + + 9: "'uncu", + 10: "'uncu", + 30: "'uncu", + + 60: "'ıncı", + 90: "'ıncı" + }; + + return moment.lang('tr', { + months : "Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"), + monthsShort : "Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"), + weekdays : "Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"), + weekdaysShort : "Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"), + weekdaysMin : "Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD.MM.YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd, D MMMM YYYY LT" + }, + calendar : { + sameDay : '[bugün saat] LT', + nextDay : '[yarın saat] LT', + nextWeek : '[haftaya] dddd [saat] LT', + lastDay : '[dün] LT', + lastWeek : '[geçen hafta] dddd [saat] LT', + sameElse : 'L' + }, + relativeTime : { + future : "%s sonra", + past : "%s önce", + s : "birkaç saniye", + m : "bir dakika", + mm : "%d dakika", + h : "bir saat", + hh : "%d saat", + d : "bir gün", + dd : "%d gün", + M : "bir ay", + MM : "%d ay", + y : "bir yıl", + yy : "%d yıl" + }, + ordinal : function (number) { + if (number === 0) { // special case for zero + return number + "'ıncı"; + } + var a = number % 10, + b = number % 100 - a, + c = number >= 100 ? 100 : null; + + return number + (suffixes[a] || suffixes[b] || suffixes[c]); + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Morocco Central Atlas Tamaziɣt in Latin (tzm-la) +// author : Abdel Said : https://github.com/abdelsaid + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('tzm-la', { + months : "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"), + monthsShort : "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"), + weekdays : "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"), + weekdaysShort : "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"), + weekdaysMin : "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: "[asdkh g] LT", + nextDay: '[aska g] LT', + nextWeek: 'dddd [g] LT', + lastDay: '[assant g] LT', + lastWeek: 'dddd [g] LT', + sameElse: 'L' + }, + relativeTime : { + future : "dadkh s yan %s", + past : "yan %s", + s : "imik", + m : "minuḍ", + mm : "%d minuḍ", + h : "saɛa", + hh : "%d tassaɛin", + d : "ass", + dd : "%d ossan", + M : "ayowr", + MM : "%d iyyirn", + y : "asgas", + yy : "%d isgasn" + }, + week : { + dow : 6, // Saturday is the first day of the week. + doy : 12 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : Morocco Central Atlas Tamaziɣt (tzm) +// author : Abdel Said : https://github.com/abdelsaid + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('tzm', { + months : "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"), + monthsShort : "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"), + weekdays : "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"), + weekdaysShort : "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"), + weekdaysMin : "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "dddd D MMMM YYYY LT" + }, + calendar : { + sameDay: "[ⴰⵙⴷⵅ ⴴ] LT", + nextDay: '[ⴰⵙⴽⴰ ⴴ] LT', + nextWeek: 'dddd [ⴴ] LT', + lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT', + lastWeek: 'dddd [ⴴ] LT', + sameElse: 'L' + }, + relativeTime : { + future : "ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s", + past : "ⵢⴰⵏ %s", + s : "ⵉⵎⵉⴽ", + m : "ⵎⵉⵏⵓⴺ", + mm : "%d ⵎⵉⵏⵓⴺ", + h : "ⵙⴰⵄⴰ", + hh : "%d ⵜⴰⵙⵙⴰⵄⵉⵏ", + d : "ⴰⵙⵙ", + dd : "%d oⵙⵙⴰⵏ", + M : "ⴰⵢoⵓⵔ", + MM : "%d ⵉⵢⵢⵉⵔⵏ", + y : "ⴰⵙⴳⴰⵙ", + yy : "%d ⵉⵙⴳⴰⵙⵏ" + }, + week : { + dow : 6, // Saturday is the first day of the week. + doy : 12 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : ukrainian (uk) +// author : zemlanin : https://github.com/zemlanin +// Author : Menelion Elensúle : https://github.com/Oire + +(function (factory) { + factory(moment); +}(function (moment) { + function plural(word, num) { + var forms = word.split('_'); + return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]); + } + + function relativeTimeWithPlural(number, withoutSuffix, key) { + var format = { + 'mm': 'хвилина_хвилини_хвилин', + 'hh': 'година_години_годин', + 'dd': 'день_дні_днів', + 'MM': 'місяць_місяці_місяців', + 'yy': 'рік_роки_років' + }; + if (key === 'm') { + return withoutSuffix ? 'хвилина' : 'хвилину'; + } + else if (key === 'h') { + return withoutSuffix ? 'година' : 'годину'; + } + else { + return number + ' ' + plural(format[key], +number); + } + } + + function monthsCaseReplace(m, format) { + var months = { + 'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'), + 'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_') + }, + + nounCase = (/D[oD]? *MMMM?/).test(format) ? + 'accusative' : + 'nominative'; + + return months[nounCase][m.month()]; + } + + function weekdaysCaseReplace(m, format) { + var weekdays = { + 'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'), + 'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'), + 'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_') + }, + + nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ? + 'accusative' : + ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ? + 'genitive' : + 'nominative'); + + return weekdays[nounCase][m.day()]; + } + + function processHoursFunction(str) { + return function () { + return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT'; + }; + } + + return moment.lang('uk', { + months : monthsCaseReplace, + monthsShort : "січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"), + weekdays : weekdaysCaseReplace, + weekdaysShort : "нд_пн_вт_ср_чт_пт_сб".split("_"), + weekdaysMin : "нд_пн_вт_ср_чт_пт_сб".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD.MM.YYYY", + LL : "D MMMM YYYY р.", + LLL : "D MMMM YYYY р., LT", + LLLL : "dddd, D MMMM YYYY р., LT" + }, + calendar : { + sameDay: processHoursFunction('[Сьогодні '), + nextDay: processHoursFunction('[Завтра '), + lastDay: processHoursFunction('[Вчора '), + nextWeek: processHoursFunction('[У] dddd ['), + lastWeek: function () { + switch (this.day()) { + case 0: + case 3: + case 5: + case 6: + return processHoursFunction('[Минулої] dddd [').call(this); + case 1: + case 2: + case 4: + return processHoursFunction('[Минулого] dddd [').call(this); + } + }, + sameElse: 'L' + }, + relativeTime : { + future : "за %s", + past : "%s тому", + s : "декілька секунд", + m : relativeTimeWithPlural, + mm : relativeTimeWithPlural, + h : "годину", + hh : relativeTimeWithPlural, + d : "день", + dd : relativeTimeWithPlural, + M : "місяць", + MM : relativeTimeWithPlural, + y : "рік", + yy : relativeTimeWithPlural + }, + + // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason + + meridiem : function (hour, minute, isLower) { + if (hour < 4) { + return "ночі"; + } else if (hour < 12) { + return "ранку"; + } else if (hour < 17) { + return "дня"; + } else { + return "вечора"; + } + }, + + ordinal: function (number, period) { + switch (period) { + case 'M': + case 'd': + case 'DDD': + case 'w': + case 'W': + return number + '-й'; + case 'D': + return number + '-го'; + default: + return number; + } + }, + + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 1st is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : uzbek +// author : Sardor Muminov : https://github.com/muminoff + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('uz', { + months : "январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"), + monthsShort : "янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"), + weekdays : "Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба".split("_"), + weekdaysShort : "Якш_Душ_Сеш_Чор_Пай_Жум_Шан".split("_"), + weekdaysMin : "Як_Ду_Се_Чо_Па_Жу_Ша".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM YYYY", + LLL : "D MMMM YYYY LT", + LLLL : "D MMMM YYYY, dddd LT" + }, + calendar : { + sameDay : '[Бугун соат] LT [да]', + nextDay : '[Эртага] LT [да]', + nextWeek : 'dddd [куни соат] LT [да]', + lastDay : '[Кеча соат] LT [да]', + lastWeek : '[Утган] dddd [куни соат] LT [да]', + sameElse : 'L' + }, + relativeTime : { + future : "Якин %s ичида", + past : "Бир неча %s олдин", + s : "фурсат", + m : "бир дакика", + mm : "%d дакика", + h : "бир соат", + hh : "%d соат", + d : "бир кун", + dd : "%d кун", + M : "бир ой", + MM : "%d ой", + y : "бир йил", + yy : "%d йил" + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 7 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : vietnamese (vn) +// author : Bang Nguyen : https://github.com/bangnk + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('vn', { + months : "tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"), + monthsShort : "Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"), + weekdays : "chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"), + weekdaysShort : "CN_T2_T3_T4_T5_T6_T7".split("_"), + weekdaysMin : "CN_T2_T3_T4_T5_T6_T7".split("_"), + longDateFormat : { + LT : "HH:mm", + L : "DD/MM/YYYY", + LL : "D MMMM [năm] YYYY", + LLL : "D MMMM [năm] YYYY LT", + LLLL : "dddd, D MMMM [năm] YYYY LT", + l : "DD/M/YYYY", + ll : "D MMM YYYY", + lll : "D MMM YYYY LT", + llll : "ddd, D MMM YYYY LT" + }, + calendar : { + sameDay: "[Hôm nay lúc] LT", + nextDay: '[Ngày mai lúc] LT', + nextWeek: 'dddd [tuần tới lúc] LT', + lastDay: '[Hôm qua lúc] LT', + lastWeek: 'dddd [tuần rồi lúc] LT', + sameElse: 'L' + }, + relativeTime : { + future : "%s tới", + past : "%s trước", + s : "vài giây", + m : "một phút", + mm : "%d phút", + h : "một giờ", + hh : "%d giờ", + d : "một ngày", + dd : "%d ngày", + M : "một tháng", + MM : "%d tháng", + y : "một năm", + yy : "%d năm" + }, + ordinal : function (number) { + return number; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : chinese +// author : suupic : https://github.com/suupic +// author : Zeno Zeng : https://github.com/zenozeng + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('zh-cn', { + months : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"), + monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"), + weekdays : "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"), + weekdaysShort : "周日_周一_周二_周三_周四_周五_周六".split("_"), + weekdaysMin : "日_一_二_三_四_五_六".split("_"), + longDateFormat : { + LT : "Ah点mm", + L : "YYYY年MMMD日", + LL : "YYYY年MMMD日", + LLL : "YYYY年MMMD日LT", + LLLL : "YYYY年MMMD日ddddLT", + l : "YYYY年MMMD日", + ll : "YYYY年MMMD日", + lll : "YYYY年MMMD日LT", + llll : "YYYY年MMMD日ddddLT" + }, + meridiem : function (hour, minute, isLower) { + var hm = hour * 100 + minute; + if (hm < 600) { + return "凌晨"; + } else if (hm < 900) { + return "早上"; + } else if (hm < 1130) { + return "上午"; + } else if (hm < 1230) { + return "中午"; + } else if (hm < 1800) { + return "下午"; + } else { + return "晚上"; + } + }, + calendar : { + sameDay : function () { + return this.minutes() === 0 ? "[今天]Ah[点整]" : "[今天]LT"; + }, + nextDay : function () { + return this.minutes() === 0 ? "[明天]Ah[点整]" : "[明天]LT"; + }, + lastDay : function () { + return this.minutes() === 0 ? "[昨天]Ah[点整]" : "[昨天]LT"; + }, + nextWeek : function () { + var startOfWeek, prefix; + startOfWeek = moment().startOf('week'); + prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]'; + return this.minutes() === 0 ? prefix + "dddAh点整" : prefix + "dddAh点mm"; + }, + lastWeek : function () { + var startOfWeek, prefix; + startOfWeek = moment().startOf('week'); + prefix = this.unix() < startOfWeek.unix() ? '[上]' : '[本]'; + return this.minutes() === 0 ? prefix + "dddAh点整" : prefix + "dddAh点mm"; + }, + sameElse : 'L' + }, + ordinal : function (number, period) { + switch (period) { + case "d": + case "D": + case "DDD": + return number + "日"; + case "M": + return number + "月"; + case "w": + case "W": + return number + "周"; + default: + return number; + } + }, + relativeTime : { + future : "%s内", + past : "%s前", + s : "几秒", + m : "1分钟", + mm : "%d分钟", + h : "1小时", + hh : "%d小时", + d : "1天", + dd : "%d天", + M : "1个月", + MM : "%d个月", + y : "1年", + yy : "%d年" + }, + week : { + // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效 + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); +// moment.js language configuration +// language : traditional chinese (zh-tw) +// author : Ben : https://github.com/ben-lin + +(function (factory) { + factory(moment); +}(function (moment) { + return moment.lang('zh-tw', { + months : "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"), + monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"), + weekdays : "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"), + weekdaysShort : "週日_週一_週二_週三_週四_週五_週六".split("_"), + weekdaysMin : "日_一_二_三_四_五_六".split("_"), + longDateFormat : { + LT : "Ah點mm", + L : "YYYY年MMMD日", + LL : "YYYY年MMMD日", + LLL : "YYYY年MMMD日LT", + LLLL : "YYYY年MMMD日ddddLT", + l : "YYYY年MMMD日", + ll : "YYYY年MMMD日", + lll : "YYYY年MMMD日LT", + llll : "YYYY年MMMD日ddddLT" + }, + meridiem : function (hour, minute, isLower) { + var hm = hour * 100 + minute; + if (hm < 900) { + return "早上"; + } else if (hm < 1130) { + return "上午"; + } else if (hm < 1230) { + return "中午"; + } else if (hm < 1800) { + return "下午"; + } else { + return "晚上"; + } + }, + calendar : { + sameDay : '[今天]LT', + nextDay : '[明天]LT', + nextWeek : '[下]ddddLT', + lastDay : '[昨天]LT', + lastWeek : '[上]ddddLT', + sameElse : 'L' + }, + ordinal : function (number, period) { + switch (period) { + case "d" : + case "D" : + case "DDD" : + return number + "日"; + case "M" : + return number + "月"; + case "w" : + case "W" : + return number + "週"; + default : + return number; + } + }, + relativeTime : { + future : "%s內", + past : "%s前", + s : "幾秒", + m : "一分鐘", + mm : "%d分鐘", + h : "一小時", + hh : "%d小時", + d : "一天", + dd : "%d天", + M : "一個月", + MM : "%d個月", + y : "一年", + yy : "%d年" + } + }); +})); + + moment.lang('en'); + + + /************************************ + Exposing Moment + ************************************/ + + function makeGlobal(deprecate) { + var warned = false, local_moment = moment; + /*global ender:false */ + if (typeof ender !== 'undefined') { + return; + } + // here, `this` means `window` in the browser, or `global` on the server + // add `moment` as a global object via a string identifier, + // for Closure Compiler "advanced" mode + if (deprecate) { + this.moment = function () { + if (!warned && console && console.warn) { + warned = true; + console.warn( + "Accessing Moment through the global scope is " + + "deprecated, and will be removed in an upcoming " + + "release."); + } + return local_moment.apply(null, arguments); + }; + } else { + this['moment'] = moment; + } + } + + // CommonJS module is defined + if (hasModule) { + module.exports = moment; + makeGlobal(true); + } else if (typeof define === "function" && define.amd) { + define("moment", function (require, exports, module) { + if (module.config().noGlobal !== true) { + // If user provided noGlobal, he is aware of global + makeGlobal(module.config().noGlobal === undefined); + } + + return moment; + }); + } else { + makeGlobal(); + } +}).call(this); diff --git a/mod/editpost.php b/mod/editpost.php index b01afe9b3..8e2d2fd60 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -132,6 +132,8 @@ function editpost_content(&$a) { '$expires' => t('Set expiration date'), '$feature_encrypt' => 'none', '$encrypt' => t('Encrypt text'), + '$expiryModalOK' => t('OK'), + '$expiryModalCANCEL' => t('Cancel'), )); return $o; diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f2f0af5f1..da64ce08e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,7 +10,12 @@ head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); + // head_add_css('library/font_awesome/css/font-awesome.min.css'); +head_add_css('view/css/conversation.css'); +head_add_css('view/css/bootstrap-red.css'); +head_add_css('view/css/widgets.css'); +head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); @@ -40,7 +45,8 @@ head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); - +head_add_js('library/bootstrap-datetimepicker/js/moment.js'); +head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); /** * Those who require this feature will know what to do with it. * Those who don't, won't. diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 1ceca04c6..09d035979 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -194,10 +194,17 @@ function enableOnUser(){ } function jotGetExpiry() { - reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); - if(reply && reply.length) { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#expiryModal').modal(); + $('#expiry-modal-OKButton').on('click', function() { + reply=$('#expiration-date').val(); + if(reply && reply.length) { $('#jot-expire').val(reply); + $('#expiryModal').modal('hide'); } +}) + + } function jotShare(id) { @@ -299,3 +306,16 @@ function enableOnUser(){ + + diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ef91f45be..72553f944 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -90,9 +90,42 @@ {{$jotnets}}
      + + + + + + -
      -- cgit v1.2.3 From 242bae5acda15b12cb87379cf6173daa16807930 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:55:28 +0100 Subject: Merge --- view/tpl/saved_searches_aside.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 615eca39d..c670ee3fa 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -12,3 +12,4 @@
    + -- cgit v1.2.3 From 1a72239af040551817813ce056640ebba6ab1ccb Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:58:27 +0100 Subject: Correction --- view/tpl/_conv_item.tpl | 118 ------------------------------------- view/tpl/_group_side.tpl | 33 ----------- view/tpl/_saved_searches_aside.tpl | 15 ----- 3 files changed, 166 deletions(-) delete mode 100755 view/tpl/_conv_item.tpl delete mode 100755 view/tpl/_group_side.tpl delete mode 100755 view/tpl/_saved_searches_aside.tpl diff --git a/view/tpl/_conv_item.tpl b/view/tpl/_conv_item.tpl deleted file mode 100755 index b6e3df7c4..000000000 --- a/view/tpl/_conv_item.tpl +++ /dev/null @@ -1,118 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
    - {{$item.num_comments}} {{$item.hide_text}} -
    - {{/if}} diff --git a/view/tpl/_group_side.tpl b/view/tpl/_group_side.tpl deleted file mode 100755 index e350087f0..000000000 --- a/view/tpl/_group_side.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
    -

    {{$title}}

    - -
    - - - {{if $ungrouped}} - - {{/if}} -
    -
    - - diff --git a/view/tpl/_saved_searches_aside.tpl b/view/tpl/_saved_searches_aside.tpl deleted file mode 100755 index 2ca2ef6ea..000000000 --- a/view/tpl/_saved_searches_aside.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
    -
    -
    - {{$searchbox}} - -
    -
    -
    -- cgit v1.2.3 From 0f902f94f30dabaa962be082e7eb4a7402fe5670 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:59:47 +0100 Subject: Correction 2 --- js/_crypto.js | 275 ------------- js/_main.js | 1219 --------------------------------------------------------- 2 files changed, 1494 deletions(-) delete mode 100644 js/_crypto.js delete mode 100644 js/_main.js diff --git a/js/_crypto.js b/js/_crypto.js deleted file mode 100644 index f9a27b182..000000000 --- a/js/_crypto.js +++ /dev/null @@ -1,275 +0,0 @@ - - -function str_rot13 (str) { - // http://kevin.vanzonneveld.net - // + original by: Jonas Raoni Soares Silva (http://www.jsfromhell.com) - // + improved by: Ates Goral (http://magnetiq.com) - // + bugfixed by: Onno Marsman - // + improved by: Rafa? Kukawski (http://blog.kukawski.pl) - // * example 1: str_rot13('Kevin van Zonneveld'); - // * returns 1: 'Xriva ina Mbaariryq' - // * example 2: str_rot13('Xriva ina Mbaariryq'); - // * returns 2: 'Kevin van Zonneveld' - // * example 3: str_rot13(33); - // * returns 3: '33' - return (str + '').replace(/[a-z]/gi, function (s) { - return String.fromCharCode(s.charCodeAt(0) + (s.toLowerCase() < 'n' ? 13 : -13)); - }); -} - - -// We probably just want the element where the text is and find it ourself. e.g. if -// there is highlighted text use it, otherwise use the entire text. -// So the third element may be useless. Fix also in view/tpl/jot.tpl before -// adding to all the editor templates and enabling the feature - -// Should probably do some input sanitising and dealing with bbcode, hiding key text, and displaying -// results in a lightbox and/or popup form are left as an exercise for the reader. - - -function red_encrypt(alg, elem,text) { - var enc_text = ''; - var newdiv = ''; - - if(typeof tinyMCE !== "undefined") - tinyMCE.triggerSave(false,true); - - var text = $(elem).val(); - - // key and hint need to be localised - - var enc_key = bootbox.confirm("
    \ -

    Passphrase:


    \ -

    Hint:

    \ -
    ",function(result){if(result) - $('#encrypt').submit();}); - - // If you don't provide a key you get rot13, which doesn't need a key - // but consequently isn't secure. - - if(! enc_key) - alg = 'rot13'; - - if((alg == 'rot13') || (alg == 'triple-rot13')) - newdiv = "[crypt alg='rot13']" + str_rot13(text) + '[/crypt]'; - - if(alg == 'aes256') { - - // This is the prompt we're going to use when the receiver tries to open it. - // Maybe "Grandma's maiden name" or "our secret place" or something. - - var enc_hint = bootbox.prompt(aStr['passhint'],function(result){return true;}); - - enc_text = CryptoJS.AES.encrypt(text,enc_key); - - encrypted = enc_text.toString(); - - newdiv = "[crypt alg='aes256' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; - } - if(alg == 'rabbit') { - - // This is the prompt we're going to use when the receiver tries to open it. - // Maybe "Grandma's maiden name" or "our secret place" or something. - - var enc_hint = bootbox.prompt(aStr['passhint']); - - enc_text = CryptoJS.Rabbit.encrypt(text,enc_key); - encrypted = enc_text.toString(); - - newdiv = "[crypt alg='rabbit' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; - } - if(alg == '3des') { - - // This is the prompt we're going to use when the receiver tries to open it. - // Maybe "Grandma's maiden name" or "our secret place" or something. - - var enc_hint = bootbox.prompt(aStr['passhint']); - - enc_text = CryptoJS.TripleDES.encrypt(text,enc_key); - encrypted = enc_text.toString(); - - newdiv = "[crypt alg='3des' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; - } - - enc_key = ''; - -// alert(newdiv); - - // This might be a comment box on a page with a tinymce editor - // so check if there is a tinymce editor but also check the display - // property of our source element - because a tinymce instance - // will have display "none". If a normal textarea such as in a comment - // box has display "none" you wouldn't be able to type in it. - - if($(elem).css('display') == 'none' && typeof tinyMCE !== "undefined") { - tinyMCE.activeEditor.setContent(newdiv); - } - else { - $(elem).val(newdiv); - } - -// textarea = document.getElementById(elem); -// if (document.selection) { -// textarea.focus(); -// selected = document.selection.createRange(); -// selected.text = newdiv; -// } else if (textarea.selectionStart || textarea.selectionStart == "0") { -// var start = textarea.selectionStart; -// var end = textarea.selectionEnd; -// textarea.value = textarea.value.substring(0, start) + newdiv + textarea.value.substring(end, textarea.value.length); -// } -} - -function red_decrypt(alg,hint,text,elem) { - - var enc_text = ''; - - if(alg == 'rot13' || alg == 'triple-rot13') - enc_text = str_rot13(text); - - if(alg == 'aes256') { - var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); - enc_text = CryptoJS.AES.decrypt(text,enc_key); - } - if(alg == 'rabbit') { - var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); - enc_text = CryptoJS.Rabbit.decrypt(text,enc_key); - } - if(alg == '3des') { - var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); - enc_text = CryptoJS.TripleDES.decrypt(text,enc_key); - } - - enc_key = ''; - - // Not sure whether to drop this back in the conversation display. - // It probably needs a lightbox or popup window because any conversation - // updates could - // wipe out the text and make you re-enter the key if it was in the - // conversation. For now we do that so you can read it. - - var enc_result = enc_text.toString(CryptoJS.enc.Utf8); - delete enc_text; - - // incorrect decryptions *usually* but don't always have zero length - // If the person typo'd let them try again without reloading the page - // otherwise they'll have no "padlock" to click to try again. - - if(enc_result.length) { - $(elem).html(b2h(enc_result)); - enc_result = ''; - } -} - - - - - -function base64_encode (data) { - // http://kevin.vanzonneveld.net - // + original by: Tyler Akins (http://rumkin.com) - // + improved by: Bayron Guevara - // + improved by: Thunder.m - // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) - // + bugfixed by: Pellentesque Malesuada - // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) - // + improved by: Rafa? Kukawski (http://kukawski.pl) - // * example 1: base64_encode('Kevin van Zonneveld'); - // * returns 1: 'S2V2aW4gdmFuIFpvbm5ldmVsZA==' - // mozilla has this native - // - but breaks in 2.0.0.12! - //if (typeof this.window['btoa'] === 'function') { - // return btoa(data); - //} - var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - var o1, o2, o3, h1, h2, h3, h4, bits, i = 0, - ac = 0, - enc = "", - tmp_arr = []; - - if (!data) { - return data; - } - - do { // pack three octets into four hexets - o1 = data.charCodeAt(i++); - o2 = data.charCodeAt(i++); - o3 = data.charCodeAt(i++); - - bits = o1 << 16 | o2 << 8 | o3; - - h1 = bits >> 18 & 0x3f; - h2 = bits >> 12 & 0x3f; - h3 = bits >> 6 & 0x3f; - h4 = bits & 0x3f; - - // use hexets to index into b64, and append result to encoded string - tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4); - } while (i < data.length); - - enc = tmp_arr.join(''); - - var r = data.length % 3; - - return (r ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3); - -} - - -function base64_decode (data) { - // http://kevin.vanzonneveld.net - // + original by: Tyler Akins (http://rumkin.com) - // + improved by: Thunder.m - // + input by: Aman Gupta - // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) - // + bugfixed by: Onno Marsman - // + bugfixed by: Pellentesque Malesuada - // + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) - // + input by: Brett Zamir (http://brett-zamir.me) - // + bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) - // * example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA=='); - // * returns 1: 'Kevin van Zonneveld' - // mozilla has this native - // - but breaks in 2.0.0.12! - //if (typeof this.window['atob'] === 'function') { - // return atob(data); - //} - var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - var o1, o2, o3, h1, h2, h3, h4, bits, i = 0, - ac = 0, - dec = "", - tmp_arr = []; - - if (!data) { - return data; - } - - data += ''; - - do { // unpack four hexets into three octets using index points in b64 - h1 = b64.indexOf(data.charAt(i++)); - h2 = b64.indexOf(data.charAt(i++)); - h3 = b64.indexOf(data.charAt(i++)); - h4 = b64.indexOf(data.charAt(i++)); - - bits = h1 << 18 | h2 << 12 | h3 << 6 | h4; - - o1 = bits >> 16 & 0xff; - o2 = bits >> 8 & 0xff; - o3 = bits & 0xff; - - if (h3 == 64) { - tmp_arr[ac++] = String.fromCharCode(o1); - } else if (h4 == 64) { - tmp_arr[ac++] = String.fromCharCode(o1, o2); - } else { - tmp_arr[ac++] = String.fromCharCode(o1, o2, o3); - } - } while (i < data.length); - - dec = tmp_arr.join(''); - - return dec; -} - - diff --git a/js/_main.js b/js/_main.js deleted file mode 100644 index d975231fe..000000000 --- a/js/_main.js +++ /dev/null @@ -1,1219 +0,0 @@ - - function confirmDelete(obj) {return bootbox.alert(aStr['delitem']); } - function confirmDelete2(obj){ return - $(function () { - $(obj).onclick(function(e) { - e.preventDefault(); - var location = $(this).attr('href'); - bootbox.confirm(aStr['delitem'], function(confirmed) { - if(confirmed) { - window.location.replace(location); - } - }); -}); -}); - - } - function commentOpen(obj,id) { - if(obj.value == aStr['comment']) { - obj.value = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - $("#mod-cmnt-wrap-" + id).show(); - openMenu("comment-edit-submit-wrapper-" + id); - return true; - } - return false; - } - function commentClose(obj,id) { - if(obj.value == '') { - obj.value = aStr['comment']; - $("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); - $("#mod-cmnt-wrap-" + id).hide(); - closeMenu("comment-edit-submit-wrapper-" + id); - return true; - } - return false; - } - - function showHideCommentBox(id) { - if( $('#comment-edit-form-' + id).is(':visible')) { - $('#comment-edit-form-' + id).hide(); - } - else { - $('#comment-edit-form-' + id).show(); - } - } - - - function commentInsert(obj,id) { - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == '$comment') { - tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - } - var ins = $(obj).html(); - ins = ins.replace('<','<'); - ins = ins.replace('>','>'); - ins = ins.replace('&','&'); - ins = ins.replace('"','"'); - $("#comment-edit-text-" + id).val(tmpStr + ins); - } - - - function insertbbcomment(comment,BBcode,id) { - // allow themes to override this - if(typeof(insertFormatting) != 'undefined') - return(insertFormatting(comment,BBcode,id)); - - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == comment) { - tmpStr = ""; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - $("#comment-edit-text-" + id).val(tmpStr); - } - - textarea = document.getElementById("comment-edit-text-" +id); - if (document.selection) { - textarea.focus(); - selected = document.selection.createRange(); - selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; - } else if (textarea.selectionStart || textarea.selectionStart == "0") { - var start = textarea.selectionStart; - var end = textarea.selectionEnd; - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } - return true; - } - - - - - function qCommentInsert(obj,id) { - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == aStr['comment']) { - tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - } - var ins = $(obj).val(); - ins = ins.replace('<','<'); - ins = ins.replace('>','>'); - ins = ins.replace('&','&'); - ins = ins.replace('"','"'); - $("#comment-edit-text-" + id).val(tmpStr + ins); - $(obj).val(''); - } - - function showHideComments(id) { - if( $('#collapsed-comments-' + id).is(':visible')) { - $('#collapsed-comments-' + id).hide(); - $('#hide-comments-' + id).html(aStr['showmore']); - } - else { - $('#collapsed-comments-' + id).show(); - $('#hide-comments-' + id).html(aStr['showfewer']); - } - } - - - function openClose(theID) { - if(document.getElementById(theID).style.display == "block") { - document.getElementById(theID).style.display = "none" - } - else { - document.getElementById(theID).style.display = "block" - } - } - - function openMenu(theID) { - document.getElementById(theID).style.display = "block" - } - - function closeMenu(theID) { - document.getElementById(theID).style.display = "none" - } - - function markRead(notifType) { - $.get('ping?f=&markRead='+notifType); - if(timer) clearTimeout(timer); - $('#' + notifType + '-update').html(''); - timer = setTimeout(NavUpdate,2000); - } - - var src = null; - var prev = null; - var livetime = null; - var msie = false; - var stopped = false; - var totStopped = false; - var timer = null; - var pr = 0; - var liking = 0; - var in_progress = false; - var langSelect = false; - var commentBusy = false; - var last_popup_menu = null; - var last_popup_button = null; - var scroll_next = false; - var next_page = 1; - var page_load = true; - var loadingPage = false; - var pageHasMoreContent = true; - var updateCountsOnly = false; - - $(function() { - $.ajaxSetup({cache: false}); - - msie = false; // $.browser.msie ; - - /* setup tooltips *//* - $("a,.tt").each(function(){ - var e = $(this); - var pos="bottom"; - if (e.hasClass("tttop")) pos="top"; - if (e.hasClass("ttbottom")) pos="bottom"; - if (e.hasClass("ttleft")) pos="left"; - if (e.hasClass("ttright")) pos="right"; - e.tipTip({defaultPosition: pos, edgeOffset: 8}); - });*/ - - var e = document.getElementById('content-complete'); - if(e) - pageHasMoreContent = false; - - /* setup onoff widgets */ - $(".onoff input").each(function(){ - val = $(this).val(); - id = $(this).attr("id"); - $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); - - }); - $(".onoff > a").click(function(event){ - event.preventDefault(); - var input = $(this).siblings("input"); - var val = 1-input.val(); - var id = input.attr("id"); - $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden"); - $("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden"); - input.val(val); - //console.log(id); - }); - - /* setup field_richtext */ - setupFieldRichtext(); - - /* popup menus */ - function close_last_popup_menu() { - if(last_popup_menu) { - last_popup_menu.hide(); -/* last_popup_button.removeClass("selected"); */ - last_popup_menu = null; - last_popup_button = null; - } - } - - /* Turn elements with one of our special rel tags into popup menus */ - - $('a[rel^=#]').click(function(e){ - manage_popup_menu(this,e); - return false; - }); - - $('span[rel^=#]').click(function(e){ - manage_popup_menu(this,e); - return false; - }); - - - function manage_popup_menu(w,e) { - close_last_popup_menu(); - menu = $( $(w).attr('rel') ); - e.preventDefault(); - e.stopPropagation(); - if (menu.attr('popup')=="false") return false; -/* $(w).parent().toggleClass("selected"); */ - /* notification menus are loaded dynamically - * - here we find a rel tag to figure out what type of notification to load */ - var loader_source = $(menu).attr('rel'); - - if(typeof(loader_source) != 'undefined' && loader_source.length) { - notify_popup_loader(loader_source); - } - menu.toggle(); - if (menu.css("display") == "none") { - last_popup_menu = null; - last_popup_button = null; - } else { - last_popup_menu = menu; - last_popup_button = $(w).parent(); - } - return false; - } - - $('html').click(function() { - close_last_popup_menu(); - }); - - // fancyboxes - $("a.popupbox").fancybox({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' - }); - - - - NavUpdate(); - // Allow folks to stop the ajax page updates with the pause/break key - $(document).keydown(function(event) { - if(event.keyCode == '8') { - var target = event.target || event.srcElement; - if (!/input|textarea/i.test(target.nodeName)) { - return false; - } - } - if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) { - event.preventDefault(); - if(stopped == false) { - stopped = true; - if (event.ctrlKey) { - totStopped = true; - } - $('#pause').html('pause'); - } else { - unpause(); - } - } else { - if (!totStopped) { - unpause(); - } - } - }); - - - }); - - function NavUpdate() { - - if(liking) - $('.like-rotator').spin(false); - - if(! stopped) { - - var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); - - $.get(pingCmd,function(data) { - - if(data.invalid == 1) { - window.location.href=window.location.href - } - - - if(! updateCountsOnly) { - // start live update - - if($('#live-network').length) { src = 'network'; liveUpdate(); } - if($('#live-channel').length) { src = 'channel'; liveUpdate(); } - if($('#live-community').length) { src = 'community'; liveUpdate(); } - if($('#live-display').length) { src = 'display'; liveUpdate(); } - if($('#live-search').length) { src = 'search'; liveUpdate(); } - - if($('#live-photos').length) { - if(liking) { - liking = 0; - window.location.href=window.location.href - } - } - } - - updateCountsOnly = false; - - if(data.network == 0) { - data.network = ''; - $('#net-update').removeClass('show') - } - else { - $('#net-update').addClass('show') - } - $('#net-update').html(data.network); - - if(data.home == 0) { data.home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } - $('#home-update').html(data.home); - - - if(data.intros == 0) { data.intros = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } - $('#intro-update').html(data.intros); - - if(data.mail == 0) { data.mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } - $('#mail-update').html(data.mail); - - - if(data.notify == 0) { data.notify = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } - $('#notify-update').html(data.notify); - - if(data.register == 0) { data.register = ''; $('#register-update').removeClass('show') } else { $('#register-update').addClass('show') } - $('#register-update').html(data.register); - - if(data.events == 0) { data.events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') } - $('#events-update').html(data.events); - - if(data.events_today == 0) { data.events_today = ''; $('#events-today-update').removeClass('show') } else { $('#events-today-update').addClass('show') } - $('#events-today-update').html(data.events_today); - - if(data.birthdays == 0) { data.birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') } - $('#birthdays-update').html(data.birthdays); - - if(data.birthdays_today == 0) { data.birthdays_today = ''; $('#birthdays-today-update').removeClass('show') } else { $('#birthdays-today-update').addClass('show') } - $('#birthdays-today-update').html(data.birthdays_today); - - if(data.all_events == 0) { data.all_events = ''; $('#all_events-update').removeClass('show') } else { $('#all_events-update').addClass('show') } - $('#all_events-update').html(data.all_events); - if(data.all_events_today == 0) { data.all_events_today = ''; $('#all_events-today-update').removeClass('show') } else { $('#all_events-today-update').addClass('show') } - $('#all_events-today-update').html(data.all_events_today); - - - $(data.notice).each(function() { - $.jGrowl(this.message, { sticky: true, theme: 'notice' }); - }); - - $(data.info).each(function(){ - $.jGrowl(this.message, { sticky: false, theme: 'info', life: 10000 }); - }); - - - - }) ; - } - timer = setTimeout(NavUpdate,updateInterval); - } - - -function updateConvItems(mode,data) { - - - - if(mode === 'update') { - prev = 'threads-begin'; - - - $('.thread-wrapper.toplevel_item',data).each(function() { - - var ident = $(this).attr('id'); - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; - - if(typeof commentWrap !== 'undefined') - itmId = commentWrap.replace('collapsed-comments-',''); - - if($('#' + ident).length == 0 && profile_page == 1) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + prev).after($(this)); - if(isVisible) - showHideComments(itmId); - $(".autotime").timeago(); - // divgrow doesn't prevent itself from attaching a second (or 500th) - // "show more" div to a content region - it also has a few other - // issues related to how we're trying to use it. - // disable for now. - // $("div.wall-item-body").divgrow({ initialHeight: 400 }); - } - else { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - // more FIXME related to expanded comments - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + ident).replaceWith($(this)); - if(isVisible) - showHideComments(itmId); - $(".autotime").timeago(); - // $("div.wall-item-body").divgrow({ initialHeight: 400 }); - - } - prev = ident; - }); - } - if(mode === 'append') { - - next = 'threads-end'; - - - - $('.thread-wrapper.toplevel_item',data).each(function() { - - - var ident = $(this).attr('id'); - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; - - if(typeof commentWrap !== 'undefined') - itmId = commentWrap.replace('collapsed-comments-',''); - - if($('#' + ident).length == 0) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#threads-end').before($(this)); - if(isVisible) - showHideComments(itmId); - $(".autotime").timeago(); - // $("div.wall-item-body").divgrow({ initialHeight: 400 }); - - } - else { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + ident).replaceWith($(this)); - if(isVisible) - showHideComments(itmId); - $(".autotime").timeago(); - // $("div.wall-item-body").divgrow({ initialHeight: 400 }); - } - }); - - if(loadingPage) { - loadingPage = false; - } - } - if(mode === 'replace') { - // clear existing content - $('.thread-wrapper').remove(); - - prev = 'threads-begin'; - - $('.thread-wrapper.toplevel_item',data).each(function() { - - var ident = $(this).attr('id'); - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; - - if(typeof commentWrap !== 'undefined') - itmId = commentWrap.replace('collapsed-comments-',''); - - if($('#' + ident).length == 0 && profile_page == 1) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - - if($('#collapsed-comments-'+itmId).is(':visible')) - isVisible = true; - $('#' + prev).after($(this)); - if(isVisible) - showHideComments(itmId); - $(".autotime").timeago(); - - // $("div.wall-item-body").divgrow({ initialHeight: 400 }); - } - prev = ident; - }); - } - - $('.like-rotator').spin(false); - - if(commentBusy) { - commentBusy = false; - $('body').css('cursor', 'auto'); - } - - /* autocomplete @nicknames */ - $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); - - var bimgs = $(".wall-item-body > img").not(function() { return this.complete; }); - var bimgcount = bimgs.length; - - if (bimgcount) { - bimgs.load(function() { - bimgcount--; - if (! bimgcount) { - collapseHeight(); - - } - }); - } else { - collapseHeight(); - } - - - // $(".wall-item-body").each(function() { - // if(! $(this).hasClass('divmore')) { - // $(this).divgrow({ initialHeight: 400, showBrackets: false }); - // $(this).addClass('divmore'); - // } - //}); - -} - - - function collapseHeight() { - $(".wall-item-body").each(function() { - if($(this).height() > 410) { - if(! $(this).hasClass('divmore')) { - $(this).divgrow({ initialHeight: 400, showBrackets: false }); - $(this).addClass('divmore'); - } - } - }); - } - - - - - - function liveUpdate() { - if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').spin(false); return; } - if(($('.comment-edit-text-full').length) || (in_progress)) { - if(livetime) { - clearTimeout(livetime); - } - livetime = setTimeout(liveUpdate, 10000); - return; - } - if(livetime != null) - livetime = null; - - prev = 'live-' + src; - - in_progress = true; - - var update_url; - - if(typeof buildCmd == 'function') { - if(scroll_next) { - bParam_page = next_page; - page_load = true; - } - else { - bParam_page = 1; - } - update_url = buildCmd(); - } - else { - page_load = false; - var udargs = ((page_load) ? '/load' : ''); - update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); - } - - if(page_load) - $("#page-spinner").spin('small'); - - $.get(update_url,function(data) { - var update_mode = ((page_load) ? 'replace' : 'update'); - if(scroll_next) - update_mode = 'append'; - page_load = false; - scroll_next = false; - in_progress = false; - updateConvItems(update_mode,data); - $("#page-spinner").spin(false); - $("#profile-jot-text-loading").spin(false); - - // FIXME - the following lines were added so that almost - // immediately after we update the posts on the page, we - // re-check and update the notification counts. - // As it turns out this causes a bit of an inefficiency - // as we're pinging twice for every update, once before - // and once after. A btter way to do this is to rewrite - // NavUpdate and perhpas LiveUpdate so that we check for - // post updates first and only call the notification ping - // once. - - updateCountsOnly = true; - if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,10); - }); - - - } - - - function imgbright(node) { -// $(node).removeClass("drophide").addClass("drop"); - } - - function imgdull(node) { -// $(node).removeClass("drop").addClass("drophide"); - } - - function notify_popup_loader(notifyType) { - - /* notifications template */ - var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html()); - var notifications_all = unescape($('
    ').append( $("#nav-" + notifyType + "-see-all").clone() ).html()); //outerHtml hack - var notifications_mark = unescape($('
    ').append( $("#nav-" + notifyType + "-mark-all").clone() ).html()); //outerHtml hack - var notifications_empty = unescape($("#nav-" + notifyType + "-menu").html()); - - var notify_menu = $("#nav-" + notifyType + "-menu"); - - var pingExCmd = 'ping/' + notifyType + ((localUser != 0) ? '?f=&uid=' + localUser : ''); - $.get(pingExCmd,function(data) { - - if(data.invalid == 1) { - window.location.href=window.location.href - } - - - if(data.notify.length==0){ - $("#nav-" + notifyType + "-menu").html(notifications_empty); - - } else { - $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); - - - $(data.notify).each(function() { - text = ""+this.name+"" + ' ' + this.message + '
    '; - html = notifications_tpl.format(this.notify_link,this.photo,text,this.when,this.class); - $("#nav-" + notifyType + "-menu").append(html); - }); - - } - }); - - } - - - // Since our ajax calls are asynchronous, we will give a few - // seconds for the first ajax call (setting like/dislike), then - // run the updater to pick up any changes and display on the page. - // The updater will turn any rotators off when it's done. - // This function will have returned long before any of these - // events have completed and therefore there won't be any - // visible feedback that anything changed without all this - // trickery. This still could cause confusion if the "like" ajax call - // is delayed and NavUpdate runs before it completes. - - - function dolike(ident,verb) { - unpause(); - $('#like-rotator-' + ident.toString()).spin('tiny'); - $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); - liking = 1; - } - - function dosubthread(ident) { - unpause(); - $('#like-rotator-' + ident.toString()).spin('tiny'); - $.get('subthread/' + ident.toString(), NavUpdate ); - liking = 1; - } - - - function dostar(ident) { - ident = ident.toString(); - $('#like-rotator-' + ident).spin('tiny'); - $.get('starred/' + ident, function(data) { - if(data.result == 1) { - $('#starred-' + ident).addClass('starred'); - $('#starred-' + ident).removeClass('unstarred'); - $('#starred-' + ident).addClass('icon-star-full'); - $('#starred-' + ident).removeClass('icon-star-empty'); - $('#star-' + ident).addClass('hidden'); - $('#unstar-' + ident).removeClass('hidden'); - } - else { - $('#starred-' + ident).addClass('unstarred'); - $('#starred-' + ident).removeClass('starred'); - $('#starred-' + ident).addClass('icon-star-empty'); - $('#starred-' + ident).removeClass('icon-star-full'); - $('#star-' + ident).removeClass('hidden'); - $('#unstar-' + ident).addClass('hidden'); - } - $('#like-rotator-' + ident).spin(false); - }); - } - - function getPosition(e) { - var cursor = {x:0, y:0}; - if ( e.pageX || e.pageY ) { - cursor.x = e.pageX; - cursor.y = e.pageY; - } - else { - if( e.clientX || e.clientY ) { - cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft; - cursor.y = e.clientY + (document.documentElement.scrollTop || document.body.scrollTop) - document.documentElement.clientTop; - } - else { - if( e.x || e.y ) { - cursor.x = e.x; - cursor.y = e.y; - } - } - } - return cursor; - } - - var lockvisible = false; - - function lockview(event,id) { - event = event || window.event; - cursor = getPosition(event); - if(lockvisible) { - lockviewhide(); - } - else { - lockvisible = true; - $.get('lockview/' + id, function(data) { - $('#panel').html(data); - $('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5}); - $('#panel').show(); - }); - } - } - - function lockviewhide() { - lockvisible = false; - $('#panel').hide(); - } - - function post_comment(id) { - unpause(); - commentBusy = true; - $('body').css('cursor', 'wait'); - $("#comment-preview-inp-" + id).val("0"); - $.post( - "item", - $("#comment-edit-form-" + id).serialize(), - function(data) { - if(data.success) { - $("#comment-edit-wrapper-" + id).hide(); - $("#comment-edit-text-" + id).val(''); - var tarea = document.getElementById("comment-edit-text-" + id); - if(tarea) - commentClose(tarea,id); - if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1500); - } - if(data.reload) { - window.location.href=data.reload; - } - }, - "json" - ); - return false; - } - - - function preview_comment(id) { - $("#comment-preview-inp-" + id).val("1"); - $("#comment-edit-preview-" + id).show(); - $.post( - "item", - $("#comment-edit-form-" + id).serialize(), - function(data) { - if(data.preview) { - - $("#comment-edit-preview-" + id).html(data.preview); - $("#comment-edit-preview-" + id + " a").click(function() { return false; }); - } - }, - "json" - ); - return true; - } - - - - function preview_post() { - $("#jot-preview").val("1"); - $("#jot-preview-content").show(); - tinyMCE.triggerSave(); - $.post( - "item", - $("#profile-jot-form").serialize(), - function(data) { - if(data.preview) { - $("#jot-preview-content").html(data.preview); - $("#jot-preview-content" + " a").click(function() { return false; }); - } - }, - "json" - ); - $("#jot-preview").val("0"); - return true; - } - - - function unpause() { - // unpause auto reloads if they are currently stopped - totStopped = false; - stopped = false; - $('#pause').html(''); - } - - - function bin2hex(s){ - // Converts the binary representation of data to hex - // - // version: 812.316 - // discuss at: http://phpjs.org/functions/bin2hex - // + original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net) - // + bugfixed by: Onno Marsman - // + bugfixed by: Linuxworld - // * example 1: bin2hex('Kev'); - // * returns 1: '4b6576' - // * example 2: bin2hex(String.fromCharCode(0x00)); - // * returns 2: '00' - var v,i, f = 0, a = []; - s += ''; - f = s.length; - - for (i = 0; i' + data.desc + '
    ' + data.version + '
    ' + data.credits + '
    ' + theme + ''); - }); - -} - -$(document).ready(function() { - -jQuery.timeago.settings.strings = { - prefixAgo : aStr['t01'], - prefixFromNow : aStr['t02'], - suffixAgo : aStr['t03'], - suffixFromNow : aStr['t04'], - seconds : aStr['t05'], - minute : aStr['t06'], - minutes : aStr['t07'], - hour : aStr['t08'], - hours : aStr['t09'], - day : aStr['t10'], - days : aStr['t11'], - month : aStr['t12'], - months : aStr['t13'], - year : aStr['t14'], - years : aStr['t15'], - wordSeparator : aStr['t16'], - numbers : aStr['t17'], -}; - - -$(".autotime").timeago(); -//$("div.wall-item-body").divgrow({ initialHeight: 400 }); - -//reCalcHeight(); - - - - - -}); - - function zFormError(elm,x) { - if(x) { - $(elm).addClass("zform-error"); - $(elm).removeClass("zform-ok"); - } - else { - $(elm).addClass("zform-ok"); - $(elm).removeClass("zform-error"); - } - } - - - -$(window).scroll(function () { - if(typeof buildCmd == 'function') { - $('#more').hide(); - $('#no-more').hide(); - - if($(window).scrollTop() + $(window).height() > $(document).height() - 200) { - $('#more').css("top","400"); - $('#more').show(); - } - - if($(window).scrollTop() + $(window).height() == $(document).height()) { - if((pageHasMoreContent) && (! loadingPage)) { - $('#more').hide(); - $('#no-more').hide(); - // alert('scroll'); - next_page++; - scroll_next = true; - loadingPage = true; - liveUpdate(); - } - - } - } -}); - -var chanviewFullSize = false; - -function chanviewFull() { - if(chanviewFullSize) { - chanviewFullSize = false; - $('#chanview-iframe-border').css({ 'position' : 'relative', 'z-index' : '10' }); - $('#remote-channel').css({ 'position' : 'relative' , 'z-index' : '10' }); - } - else { - chanviewFullSize = true; - $('#chanview-iframe-border').css({ 'position' : 'fixed', 'top' : '0', 'left' : '0', 'z-index' : '150001' }); - $('#remote-channel').css({ 'position' : 'fixed', 'top' : '0', 'left' : '0', 'z-index' : '150000' }); - resize_iframe(); - } -} - - function addhtmltext(data) { - data = h2b(data); - addeditortext(data); - } - - function addeditortext(data) { - if(plaintext == 'none') { - var currentText = $("#profile-jot-text").val(); - $("#profile-jot-text").val(currentText + data); - } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); - } - - - function h2b(s) { - var y = s; - function rep(re, str) { - y = y.replace(re,str); - }; - - rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); - rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]"); - rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]"); - rep(/(.*?)<\/font>/gi,"$1"); - rep(//gi,"[img=$1x$2]$3[/img]"); - rep(//gi,"[img=$2x$1]$3[/img]"); - rep(//gi,"[img=$3x$2]$1[/img]"); - rep(//gi,"[img=$2x$3]$1[/img]"); - rep(//gi,"[img]$1[/img]"); - - - rep(/
      (.*?)<\/ul>/gi,"[list]$1[/list]"); - rep(/
        (.*?)<\/ul>/gi,"[list=]$1[/list]"); - rep(/
          (.*?)<\/ul>/gi,"[list=1]$1[/list]"); - rep(/
            (.*?)<\/ul>/gi,"[list=i]$1[/list]"); - rep(/
              (.*?)<\/ul>/gi,"[list=I]$1[/list]"); - rep(/
                (.*?)<\/ul>/gi,"[list=a]$1[/list]"); - rep(/
                  (.*?)<\/ul>/gi,"[list=A]$1[/list]"); - rep(/
                • (.*?)<\/li>/gi,"[li]$1[/li]"); - - rep(/(.*?)<\/code>/gi,"[code]$1[/code]"); - rep(/<\/(strong|b)>/gi,"[/b]"); - rep(/<(strong|b)>/gi,"[b]"); - rep(/<\/(em|i)>/gi,"[/i]"); - rep(/<(em|i)>/gi,"[i]"); - rep(/<\/u>/gi,"[/u]"); - - - rep(/(.*?)<\/span>/gi,"[u]$1[/u]"); - rep(//gi,"[u]"); - rep(/]*>/gi,"[quote]"); - rep(/<\/blockquote>/gi,"[/quote]"); - rep(/
                  /gi,"[hr]"); - rep(/
                  /gi,"\n"); - rep(//gi,"\n"); - rep(/
                  /gi,"\n"); - rep(/

                  /gi,""); - rep(/<\/p>/gi,"\n"); - rep(/ /gi," "); - rep(/"/gi,"\""); - rep(/</gi,"<"); - rep(/>/gi,">"); - rep(/&/gi,"&"); - - return y; - }; - - - function b2h(s) { - var y = s; - function rep(re, str) { - y = y.replace(re,str); - }; - - rep(/\&/gi,"&"); - rep(/\/gi,">"); - rep(/\"/gi,"""); - - rep(/\n/gi,"
                  "); - rep(/\[b\]/gi,""); - rep(/\[\/b\]/gi,""); - rep(/\[i\]/gi,""); - rep(/\[\/i\]/gi,""); - rep(/\[u\]/gi,""); - rep(/\[\/u\]/gi,""); - rep(/\[hr\]/gi,"

                  "); - rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); - rep(/\[url\](.*?)\[\/url\]/gi,"$1"); - rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); - rep(/\[img\](.*?)\[\/img\]/gi,""); - - // FIXME - add zid() - rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"$2"); - rep(/\[zrl\](.*?)\[\/zrl\]/gi,"$1"); - rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,""); - rep(/\[zmg\](.*?)\[\/zmg\]/gi,""); - - rep(/\[list\](.*?)\[\/list\]/gi, '
                    $1
                  '); - rep(/\[list=\](.*?)\[\/list\]/gi, '
                    $1
                  '); - rep(/\[list=1\](.*?)\[\/list\]/gi, '
                    $1
                  '); - rep(/\[list=i\](.*?)\[\/list\]/gi,'
                    $1
                  '); - rep(/\[list=I\](.*?)\[\/list\]/gi, '
                    $1
                  '); - rep(/\[list=a\](.*?)\[\/list\]/gi, '
                    $1
                  '); - rep(/\[list=A\](.*?)\[\/list\]/gi, '
                    $1
                  '); - rep(/\[li\](.*?)\[\/li\]/gi, '
                • $1
                  • '); - rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); - rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); - rep(/\[code\](.*?)\[\/code\]/gi,"$1"); - rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                  $1
                  "); - - rep(/\[video\](.*?)\[\/video\]/gi,"$1"); - rep(/\[audio\](.*?)\[\/audio\]/gi,"$1"); - - rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); - - rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">'); - - return y; - }; - - -function zid(s) { - if((! s.length) || (s.indexOf('zid=') != (-1))) - return s; - if(! zid.length) - return s; - var has_params = ((s.indexOf('?') == (-1)) ? false : true); - var achar = ((has_params) ? '&' : '?'); - s = s + achar + 'f=&zid=' + zid; - return s; -} -- cgit v1.2.3 From 0f4b6ba3718445e17de0d56017e55ab099b6f61d Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 15:05:56 +0100 Subject: Merge correction --- view/php/theme_init.php | 3 --- view/tpl/saved_searches_aside.tpl | 1 - 2 files changed, 4 deletions(-) diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 509df8fef..4aecb8ecf 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -15,10 +15,7 @@ head_add_css('library/colorbox/colorbox.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); -<<<<<<< HEAD head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); -======= ->>>>>>> upstream/master head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index c670ee3fa..615eca39d 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -12,4 +12,3 @@
    - -- cgit v1.2.3 From 6480e14a910252f550929d3e1d7520a966dfbb09 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 20:01:18 +0100 Subject: Use the red matrix icons --- view/tpl/jot.tpl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index abe1c0924..a0bc9c805 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -101,7 +101,8 @@
    - + +
    @@ -117,7 +118,13 @@ -- cgit v1.2.3 From c4b4f277963af2a3ef782dc14d369cbfe3b46a2e Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 22 Dec 2013 20:47:57 +0000 Subject: Some sys chan stuff --- boot.php | 12 ++++++------ include/identity.php | 49 ++++++++++++++----------------------------------- install/update.php | 18 +++++++++++++++++- 3 files changed, 37 insertions(+), 42 deletions(-) diff --git a/boot.php b/boot.php index 1fc65d78f..6b3499a05 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1084 ); +define ( 'DB_UPDATE_VERSION', 1085 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -363,7 +363,7 @@ define ( 'HUBLOC_FLAGS_PRIMARY', 0x0001); define ( 'HUBLOC_FLAGS_UNVERIFIED', 0x0002); define ( 'HUBLOC_FLAGS_DELETED', 0x1000); - +define ( 'XCHAN_FLAGS_NORMAL', 0x0000); define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); define ( 'XCHAN_FLAGS_ORPHAN', 0x0002); define ( 'XCHAN_FLAGS_CENSORED', 0x0004); @@ -496,10 +496,11 @@ define ( 'ITEM_MODERATED', 0x0004); define ( 'ITEM_SPAM', 0x0008); define ( 'ITEM_DELETED', 0x0010); define ( 'ITEM_UNPUBLISHED', 0x0020); -define ( 'ITEM_WEBPAGE', 0x0040); // is a static web page, not a conversational item +define ( 'ITEM_WEBPAGE', 0x0040); // is a static web page, not a conversational item define ( 'ITEM_DELAYED_PUBLISH', 0x0080); -define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody confuses this with ITEM_BLOCKED -define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche +define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody confuses this with ITEM_BLOCKED +define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche +define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker /** * Item Flags */ @@ -518,7 +519,6 @@ define ( 'ITEM_MENTIONSME', 0x0400); define ( 'ITEM_NOCOMMENT', 0x0800); // commenting/followups are disabled define ( 'ITEM_OBSCURED', 0x1000); // bit-mangled to protect from casual browsing by site admin define ( 'ITEM_VERIFIED', 0x2000); // Signature verification was successful - /** * * Reverse the effect of magic_quotes_gpc if it is enabled. diff --git a/include/identity.php b/include/identity.php index 80f02a9c5..b44c77e6e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -71,22 +71,21 @@ function validate_channelname($name) { /** - * @function create_dir_account() + * @function create_sys_account() * Create a system channel - which has no account attached * - * Currently unused. * */ -function create_dir_account() { - create_identity(array( - 'account_id' => 'xxx', // This will create an identity with an (integer) account_id of 0, but account_id is required - 'nickname' => 'dir', - 'name' => 'Directory', - 'pageflags' => PAGE_DIRECTORY_CHANNEL|PAGE_HIDDEN, - 'publish' => 0 - )); -} +//function create_sys_channel() { +// create_identity(array( +// 'nickname' => 'sys', +// 'name' => 'System', +// 'pageflags' => PAGE_SYSTEM, +// 'publish' => 0, +// 'xchanflags' => XCHAN_FLAGS_SYSTEM +// )); +//} /** * @channel_total() @@ -145,7 +144,7 @@ function create_identity($arr) { $name = escape_tags($arr['name']); $pageflags = ((x($arr,'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL); - + $xchanflags = ((x($arr,'xchanflags')) ? intval($arr['xchanflags']) : XCHAN_FLAGS_NORMAL); $name_error = validate_channelname($arr['name']); if($name_error) { $ret['message'] = $name_error; @@ -243,7 +242,7 @@ function create_identity($arr) { $newuid = $ret['channel']['channel_id']; - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d')", dbesc($hash), dbesc($guid), dbesc($sig), @@ -258,7 +257,8 @@ function create_identity($arr) { dbesc($ret['channel']['channel_name']), dbesc('zot'), dbesc(datetime_convert()), - dbesc(datetime_convert()) + dbesc(datetime_convert()), + intval($xchanflags) ); // Not checking return value. @@ -1109,24 +1109,3 @@ 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/install/update.php b/install/update.php index f498ec042..05bddba42 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sun, 22 Dec 2013 20:51:49 +0000 Subject: xref --- mod/xref.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 mod/xref.php diff --git a/mod/xref.php b/mod/xref.php new file mode 100644 index 000000000..566de1998 --- /dev/null +++ b/mod/xref.php @@ -0,0 +1,20 @@ + 2) + $url = argv(2); + + goaway (z_root() . '/' . $url); + +} -- cgit v1.2.3 From 57bf80fff09541845f1b9d4a915d832e4f146d20 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 22 Dec 2013 20:54:31 +0000 Subject: Achievements --- mod/achievements.php | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 mod/achievements.php diff --git a/mod/achievements.php b/mod/achievements.php new file mode 100644 index 000000000..1910def73 --- /dev/null +++ b/mod/achievements.php @@ -0,0 +1,84 @@ + 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + return; +} + + $profile = 0; + $profile = argv(1); + profile_load($a,$which,$profile); + + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $perms = get_all_perms($owner,$ob_hash); + if(! $perms['view_profile']) { + notice( t('Permission denied.') . EOL); + return; + } + +// By default, all badges are false + $contactbadge = false; + $profilebadge = false; + $keywordsbadge = false; + +// Check number of contacts. Award a badge if over 10 +// We'll figure these out on each page load instead of +// writing them to the DB because that will mean one needs +// to retain their achievements - eg, you can't add +// a bunch of channels just to get your badge, and then +// delete them all again. If these become popular or +// used in profiles or something, we may need to reconsider +// and add a table for this - because this won't scale. + + $r = q("select * from abook where abook_channel = %d", + intval($owner) + ); + + if (count($r)) + $contacts = count($r); + // We're checking for 11 to adjust for the abook record for self + if ($contacts >= 11) + $contactbadge = true; + +// Check if an about field in the profile has been created. + + $r = q("select * from profile where uid = %d and about <> ''", + intval($owner) + ); + + if ($r) + $profilebadge = 1; + +// Check if keywords have been set + + $r = q("select * from profile where uid = %d and keywords <> ''", + intval($owner) + ); + + if($r) + $keywordsbadge = 1; + +// FIXME - stick ths in a template, and make it look pretty. + $o .= "Template not implemented"; + $o .= "If this is one, you get the profile badge" . $profilebadge . "
    "; + $o .= "If this is one, you get the contact badge" . $contactbadge . "
    "; + $o .= "If this is one you get the keywords badge" . $keywordsbadge . "
    "; + $o .= "I haven't done the top level posts badge yet" . $toplevelpostsbadge . "
    "; + $o .= "I haven't done the number of channels badge yet" . $channelsbadge; + + +return $o; + +} -- cgit v1.2.3 From 569e93d6e13e59528867b0a715b33f8f10610add Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 22 Dec 2013 20:54:41 +0000 Subject: Ooops, also update the DB --- install/database.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install/database.sql b/install/database.sql index ef79862c3..915cecdba 100644 --- a/install/database.sql +++ b/install/database.sql @@ -1029,3 +1029,11 @@ CREATE TABLE IF NOT EXISTS `xtag` ( KEY `xtag_hash` (`xtag_hash`), KEY `xtag_flags` (`xtag_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE if not exists `sys_perms` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , + `cat` CHAR( 255 ) NOT NULL , + `k` CHAR( 255 ) NOT NULL , + `v` MEDIUMTEXT NOT NULL, + `public_perm` TINYINT( 1 ) UNSIGNED NOT NULL +) ENGINE = MYISAM DEFAULT CHARSET = utf8"); -- cgit v1.2.3 From 2074bd0a3bf13a2d5d77f43489092a1230447213 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 22 Dec 2013 21:13:24 +0000 Subject: Must have broken that in a merge - put it back --- include/identity.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/identity.php b/include/identity.php index b44c77e6e..568eae8c0 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1109,3 +1109,20 @@ 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'; +} -- cgit v1.2.3 From 0d5c5187f9123e6ac9490408544e4816234adf17 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 22 Dec 2013 21:15:13 +0000 Subject: Style --- include/identity.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/identity.php b/include/identity.php index 568eae8c0..2226cdb19 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1112,17 +1112,17 @@ function get_theme_uid() { /** * @function get_default_profile_photo($size = 175) -* Retrieves the path of the default_profile_photo for this system -* with the specified size. +* Retrieves the path of the default_profile_photo for this system +* with the specified size. * @param int $size -* one of (175, 80, 48) +* 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'; + $scheme = get_config('system','default_profile_photo'); + if(! $scheme) + $scheme = 'rainbow_man'; + return 'images/default_profile_photos/' . $scheme . '/' . $size . '.jpg'; } -- cgit v1.2.3 From 77fdb4a1eee6d7e2d3b0d3d50896a0100eccf373 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 13:49:32 -0800 Subject: js functions behind quick permission links were lost in comanchification process - because the js didn't get relocated to the new connedit module --- view/js/mod_connections.js | 82 ---------------------------------------------- view/js/mod_connedit.js | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 view/js/mod_connedit.js diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js index 404010636..8a8f2fee6 100644 --- a/view/js/mod_connections.js +++ b/view/js/mod_connections.js @@ -21,85 +21,3 @@ $(".autocomplete-w1 .selected").keyup(function(event){ } }); - -function connectFullShare() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_contacts').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); - $('#me_id_perms_send_stream').attr('checked','checked'); - $('#me_id_perms_post_wall').attr('checked','checked'); - $('#me_id_perms_post_comments').attr('checked','checked'); - $('#me_id_perms_post_mail').attr('checked','checked'); - $('#me_id_perms_chat').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_republish').attr('checked','checked'); -} - -function connectCautiousShare() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); - $('#me_id_perms_send_stream').attr('checked','checked'); - $('#me_id_perms_post_comments').attr('checked','checked'); - $('#me_id_perms_post_mail').attr('checked','checked'); -} - -function connectForum() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_contacts').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); - $('#me_id_perms_send_stream').attr('checked','checked'); - $('#me_id_perms_post_wall').attr('checked','checked'); - $('#me_id_perms_post_comments').attr('checked','checked'); - $('#me_id_perms_post_mail').attr('checked','checked'); - $('#me_id_perms_tag_deliver').attr('checked','checked'); - $('#me_id_perms_republish').attr('checked','checked'); - -} - -function connectSoapBox() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_contacts').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); -} - - -function connectFollowOnly() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_send_stream').attr('checked','checked'); -} - diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js new file mode 100644 index 000000000..51dbcf4bf --- /dev/null +++ b/view/js/mod_connedit.js @@ -0,0 +1,82 @@ + +function connectFullShare() { + $('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + $('#me_id_perms_view_stream').attr('checked','checked'); + $('#me_id_perms_view_profile').attr('checked','checked'); + $('#me_id_perms_view_photos').attr('checked','checked'); + $('#me_id_perms_view_contacts').attr('checked','checked'); + $('#me_id_perms_view_storage').attr('checked','checked'); + $('#me_id_perms_view_pages').attr('checked','checked'); + $('#me_id_perms_send_stream').attr('checked','checked'); + $('#me_id_perms_post_wall').attr('checked','checked'); + $('#me_id_perms_post_comments').attr('checked','checked'); + $('#me_id_perms_post_mail').attr('checked','checked'); + $('#me_id_perms_chat').attr('checked','checked'); + $('#me_id_perms_view_storage').attr('checked','checked'); + $('#me_id_perms_republish').attr('checked','checked'); +} + +function connectCautiousShare() { + $('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + + $('#me_id_perms_view_stream').attr('checked','checked'); + $('#me_id_perms_view_profile').attr('checked','checked'); + $('#me_id_perms_view_photos').attr('checked','checked'); + $('#me_id_perms_view_storage').attr('checked','checked'); + $('#me_id_perms_view_pages').attr('checked','checked'); + $('#me_id_perms_send_stream').attr('checked','checked'); + $('#me_id_perms_post_comments').attr('checked','checked'); + $('#me_id_perms_post_mail').attr('checked','checked'); +} + +function connectForum() { + $('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + + $('#me_id_perms_view_stream').attr('checked','checked'); + $('#me_id_perms_view_profile').attr('checked','checked'); + $('#me_id_perms_view_photos').attr('checked','checked'); + $('#me_id_perms_view_contacts').attr('checked','checked'); + $('#me_id_perms_view_storage').attr('checked','checked'); + $('#me_id_perms_view_pages').attr('checked','checked'); + $('#me_id_perms_send_stream').attr('checked','checked'); + $('#me_id_perms_post_wall').attr('checked','checked'); + $('#me_id_perms_post_comments').attr('checked','checked'); + $('#me_id_perms_post_mail').attr('checked','checked'); + $('#me_id_perms_tag_deliver').attr('checked','checked'); + $('#me_id_perms_republish').attr('checked','checked'); + +} + +function connectSoapBox() { + $('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + + $('#me_id_perms_view_stream').attr('checked','checked'); + $('#me_id_perms_view_profile').attr('checked','checked'); + $('#me_id_perms_view_photos').attr('checked','checked'); + $('#me_id_perms_view_contacts').attr('checked','checked'); + $('#me_id_perms_view_storage').attr('checked','checked'); + $('#me_id_perms_view_pages').attr('checked','checked'); +} + + +function connectFollowOnly() { + $('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + + $('#me_id_perms_send_stream').attr('checked','checked'); +} + -- cgit v1.2.3 From 97728543c1cef3a8cd09e2a95189837182dd09bc Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 14:08:38 -0800 Subject: clean up sys_channel creation so it will work --- include/identity.php | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/include/identity.php b/include/identity.php index 2226cdb19..5fa25c489 100644 --- a/include/identity.php +++ b/include/identity.php @@ -71,21 +71,33 @@ function validate_channelname($name) { /** - * @function create_sys_account() + * @function create_sys_channel() * Create a system channel - which has no account attached * - * */ -//function create_sys_channel() { -// create_identity(array( -// 'nickname' => 'sys', -// 'name' => 'System', -// 'pageflags' => PAGE_SYSTEM, -// 'publish' => 0, -// 'xchanflags' => XCHAN_FLAGS_SYSTEM -// )); -//} +function create_sys_channel() { + if(get_sys_channel()) + return; + create_identity(array( + 'account_id' => 'xxx', // This will create an identity with an (integer) account_id of 0, but account_id is required + 'nickname' => 'sys', + 'name' => 'System', + 'pageflags' => PAGE_SYSTEM, + 'publish' => 0, + 'xchanflags' => XCHAN_FLAGS_SYSTEM + )); +} + +function get_sys_channel() { + $r = q("select * from channel left join xchan on channel_hash = xchan_hash where (channel_pageflags & %d) limit 1", + intval(PAGE_SYSTEM) + ); + if($r) + return $r[0]; + return false; +} + /** * @channel_total() @@ -242,7 +254,7 @@ function create_identity($arr) { $newuid = $ret['channel']['channel_id']; - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d')", + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)", dbesc($hash), dbesc($guid), dbesc($sig), -- cgit v1.2.3 From c1a85ccbec8f0c41b4e5927846bf1dce0db93dd4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 14:29:15 -0800 Subject: add ability to set created date/time from the api --- mod/item.php | 7 ++++--- view/tpl/jot.tpl | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/item.php b/mod/item.php index 7f881d28d..b7ad6b97c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -66,8 +66,8 @@ function item_post(&$a) { $owner_hash = null; - $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); - + $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); + $created = ((x($_REQUEST,'created')) ? datetime_convert('UTC','UTC',$_REQUEST['created']) : datetime_convert()); $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); @@ -274,6 +274,7 @@ function item_post(&$a) { $item_flags = $orig_post['item_flags']; $item_restrict = $orig_post['item_restrict']; $postopts = $orig_post['postopts']; + $created = $orig_post['created']; } else { @@ -602,7 +603,7 @@ function item_post(&$a) { $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); $datarray['author_xchan'] = $observer['xchan_hash']; - $datarray['created'] = datetime_convert(); + $datarray['created'] = $created; $datarray['edited'] = datetime_convert(); $datarray['expires'] = $expires; $datarray['commented'] = datetime_convert(); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index a0bc9c805..9038155be 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -12,7 +12,6 @@ - {{$mimeselect}} {{$layoutselect}} -- cgit v1.2.3 From 6e5173f4309f64d2ff4fe53e45c004b6a2b69c2c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 15:51:02 -0800 Subject: let's confront this "social network" elephant in the room head on rather than try to sweep it under the rug. --- assets/home.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/home.html b/assets/home.html index cbeae1fd2..f9f6cdc13 100644 --- a/assets/home.html +++ b/assets/home.html @@ -116,6 +116,9 @@ The internet is broken. We're fixing it.
    Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.

    +It seems that many people can only envision the internet the the distorted perception of social networking. So let's get a few things straight. Is the Red Matrix a social network? No. That's like saying your car is an air-conditioner. Your car may have an air conditioner, but that isn't its prime function. Its prime function is a transportation device. The Red Matrix has some very advanced communication technology embedded in it, (much more advanced than many so-called social networks), and one can do social network things with it (quite well in fact); but its prime function is a decentralised identity-aware publishing platform. More on that in a minute. Decentralised privacy aware communications between channels is just another feature we provide. +

    +

    The Red Matrix is a decentralised network where people are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license.

    -- cgit v1.2.3 From be19eb045c7e8003152afd860e89ca1488a92a79 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 15:53:08 -0800 Subject: proof-read --- assets/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/home.html b/assets/home.html index f9f6cdc13..3e41c3e83 100644 --- a/assets/home.html +++ b/assets/home.html @@ -116,7 +116,7 @@ The internet is broken. We're fixing it. Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.

    -It seems that many people can only envision the internet the the distorted perception of social networking. So let's get a few things straight. Is the Red Matrix a social network? No. That's like saying your car is an air-conditioner. Your car may have an air conditioner, but that isn't its prime function. Its prime function is a transportation device. The Red Matrix has some very advanced communication technology embedded in it, (much more advanced than many so-called social networks), and one can do social network things with it (quite well in fact); but its prime function is a decentralised identity-aware publishing platform. More on that in a minute. Decentralised privacy aware communications between channels is just another feature we provide. +It seems that many people can only envision the internet through the distorted perception of social networking. So let's get a few things straight. Is the Red Matrix a social network? No. That's like saying your car is an air-conditioner. Your car may have an air conditioner, but that isn't its prime function. Its prime function is a transportation device. The Red Matrix has some very advanced communication technology embedded in it, (much more advanced than many so-called social networks), and one can do social network things with it (quite well in fact); but its prime function is a decentralised identity-aware publishing platform. More on that in a minute. Decentralised privacy aware communications between channels is just another feature we provide.

    The Red Matrix is a decentralised network where people are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. -- cgit v1.2.3 From 7d484969dd8cece4e538ea4b4ca56f531c53abb5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 16:47:14 -0800 Subject: more proof-reading --- assets/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/home.html b/assets/home.html index 3e41c3e83..ead52cb18 100644 --- a/assets/home.html +++ b/assets/home.html @@ -116,10 +116,10 @@ The internet is broken. We're fixing it. Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.

    -It seems that many people can only envision the internet through the distorted perception of social networking. So let's get a few things straight. Is the Red Matrix a social network? No. That's like saying your car is an air-conditioner. Your car may have an air conditioner, but that isn't its prime function. Its prime function is a transportation device. The Red Matrix has some very advanced communication technology embedded in it, (much more advanced than many so-called social networks), and one can do social network things with it (quite well in fact); but its prime function is a decentralised identity-aware publishing platform. More on that in a minute. Decentralised privacy aware communications between channels is just another feature we provide. +It seems that many people can only envision the internet through the distorted perception of social networking. So let's get a few things straight. Is the Red Matrix a social network? No. Is your car an air-conditioner? No. Your car may have an air conditioner, but that isn't its prime function. Its prime function is a transportation device. The Red Matrix has some very advanced communication technology embedded in it, (much more advanced than many so-called social networks), and one can do social network things with it (quite well in fact); but its prime function is a decentralised identity-aware web publishing platform. More on that in a minute. Decentralised privacy aware communications between channels is (like your car's air conditioner) just another feature the Red Matrix provides.

    -The Red Matrix is a decentralised network where people are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. +The Red Matrix is a decentralised network where the people using it are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license.

    And the Red Matrix has Got Zot. -- cgit v1.2.3 From 38df3f640458ddb3d6ddd4055b275c59085f14d0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 16:53:26 -0800 Subject: make xref work --- mod/xref.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mod/xref.php b/mod/xref.php index 566de1998..c296bf0e1 100644 --- a/mod/xref.php +++ b/mod/xref.php @@ -1,20 +1,20 @@ 2) - $url = argv(2); + if (argc() > 2) + $url = argv(2); - goaway (z_root() . '/' . $url); + goaway (z_root() . '/' . $url); } -- cgit v1.2.3 From a9e225b38af3a79802ee52670842ea1d732e9214 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 17:30:49 -0800 Subject: issue deleting photos (attached item remained undeleted and became visible, though the photo was gone) --- README.md | 4 ++-- mod/photos.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8bc45e55e..93dad882b 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@ Within the Red Matrix, identity is nomadic. It defines you and it belongs to you The Red Matrix is free and open source distributed under the MIT license. -Currently the project is in "Public Preview". A lot of work remains, but many important bits are functioning. Please connect with one of the developer channels ("Channel One" would be a good choice) if you are interested in helping us out. +Please connect with one of the developer channels ("Channel One" would be a good choice) if you are interested in helping us out. [Please help us change the world by providing a small donation.](http://pledgie.com/campaigns/18417) (Large donations are also graciously accepted). -If you would like to become part of the Red Matrix **right now** (and aren't concerned that there may be a few bugs), please select a public hub from one of our open providers at [https://zothub.com/pubsites](https://zothub.com/pubsites). All sites are interlinked and you can always move to another, so the choice of site can be somewhat arbitrary. \ No newline at end of file +If you would like to become a member of the Red Matrix **right now** , please select a public hub from one of our open providers at [https://zothub.com/pubsites](https://zothub.com/pubsites). All sites are interlinked and you can always move to another, so the choice of site can be somewhat arbitrary. \ No newline at end of file diff --git a/mod/photos.php b/mod/photos.php index 63806896b..9e6fcecdb 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -183,7 +183,7 @@ function photos_post(&$a) { intval($page_owner_uid) ); if(count($i)) { - q("UPDATE `item` SET item_restrict = (item_restrict & %d), `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d", + q("UPDATE `item` SET item_restrict = (item_restrict | %d), `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d", intval(ITEM_DELETED), dbesc(datetime_convert()), dbesc(datetime_convert()), -- cgit v1.2.3 From eff38538eeaa3af0774c77d26c5b00dd79cb9e8c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 17:44:14 -0800 Subject: more (somewhat minor) but important cleanup for mod_photos so visitors with the correct permissions to add photos can also remove them --- mod/photos.php | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 9e6fcecdb..ff58e18d9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -157,23 +157,20 @@ function photos_post(&$a) { } if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) { -// FIXME + // same as above but remove single photo - if($visitor) { - $r = q("SELECT `id`, `resource_id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource_id` = '%s' LIMIT 1", - intval($visitor), - intval($page_owner_uid), - dbesc($a->argv[2]) - ); - } - else { - $r = q("SELECT `id`, `resource_id` FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' LIMIT 1", - intval(local_user()), - dbesc($a->argv[2]) - ); - } - if(count($r)) { + $ob_hash = get_observer_hash(); + if(! $ob_hash) + goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + + $r = q("SELECT `id`, `resource_id` FROM `photo` WHERE ( xchan = '%s' or `uid` = %d ) AND `resource_id` = '%s' LIMIT 1", + dbesc($ob_hash), + intval(local_user()), + dbesc($a->argv[2]) + ); + + if($r) { q("DELETE FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'", intval($page_owner_uid), dbesc($r[0]['resource_id']) @@ -200,7 +197,6 @@ function photos_post(&$a) { } goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); - return; // NOTREACHED } if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) { -- cgit v1.2.3 From 1a42580ad44f768ba8d4eb0669f3b8be03670e04 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 18:37:39 -0800 Subject: remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code. --- boot.php | 2 +- include/Contact.php | 2 +- include/acl_selectors.php | 2 +- include/event.php | 20 ++++++++++---------- include/group.php | 24 ++++++++++++------------ include/identity.php | 2 +- include/items.php | 2 +- include/photos.php | 2 +- include/security.php | 2 +- install/database.sql | 6 +++--- install/update.php | 15 ++++++++++++++- mod/acl.php | 14 +++++++------- mod/contactgroup.php | 2 +- mod/events.php | 2 +- mod/fbrowser.php | 2 +- mod/group.php | 8 ++++---- mod/import.php | 2 +- mod/lockview.php | 4 ++-- mod/network.php | 2 +- mod/photos.php | 18 +++++++++--------- 20 files changed, 73 insertions(+), 60 deletions(-) diff --git a/boot.php b/boot.php index 6b3499a05..7d9075af2 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1085 ); +define ( 'DB_UPDATE_VERSION', 1086 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/Contact.php b/include/Contact.php index 59605e463..fd450033c 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -255,7 +255,7 @@ function channel_remove($channel_id, $local = true) { } - q("DELETE FROM `group` WHERE `uid` = %d", intval($channel_id)); + q("DELETE FROM `groups` WHERE `uid` = %d", intval($channel_id)); q("DELETE FROM `group_member` WHERE `uid` = %d", intval($channel_id)); q("DELETE FROM `event` WHERE `uid` = %d", intval($channel_id)); q("DELETE FROM `item` WHERE `uid` = %d", intval($channel_id)); diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 930f9967a..749ca75eb 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -14,7 +14,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $o .= "'; + $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/version.inc b/version.inc index 4aa1ec592..353e8ce82 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-22.534 +2013-12-23.535 -- cgit v1.2.3 From 9daa6478556acab40958e61df39c1b7a8fc74d55 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 23 Dec 2013 21:01:49 +0000 Subject: s/zrl/zid --- view/tpl/page_display.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index a01bbea35..9b6b182c8 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -2,7 +2,7 @@

    {{$title}}

    -
    {{$author}}
    +
    {{$author}}
    {{$date}}
    {{$body}}
    -- cgit v1.2.3 From 84d8fab6f1a049bb502c370c39fc3b44182ef24c Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Mon, 23 Dec 2013 22:29:35 +0100 Subject: Show expire date in post tooltip --- include/ItemObject.php | 1 + view/tpl/conv_item.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 6088a2c1c..170f013a1 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -217,6 +217,7 @@ class Item extends BaseObject { 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), + 'expiretime' => (($item['expires'] > 0) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fb36f5dca..4108108b2 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -39,7 +39,7 @@
    {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    -
    {{if $item.verified}} {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}}
    +
    {{if $item.verified}} {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}}
    {{$item.title}}
    -- cgit v1.2.3 From 63a42480c7eb36bdc8b63b31b2a4d222ba5751cd Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 15:13:09 -0800 Subject: add account_level, is_foreigner and is_member functions; convert all e2ee user input and prompts to hex to avoid javascipt's lame handling of quotes. !!This breaks all prior encrypted posts.!! --- boot.php | 2 +- include/bbcode.php | 11 +++++++---- include/identity.php | 32 ++++++++++++++++++++++++++++++++ install/database.sql | 4 +++- install/update.php | 11 ++++++++++- js/crypto.js | 10 +++++----- js/main.js | 9 +++++++++ mod/chanview.php | 12 ++++++++---- mod/post.php | 5 +++++ 9 files changed, 80 insertions(+), 16 deletions(-) diff --git a/boot.php b/boot.php index 7d9075af2..777d927d2 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1086 ); +define ( 'DB_UPDATE_VERSION', 1087 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/bbcode.php b/include/bbcode.php index 271cace73..6374675f1 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -105,21 +105,24 @@ function bb_parse_crypt($match) { $attributes = $match[1]; $algorithm = ""; + preg_match("/alg='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") - $algorithm = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $algorithm = $matches[1]; preg_match("/alg=\"\;(.*?)\"\;/ism", $attributes, $matches); if ($matches[1] != "") - $algorithm = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $algorithm = $matches[1]; $hint = ""; + + preg_match("/hint='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") - $hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $hint = $matches[1]; preg_match("/hint=\"\;(.*?)\"\;/ism", $attributes, $matches); if ($matches[1] != "") - $hint = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $hint = $matches[1]; $x = random_string(); diff --git a/include/identity.php b/include/identity.php index be4e4be93..63b05f4bb 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1138,3 +1138,35 @@ function get_default_profile_photo($size = 175) { $scheme = 'rainbow_man'; return 'images/default_profile_photos/' . $scheme . '/' . $size . '.jpg'; } + + +/** + * + * @function is_foreigner($s) + * Test whether a given identity is NOT a member of the Red Matrix + * @param string $s; + * xchan_hash of the identity in question + * + * @returns boolean true or false + * + */ + +function is_foreigner($s) { + return((strpbrk($s,':@')) ? true : false); +} + + +/** + * + * @function is_member($s) + * Test whether a given identity is a member of the Red Matrix + * @param string $s; + * xchan_hash of the identity in question + * + * @returns boolean true or false + * + */ + +function is_member($s) { + return((is_foreigner($s)) ? false : true); +} \ No newline at end of file diff --git a/install/database.sql b/install/database.sql index f73460937..cb332c75b 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,6 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', + `account_level` int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), @@ -63,7 +64,8 @@ CREATE TABLE IF NOT EXISTS `account` ( KEY `account_lastlog` (`account_lastlog`), KEY `account_expires` (`account_expires`), KEY `account_default_channel` (`account_default_channel`), - KEY `account_external` (`account_external`) + KEY `account_external` (`account_external`), + KEY `account_level` (`account_level`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `addon` ( diff --git a/install/update.php b/install/update.php index 817e4b6bc..c731eab06 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ poi['xchan_url'] . '&addr=' . $a->poi['xchan_addr'] - : $a->poi['xchan_url'] - ); + if(is_foreigner($a->poi['xchan_hash'])) + $url = $a->poi['xchan_url']; + else { + $url = (($observer) + ? 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 diff --git a/mod/post.php b/mod/post.php index 7f495140e..965ba09a3 100644 --- a/mod/post.php +++ b/mod/post.php @@ -69,6 +69,7 @@ function post_init(&$a) { * "success":1, * "confirm":"q0Ysovd1u..." * "service_class":(optional) + * "level":(optional) * } * * 'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the @@ -150,6 +151,7 @@ function post_init(&$a) { $remote = remote_user(); $result = null; $remote_service_class = ''; + $remote_level = 0; $remote_hub = $x[0]['hubloc_url']; // Also check that they are coming from the same site as they authenticated with originally. @@ -210,6 +212,8 @@ function post_init(&$a) { } if(array_key_exists('service_class',$j)) $remote_service_class = $j['service_class']; + if(array_key_exists('level',$j)) + $remote_level = $j['level']; } // everything is good... maybe if(local_user()) { @@ -241,6 +245,7 @@ function post_init(&$a) { $_SESSION['visitor_id'] = $x[0]['xchan_hash']; $_SESSION['my_address'] = $address; $_SESSION['remote_service_class'] = $remote_service_class; + $_SESSION['remote_level'] = $remote_level; $_SESSION['remote_hub'] = $remote_hub; $arr = array('xchan' => $x[0], 'url' => $desturl, 'session' => $_SESSION); -- cgit v1.2.3 From b08d4cc1fe2b8dd45de7546f05cf9a9601aeca03 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 17:24:25 -0800 Subject: first cut at a directory popup. It's a bit annoying at the moment, so we'll have to make it less so. Also had second thoughts about the project homepage changes made yesterday. Just because a bunch of Reddit trolls can't get social networking out of their brain long enough to explore other technologies or even read the project page doesn't mean we should pander to them and explain how or why we either are or aren't a social network. --- assets/home.html | 3 - mod/directory.php | 3 +- mod/dirprofile.php | 151 ++++++++++++++++++++++++++++++++++++++++++++ mod/dirsearch.php | 18 +++++- view/css/conversation.css | 2 + view/js/mod_directory.js | 8 +++ view/tpl/direntry.tpl | 2 +- view/tpl/direntry_large.tpl | 16 +++++ view/tpl/jot.tpl | 2 +- 9 files changed, 196 insertions(+), 9 deletions(-) create mode 100644 mod/dirprofile.php create mode 100644 view/js/mod_directory.js create mode 100755 view/tpl/direntry_large.tpl diff --git a/assets/home.html b/assets/home.html index 3a3628748..3f018edfc 100644 --- a/assets/home.html +++ b/assets/home.html @@ -116,9 +116,6 @@ The internet is broken. We're fixing it.
    Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.

    -It seems that many people can only envision the internet through the distorted perception of social networking. So let's get a few things straight. Is the Red Matrix a social network? No. Is your car an air-conditioner? No. Your car may have an air conditioner, but that isn't its prime function. Its prime function is a transportation device. The Red Matrix has some very advanced communication technology embedded in it, (much more advanced than many so-called social networks), and one can do social network things with it (quite well in fact); but its prime function is a decentralised identity-aware web publishing platform. More on that in a minute. Decentralised privacy aware communications between channels is (like your car's air conditioner) just another feature the Red Matrix provides. It doesn't belong to a corporation; it's just an integral part of your new internet. -

    -

    The Red Matrix is a decentralised network where the people using it are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license.

    diff --git a/mod/directory.php b/mod/directory.php index 9e4c37fae..53542db60 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -168,6 +168,7 @@ function directory_content(&$a) { 'id' => ++$t, 'profile_link' => $profile_link, 'photo' => $rr['photo'], + 'hash' => $rr['hash'], 'alttext' => $rr['name'] . ' ' . $rr['address'], 'name' => $rr['name'], 'details' => $pdesc . $details, @@ -186,7 +187,7 @@ function directory_content(&$a) { call_hooks('directory_item', $arr); - $entries[] = $entry; + $entries[] = $arr['entry']; unset($profile); unset($location); diff --git a/mod/dirprofile.php b/mod/dirprofile.php new file mode 100644 index 000000000..133089419 --- /dev/null +++ b/mod/dirprofile.php @@ -0,0 +1,151 @@ +' : ''); + $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); + + if(in_array($rr['hash'],$contacts)) + $connect_link = ''; + + $details = ''; + if(strlen($rr['locale'])) + $details .= $rr['locale']; + if(strlen($rr['region'])) { + if(strlen($rr['locale'])) + $details .= ', '; + $details .= $rr['region']; + } + if(strlen($rr['country'])) { + if(strlen($details)) + $details .= ', '; + $details .= $rr['country']; + } + if(strlen($rr['birthday'])) { + if(($years = age($rr['birthday'],'UTC','')) != 0) + $details .= '
    ' . t('Age: ') . $years ; + } + if(strlen($rr['gender'])) + $details .= '
    ' . t('Gender: ') . $rr['gender']; + + $page_type = ''; + + $profile = $rr; + + if ((x($profile,'locale') == 1) + || (x($profile,'region') == 1) + || (x($profile,'postcode') == 1) + || (x($profile,'country') == 1)) + $location = t('Location:'); + + $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); + + $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + + $about = ((x($profile,'about') == 1) ? t('About:') : False); + + + + $entry = replace_macros(get_markup_template('direntry_large.tpl'), array( + '$id' => ++$t, + '$profile_link' => $profile_link, + '$photo' => $rr['photo_l'], + '$alttext' => $rr['name'] . ' ' . $rr['address'], + '$name' => $rr['name'], + '$details' => $pdesc . $details, + '$profile' => $profile, + '$location' => $location, + '$gender' => $gender, + '$pdesc' => $pdesc, + '$marital' => $marital, + '$homepage' => $homepage, + '$about' => $about, + '$conn_label' => t('Connect'), + '$connect' => $connect_link, + )); + + + echo $entry; + killme(); + + } + } + else { + info( t("Not found.") . EOL); + } + } + } + } + + + + +} \ No newline at end of file diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 6315cae31..6490d59df 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -27,9 +27,10 @@ function dirsearch_content(&$a) { json_return_and_die($ret); } + $hash = ((x($_REQUEST['hash'])) ? $_REQUEST['hash'] : ''); $name = ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''); - $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : ''); + $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : ''); $address = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); $locale = ((x($_REQUEST,'locale')) ? $_REQUEST['locale'] : ''); $region = ((x($_REQUEST,'region')) ? $_REQUEST['region'] : ''); @@ -91,6 +92,13 @@ function dirsearch_content(&$a) { $sql_extra .= " AND xprof_age >= " . intval($agege) . ") "; } + + if($hash) { + $sql_extra = " AND xchan_hash = '" . dbesc($hash) . "' "; + } + + + $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 80); $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); $startrec = (($page+1) * $perpage) - $perpage; @@ -112,6 +120,9 @@ function dirsearch_content(&$a) { $logic = ((strlen($sql_extra)) ? 0 : 1); + if($hash) + $logic = 1; + $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) " : ''); if($safe < 0) $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) "; @@ -161,13 +172,13 @@ function dirsearch_content(&$a) { json_return_and_die($spkt); } else { - +dbg(1); $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql $order $qlimit ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN), intval(XCHAN_FLAGS_DELETED) ); - +dbg(0); } $ret['page'] = $page + 1; @@ -187,6 +198,7 @@ function dirsearch_content(&$a) { // $entry['updated'] = (($rr['ud_date']) ? $rr['ud_date'] : '0000-00-00 00:00:00'); // $entry['update_guid'] = (($rr['ud_guid']) ? $rr['ud_guid'] : ''); $entry['url'] = $rr['xchan_url']; + $entry['photo_l'] = $rr['xchan_photo_l']; $entry['photo'] = $rr['xchan_photo_m']; $entry['address'] = $rr['xchan_addr']; $entry['description'] = $rr['xprof_desc']; diff --git a/view/css/conversation.css b/view/css/conversation.css index 8125b6278..493ce9cd5 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -55,6 +55,8 @@ #profile-expires, #profile-expires, #jot-perms-icon, +#jot-preview-link, +#profile-encrypt, .hover, .focus { cursor: pointer; } diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js new file mode 100644 index 000000000..96a38a109 --- /dev/null +++ b/view/js/mod_directory.js @@ -0,0 +1,8 @@ +function dirdetails(hash) { + + $.get('dirprofile' + '?f=&hash=' + hash, function( data ) { + $.colorbox({ html: data }); + }); + +} + diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 35bbbe0fd..ae2291d01 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -7,7 +7,7 @@ -

    {{$entry.name}}
    +
    {{$entry.name}}
    {{if $entry.connect}}
    {{$entry.conn_label}}
    {{/if}} diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl new file mode 100755 index 000000000..cf45d8f48 --- /dev/null +++ b/view/tpl/direntry_large.tpl @@ -0,0 +1,16 @@ +
    +
    + +
    +
    +{{$alttext}} +
    +
    + +
    {{$name}}
    +{{if $entry.connect}} +
    {{$conn_label}}
    +{{/if}} +
    {{$details}}
    +
    +
    diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 9038155be..e1e1e3080 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -70,7 +70,7 @@ {{/if}} - {{if $preview}}{{/if}} + {{if $preview}}{{/if}}
    -- cgit v1.2.3 From 766454a607425d74d90fe0125fcadff5c80a2c58 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 18:59:49 -0800 Subject: first thing to make it less annoying is to only popup if you click. Will improve on it later - but this gives us something we can test to improve the popup contents. --- view/tpl/direntry.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index ae2291d01..e40504c8f 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -7,7 +7,7 @@ -
    {{$entry.name}}
    +
    {{$entry.name}}
    {{if $entry.connect}}
    {{$entry.conn_label}}
    {{/if}} -- cgit v1.2.3 From 8194ade8868bb57180d49a86216fc6fd680b4e79 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 19:44:23 -0800 Subject: improve the directory popup a bit --- include/dir_fns.php | 4 ++-- mod/dirprofile.php | 42 +++++++++++++++++++++++++++++++++++------- mod/dirsearch.php | 5 +---- view/tpl/direntry_large.tpl | 11 ++++++++++- 4 files changed, 48 insertions(+), 14 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 823763e63..7be0bd4c6 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -201,10 +201,10 @@ function syncdirs($uid) { } + $address = $p[0]['channel_address'] . '@' . get_app()->get_hostname(); if(perm_is_allowed($uid,'','view_profile')) { - import_directory_profile($hash,$profile); - + import_directory_profile($hash,$profile,$address,0); } else { // they may have made it private diff --git a/mod/dirprofile.php b/mod/dirprofile.php index 133089419..dd583a89e 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -104,16 +104,42 @@ function dirprofile_init(&$a) { || (x($profile,'country') == 1)) $location = t('Location:'); - $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); - $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + $marital = ((x($profile,'marital') == 1) ? t('Status: ') . $profile['marital'] : False); + $sexual = ((x($profile,'sexual') == 1) ? t('Sexual Preference: ') . $profile['sexual'] : False); - $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); - - $about = ((x($profile,'about') == 1) ? t('About:') : False); - +// $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') . $profile['homepage'] : False); + +// $about = ((x($profile,'about') == 1) ? t('About: ') . $profile['about'] : False); + + $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); + if($keywords) { + $keywords = str_replace(',',' ', $keywords); + $keywords = str_replace(' ',' ', $keywords); + $karr = explode(' ', $keywords); + $out = ''; + if($karr) { + if(local_user()) { + $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", + intval(local_user()) + ); + if($r) { + $keywords = str_replace(',',' ', $r[0]['keywords']); + $keywords = str_replace(' ',' ', $keywords); + $marr = explode(' ', $keywords); + } + } + foreach($karr as $k) { + if(strlen($out)) + $out .= ', '; + if($marr && in_array($k,$marr)) + $out .= '' . $k . ''; + else + $out .= $k; + } + } - + } $entry = replace_macros(get_markup_template('direntry_large.tpl'), array( '$id' => ++$t, '$profile_link' => $profile_link, @@ -128,6 +154,8 @@ function dirprofile_init(&$a) { '$marital' => $marital, '$homepage' => $homepage, '$about' => $about, + '$kw' => (($out) ? t('Keywords: ') : ''), + '$keywords' => $out, '$conn_label' => t('Connect'), '$connect' => $connect_link, )); diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 6490d59df..43cb13470 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -172,13 +172,11 @@ function dirsearch_content(&$a) { json_return_and_die($spkt); } else { -dbg(1); $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql $order $qlimit ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN), intval(XCHAN_FLAGS_DELETED) ); -dbg(0); } $ret['page'] = $page + 1; @@ -195,8 +193,6 @@ dbg(0); $entry['name'] = $rr['xchan_name']; $entry['hash'] = $rr['xchan_hash']; -// $entry['updated'] = (($rr['ud_date']) ? $rr['ud_date'] : '0000-00-00 00:00:00'); -// $entry['update_guid'] = (($rr['ud_guid']) ? $rr['ud_guid'] : ''); $entry['url'] = $rr['xchan_url']; $entry['photo_l'] = $rr['xchan_photo_l']; $entry['photo'] = $rr['xchan_photo_m']; @@ -210,6 +206,7 @@ dbg(0); $entry['age'] = $rr['xprof_age']; $entry['gender'] = $rr['xprof_gender']; $entry['marital'] = $rr['xprof_marital']; + $entry['sexual'] = $rr['xprof_sexual']; $entry['keywords'] = $rr['xprof_keywords']; $entries[] = $entry; diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index cf45d8f48..605abb9b3 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -8,9 +8,18 @@
    {{$name}}
    -{{if $entry.connect}} +{{if $connect}}
    {{$conn_label}}
    {{/if}}
    {{$details}}
    +{{if $marital}} +
    {{$marital}}
    +{{/if}} +{{if $sexual}} +
    {{$sexual}}
    +{{/if}} +{{if $kw}} +
    {{$kw}} {{$keywords}}
    +{{/if}} -- cgit v1.2.3 From 4e3a2c5f28690158d9cf3c282f9d14736b5b0550 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 19:51:51 -0800 Subject: make sure resize fires --- view/js/mod_directory.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index 96a38a109..29caa8d55 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -1,7 +1,8 @@ function dirdetails(hash) { $.get('dirprofile' + '?f=&hash=' + hash, function( data ) { - $.colorbox({ html: data }); + $.colorbox({ maxWidth: '75%', maxHeight: '75%', html: data }); + $.colorbox.resize(); }); } -- cgit v1.2.3 From 1c5fe5a1ac252058c81d44409841441711f2c6b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 20:04:00 -0800 Subject: set the height so colorbox can set its size correctly --- view/js/mod_directory.js | 3 +-- view/tpl/direntry_large.tpl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index 29caa8d55..96a38a109 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -1,8 +1,7 @@ function dirdetails(hash) { $.get('dirprofile' + '?f=&hash=' + hash, function( data ) { - $.colorbox({ maxWidth: '75%', maxHeight: '75%', html: data }); - $.colorbox.resize(); + $.colorbox({ html: data }); }); } diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index 605abb9b3..58c9d5404 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -3,7 +3,7 @@
    -{{$alttext}} +{{$alttext}}
    -- cgit v1.2.3 From 80879369e7f11a5ffd69e34e9797db47f76bfc24 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 20:18:04 -0800 Subject: get around size limit --- view/tpl/direntry_large.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index 58c9d5404..c71dd0eb9 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -1,9 +1,9 @@ -
    +
    -{{$alttext}} +{{$alttext}}
    @@ -12,7 +12,6 @@
    {{$conn_label}}
    {{/if}}
    {{$details}}
    -
    {{if $marital}}
    {{$marital}}
    {{/if}} @@ -23,3 +22,4 @@
    {{$kw}} {{$keywords}}
    {{/if}}
    +
    -- cgit v1.2.3 From 71dde7c6875c85e4bfbe6e2eadecaf0bbc9fd20c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Dec 2013 22:56:32 -0800 Subject: use case-insensitive array search for matching directory keywords with your own --- doc/To-Do-Code.md | 2 +- mod/dirprofile.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index dc2ba8245..2d9228e88 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -23,7 +23,7 @@ We need much more than this, but here are areas where developers can help. Pleas * Extend WebDAV to provide desktop access to photo albums and existing file (attachment) storage -* Directory - provide a hover popup providing much more detail about the channel of interest. Keywords, additional public profile details, perhaps the last public post, anything else of interest. +* Directory - provide a hover popup providing much more detail about the channel of interest. Keywords, additional public profile details, perhaps the last public post, anything else of interest. [Update - we now have this, but it can be improved.] * Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview diff --git a/mod/dirprofile.php b/mod/dirprofile.php index dd583a89e..01a0debfc 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -132,7 +132,7 @@ function dirprofile_init(&$a) { foreach($karr as $k) { if(strlen($out)) $out .= ', '; - if($marr && in_array($k,$marr)) + if($marr && in_arrayi($k,$marr)) $out .= '' . $k . ''; else $out .= $k; -- cgit v1.2.3 From 96d150bf2b1e2e90d73d1b70e79937fa070f439d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 24 Dec 2013 15:43:46 +0000 Subject: Add cutsom/ to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 77cc26aab..21f90f09a 100755 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ home.html addon *~ compiled/ +custom/ # patch attempts *.orig -- cgit v1.2.3 From b1ade138ff7fc47f2b70fb3fbf130127140b5271 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 01:05:46 -0800 Subject: use colorbox for single photo viewing (replacing prettyPhoto, which may have license incompatibilities). Also set maximum size of a directory popup and let it scroll after that in case somebody set their profile keywords to the content of Webster's dictionary. --- doc/To-Do-Code.md | 2 ++ version.inc | 2 +- view/js/mod_directory.js | 2 +- view/tpl/photo_view.tpl | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 2d9228e88..403f6be30 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -13,6 +13,8 @@ We need much more than this, but here are areas where developers can help. Pleas * Integrate the "open site" list with the register page +* "mixed content warning" redirector so that if your server is https (as it should be) so are all your embedded content and media links + * Write more webpage layouts * Write more webpage widgets diff --git a/version.inc b/version.inc index 353e8ce82..bdcfdd8ad 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-23.535 +2013-12-25.537 diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index 96a38a109..291734b4f 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -1,7 +1,7 @@ function dirdetails(hash) { $.get('dirprofile' + '?f=&hash=' + hash, function( data ) { - $.colorbox({ html: data }); + $.colorbox({ maxWidth: "50%", maxHeight: "75%", html: data }); }); } diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index cdaae67e4..c3b697776 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -11,7 +11,7 @@ {{if $prevlink}}{{/if}} -
    +
    {{if $nextlink}}{{/if}}
    {{$desc}}
    -- cgit v1.2.3 From 5dee22c94d1ab366c88a7d3058867e70f5cfb827 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 01:22:51 -0800 Subject: db update for directory profiles - and fix broken database.sql from the sys_perms addition a couple days back --- boot.php | 2 +- install/database.sql | 31 ++++++++++++++++++------------- install/update.php | 12 +++++++++++- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/boot.php b/boot.php index 777d927d2..eeaae7c8c 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1087 ); +define ( 'DB_UPDATE_VERSION', 1088 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index cb332c75b..6be73f193 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', - `account_level` int(10) unsigned NOT NULL DEFAULT 0, + `account_level` int(10) unsigned NOT NULL, PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), @@ -848,6 +848,15 @@ CREATE TABLE IF NOT EXISTS `spam` ( KEY `term` (`term`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `sys_perms` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cat` char(255) NOT NULL, + `k` char(255) NOT NULL, + `v` mediumtext NOT NULL, + `public_perm` tinyint(1) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `term` ( `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', @@ -915,7 +924,7 @@ CREATE TABLE IF NOT EXISTS `verify` ( KEY `token` (`token`), KEY `meta` (`meta`), KEY `created` (`created`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `vote` ( `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -971,7 +980,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` ( KEY `xchan` (`xchan`), KEY `cat` (`cat`), KEY `k` (`k`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xign` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -1008,6 +1017,9 @@ CREATE TABLE IF NOT EXISTS `xprof` ( `xprof_postcode` char(32) NOT NULL DEFAULT '', `xprof_country` char(255) NOT NULL DEFAULT '', `xprof_keywords` text NOT NULL, + `xprof_about` text NOT NULL, + `xprof_homepage` char(255) NOT NULL DEFAULT '', + `xprof_hometown` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`xprof_hash`), KEY `xprof_desc` (`xprof_desc`), KEY `xprof_dob` (`xprof_dob`), @@ -1018,7 +1030,8 @@ CREATE TABLE IF NOT EXISTS `xprof` ( KEY `xprof_region` (`xprof_region`), KEY `xprof_postcode` (`xprof_postcode`), KEY `xprof_country` (`xprof_country`), - KEY `xprof_age` (`xprof_age`) + KEY `xprof_age` (`xprof_age`), + KEY `xprof_hometown` (`xprof_hometown`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xtag` ( @@ -1030,12 +1043,4 @@ CREATE TABLE IF NOT EXISTS `xtag` ( KEY `xtag_term` (`xtag_term`), KEY `xtag_hash` (`xtag_hash`), KEY `xtag_flags` (`xtag_flags`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -CREATE TABLE if not exists `sys_perms` ( - `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `cat` CHAR( 255 ) NOT NULL , - `k` CHAR( 255 ) NOT NULL , - `v` MEDIUMTEXT NOT NULL, - `public_perm` TINYINT( 1 ) UNSIGNED NOT NULL -) ENGINE = MYISAM DEFAULT CHARSET = utf8"); +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index c731eab06..8e64413dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 25 Dec 2013 01:57:04 -0800 Subject: extend the directory profiles a bit more --- include/dir_fns.php | 4 ++++ include/zot.php | 15 ++++++++++++++- mod/dirprofile.php | 7 +++++-- mod/dirsearch.php | 3 +++ mod/zfinger.php | 6 +++++- view/tpl/direntry_large.tpl | 9 +++++++++ 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 7be0bd4c6..ab8b67985 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -167,6 +167,10 @@ function syncdirs($uid) { $profile['region'] = $p[0]['region']; $profile['postcode'] = $p[0]['postal_code']; $profile['country'] = $p[0]['country_name']; + $profile['about'] = $p[0]['about']; + $profile['homepage'] = $p[0]['homepage']; + $profile['hometown'] = $p[0]['hometown']; + if($p[0]['keywords']) { $tags = array(); $k = explode(' ',$p[0]['keywords']); diff --git a/include/zot.php b/include/zot.php index b0d87cea9..9d3e66e40 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1644,6 +1644,10 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ $arr['xprof_postcode'] = (($profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT,'UTF-8',false) : ''); $arr['xprof_country'] = (($profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_about'] = (($profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_homepage'] = (($profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT,'UTF-8',false) : ''); + $arr['xprof_hometown'] = (($profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT,'UTF-8',false) : ''); + $clean = array(); if(array_key_exists('keywords',$profile) and is_array($profile['keywords'])) { import_directory_keywords($hash,$profile['keywords']); @@ -1692,6 +1696,9 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ xprof_region = '%s', xprof_postcode = '%s', xprof_country = '%s', + xprof_about = '%s', + xprof_homepage = '%s', + xprof_hometown = '%s', xprof_keywords = '%s' where xprof_hash = '%s' limit 1", dbesc($arr['xprof_desc']), @@ -1704,6 +1711,9 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ dbesc($arr['xprof_region']), dbesc($arr['xprof_postcode']), dbesc($arr['xprof_country']), + dbesc($arr['xprof_about']), + dbesc($arr['xprof_homepage']), + dbesc($arr['xprof_hometown']), dbesc($arr['xprof_keywords']), dbesc($arr['xprof_hash']) ); @@ -1712,7 +1722,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ else { $update = true; logger('import_directory_profile: new profile'); - $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", + $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xrpof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($arr['xprof_hash']), dbesc($arr['xprof_desc']), dbesc($arr['xprof_dob']), @@ -1724,6 +1734,9 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ dbesc($arr['xprof_region']), dbesc($arr['xprof_postcode']), dbesc($arr['xprof_country']), + dbesc($arr['xprof_about']), + dbesc($arr['xprof_homepage']), + dbesc($arr['xprof_hometown']), dbesc($arr['xprof_keywords']) ); } diff --git a/mod/dirprofile.php b/mod/dirprofile.php index 01a0debfc..ba056e864 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -1,6 +1,7 @@ $pdesc, '$marital' => $marital, '$homepage' => $homepage, + '$hometown' => $hometown, '$about' => $about, '$kw' => (($out) ? t('Keywords: ') : ''), '$keywords' => $out, diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 43cb13470..d1f4761bc 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -207,6 +207,9 @@ function dirsearch_content(&$a) { $entry['gender'] = $rr['xprof_gender']; $entry['marital'] = $rr['xprof_marital']; $entry['sexual'] = $rr['xprof_sexual']; + $entry['sexual'] = $rr['xprof_about']; + $entry['sexual'] = $rr['xprof_homepage']; + $entry['sexual'] = $rr['xprof_hometown']; $entry['keywords'] = $rr['xprof_keywords']; $entries[] = $entry; diff --git a/mod/zfinger.php b/mod/zfinger.php index aad8e224d..94671271b 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -126,12 +126,16 @@ function zfinger_init(&$a) { $profile['region'] = $p[0]['region']; $profile['postcode'] = $p[0]['postal_code']; $profile['country'] = $p[0]['country_name']; + $profile['about'] = $p[0]['about']; + $profile['homepage'] = $p[0]['homepage']; + $profile['hometown'] = $p[0]['hometown']; + if($p[0]['keywords']) { $tags = array(); $k = explode(' ',$p[0]['keywords']); if($k) { foreach($k as $kk) { - if(trim($kk)) { + if(trim($kk," \t\n\r\0\x0B,")) { $tags[] = trim($kk," \t\n\r\0\x0B,"); } } diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index c71dd0eb9..a1800c994 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -18,6 +18,15 @@ {{if $sexual}}
    {{$sexual}}
    {{/if}} +{{if $homepage}} +
    {{$homepage}}
    +{{/if}} +{{if $hometown}} +
    {{$hometown}}
    +{{/if}} +{{if $about}} +
    {{$about}}
    +{{/if}} {{if $kw}}
    {{$kw}} {{$keywords}}
    {{/if}} -- cgit v1.2.3 From c1875bcc37ea1e668ccd0821baacd8706142f543 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 02:04:52 -0800 Subject: cut/paste error --- mod/dirsearch.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index d1f4761bc..7d41ca1b7 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -207,9 +207,9 @@ function dirsearch_content(&$a) { $entry['gender'] = $rr['xprof_gender']; $entry['marital'] = $rr['xprof_marital']; $entry['sexual'] = $rr['xprof_sexual']; - $entry['sexual'] = $rr['xprof_about']; - $entry['sexual'] = $rr['xprof_homepage']; - $entry['sexual'] = $rr['xprof_hometown']; + $entry['about'] = $rr['xprof_about']; + $entry['homepage'] = $rr['xprof_homepage']; + $entry['hometown'] = $rr['xprof_hometown']; $entry['keywords'] = $rr['xprof_keywords']; $entries[] = $entry; -- cgit v1.2.3 From 4ec569d6e7ce5f114796d2a9e9f27fc945f0e61c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 02:45:22 -0800 Subject: sslify http links in media elements if you're on an https server --- include/text.php | 32 ++++++++++++++++++++++++++++++++ mod/sslify.php | 6 ++++++ 2 files changed, 38 insertions(+) create mode 100644 mod/sslify.php diff --git a/include/text.php b/include/text.php index b3154d23e..8b71fbddf 100755 --- a/include/text.php +++ b/include/text.php @@ -781,6 +781,34 @@ function linkify($s) { return($s); } +/** + * @function sslify($s) + * Replace media element using http url with https to a local redirector if using https locally + * @param string $s + * + * Looks for HTML tags containing src elements that are http when we're viewing an https page + * Typically this throws an insecure content violation in the browser. So we redirect them + * to a local redirector which uses https and which redirects to the selected content + * + * @returns string + */ + + +function sslify($s) { + if(strpos(z_root(),'https:') === false) + return $s; + $matches = null; + $cnt = preg_match_all("/\<(.*?)src=\"(http\:.*?)\"(.*?)\>/",$s,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $match) { + $s = str_replace($match[2],z_root() . '/sslify?f=&url=' . urlencode($match[2]),$s); + } + } + return $s; +} + + + function get_poke_verbs() { // index is present tense verb @@ -1166,6 +1194,10 @@ function prepare_body(&$item,$attach = false) { if(local_user() == $item['uid']) $s .= format_filer($item); + + $s = sslify($s); + + // Look for spoiler $spoilersearch = '
    '; diff --git a/mod/sslify.php b/mod/sslify.php new file mode 100644 index 000000000..951a201ea --- /dev/null +++ b/mod/sslify.php @@ -0,0 +1,6 @@ + Date: Wed, 25 Dec 2013 02:48:59 -0800 Subject: didn't work --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 8b71fbddf..38f24c6b2 100755 --- a/include/text.php +++ b/include/text.php @@ -1195,7 +1195,7 @@ function prepare_body(&$item,$attach = false) { $s .= format_filer($item); - $s = sslify($s); +// $s = sslify($s); // Look for spoiler -- cgit v1.2.3 From 66600ed2f855f11af256abfd624eb771f3352c66 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 04:06:26 -0800 Subject: try again --- include/text.php | 2 +- mod/sslify.php | 15 +++++++++++++++ view/tpl/oembed_video.tpl | 6 +++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/text.php b/include/text.php index 38f24c6b2..8b71fbddf 100755 --- a/include/text.php +++ b/include/text.php @@ -1195,7 +1195,7 @@ function prepare_body(&$item,$attach = false) { $s .= format_filer($item); -// $s = sslify($s); + $s = sslify($s); // Look for spoiler diff --git a/mod/sslify.php b/mod/sslify.php index 951a201ea..84afec6dc 100644 --- a/mod/sslify.php +++ b/mod/sslify.php @@ -1,6 +1,21 @@ - -
    + + +
    -- cgit v1.2.3 From c5c5e8b4e00fa178b59dbfbaf07f99439df3c87e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 14:22:42 -0800 Subject: knock a couple of items off the to-do list. There may still be some associated issues and/or feature requests but we'll deal with those separately. --- doc/To-Do-Code.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 403f6be30..95d2decd9 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -13,8 +13,6 @@ We need much more than this, but here are areas where developers can help. Pleas * Integrate the "open site" list with the register page -* "mixed content warning" redirector so that if your server is https (as it should be) so are all your embedded content and media links - * Write more webpage layouts * Write more webpage widgets @@ -25,8 +23,6 @@ We need much more than this, but here are areas where developers can help. Pleas * Extend WebDAV to provide desktop access to photo albums and existing file (attachment) storage -* Directory - provide a hover popup providing much more detail about the channel of interest. Keywords, additional public profile details, perhaps the last public post, anything else of interest. [Update - we now have this, but it can be improved.] - * Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview * Events module - event followups and RSVP @@ -45,7 +41,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). -* (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. +* Put mod_admin under Comanche 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. -- cgit v1.2.3 From eda7c24c4ef45c88287ee6580af5d373c3676da9 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 16:53:59 -0800 Subject: improve the register text until the new register page is finished --- mod/register.php | 11 +++++++++++ view/css/mod_register.css | 5 +++++ view/tpl/register.tpl | 10 ++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/mod/register.php b/mod/register.php index 3f1fc5400..990cce2ed 100644 --- a/mod/register.php +++ b/mod/register.php @@ -135,12 +135,19 @@ function register_post(&$a) { function register_content(&$a) { + $registration_is = ''; + $other_sites = ''; if(get_config('system','register_policy') == REGISTER_CLOSED) { require_once('mod/pubsites.php'); return pubsites_content($a); } + if(get_config('system','register_policy') == REGISTER_APPROVE) { + $registration_is = t('Registration on this site/hub is by approval only.'); + $other_sites = t('Register at another affiliated site/hub'); + } + $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { $r = q("select count(account_id) as total from account where account_created > UTC_TIMESTAMP() - INTERVAL 1 day"); @@ -175,10 +182,14 @@ function register_content(&$a) { $invite_code = ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "" ); + + $o = replace_macros(get_markup_template('register.tpl'), array( '$title' => t('Registration'), + '$reg_is' => $registration_is, '$registertext' => get_config('system','register_text'), + '$other_sites' => $other_sites, '$invitations' => get_config('system','invitation_only'), '$invite_desc' => t('Membership on this site is by invitation only.'), '$label_invite' => t('Please enter your invitation code'), diff --git a/view/css/mod_register.css b/view/css/mod_register.css index aca6ee002..870fb4634 100644 --- a/view/css/mod_register.css +++ b/view/css/mod_register.css @@ -10,6 +10,11 @@ h2 { margin-top: 5%; } +#register-desc, #register-text, #register-sites { + font-weight: bold; + margin-bottom: 15px; +} + .register-label { float: left; width: 275px; diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 48c1ba525..6cec036fc 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -2,8 +2,14 @@
    -{{if $registertext}} -
    {{$registertext}}
    + + +{{if $reg_is}} +
    {{$reg_is}} +{{/if}} +{{if $registertext}}
    {{$registertext}}
    +{{/if}} +{{if $other_sites}}
    {{$other_sites}}
    {{/if}} {{if $invitations}} -- cgit v1.2.3 From 1430db5ea842cf280413c846eba65036c0bcabc7 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 16:57:48 -0800 Subject: and add a border for delineation --- view/css/mod_register.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/css/mod_register.css b/view/css/mod_register.css index 870fb4634..b662610ae 100644 --- a/view/css/mod_register.css +++ b/view/css/mod_register.css @@ -13,6 +13,8 @@ h2 { #register-desc, #register-text, #register-sites { font-weight: bold; margin-bottom: 15px; + padding: 8px; + border: 1px solid #ccc; } .register-label { -- cgit v1.2.3 From b7686b2a50f15143a3c5ecb16da023d81ac660cd Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 16:58:59 -0800 Subject: missing end div --- view/tpl/register.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 6cec036fc..916a946d3 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -5,7 +5,7 @@ {{if $reg_is}} -
    {{$reg_is}} +
    {{$reg_is}}
    {{/if}} {{if $registertext}}
    {{$registertext}}
    {{/if}} -- cgit v1.2.3 From 9d9fc6e2dce2bc98f714bd02a12645e1685e1d35 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 17:08:32 -0800 Subject: mod_invite - don't generate errors for email addresses consisting of blank lines --- mod/invite.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/invite.php b/mod/invite.php index e23ed7d2a..9e37d1e6d 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -42,6 +42,8 @@ function invite_post(&$a) { foreach($recips as $recip) { $recip = trim($recip); + if(! $recip) + continue; if(! valid_email($recip)) { notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL); -- cgit v1.2.3 From f133218b33f0c7f9e4234aa2f4f85ae984ac726d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 23:14:13 -0800 Subject: don't include deleted folks in acl popup --- mod/acl.php | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/mod/acl.php b/mod/acl.php index c9a4d417f..cd3e24367 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -49,9 +49,10 @@ function acl_init(&$a){ if ($type=='' || $type=='c'){ $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2" , + WHERE abook_channel = %d AND not ( abook_flags & %d ) and not (xchan_flags & %d ) $sql_extra2" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), + intval(XCHAN_FLAGS_DELETED) ); $contact_count = (int)$r[0]['c']; } @@ -64,9 +65,11 @@ function acl_init(&$a){ $r = q("SELECT count(xchan_hash) as c FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )) + and not ( xchan_flags & %d ) $sql_extra2 ", intval(local_user()), - intval(PERMS_W_MAIL) + intval(PERMS_W_MAIL), + intval(XCHAN_FLAGS_DELETED) ); if($r) @@ -78,8 +81,9 @@ function acl_init(&$a){ // autocomplete for Contacts $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel = %d $sql_extra2" , - intval(local_user()) + WHERE abook_channel = %d and not ( xchan_flags & %d ) $sql_extra2" , + intval(local_user()), + intval(XCHAN_FLAGS_DELETED) ); $contact_count = (int)$r[0]['c']; @@ -121,32 +125,39 @@ function acl_init(&$a){ ); } } - + if ($type=='' || $type=='c') { $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" , + WHERE abook_channel = %d AND not ( abook_flags & %d ) and not (xchan_flags & %d ) $sql_extra2 order by xchan_name asc" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), + intval(XCHAN_FLAGS_DELETED) ); + } elseif($type == 'm') { $r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )) + and not (xchan_flags & %d) $sql_extra3 ORDER BY `xchan_name` ASC ", intval(local_user()), - intval(PERMS_W_MAIL) + intval(PERMS_W_MAIL), + intval(XCHAN_FLAGS_DELETED) ); } elseif($type == 'a') { $r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag , abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d + and not (xchan_flags & %d) $sql_extra3 ORDER BY xchan_name ASC ", - intval(local_user()) + intval(local_user()), + intval(XCHAN_FLAGS_DELETED) + ); } elseif($type == 'x') { -- cgit v1.2.3 From 152ed9637926f478a6d15a29950f085117172a6f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Dec 2013 00:14:17 -0800 Subject: issue #230 - deletion failure in multiple delivery chains --- include/zot.php | 5 ++++- version.inc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index 9d3e66e40..9d6f462fe 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1384,7 +1384,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) { if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { require_once('include/event.php'); $ev = bbtoevent($arr['body']); - if(x($ev,'desc') && x($ev,'start')) { + if(x($ev,'desc') && x($ev,'start')) { $ev['event_xchan'] = $arr['author_xchan']; $ev['uid'] = $channel['channel_id']; $ev['account'] = $channel['channel_account_id']; @@ -1539,6 +1539,9 @@ function delete_imported_item($sender,$item,$uid) { require_once('include/items.php'); drop_item($r[0]['id'],false); + + tag_deliver($uid,$r[0]['id']); + return $r[0]['id']; } diff --git a/version.inc b/version.inc index bdcfdd8ad..a5b44289f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-25.537 +2013-12-26.538 -- cgit v1.2.3 From c59688553c6f681fe7a11479b69dce8c3cd308dc Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Dec 2013 13:08:16 -0800 Subject: remove prettyphoto from core - this will affect the enhanced photo albums feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins. --- include/features.php | 4 +++- mod/photos.php | 27 +++++++++++++-------------- view/tpl/photo_album.tpl | 1 - view/tpl/photo_view.tpl | 2 -- view/tpl/prettyphoto.tpl | 6 ------ view/tpl/webpagelist.tpl | 4 +--- 6 files changed, 17 insertions(+), 27 deletions(-) delete mode 100644 view/tpl/prettyphoto.tpl diff --git a/include/features.php b/include/features.php index 978d7af8a..40adf1d41 100644 --- a/include/features.php +++ b/include/features.php @@ -24,7 +24,9 @@ function get_features() { array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel')), array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders')), - array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), +// prettyphoto has licensing issues and will no longer be provided in core - +// in any event this setting should probably be a theme option or plugin +// array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), //FIXME - needs a description, but how the hell do we explain this to normals? array('sendzid', t('Extended Identity Sharing'), t(' ')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')), diff --git a/mod/photos.php b/mod/photos.php index 3c724ddc2..85d3f50b0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -817,25 +817,24 @@ function photos_content(&$a) { $ext = $phototypes[$rr['type']]; - if($a->get_template_engine() === 'internal') { - $imgalt_e = template_escape($rr['filename']); - $desc_e = template_escape($rr['description']); - } - else { - $imgalt_e = $rr['filename']; - $desc_e = $rr['description']; - } + $imgalt_e = $rr['filename']; + $desc_e = $rr['description']; + +// prettyphoto has potential license issues, so we can no longer include it in core +// The following lines would need to be modified so that they are provided in theme specific files +// instead of core modules for themes that wish to make use of prettyphoto. I would suggest +// the feature as a per-theme display option and putting the rel line inside a template. - if(feature_enabled($a->data['channel']['channel_id'],'prettyphoto')){ - $imagelink = ($a->get_baseurl() . '/photo/' . $rr['resource_id'] . '.' . $ext ); - $rel=("prettyPhoto[pp_gal]"); - } - else { +// if(feature_enabled($a->data['channel']['channel_id'],'prettyphoto')){ +// $imagelink = ($a->get_baseurl() . '/photo/' . $rr['resource_id'] . '.' . $ext ); +// $rel=("prettyPhoto[pp_gal]"); +// } +// else { $imagelink = ($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); $rel=("photo"); - } +// } $o .= replace_macros($tpl,array( '$id' => $rr['id'], diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index c170d47a3..a63bff78c 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,4 +1,3 @@ -{{include file="prettyphoto.tpl"}}
    {{$imgalt}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index c3b697776..e56fd5b57 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,5 +1,3 @@ -{{include file="prettyphoto.tpl"}} -

    {{$album.1}}

    diff --git a/view/tpl/prettyphoto.tpl b/view/tpl/prettyphoto.tpl deleted file mode 100644 index 6d047e620..000000000 --- a/view/tpl/prettyphoto.tpl +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 437e93348..c19836a28 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,5 +1,3 @@ -{{include file="prettyphoto.tpl"}} - {{if $pages}}
    @@ -8,7 +6,7 @@
    {{if $edit}} {{/if}} {{if $view}} {{/if}} - {{if $preview}} {{/if}} + {{if $preview}} {{/if}} {{$item.title}}
    {{/foreach}} -- cgit v1.2.3 From 121ee48963f7da0aec45b94163d68f23a36c7744 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 27 Dec 2013 21:19:23 -0800 Subject: sslify - remove the redirect fallback - as it gets called occasionally and creates mixed content exceptions. Let's see how we go without it. Also a doc update. --- doc/html/Contact_8php.html | 2 +- doc/html/acl__selectors_8php.html | 2 +- doc/html/bbcode_8php.html | 2 +- doc/html/boot_8php.html | 92 +- doc/html/boot_8php.js | 2 + doc/html/contact__widgets_8php.html | 2 +- doc/html/crypto_8php.html | 2 +- doc/html/datetime_8php.html | 4 +- doc/html/dba__driver_8php.html | 4 +- doc/html/dir__fns_8php.html | 6 +- doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 10 + doc/html/dir_d41ce877eb409a4791b288730010abe2.js | 5 + doc/html/extract_8php.html | 2 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 245 +- doc/html/globals_0x61.html | 3 + doc/html/globals_0x63.html | 6 +- doc/html/globals_0x64.html | 6 +- doc/html/globals_0x67.html | 3 + doc/html/globals_0x69.html | 9 + doc/html/globals_0x6d.html | 11 +- doc/html/globals_0x73.html | 12 +- doc/html/globals_0x77.html | 12 + doc/html/globals_0x78.html | 6 + doc/html/globals_func_0x61.html | 3 + doc/html/globals_func_0x63.html | 6 +- doc/html/globals_func_0x64.html | 6 +- doc/html/globals_func_0x67.html | 3 + doc/html/globals_func_0x69.html | 6 + doc/html/globals_func_0x6d.html | 11 +- doc/html/globals_func_0x73.html | 12 +- doc/html/globals_func_0x77.html | 12 + doc/html/globals_func_0x78.html | 3 + doc/html/globals_vars_0x69.html | 3 + doc/html/globals_vars_0x78.html | 3 + doc/html/identity_8php.html | 116 +- doc/html/identity_8php.js | 5 +- doc/html/include_2config_8php.html | 4 +- doc/html/include_2menu_8php.html | 2 +- doc/html/include_2message_8php.html | 8 +- doc/html/include_2network_8php.html | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/mod_2directory_8php.html | 18 - doc/html/mod_2directory_8php.js | 1 - doc/html/mod_2message_8php.html | 27 +- doc/html/mod_2message_8php.js | 3 +- doc/html/nav_8php.html | 2 +- doc/html/navtree.js | 15 +- doc/html/navtreeindex0.js | 220 +- doc/html/navtreeindex1.js | 166 +- doc/html/navtreeindex2.js | 54 +- doc/html/navtreeindex3.js | 86 +- doc/html/navtreeindex4.js | 70 +- doc/html/navtreeindex5.js | 214 +- doc/html/navtreeindex6.js | 224 +- doc/html/navtreeindex7.js | 186 +- doc/html/navtreeindex8.js | 13 + doc/html/permissions_8php.html | 4 +- doc/html/php2po_8php.html | 4 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/plugin_8php.html | 2 +- doc/html/post_8php.html | 2 +- doc/html/pubsites_8php.html | 2 + doc/html/search/all_61.js | 4 +- doc/html/search/all_63.js | 2 +- doc/html/search/all_64.js | 3 +- doc/html/search/all_67.js | 1 + doc/html/search/all_69.js | 3 + doc/html/search/all_6d.js | 8 +- doc/html/search/all_73.js | 7 +- doc/html/search/all_77.js | 4 + doc/html/search/all_78.js | 5 +- doc/html/search/files_61.js | 3 +- doc/html/search/files_64.js | 1 + doc/html/search/files_6d.js | 3 +- doc/html/search/files_73.js | 1 + doc/html/search/files_78.js | 3 +- doc/html/search/functions_61.js | 1 + doc/html/search/functions_63.js | 2 +- doc/html/search/functions_64.js | 2 +- doc/html/search/functions_67.js | 1 + doc/html/search/functions_69.js | 2 + doc/html/search/functions_6d.js | 5 +- doc/html/search/functions_73.js | 4 +- doc/html/search/functions_77.js | 4 + doc/html/search/functions_78.js | 3 +- doc/html/search/variables_69.js | 1 + doc/html/search/variables_78.js | 1 + doc/html/search_8php.html | 37 - doc/html/search_8php.js | 4 +- doc/html/taxonomy_8php.html | 2 +- doc/html/text_8php.html | 54 +- doc/html/text_8php.js | 1 + doc/html/typo_8php.html | 2 +- doc/html/widgets_8php.html | 75 +- doc/html/widgets_8php.js | 4 + doc/html/zot_8php.html | 4 +- include/features.php | 4 +- mod/sslify.php | 5 +- util/messages.po | 3120 ++++++++++---------- version.inc | 2 +- 102 files changed, 2840 insertions(+), 2522 deletions(-) diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index e5f75da07..e6e4270df 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -504,7 +504,7 @@ Functions
    -

    Referenced by chanview_content(), message_content(), and widget_vcard().

    +

    Referenced by widget_vcard().

    diff --git a/doc/html/acl__selectors_8php.html b/doc/html/acl__selectors_8php.html index b0bf3be67..92e6c4d4a 100644 --- a/doc/html/acl__selectors_8php.html +++ b/doc/html/acl__selectors_8php.html @@ -188,7 +188,7 @@ Functions
    -

    Referenced by message_content().

    +

    Referenced by mail_content().

    diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index 2086751e7..5e2986440 100644 --- a/doc/html/bbcode_8php.html +++ b/doc/html/bbcode_8php.html @@ -241,7 +241,7 @@ Functions
    -

    Referenced by bb2diaspora(), construct_activity_object(), construct_activity_target(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), and tagrm_content().

    +

    Referenced by bb2diaspora(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), and tagrm_content().

    diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 3085b9914..2d9cc399a 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -200,7 +200,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1084 +const DB_UPDATE_VERSION 1088   const EOL '<br />' . "\r\n"   @@ -450,6 +450,8 @@ Variables   const HUBLOC_FLAGS_DELETED 0x1000   +const XCHAN_FLAGS_NORMAL 0x0000 +  const XCHAN_FLAGS_HIDDEN 0x0001   const XCHAN_FLAGS_ORPHAN 0x0002 @@ -628,6 +630,8 @@ Variables   const ITEM_PDL 0x0200   +const ITEM_BUG 0x0400 +  const ITEM_ORIGIN 0x0001   const ITEM_UNSEEN 0x0002 @@ -704,7 +708,7 @@ Variables
    -

    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().

    +

    Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), mail_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(), xref_init(), and zotfeed_init().

    @@ -722,7 +726,7 @@ Variables
    -

    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().

    +

    Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), mail_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(), xref_init(), and zotfeed_init().

    @@ -942,7 +946,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(), 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().

    +

    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(), dir_tagblock(), 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_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    @@ -1022,7 +1026,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_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().

    +

    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(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().

    @@ -1055,7 +1059,7 @@ Variables
    -

    Referenced by connections_init(), connedit_init(), message_content(), network_init(), page_init(), photos_init(), and profile_sidebar().

    +

    Referenced by connections_init(), connedit_init(), mail_content(), message_content(), network_init(), page_init(), photos_init(), and profile_sidebar().

    @@ -1073,7 +1077,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_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().

    +

    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(), dirprofile_init(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), 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().

    @@ -1124,7 +1128,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(), 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(), dirprofile_init(), 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(), sslify_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().

    @@ -1159,7 +1163,7 @@ Variables
    -

    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().

    +

    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_content(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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().

    @@ -1193,7 +1197,7 @@ Variables
    -

    Referenced by admin_content(), api_content(), channel_content(), connections_content(), connedit_content(), follow_content(), home_content(), login_content(), message_content(), network_content(), notify_content(), oexchange_content(), post_to_red_displayAdminContent(), profile_content(), regmod_content(), and rpost_content().

    +

    Referenced by admin_content(), api_content(), channel_content(), connections_content(), connedit_content(), follow_content(), home_content(), login_content(), mail_content(), message_content(), network_content(), notify_content(), oexchange_content(), post_to_red_displayAdminContent(), profile_content(), regmod_content(), and rpost_content().

    @@ -1211,7 +1215,7 @@ Variables
    -

    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().

    +

    Referenced by achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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().

    @@ -1233,7 +1237,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_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().

    +

    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(), mail_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().

    @@ -1250,7 +1254,7 @@ Variables
    -

    Referenced by channel_content(), community_content(), directory_aside(), directory_content(), display_content(), drop_items(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().

    +

    Referenced by channel_content(), community_content(), directory_content(), dirprofile_init(), display_content(), drop_items(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().

    @@ -1311,7 +1315,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_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().

    +

    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(), dirprofile_init(), 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_content(), mail_post(), mail_store(), 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(), 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().

    @@ -1345,7 +1349,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(), 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().

    +

    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(), dirprofile_init(), 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(), mail_post(), 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(), sslify(), 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_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    @@ -2094,7 +2098,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1084const DB_UPDATE_VERSION 1088
    @@ -2126,7 +2130,7 @@ Variables
    -

    Referenced by directory_content(), directory_run(), navbar_complete(), pubsites_content(), sync_directories(), and update_suggestions().

    +

    Referenced by directory_content(), directory_run(), dirprofile_init(), navbar_complete(), pubsites_content(), sync_directories(), and update_suggestions().

    @@ -2154,7 +2158,7 @@ Variables
    -

    Referenced by directory_content(), directory_run(), import_site(), navbar_complete(), poller_run(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

    +

    Referenced by directory_content(), directory_run(), dirprofile_init(), import_site(), navbar_complete(), poller_run(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

    @@ -2182,7 +2186,7 @@ Variables
    -

    Referenced by directory_content(), directory_run(), import_site(), import_xchan(), navbar_complete(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

    +

    Referenced by directory_content(), directory_run(), dirprofile_init(), import_site(), import_xchan(), navbar_complete(), pubsites_content(), sync_directories(), update_suggestions(), and zfinger_init().

    @@ -2208,7 +2212,7 @@ Variables
    -

    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().

    +

    Referenced by achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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().

    @@ -2365,6 +2369,18 @@ Variables
    +
    + + +
    +
    + + + + +
    const ITEM_BUG 0x0400
    +
    +
    @@ -2765,7 +2781,7 @@ Variables
    -

    Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), detect_language(), directory_content(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), magic_init(), mail_store(), message_post(), mini_group_select(), new_contact(), notifier_run(), onepoll_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), detect_language(), directory_content(), dirprofile_init(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), onepoll_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -2779,7 +2795,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(), 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(), dirprofile_init(), 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().

    @@ -2862,7 +2878,7 @@ Variables
    -

    Referenced by encode_mail(), get_mail_elements(), message_content(), and process_mail_delivery().

    +

    Referenced by encode_mail(), get_mail_elements(), mail_content(), and process_mail_delivery().

    @@ -3528,8 +3544,6 @@ Variables
    -

    Referenced by create_dir_account().

    -
    @@ -3542,7 +3556,7 @@ Variables
    -

    Referenced by create_dir_account(), and zfinger_init().

    +

    Referenced by zfinger_init().

    @@ -3599,7 +3613,7 @@ Variables
    -

    Referenced by zfinger_init().

    +

    Referenced by create_sys_channel(), get_sys_channel(), and zfinger_init().

    @@ -3824,7 +3838,7 @@ Variables
    -

    Referenced by acl_init(), get_perms(), message_post(), new_contact(), and public_recips().

    +

    Referenced by acl_init(), get_perms(), mail_post(), new_contact(), and public_recips().

    @@ -4077,7 +4091,7 @@ Variables
    -

    Referenced by admin_page_site(), import_site(), list_public_sites(), ping_init(), register_post(), and zfinger_init().

    +

    Referenced by admin_page_site(), import_site(), list_public_sites(), ping_init(), register_content(), register_post(), and zfinger_init().

    @@ -4318,7 +4332,7 @@ Variables
    -

    Referenced by search_init(), search_saved_searches(), and widget_savedsearch().

    +

    Referenced by widget_savedsearch().

    @@ -4432,7 +4446,7 @@ Variables
    -

    Referenced by channel_remove(), connections_content(), dirsearch_content(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().

    +

    Referenced by acl_init(), channel_remove(), connections_content(), dirsearch_content(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().

    @@ -4448,6 +4462,20 @@ Variables

    Referenced by dirsearch_content(), import_xchan(), suggestion_query(), syncdirs(), viewconnections_content(), and zfinger_init().

    + + + +
    +
    + + + + +
    const XCHAN_FLAGS_NORMAL 0x0000
    +
    + +

    Referenced by create_identity().

    +
    @@ -4488,6 +4516,8 @@ Variables
    +

    Referenced by create_sys_channel().

    +
    diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index dc2cf6b5b..29722c7b7 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -112,6 +112,7 @@ var boot_8php = [ "HUBLOC_SEND_ERROR", "boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456", null ], [ "HUBLOC_WORKS", "boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c", null ], [ "ITEM_BLOCKED", "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f", null ], + [ "ITEM_BUG", "boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34", null ], [ "ITEM_BUILDBLOCK", "boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf", null ], [ "ITEM_DELAYED_PUBLISH", "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20", null ], [ "ITEM_DELETED", "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49", null ], @@ -263,6 +264,7 @@ var boot_8php = [ "XCHAN_FLAGS_CENSORED", "boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e", null ], [ "XCHAN_FLAGS_DELETED", "boot_8php.html#a9ea1290e00c6d40684892047f2c778a9", null ], [ "XCHAN_FLAGS_HIDDEN", "boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2", null ], + [ "XCHAN_FLAGS_NORMAL", "boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6", 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 ], diff --git a/doc/html/contact__widgets_8php.html b/doc/html/contact__widgets_8php.html index 2af5ba620..a9febe165 100644 --- a/doc/html/contact__widgets_8php.html +++ b/doc/html/contact__widgets_8php.html @@ -207,7 +207,7 @@ Functions
    -

    Referenced by directory_aside(), and widget_findpeople().

    +

    Referenced by widget_findpeople().

    diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 1b4f6ce6c..981ec06dd 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -318,7 +318,7 @@ Functions
    -

    Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), message_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().

    +

    Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), mail_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().

    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 27fdb2153..3a12d59ce 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -172,7 +172,7 @@ Functions
    -

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

    +

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

    @@ -334,7 +334,7 @@ Functions
    -

    Referenced by advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_store(), message_content(), message_post(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index f4f0b0a21..b691b0514 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(), 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().

    +

    Referenced by account_verify_password(), achievements_content(), 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(), 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(), 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().

    +

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), 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(), dirprofile_init(), 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(), get_sys_channel(), 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_content(), 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(), 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(), 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__fns_8php.html b/doc/html/dir__fns_8php.html index 5aeb02ea2..a5b8f1cee 100644 --- a/doc/html/dir__fns_8php.html +++ b/doc/html/dir__fns_8php.html @@ -139,7 +139,7 @@ Functions
    -

    Referenced by directory_aside().

    +

    Referenced by widget_dirsafemode().

    @@ -156,7 +156,7 @@ Functions
    -

    Referenced by directory_aside().

    +

    Referenced by widget_dirsort().

    @@ -174,7 +174,7 @@ Functions
    -

    Referenced by directory_content(), directory_run(), navbar_complete(), pubsites_content(), and update_suggestions().

    +

    Referenced by directory_content(), directory_run(), dirprofile_init(), navbar_complete(), pubsites_content(), and update_suggestions().

    diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 13fdcd134..a4780b265 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -106,6 +106,8 @@ $(document).ready(function(){initNavTree('dir_d41ce877eb409a4791b288730010abe2.h Files file  _well_known.php   +file  achievements.php +  file  acl.php   file  admin.php @@ -142,6 +144,8 @@ Files   file  directory.php   +file  dirprofile.php +  file  dirsearch.php   file  display.php @@ -196,6 +200,8 @@ Files   file  magic.php   +file  mail.php +  file  manage.php   file  match.php @@ -290,6 +296,8 @@ Files   file  sources.php   +file  sslify.php +  file  starred.php   file  subthread.php @@ -340,6 +348,8 @@ Files   file  xrd.php   +file  xref.php +  file  zfinger.php   file  zotfeed.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index b95fe1e8e..17ed67b37 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -1,6 +1,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ [ "_well_known.php", "__well__known_8php.html", "__well__known_8php" ], + [ "achievements.php", "achievements_8php.html", "achievements_8php" ], [ "acl.php", "acl_8php.html", "acl_8php" ], [ "admin.php", "admin_8php.html", "admin_8php" ], [ "api.php", "mod_2api_8php.html", "mod_2api_8php" ], @@ -19,6 +20,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "contactgroup.php", "contactgroup_8php.html", "contactgroup_8php" ], [ "delegate.php", "delegate_8php.html", "delegate_8php" ], [ "directory.php", "mod_2directory_8php.html", "mod_2directory_8php" ], + [ "dirprofile.php", "dirprofile_8php.html", "dirprofile_8php" ], [ "dirsearch.php", "dirsearch_8php.html", "dirsearch_8php" ], [ "display.php", "display_8php.html", "display_8php" ], [ "editblock.php", "editblock_8php.html", "editblock_8php" ], @@ -46,6 +48,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "login.php", "login_8php.html", "login_8php" ], [ "lostpass.php", "lostpass_8php.html", "lostpass_8php" ], [ "magic.php", "magic_8php.html", "magic_8php" ], + [ "mail.php", "mail_8php.html", "mail_8php" ], [ "manage.php", "manage_8php.html", "manage_8php" ], [ "match.php", "match_8php.html", "match_8php" ], [ "menu.php", "mod_2menu_8php.html", "mod_2menu_8php" ], @@ -93,6 +96,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "sitelist.php", "sitelist_8php.html", "sitelist_8php" ], [ "smilies.php", "smilies_8php.html", "smilies_8php" ], [ "sources.php", "sources_8php.html", "sources_8php" ], + [ "sslify.php", "sslify_8php.html", "sslify_8php" ], [ "starred.php", "starred_8php.html", "starred_8php" ], [ "subthread.php", "subthread_8php.html", "subthread_8php" ], [ "suggest.php", "suggest_8php.html", "suggest_8php" ], @@ -118,6 +122,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "wfinger.php", "wfinger_8php.html", "wfinger_8php" ], [ "xchan.php", "xchan_8php.html", "xchan_8php" ], [ "xrd.php", "xrd_8php.html", "xrd_8php" ], + [ "xref.php", "xref_8php.html", "xref_8php" ], [ "zfinger.php", "zfinger_8php.html", "zfinger_8php" ], [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ], [ "zping.php", "zping_8php.html", "zping_8php" ] diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index f1a46cb59..8c5123947 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -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(), 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(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_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(), sslify(), 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 69f76c078..b158711f7 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions
    -

    Referenced by apw_form(), categories_widget(), connedit_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), message_content(), message_post(), nav(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), search_saved_searches(), searchbox(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), and widget_tagcloud_wall().

    +

    Referenced by apw_form(), categories_widget(), connedit_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), mail_content(), mail_post(), nav(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), searchbox(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), and widget_tagcloud_wall().

    diff --git a/doc/html/files.html b/doc/html/files.html index e5f4c0030..e9784846e 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -190,126 +190,131 @@ $(document).ready(function(){initNavTree('files.html','');}); |\*zot.php o+mod |o*_well_known.php -|o*acl.php -|o*admin.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 -|o*dirsearch.php -|o*display.php -|o*editblock.php -|o*editlayout.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*filestorage.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*invite.php -|o*item.php -|o*layouts.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*notes.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*pubsites.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*achievements.php +|o*acl.php +|o*admin.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 +|o*dirprofile.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*filestorage.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*invite.php +|o*item.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*mail.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*notes.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*pubsites.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*sslify.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*xref.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 8171bd53d..7ececed85 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -225,6 +225,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • account_verify_password() : auth.php
    • +
  • achievements_content() +: achievements.php +
  • acl_init() : acl.php
    • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 8a5e33aac..3636da120 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -432,12 +432,12 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • create_account() : account.php
    • -
  • create_dir_account() -: identity.php -
  • create_identity() : identity.php
    • +
  • create_sys_channel() +: identity.php +
  • cronhooks_run() : cronhooks.php
    • diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index bf0bb5f4d..b8730af37 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -237,9 +237,6 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • dir_tagblock() : taxonomy.php
    • -
  • directory_aside() -: directory.php -
  • directory_content() : directory.php
    • @@ -267,6 +264,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • directory_run() : directory.php
    • +
  • dirprofile_init() +: dirprofile.php +
  • dirsearch_content() : dirsearch.php
    • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index 916f6809c..f8eeb72dc 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -273,6 +273,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
  • get_rpost_path() : zot.php
    • +
  • get_sys_channel() +: identity.php +
  • get_tags() : text.php
    • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 2af0ad401..665d44944 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -214,12 +214,21 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • is_ajax() : boot.php
    • +
  • is_foreigner() +: identity.php +
    • +
  • is_member() +: identity.php +
  • is_site_admin() : boot.php
  • ITEM_BLOCKED : boot.php
    • +
  • ITEM_BUG +: boot.php +
  • ITEM_BUILDBLOCK : boot.php
    • diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index 4c4f3cc07..2b20745d9 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -153,6 +153,9 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
  • magiclink_url() : text.php
    • +
  • mail_content() +: mail.php +
  • MAIL_DELETED : boot.php
    • @@ -162,6 +165,9 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
  • MAIL_OBSCURED : boot.php
    • +
  • mail_post() +: mail.php +
  • MAIL_RECALLED : boot.php
    • @@ -244,10 +250,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');}); : menu.php
  • message_content() -: message.php -
    • -
  • message_post() -: message.php +: message.php
  • micropro() : text.php diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index 82d39213c..25f4a2a3d 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -165,12 +165,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • search_init() : search.php
    • -
  • search_post() -: search.php -
    • -
  • search_saved_searches() -: search.php -
  • searchbox() : text.php
    • @@ -285,6 +279,12 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • SSL_POLICY_SELFSIGN : boot.php
    • +
  • sslify() +: text.php +
    • +
  • sslify_init() +: sslify.php +
  • starred_init() : starred.php
    • diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index ecc4ee5cc..da5be2e74 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -186,6 +186,15 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
  • widget_design_tools() : widgets.php
    • +
  • widget_dirsafemode() +: widgets.php +
    • +
  • widget_dirsort() +: widgets.php +
    • +
  • widget_dirtags() +: widgets.php +
  • widget_filer() : widgets.php
    • @@ -201,6 +210,9 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
  • widget_mailmenu() : widgets.php
    • +
  • widget_menu_preview() +: widgets.php +
  • widget_notes() : widgets.php
    • diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index 2b6136ac4..f016dce14 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -159,6 +159,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
  • XCHAN_FLAGS_HIDDEN : boot.php
    • +
  • XCHAN_FLAGS_NORMAL +: boot.php +
  • XCHAN_FLAGS_ORPHAN : boot.php
    • @@ -189,6 +192,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
  • xrd_init() : xrd.php
    • +
  • xref_init() +: xref.php +
    • diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 0ed363e79..23933a25b 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -164,6 +164,9 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
  • account_verify_password() : auth.php
    • +
  • achievements_content() +: achievements.php +
  • acl_init() : acl.php
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index f83049a51..2a9402889 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -413,12 +413,12 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • create_account() : account.php
    • -
  • create_dir_account() -: identity.php -
  • create_identity() : identity.php
    • +
  • create_sys_channel() +: identity.php +
  • cronhooks_run() : cronhooks.php
    • diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index 407338bb3..bfb83e73e 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -230,9 +230,6 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • dir_tagblock() : taxonomy.php
    • -
  • directory_aside() -: directory.php -
  • directory_content() : directory.php
    • @@ -242,6 +239,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • directory_run() : directory.php
    • +
  • dirprofile_init() +: dirprofile.php +
  • dirsearch_content() : dirsearch.php
    • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 915434398..3e0687555 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -272,6 +272,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
  • get_rpost_path() : zot.php
    • +
  • get_sys_channel() +: identity.php +
  • get_tags() : text.php
    • diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 1c0b48bfb..efa44411c 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -206,6 +206,12 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
  • is_ajax() : boot.php
    • +
  • is_foreigner() +: identity.php +
    • +
  • is_member() +: identity.php +
  • is_site_admin() : boot.php
    • diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index d43466984..d8cd1849c 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_0x6d.html @@ -152,6 +152,12 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
  • magiclink_url() : text.php
    • +
  • mail_content() +: mail.php +
    • +
  • mail_post() +: mail.php +
  • mail_store() : items.php
    • @@ -213,10 +219,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');}); : menu.php
  • message_content() -: message.php -
    • -
  • message_post() -: message.php +: message.php
  • micropro() : text.php diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index 4c27ae318..1f3aca686 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -164,12 +164,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • search_init() : search.php
    • -
  • search_post() -: search.php -
    • -
  • search_saved_searches() -: search.php -
  • searchbox() : text.php
    • @@ -275,6 +269,12 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • sources_post() : sources.php
    • +
  • sslify() +: text.php +
    • +
  • sslify_init() +: sslify.php +
  • starred_init() : starred.php
    • diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index 42ba67c12..31af26a40 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -182,6 +182,15 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
  • widget_design_tools() : widgets.php
    • +
  • widget_dirsafemode() +: widgets.php +
    • +
  • widget_dirsort() +: widgets.php +
    • +
  • widget_dirtags() +: widgets.php +
  • widget_filer() : widgets.php
    • @@ -197,6 +206,9 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
  • widget_mailmenu() : widgets.php
    • +
  • widget_menu_preview() +: widgets.php +
  • widget_notes() : widgets.php
    • diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html index f0f230193..24b97f465 100644 --- a/doc/html/globals_func_0x78.html +++ b/doc/html/globals_func_0x78.html @@ -170,6 +170,9 @@ $(document).ready(function(){initNavTree('globals_func_0x78.html','');});
  • xrd_init() : xrd.php
    • +
  • xref_init() +: xref.php +
    • diff --git a/doc/html/globals_vars_0x69.html b/doc/html/globals_vars_0x69.html index 09db932b0..2d4e26940 100644 --- a/doc/html/globals_vars_0x69.html +++ b/doc/html/globals_vars_0x69.html @@ -148,6 +148,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x69.html','');});
  • ITEM_BLOCKED : boot.php
    • +
  • ITEM_BUG +: boot.php +
  • ITEM_BUILDBLOCK : boot.php
    • diff --git a/doc/html/globals_vars_0x78.html b/doc/html/globals_vars_0x78.html index 4eebc0799..4278aa8f4 100644 --- a/doc/html/globals_vars_0x78.html +++ b/doc/html/globals_vars_0x78.html @@ -148,6 +148,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x78.html','');});
  • XCHAN_FLAGS_HIDDEN : boot.php
    • +
  • XCHAN_FLAGS_NORMAL +: boot.php +
  • XCHAN_FLAGS_ORPHAN : boot.php
    • diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index af9595a99..1e46f568a 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -116,8 +116,10 @@ Functions    validate_channelname ($name)   - create_dir_account () -  + create_sys_channel () +  + get_sys_channel () +   channel_total ()    create_identity ($arr) @@ -150,6 +152,10 @@ Functions    get_default_profile_photo ($size=175)   + is_foreigner ($s) +  + is_member ($s) + 

    Function Documentation

    @@ -187,23 +193,6 @@ Functions

    Referenced by zfinger_init().

    - - - -
    -
    - - - - - - - -
    create_dir_account ()
    -
    -

    create_dir_account() Create a system channel - which has no account attached

    -

    Currently unused.

    -
    @@ -228,7 +217,23 @@ Functions
    Returns
    array 'success' => boolean true or false 'message' => optional error text if success is false 'channel' => if successful the created channel array
    -

    Referenced by create_dir_account(), and new_channel_post().

    +

    Referenced by create_sys_channel(), and new_channel_post().

    + + + + +
    +
    + + + + + + + +
    create_sys_channel ()
    +
    +

    create_sys_channel() Create a system channel - which has no account attached

    @@ -320,6 +325,23 @@ Functions

    Referenced by nav(), and zid().

    + + + +
    +
    + + + + + + + +
    get_sys_channel ()
    +
    + +

    Referenced by create_sys_channel().

    +
    @@ -387,6 +409,56 @@ Functions

    Referenced by create_identity().

    + + + +
    +
    + + + + + + + + +
    is_foreigner ( $s)
    +
    +

    is_foreigner($s) Test whether a given identity is NOT a member of the Red Matrix

    +
    Parameters
    + + +
    string$s,;xchan_hash of the identity in question
    +
    +
    +
    Returns
    boolean true or false
    + +

    Referenced by chanview_content(), and is_member().

    + +
    +
    + +
    +
    + + + + + + + + +
    is_member ( $s)
    +
    +

    is_member($s) Test whether a given identity is a member of the Red Matrix

    +
    Parameters
    + + +
    string$s,;xchan_hash of the identity in question
    +
    +
    +
    Returns
    boolean true or false
    +
    @@ -413,8 +485,6 @@ Functions
    -

    Referenced by connect_init().

    -
    @@ -460,7 +530,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(), photos_init(), profile_init(), profile_photo_init(), profiles_init(), profperm_init(), viewconnections_init(), and webpages_content().

    +

    Referenced by achievements_content(), 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 2a6e0bdc4..873f46450 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -2,16 +2,19 @@ var identity_8php = [ [ "advanced_profile", "identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4", null ], [ "channel_total", "identity_8php.html#a77d2237f1846964634b1c99089c27c7d", null ], - [ "create_dir_account", "identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd", null ], [ "create_identity", "identity_8php.html#a345f4c943d84de502ec6e72d2c813945", null ], + [ "create_sys_channel", "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05", 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 ], + [ "get_sys_channel", "identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51", null ], [ "get_theme_uid", "identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ], [ "identity_basic_export", "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03", null ], [ "identity_check_service_class", "identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633", null ], + [ "is_foreigner", "identity_8php.html#ae2b140df652a55ca11bb6a99005fce35", null ], + [ "is_member", "identity_8php.html#a9637c557e13d9671f3eeb124ab98212a", null ], [ "profile_create_sidebar", "identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ], [ "profile_load", "identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ], [ "profile_sidebar", "identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 5abb9855e..0a73d143f 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_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().

    +

    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_content(), directory_run(), dirprofile_init(), 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(), 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().

    +

    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(), mail_content(), 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().

    diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html index 75adcc316..d8ccbd4ba 100644 --- a/doc/html/include_2menu_8php.html +++ b/doc/html/include_2menu_8php.html @@ -422,7 +422,7 @@ Functions
    -

    Referenced by comanche_menu(), mitem_content(), and profile_sidebar().

    +

    Referenced by comanche_menu(), profile_sidebar(), and widget_menu_preview().

    diff --git a/doc/html/include_2message_8php.html b/doc/html/include_2message_8php.html index d66e4bfa1..feacd5b3a 100644 --- a/doc/html/include_2message_8php.html +++ b/doc/html/include_2message_8php.html @@ -154,7 +154,7 @@ Functions
    -

    Referenced by message_content().

    +

    Referenced by mail_content(), and message_content().

    @@ -188,7 +188,7 @@ Functions
    -

    Referenced by message_content().

    +

    Referenced by mail_content().

    @@ -260,7 +260,7 @@ Functions
    -

    Referenced by message_content().

    +

    Referenced by message_content().

    @@ -313,7 +313,7 @@ Functions

    When a photo was uploaded into the message using the (profile wall) ajax uploader, The permissions are initially set to disallow anybody but the owner from seeing it. This is because the permissions may not yet have been set for the post. If it's private, the photo permissions should be set appropriately. But we didn't know the final permissions on the post until now. So now we'll look for links of uploaded messages that are in the post and set them to the same permissions as the post itself.

    -

    Referenced by api_direct_messages_new(), and message_post().

    +

    Referenced by api_direct_messages_new(), and mail_post().

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 64a44cb62..c431d65ad 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -651,7 +651,7 @@ Functions
    Returns
    array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content
    -

    Referenced by check_htaccess(), directory_content(), import_post(), import_profile_photo(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), scale_external_images(), setup_post(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().

    +

    Referenced by check_htaccess(), directory_content(), dirprofile_init(), import_post(), import_profile_photo(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), scale_external_images(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index a5cf59220..7e960877d 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -1481,7 +1481,7 @@ Functions
    -

    Referenced by item_store(), and item_store_update().

    +

    Referenced by delete_imported_item(), item_store(), and item_store_update().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 24bc44a97..aecb21941 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(), 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().

    +

    Referenced by achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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_2directory_8php.html b/doc/html/mod_2directory_8php.html index be5007e01..cca2ed279 100644 --- a/doc/html/mod_2directory_8php.html +++ b/doc/html/mod_2directory_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('mod_2directory_8php.html','');}); Functions  directory_init (&$a)   - directory_aside (&$a) -   directory_content (&$a)  

    Function Documentation

    - -
    -
    - - - - - - - - -
    directory_aside (& $a)
    -
    - -
    -
    diff --git a/doc/html/mod_2directory_8php.js b/doc/html/mod_2directory_8php.js index 9628750ce..783c03a81 100644 --- a/doc/html/mod_2directory_8php.js +++ b/doc/html/mod_2directory_8php.js @@ -1,6 +1,5 @@ var mod_2directory_8php = [ - [ "directory_aside", "mod_2directory_8php.html#aa1d928543212871491706216742dd73c", null ], [ "directory_content", "mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44", null ], [ "directory_init", "mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf", null ] ]; \ No newline at end of file diff --git a/doc/html/mod_2message_8php.html b/doc/html/mod_2message_8php.html index 789353cff..459ddb125 100644 --- a/doc/html/mod_2message_8php.html +++ b/doc/html/mod_2message_8php.html @@ -112,35 +112,16 @@ $(document).ready(function(){initNavTree('mod_2message_8php.html','');}); - - - - + +

    Functions

     message_post (&$a)
     
    if(!function_exists('item_extract_images'))
    -if(!function_exists('item_redir_and_replace_images'))     		message_content (&$a)
     
     message_content (&$a)
     

    Function Documentation

    - +
    - - - - - - -
    if (!function_exists('item_extract_images')) if (!function_exists('item_redir_and_replace_images')) message_content (& $a)
    -
    - -
    -
    - -
    -
    - - - + diff --git a/doc/html/mod_2message_8php.js b/doc/html/mod_2message_8php.js index 598b2f323..4be200bf0 100644 --- a/doc/html/mod_2message_8php.js +++ b/doc/html/mod_2message_8php.js @@ -1,5 +1,4 @@ var mod_2message_8php = [ - [ "message_content", "mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79", null ], - [ "message_post", "mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718", null ] + [ "message_content", "mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f", null ] ]; \ No newline at end of file diff --git a/doc/html/nav_8php.html b/doc/html/nav_8php.html index c63c5e7ca..c00d5ce4c 100644 --- a/doc/html/nav_8php.html +++ b/doc/html/nav_8php.html @@ -158,7 +158,7 @@ Functions
    message_post message_content ( &  $a)
    -

    Referenced by channel_content(), community_content(), connections_content(), directory_content(), events_content(), help_content(), message_content(), network_content(), notifications_content(), profiles_init(), and search_content().

    +

    Referenced by channel_content(), community_content(), connections_content(), directory_content(), events_content(), help_content(), mail_content(), message_content(), network_content(), notifications_content(), profiles_init(), and search_content().

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index f5290f2e9..29cd3e322 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,13 +36,14 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7", -"classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050", -"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b", -"globals_0x6d.html", -"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a", -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6", -"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a" +"boot_8php.html#a899d24fd074594ceebbf72e1feff335f", +"classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f", +"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be", +"globals_0x67.html", +"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7", +"php2po_8php.html#a48cb304902320d173a4eaa41543327b9", +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce", +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 108c31845..4db4b1d13 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -34,9 +34,11 @@ var NAVTREEINDEX0 = "account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[5,0,0,2,9], "account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[5,0,0,2,8], "account_8php.html#ae052bd5558847bd38e89c213561a9771":[5,0,0,2,2], -"acl_8php.html":[5,0,1,1], -"acl_8php.html#a57dceff370d4a0e7ae673d50fbfda61f":[5,0,1,1,1], -"acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a":[5,0,1,1,0], +"achievements_8php.html":[5,0,1,1], +"achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e":[5,0,1,1,0], +"acl_8php.html":[5,0,1,2], +"acl_8php.html#a57dceff370d4a0e7ae673d50fbfda61f":[5,0,1,2,1], +"acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a":[5,0,1,2,0], "acl__selectors_8php.html":[5,0,0,3], "acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31":[5,0,0,3,3], "acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91":[5,0,0,3,0], @@ -44,27 +46,27 @@ var NAVTREEINDEX0 = "acl__selectors_8php.html#ad6664fb8330308e23f2645cd6624727e":[5,0,0,3,1], "activities_8php.html":[5,0,0,4], "activities_8php.html#a80134e807719b3c54aba971958d2e132":[5,0,0,4,0], -"admin_8php.html":[5,0,1,2], -"admin_8php.html#a1d1362698af14d209aa3a0fb655551dd":[5,0,1,2,4], -"admin_8php.html#a233b7c8c31776b7020532003c6e44e1c":[5,0,1,2,5], -"admin_8php.html#a54128076986ba80c4a103de3fc3e19a8":[5,0,1,2,6], -"admin_8php.html#a5a696706a3869800e65fb365214241b7":[5,0,1,2,12], -"admin_8php.html#a60ba9783ad14545814919970bc3fb725":[5,0,1,2,3], -"admin_8php.html#a62f10f90c47686c9c3c37c4c03a108d2":[5,0,1,2,11], -"admin_8php.html#a6943543f3138f6ee182cb701f415d1cc":[5,0,1,2,2], -"admin_8php.html#aaa6addf2dbc3f3fcf99244a56b41eade":[5,0,1,2,1], -"admin_8php.html#ac0f3bd12431c056aad77bac9d09fa30e":[5,0,1,2,7], -"admin_8php.html#ac6e95b920b5abd030cc522964987087a":[5,0,1,2,9], -"admin_8php.html#acf51f5837a7427832144c2bf7308ada3":[5,0,1,2,13], -"admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4":[5,0,1,2,15], -"admin_8php.html#add865f4ae806ecbf716f423fc3e50e4f":[5,0,1,2,8], -"admin_8php.html#ae46311a3fefc21abc838a26e91789de6":[5,0,1,2,14], -"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], +"admin_8php.html":[5,0,1,3], +"admin_8php.html#a1d1362698af14d209aa3a0fb655551dd":[5,0,1,3,4], +"admin_8php.html#a233b7c8c31776b7020532003c6e44e1c":[5,0,1,3,5], +"admin_8php.html#a54128076986ba80c4a103de3fc3e19a8":[5,0,1,3,6], +"admin_8php.html#a5a696706a3869800e65fb365214241b7":[5,0,1,3,12], +"admin_8php.html#a60ba9783ad14545814919970bc3fb725":[5,0,1,3,3], +"admin_8php.html#a62f10f90c47686c9c3c37c4c03a108d2":[5,0,1,3,11], +"admin_8php.html#a6943543f3138f6ee182cb701f415d1cc":[5,0,1,3,2], +"admin_8php.html#aaa6addf2dbc3f3fcf99244a56b41eade":[5,0,1,3,1], +"admin_8php.html#ac0f3bd12431c056aad77bac9d09fa30e":[5,0,1,3,7], +"admin_8php.html#ac6e95b920b5abd030cc522964987087a":[5,0,1,3,9], +"admin_8php.html#acf51f5837a7427832144c2bf7308ada3":[5,0,1,3,13], +"admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4":[5,0,1,3,15], +"admin_8php.html#add865f4ae806ecbf716f423fc3e50e4f":[5,0,1,3,8], +"admin_8php.html#ae46311a3fefc21abc838a26e91789de6":[5,0,1,3,14], +"admin_8php.html#af124619fdc278fe2bf14c45ddaa260fb":[5,0,1,3,10], +"admin_8php.html#af81f081851791cd15e49e8ff6722dc27":[5,0,1,3,16], +"admin_8php.html#afef415e4011607fbb665610441595015":[5,0,1,3,0], "annotated.html":[4,0], -"apps_8php.html":[5,0,1,4], -"apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c":[5,0,1,4,0], +"apps_8php.html":[5,0,1,5], +"apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c":[5,0,1,5,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], @@ -93,8 +95,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,6], -"blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,6,0], +"blocks_8php.html":[5,0,1,7], +"blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,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], @@ -104,150 +106,148 @@ 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,129], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,130], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,34], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,143], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,238], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,144], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,239], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,50], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,159], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,160], "boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,42], "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,99], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,198], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,199], "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#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,164], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,256], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,252], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,255], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,21], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,56], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], "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#a14d44d4a00223dc3db4ea962325db192":[5,0,4,190], "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#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,143], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,139], +"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,163], +"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,133], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,263], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,233], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,265], +"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,167], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,73], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,211], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,212], "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#a1fbb93cf030f07391f22cc2948744869":[5,0,4,150], +"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,183], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,235], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,37], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,20], "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#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,245], +"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,186], "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#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,125], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,210], "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#a2b525996e4426bdddbcec277778bde08":[5,0,4,231], +"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,182], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,122], "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#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,217], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,137], "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,39], -"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#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,115], +"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,152], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,269], +"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,171], "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#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,268], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,208], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], "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,125], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,202], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,180], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,126], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,203], +"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,181], "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#a444ce608ce34efb82ee11852f36e825f":[5,0,4,157], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,147], "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#a45b12aefab9675baffc7a07a09486db8":[5,0,4,253], +"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,169], "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#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,225], +"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,168], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6], -"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#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,201], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,221], +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,193], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,151], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,38], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,79], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,31], -"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#a56fd673eaa7014150297ce1162502db5":[5,0,4,185], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,220], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,266], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,19], "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#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,175], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,197], "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#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,155], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,198], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,18], "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#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,249], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,161], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,135], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,138], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,41], -"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#a6969947145a139ec374ce098224d8e81":[5,0,4,141], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,237], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,224], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,218], "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#a6df1102664f64b274810db85197c2755":[5,0,4,206], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,124], +"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[5,0,4,202], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,236], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,26], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,175], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,127], +"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,176], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,128], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,69], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,256], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,257], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], "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#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,227], "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#a7af107fab8d62b9a73801713b774ed30":[5,0,4,127], +"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,156], "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#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,158], "boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,45], "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#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,113], +"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,195], "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,49], "boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,107], "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,53], -"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,95], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,221] +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,120], +"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,112], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,248], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,247], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,174] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 886ded9c8..755dbd274 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,132 +1,136 @@ var NAVTREEINDEX1 = { -"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#a899d24fd074594ceebbf72e1feff335f":[5,0,4,16], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,95], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,222], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,123], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,117], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,229], +"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,264], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,29], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], -"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#a93823d15ae07548a4c49de88d325cd26":[5,0,4,142], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,121], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,119], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,259], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,234], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,17], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,187], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,222], +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,188], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,223], "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,44], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], -"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#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,215], +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,189], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,262], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,250], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,214], +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,177], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,24], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,195], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,196], "boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,40], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,148], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,149], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,145], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,146], "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#aa9244fc9cc221980c07a20cc534111be":[5,0,4,219], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,132], +"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,204], "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,63], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,179], +"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,180], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,111], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,204], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,205], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,30], -"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#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,200], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,226], +"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,173], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,209], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,105], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,133], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,134], "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,51], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,190], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,191], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7], "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,94], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,35], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,229], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,230], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,253], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,254], "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#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,118], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,23], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,158], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,227], +"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,159], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,228], "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,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#ac86615ddc0763a00f5311c90e991730c":[5,0,4,260], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,114], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,116], +"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,187], "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,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#acca19aae62e1a6951a856b945de20d67":[5,0,4,162], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,261], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,216], +"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,194], "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#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,145], +"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,153], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10], "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,210], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,237], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,231], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,211], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,238], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,232], "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#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,129], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,241], "boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,36], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,22], -"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#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,246], +"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,170], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,148], +"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,178], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,258], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,25], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,250], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,251], "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,46], -"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#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,213], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,242], +"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,154], "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#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,165], +"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,179], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,131], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,28], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,242], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,171], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,243], +"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,172], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,55], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,47], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,135], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,191], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,136], +"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,192], "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#af86c651547aa8f9e549ee40a09455549":[5,0,4,240], +"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,184], +"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,166], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,244], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,43], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,77], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,139], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,140], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], -"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,265], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,206], +"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,267], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,207], "cache_8php.html":[5,0,0,11], -"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], +"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], "classApp.html":[4,0,5], "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3":[4,0,5,56], "classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,40], @@ -245,9 +249,5 @@ var NAVTREEINDEX1 = "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0], "classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a":[4,0,8,15], "classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6":[4,0,8,14], -"classFKOAuth1.html":[4,0,13], -"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] +"classFKOAuth1.html":[4,0,13] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 160e9d557..79c1c38f8 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,9 @@ var NAVTREEINDEX2 = { +"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#a4edfe2e77ecd2e16ff6b5eb516ed3599":[4,0,14,2], @@ -212,8 +216,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,10], -"cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8":[5,0,1,10,1], +"cloud_8php.html":[5,0,1,11], +"cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8":[5,0,1,11,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], @@ -223,31 +227,27 @@ 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,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], +"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,3], +"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,15,0], +"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,15,2], +"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,15,1], +"connedit_8php.html":[5,0,1,16], +"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[5,0,1,16,3], +"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[5,0,1,16,2], +"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[5,0,1,16,0], +"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[5,0,1,16,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__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,18,0] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 5415cbcb0..eb680dc16 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,10 +1,14 @@ var NAVTREEINDEX3 = { +"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], +"contactgroup_8php.html":[5,0,1,17], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,17,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], @@ -75,8 +79,8 @@ var NAVTREEINDEX3 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], "dba__mysql_8php.html":[5,0,0,0,1], "dba__mysqli_8php.html":[5,0,0,0,2], -"delegate_8php.html":[5,0,1,17], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,17,0], +"delegate_8php.html":[5,0,1,18], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,18,0], "deliver_8php.html":[5,0,0,25], "deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,25,0], "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,2,0], @@ -108,12 +112,14 @@ var NAVTREEINDEX3 = "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0], "dir_d520c5cf583201d9437764f209363c22.html":[5,0,3,1,0], -"dirsearch_8php.html":[5,0,1,19], -"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,19,1], -"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,19,2], -"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,19,0], -"display_8php.html":[5,0,1,20], -"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,20,0], +"dirprofile_8php.html":[5,0,1,20], +"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[5,0,1,20,0], +"dirsearch_8php.html":[5,0,1,21], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,21,1], +"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,21,2], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,21,0], +"display_8php.html":[5,0,1,22], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,22,0], "docblox__errorchecker_8php.html":[5,0,2,3], "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,3,3], "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,3,2], @@ -126,14 +132,14 @@ var NAVTREEINDEX3 = "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,3,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,3,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,3,10], -"editblock_8php.html":[5,0,1,21], -"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,21,0], -"editlayout_8php.html":[5,0,1,22], -"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,22,0], -"editpost_8php.html":[5,0,1,23], -"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,23,0], -"editwebpage_8php.html":[5,0,1,24], -"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,24,0], +"editblock_8php.html":[5,0,1,23], +"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,23,0], +"editlayout_8php.html":[5,0,1,24], +"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,24,0], +"editpost_8php.html":[5,0,1,25], +"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,25,0], +"editwebpage_8php.html":[5,0,1,26], +"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,26,0], "enotify_8php.html":[5,0,0,28], "enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,28,1], "event_8php.html":[5,0,0,29], @@ -144,9 +150,9 @@ var NAVTREEINDEX3 = "event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,29,2], "event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,29,3], "event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,29,4], -"events_8php.html":[5,0,1,25], -"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,25,0], -"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,25,1], +"events_8php.html":[5,0,1,27], +"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,27,0], +"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,27,1], "expire_8php.html":[5,0,0,30], "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,30,0], "extract_8php.html":[5,0,2,4], @@ -154,20 +160,20 @@ var NAVTREEINDEX3 = "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,4,2], "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,4,0], "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,4,1], -"fbrowser_8php.html":[5,0,1,26], -"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,26,0], +"fbrowser_8php.html":[5,0,1,28], +"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,28,0], "features_8php.html":[5,0,0,31], "features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,31,0], "features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,31,1], -"feed_8php.html":[5,0,1,27], -"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,27,0], -"filer_8php.html":[5,0,1,28], -"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,28,0], -"filerm_8php.html":[5,0,1,29], -"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,29,0], +"feed_8php.html":[5,0,1,29], +"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,29,0], +"filer_8php.html":[5,0,1,30], +"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,30,0], +"filerm_8php.html":[5,0,1,31], +"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,31,0], "files.html":[5,0], -"filestorage_8php.html":[5,0,1,30], -"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,30,0], +"filestorage_8php.html":[5,0,1,32], +"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,32,0], "fpostit_8php.html":[5,0,2,0,0], "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0], "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[5,0,2,0,0,1], @@ -188,9 +194,9 @@ var NAVTREEINDEX3 = "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,5,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,5,3], "friendica__smarty_8php.html":[5,0,0,33], -"fsuggest_8php.html":[5,0,1,32], -"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,32,1], -"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,32,0], +"fsuggest_8php.html":[5,0,1,34], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,34,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,34,0], "full_8php.html":[5,0,3,0,1], "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0], "functions.html":[4,3,0], @@ -214,8 +220,8 @@ var NAVTREEINDEX3 = "functions_0x73.html":[4,3,0,17], "functions_0x74.html":[4,3,0,18], "functions_0x76.html":[4,3,0,19], -"functions_func.html":[4,3,1], "functions_func.html":[4,3,1,0], +"functions_func.html":[4,3,1], "functions_func_0x61.html":[4,3,1,1], "functions_func_0x62.html":[4,3,1,2], "functions_func_0x63.html":[4,3,1,3], @@ -235,19 +241,13 @@ 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], "globals.html":[5,1,0,0], +"globals.html":[5,1,0], "globals_0x5f.html":[5,1,0,1], "globals_0x61.html":[5,1,0,2], "globals_0x62.html":[5,1,0,3], "globals_0x63.html":[5,1,0,4], "globals_0x64.html":[5,1,0,5], "globals_0x65.html":[5,1,0,6], -"globals_0x66.html":[5,1,0,7], -"globals_0x67.html":[5,1,0,8], -"globals_0x68.html":[5,1,0,9], -"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_0x66.html":[5,1,0,7] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 06c60cd20..4b5facae7 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,11 @@ var NAVTREEINDEX4 = { +"globals_0x67.html":[5,1,0,8], +"globals_0x68.html":[5,1,0,9], +"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], @@ -13,8 +19,8 @@ var NAVTREEINDEX4 = "globals_0x77.html":[5,1,0,24], "globals_0x78.html":[5,1,0,25], "globals_0x7a.html":[5,1,0,26], -"globals_func.html":[5,1,1], "globals_func.html":[5,1,1,0], +"globals_func.html":[5,1,1], "globals_func_0x61.html":[5,1,1,1], "globals_func_0x62.html":[5,1,1,2], "globals_func_0x63.html":[5,1,1,3], @@ -40,8 +46,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], "globals_vars.html":[5,1,2,0], +"globals_vars.html":[5,1,2], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -66,15 +72,15 @@ var NAVTREEINDEX4 = "gprobe_8php.html":[5,0,0,34], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,34,0], "greenthumbnails_8php.html":[5,0,3,1,0,1,3], -"help_8php.html":[5,0,1,34], -"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,34,1], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,34,0], +"help_8php.html":[5,0,1,36], +"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,36,1], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,36,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], +"home_8php.html":[5,0,1,37], +"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,37,0], +"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,37,1], +"hostxrd_8php.html":[5,0,1,38], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,38,0], "html2bbcode_8php.html":[5,0,0,36], "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,36,3], "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,36,1], @@ -86,28 +92,31 @@ var NAVTREEINDEX4 = "html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,37,2], "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,10], -"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,38,14], -"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,38,13], +"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,38,3], +"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,38,2], +"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,11], +"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,38,17], +"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,38,16], "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#a5b815330f3d177ab383af37a6c12e532":[5,0,0,38,20], +"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,38,21], "identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,38,1], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,15], +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,18], +"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,38,14], "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,9], +"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,38,10], +"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[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,11], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,12], "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,38,4], -"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,38,12], +"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,38,15], +"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,38,13], "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], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,19], +"import_8php.html":[5,0,1,39], +"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,39,1], +"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,39,0], "include_2api_8php.html":[5,0,0,5], "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], @@ -240,14 +249,5 @@ var NAVTREEINDEX4 = "include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,46,0], "include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,46,3], "include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,15], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,11], -"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,1], -"include_2notify_8php.html":[5,0,0,48], -"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,48,0], -"include_2oembed_8php.html":[5,0,0,50], -"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,50,5], -"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_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,11] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index d6e5085ff..fcbb2eb59 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,14 @@ var NAVTREEINDEX5 = { +"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,1], +"include_2notify_8php.html":[5,0,0,48], +"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,48,0], +"include_2oembed_8php.html":[5,0,0,50], +"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,50,5], +"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], @@ -16,16 +25,16 @@ var NAVTREEINDEX5 = "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], -"invite_8php.html":[5,0,1,38], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,38,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,38,1], -"item_8php.html":[5,0,1,39], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,39,0], -"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,39,3], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,39,5], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,39,4], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,39,1], -"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,39,2], +"invite_8php.html":[5,0,1,40], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,40,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,40,1], +"item_8php.html":[5,0,1,41], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,41,0], +"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,41,3], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,41,5], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,41,4], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,41,1], +"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,41,2], "items_8php.html":[5,0,0,41], "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,53], "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,41,2], @@ -91,23 +100,26 @@ var NAVTREEINDEX5 = "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,42,5], "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,42,2], "language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,42,8], -"layouts_8php.html":[5,0,1,40], -"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,40,0], -"like_8php.html":[5,0,1,41], -"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,41,0], -"lockview_8php.html":[5,0,1,42], -"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,42,0], -"login_8php.html":[5,0,1,43], -"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,43,0], -"lostpass_8php.html":[5,0,1,44], -"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,44,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,44,1], -"magic_8php.html":[5,0,1,45], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,45,0], -"manage_8php.html":[5,0,1,46], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,46,0], -"match_8php.html":[5,0,1,47], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,47,0], +"layouts_8php.html":[5,0,1,42], +"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,42,0], +"like_8php.html":[5,0,1,43], +"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,43,0], +"lockview_8php.html":[5,0,1,44], +"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,44,0], +"login_8php.html":[5,0,1,45], +"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,45,0], +"lostpass_8php.html":[5,0,1,46], +"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,46,0], +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,46,1], +"magic_8php.html":[5,0,1,47], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,47,0], +"mail_8php.html":[5,0,1,48], +"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[5,0,1,48,0], +"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[5,0,1,48,1], +"manage_8php.html":[5,0,1,49], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,49,0], +"match_8php.html":[5,0,1,50], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,50,0], "md_README.html":[2], "md_config.html":[0], "md_fresh.html":[1], @@ -119,52 +131,50 @@ var NAVTREEINDEX5 = "minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,1,0,1,4,0], "minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,1,0,1,4,2], "minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,1,0,1,4,1], -"mitem_8php.html":[5,0,1,50], -"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,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], -"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,18,1], -"mod_2follow_8php.html":[5,0,1,31], -"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,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,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], -"mod_2notify_8php.html":[5,0,1,57], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,57,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,57,0], -"mod_2oembed_8php.html":[5,0,1,58], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,58,0], -"mod_2photos_8php.html":[5,0,1,64], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,64,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,64,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,64,1], +"mitem_8php.html":[5,0,1,53], +"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,53,2], +"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,53,0], +"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,53,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_2directory_8php.html":[5,0,1,19], +"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,19,1], +"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,19,0], +"mod_2follow_8php.html":[5,0,1,33], +"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,33,1], +"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,33,0], +"mod_2group_8php.html":[5,0,1,35], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,35,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,35,1], +"mod_2menu_8php.html":[5,0,1,51], +"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,51,0], +"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,51,1], +"mod_2message_8php.html":[5,0,1,52], +"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[5,0,1,52,0], +"mod_2network_8php.html":[5,0,1,56], +"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,56,1], +"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,56,0], +"mod_2notify_8php.html":[5,0,1,60], +"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,60,1], +"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,60,0], +"mod_2oembed_8php.html":[5,0,1,61], +"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,61,0], +"mod_2photos_8php.html":[5,0,1,67], +"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,67,2], +"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,67,0], +"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,67,1], "mod__import_8php.html":[5,0,3,0,3], "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,3,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], -"msearch_8php.html":[5,0,1,52], -"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,52,0], +"mood_8php.html":[5,0,1,54], +"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,54,0], +"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,54,1], +"msearch_8php.html":[5,0,1,55], +"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,55,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[3,0,0], @@ -175,50 +185,50 @@ var NAVTREEINDEX5 = "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], "namespaces.html":[3,0], -"namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[3,0,3], +"namespaceupdatetpl.html":[4,0,3], "namespaceutil.html":[4,0,4], "namespaceutil.html":[3,0,4], "nav_8php.html":[5,0,0,45], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,45,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,45,1], -"new__channel_8php.html":[5,0,1,54], -"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], +"new__channel_8php.html":[5,0,1,57], +"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,57,2], +"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,57,1], +"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,57,0], "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], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,56,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,56,0], +"notes_8php.html":[5,0,1,58], +"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,58,0], +"notifications_8php.html":[5,0,1,59], +"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,59,1], +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,59,0], "notifier_8php.html":[5,0,0,47], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,47,0], "oauth_8php.html":[5,0,0,49], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,49,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,49,2], -"oexchange_8php.html":[5,0,1,59], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,59,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,59,1], +"oexchange_8php.html":[5,0,1,62], +"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,62,0], +"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,62,1], "olddefault_8php.html":[5,0,3,1,0,1,5], "onedirsync_8php.html":[5,0,0,51], "onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,51,0], "onepoll_8php.html":[5,0,0,52], "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,52,0], -"opensearch_8php.html":[5,0,1,60], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,60,0], -"page_8php.html":[5,0,1,61], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,61,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,61,0], +"opensearch_8php.html":[5,0,1,63], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,63,0], +"page_8php.html":[5,0,1,64], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,64,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,64,0], "page__widgets_8php.html":[5,0,0,53], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,53,1], "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,53,0], "pages.html":[], -"parse__url_8php.html":[5,0,1,62], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,62,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,62,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,62,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,62,0], +"parse__url_8php.html":[5,0,1,65], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,65,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,65,3], +"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,65,1], +"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,65,0], "passion_8php.html":[5,0,3,1,0,1,6], "passionwide_8php.html":[5,0,3,1,0,1,7], "permissions_8php.html":[5,0,0,54], @@ -227,8 +237,8 @@ var NAVTREEINDEX5 = "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,54,3], "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,54,4], "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,54,1], -"photo_8php.html":[5,0,1,63], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,63,0], +"photo_8php.html":[5,0,1,66], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,66,0], "photo__driver_8php.html":[5,0,0,1,0], "photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca":[5,0,0,1,0,3], "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2], @@ -239,15 +249,5 @@ var NAVTREEINDEX5 = "php2po_8php.html":[5,0,2,6], "php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[5,0,2,6,7], "php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[5,0,2,6,5], -"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[5,0,2,6,6], -"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,6,3], -"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,6,0], -"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,6,1], -"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,6,4], -"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,5], -"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,5,0], -"php_8php.html":[5,0,1,65] +"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[5,0,2,6,6] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 82557738b..0757cc286 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,9 +1,19 @@ var NAVTREEINDEX6 = { -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,65,0], +"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,6,3], +"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,6,0], +"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,6,1], +"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,6,4], +"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,5], +"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,5,0], +"php_8php.html":[5,0,1,68], +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,68,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], +"ping_8php.html":[5,0,1,69], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,69,0], "plugin_8php.html":[5,0,0,56], "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,21], "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,24], @@ -37,16 +47,16 @@ var NAVTREEINDEX6 = "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,56,5], "po2php_8php.html":[5,0,2,7], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0], -"poco_8php.html":[5,0,1,67], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,67,0], -"poke_8php.html":[5,0,1,68], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,68,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,68,0], +"poco_8php.html":[5,0,1,70], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,70,0], +"poke_8php.html":[5,0,1,71], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,71,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,71,0], "poller_8php.html":[5,0,0,57], "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,57,0], -"post_8php.html":[5,0,1,69], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,69,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,69,1], +"post_8php.html":[5,0,1,72], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,72,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,72,1], "post__to__red_8php.html":[5,0,2,1,0,0], "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823":[5,0,2,1,0,0,16], "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,0,12], @@ -72,36 +82,36 @@ var NAVTREEINDEX6 = "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,0,18], "post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,0,23], "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,0,11], -"pretheme_8php.html":[5,0,1,70], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,70,0], -"probe_8php.html":[5,0,1,71], -"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,71,0], -"profile_8php.html":[5,0,1,72], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,72,0], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,72,1], -"profile__photo_8php.html":[5,0,1,73], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,73,0], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,73,1], +"pretheme_8php.html":[5,0,1,73], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,73,0], +"probe_8php.html":[5,0,1,74], +"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,74,0], +"profile_8php.html":[5,0,1,75], +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,75,0], +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,75,1], +"profile__photo_8php.html":[5,0,1,76], +"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,76,0], +"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,76,1], "profile__selectors_8php.html":[5,0,0,58], "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,58,2], "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,58,1], "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,58,0], -"profiles_8php.html":[5,0,1,74], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,74,1], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,74,0], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,74,2], -"profperm_8php.html":[5,0,1,75], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,75,1], -"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], +"profiles_8php.html":[5,0,1,77], +"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,77,1], +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,77,0], +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,77,2], +"profperm_8php.html":[5,0,1,78], +"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,78,1], +"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,78,0], +"pubsites_8php.html":[5,0,1,79], +"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,79,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,77], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,77,0], +"randprof_8php.html":[5,0,1,80], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,80,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], @@ -134,30 +144,28 @@ 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], -"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], +"register_8php.html":[5,0,1,81], +"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,81,0], +"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,81,2], +"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,81,1], +"regmod_8php.html":[5,0,1,82], +"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,82,0], +"removeme_8php.html":[5,0,1,83], +"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,83,0], +"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,83,1], +"rmagic_8php.html":[5,0,1,84], +"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,84,0], +"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,84,2], +"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,84,1], +"rpost_8php.html":[5,0,1,85], +"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,85,0], +"rsd__xml_8php.html":[5,0,1,86], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,86,0], +"search_8php.html":[5,0,1,87], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,87,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,87,1], +"search__ac_8php.html":[5,0,1,88], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,88,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], @@ -182,36 +190,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,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], +"settings_8php.html":[5,0,1,89], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,89,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,89,1], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,89,2], +"setup_8php.html":[5,0,1,90], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,90,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,90,13], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,90,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,90,12], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,90,9], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,90,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,90,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,90,7], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,90,11], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,90,4], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,90,10], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,90,8], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,90,15], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,90,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,90,14], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,90,6], +"share_8php.html":[5,0,1,91], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,91,0], +"siteinfo_8php.html":[5,0,1,92], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,92,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,92,0], +"sitelist_8php.html":[5,0,1,93], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,93,0], +"smilies_8php.html":[5,0,1,94], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,94,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], @@ -222,32 +230,24 @@ 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,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], +"sources_8php.html":[5,0,1,95], +"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,95,0], +"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,95,1], +"sslify_8php.html":[5,0,1,96], +"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,96,0], +"starred_8php.html":[5,0,1,97], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,97,0], +"subthread_8php.html":[5,0,1,98], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,98,0], +"suggest_8php.html":[5,0,1,99], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,99,0], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,99,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,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], -"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,67,2], -"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#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,67,1], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,67,13], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,67,12] +"tagger_8php.html":[5,0,1,100], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,100,0], +"tagrm_8php.html":[5,0,1,101], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,101,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,101,0], +"taxonomy_8php.html":[5,0,0,67] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 173e233a8..dd4c374b5 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,15 @@ var NAVTREEINDEX7 = { +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,67,8], +"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,67,0], +"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,67,2], +"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#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], @@ -16,7 +26,7 @@ var NAVTREEINDEX7 = "text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,69,11], "text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,69,44], "text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,69,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,78], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,79], "text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,69,32], "text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,69,35], "text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,69,49], @@ -25,20 +35,21 @@ var NAVTREEINDEX7 = "text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,69,47], "text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,69,42], "text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,69,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,86], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,75], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,87], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,76], "text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,69,48], "text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,69,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,88], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,89], "text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,69,23], -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,83], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,81], +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,84], +"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,69,73], +"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,82], "text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,69,30], "text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,69,41], "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,72], "text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,69,7], "text_8php.html#a3ef8c0cf31f35f77462067de8712fa34":[5,0,0,69,28], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,84], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,85], "text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,33], "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,71], "text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,69,31], @@ -47,20 +58,20 @@ var NAVTREEINDEX7 = "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,69,50], "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,69,24], "text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,69,60], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,80], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,81], "text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,69,9], "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,69,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,79], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,80], "text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,69,40], "text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,69,27], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,76], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,77], "text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,69,1], "text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,69,34], "text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,69,26], -"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,77], +"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,78], "text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,69,8], "text_8php.html#a876e94892867019935b348b573299352":[5,0,0,69,68], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,73], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,74], "text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,69,15], "text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,69,20], "text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,69,59], @@ -74,10 +85,10 @@ var NAVTREEINDEX7 = "text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,69,17], "text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,69,55], "text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,69,36], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,87], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,88], "text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,69,69], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,82], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,85], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,83], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,86], "text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,69,56], "text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,69,37], "text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,70], @@ -92,7 +103,7 @@ var NAVTREEINDEX7 = "text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,69,57], "text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,69,25], "text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,69,0], -"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,74], +"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,75], "text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,69,62], "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,69,22], "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,69,12], @@ -108,13 +119,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,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], +"thing_8php.html":[5,0,1,102], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,102,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,102,1], +"toggle__mobile_8php.html":[5,0,1,103], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,103,0], +"toggle__safesearch_8php.html":[5,0,1,104], +"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,104,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], @@ -128,18 +139,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,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], +"uexport_8php.html":[5,0,1,105], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,105,0], +"update__channel_8php.html":[5,0,1,106], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,106,0], +"update__community_8php.html":[5,0,1,107], +"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,107,0], +"update__display_8php.html":[5,0,1,108], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,108,0], +"update__network_8php.html":[5,0,1,109], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,109,0], +"update__search_8php.html":[5,0,1,110], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,110,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], @@ -167,54 +178,60 @@ 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,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], +"view_8php.html":[5,0,1,111], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,111,0], +"viewconnections_8php.html":[5,0,1,112], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,112,1], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,112,0], +"viewsrc_8php.html":[5,0,1,113], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,113,0], +"vote_8php.html":[5,0,1,114], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,114,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,114,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,114,1], +"wall__attach_8php.html":[5,0,1,115], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,115,0], +"wall__upload_8php.html":[5,0,1,116], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,116,0], +"webfinger_8php.html":[5,0,1,117], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,117,0], +"webpages_8php.html":[5,0,1,118], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,118,0], +"wfinger_8php.html":[5,0,1,119], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,119,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,15], +"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,70,7], +"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,70,19], "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,16], -"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,70,11], -"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,8], +"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[5,0,0,70,5], +"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[5,0,0,70,13], +"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,70,14], +"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,70,8], +"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,70,20], +"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,70,15], +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,11], "widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,70,1], -"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,13], +"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,17], +"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,70,6], "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#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,70,18], +"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,70,16], +"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,70,22], +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,70,10], "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#ade630b19fb4c622b7b2f6f8ef89eefa2":[5,0,0,70,9], +"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,70,21], "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], +"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,70,12], +"xchan_8php.html":[5,0,1,120], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,120,0], +"xrd_8php.html":[5,0,1,121], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,121,0], +"xref_8php.html":[5,0,1,122], +"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,122,0], +"zfinger_8php.html":[5,0,1,123], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,123,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], @@ -232,20 +249,5 @@ var NAVTREEINDEX7 = "zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,71,24], "zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,71,19], "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,71,12], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,71,11], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,71,14], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,71,23], -"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,71,16], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,71,27], -"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,71,9], -"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,71,1], -"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[5,0,0,71,4], -"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,71,2], -"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,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] +"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,71,11] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 1747bda19..c532f77d8 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,18 @@ var NAVTREEINDEX8 = { +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,71,14], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,71,23], +"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,71,16], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,71,27], +"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,71,9], +"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,71,1], +"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[5,0,0,71,4], +"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,71,2], +"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,124], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,124,0], "zping_8php.html":[5,0,1,125], "zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,125,0] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index ee986e74a..2311ab23c 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(), connedit_content(), editblock_content(), editlayout_content(), editwebpage_content(), filestorage_content(), layouts_content(), page_content(), webpages_content(), and zfinger_init().

    +

    Referenced by achievements_content(), 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
    -

    Referenced by connedit_content(), create_identity(), get_all_perms(), message_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().

    +

    Referenced by connedit_content(), create_identity(), get_all_perms(), mail_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().

    diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index 1b64b003a..8f9d5b998 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_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().

    +

    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(), dirprofile_init(), 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(), mail_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(), sslify_init(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().

    @@ -182,7 +182,7 @@ Variables
    -

    Referenced by po2php_run().

    +

    Referenced by dirprofile_init(), and po2php_run().

    diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 1741fff27..a2d52fdb9 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_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().

    +

    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(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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 cbdc0ae40..591fbc569 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -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(), 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().

    +

    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(), dirprofile_init(), 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(), mail_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().

    diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html index 518ca703d..ca5ac2fb3 100644 --- a/doc/html/post_8php.html +++ b/doc/html/post_8php.html @@ -141,7 +141,7 @@ Functions

    The sender of this packet is an arbitrary/random site channel. The recipients will be a single recipient corresponding to the guid and guid_sig we have associated with the requesting auth identity

    { "type":"auth_check", "sender":{ "guid":"kgVFf_...", "guid_sig":"PT9-TApz...", "url":"http:\/\/podunk.edu", "url_sig":"T8Bp7j..." }, "recipients":{ { "guid":"ZHSqb...", "guid_sig":"JsAAXi..." } } "callback":"\/post", "version":1, "secret":"1eaa661", "secret_sig":"eKV968b1..." }

    auth_check messages MUST use encapsulated encryption. This message is sent to the origination site, which checks the 'secret' to see if it is the same as the 'sec' which it passed originally. It also checks the secret_sig which is the secret signed by the destination channel's private key and base64url encoded. If everything checks out, a json packet is returned:

    -

    { "success":1, "confirm":"q0Ysovd1u..." "service_class":(optional) }

    +

    { "success":1, "confirm":"q0Ysovd1u..." "service_class":(optional) "level":(optional) }

    'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the base64url encoded whirlpool hash of the requestor's guid and guid_sig; signed with the source channel private key. This prevents a man-in-the-middle from inserting a rogue success packet. Upon receipt and successful verification of this packet, the destination site will redirect to the original destination URL and indicate a successful remote login. Service_class can be used by cooperating sites to provide different access rights based on account rights and subscription plans. It is a string whose contents are not defined by protocol. Example: "basic" or "gold".

    diff --git a/doc/html/pubsites_8php.html b/doc/html/pubsites_8php.html index f9f83cae7..0972e9cd4 100644 --- a/doc/html/pubsites_8php.html +++ b/doc/html/pubsites_8php.html @@ -130,6 +130,8 @@ Functions
    +

    Referenced by register_content().

    +
    diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index d2fefe5fa..796a61fc9 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -28,6 +28,8 @@ var searchData= ['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']]], + ['achievements_2ephp',['achievements.php',['../achievements_8php.html',1,'']]], + ['achievements_5fcontent',['achievements_content',['../achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e',1,'achievements.php']]], ['acknowledge_5fpermissions',['acknowledge_permissions',['../classProtoDriver.html#a1593f3abae050edbd9304f4f8bc4894a',1,'ProtoDriver\acknowledge_permissions()'],['../classZotDriver.html#a3cfdf443da4e5326e205855d7c0054f2',1,'ZotDriver\acknowledge_permissions()']]], ['acl_2ephp',['acl.php',['../acl_8php.html',1,'']]], ['acl_5finit',['acl_init',['../acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a',1,'acl.php']]], @@ -158,8 +160,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',['../mod_2attach_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], + ['attach_2ephp',['attach.php',['../mod_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 45994dfef..151b69171 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -132,8 +132,8 @@ var searchData= ['count_5fcommon_5ffriends_5fzcid',['count_common_friends_zcid',['../socgraph_8php.html#af175807406d94407a5e11742a3287746',1,'socgraph.php']]], ['count_5fdescendants',['count_descendants',['../classItem.html#aca1e66988ed00cd627b2a359b72cd0ae',1,'Item\count_descendants()'],['../conversation_8php.html#ab2383dff4f823e580399ff469d90ab19',1,'count_descendants(): conversation.php']]], ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], - ['create_5fdir_5faccount',['create_dir_account',['../identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd',1,'identity.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], + ['create_5fsys_5fchannel',['create_sys_channel',['../identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05',1,'identity.php']]], ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], ['cronhooks_2ephp',['cronhooks.php',['../cronhooks_8php.html',1,'']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 5a666fcdc..040e73cc4 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -55,7 +55,6 @@ var searchData= ['dir_5ftagblock',['dir_tagblock',['../taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1',1,'taxonomy.php']]], ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]], - ['directory_5faside',['directory_aside',['../mod_2directory_8php.html#aa1d928543212871491706216742dd73c',1,'directory.php']]], ['directory_5fcontent',['directory_content',['../mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44',1,'directory.php']]], ['directory_5ffallback_5fmaster',['DIRECTORY_FALLBACK_MASTER',['../boot_8php.html#abedd940e664017c61b48c6efa31d0cb8',1,'boot.php']]], ['directory_5finit',['directory_init',['../mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf',1,'directory.php']]], @@ -65,6 +64,8 @@ var searchData= ['directory_5fmode_5fstandalone',['DIRECTORY_MODE_STANDALONE',['../boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8',1,'boot.php']]], ['directory_5frealm',['DIRECTORY_REALM',['../boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd',1,'boot.php']]], ['directory_5frun',['directory_run',['../include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0',1,'directory.php']]], + ['dirprofile_2ephp',['dirprofile.php',['../dirprofile_8php.html',1,'']]], + ['dirprofile_5finit',['dirprofile_init',['../dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052',1,'dirprofile.php']]], ['dirsearch_2ephp',['dirsearch.php',['../dirsearch_8php.html',1,'']]], ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]], ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 95b549ff9..4b0189bce 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -70,6 +70,7 @@ var searchData= ['get_5fredirect_5furl',['get_redirect_url',['../classItem.html#a428f448f89a8629055ea3294eb942aea',1,'Item']]], ['get_5frel_5flink',['get_rel_link',['../text_8php.html#a3972701c5c83624ec4e2d06242f614e7',1,'text.php']]], ['get_5frpost_5fpath',['get_rpost_path',['../zot_8php.html#a8e22dbc6f884be3644a892a876cbd972',1,'zot.php']]], + ['get_5fsys_5fchannel',['get_sys_channel',['../identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51',1,'identity.php']]], ['get_5ftags',['get_tags',['../text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623',1,'text.php']]], ['get_5ftemplate',['get_template',['../classItem.html#aba23a0a9d89e316d2b343cc46d695d91',1,'Item']]], ['get_5ftemplate_5fdata',['get_template_data',['../classConversation.html#a2a96b7a6573ae53db861624659e831cb',1,'Conversation\get_template_data()'],['../classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8',1,'Item\get_template_data()']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index 4601373ca..dd7a0efc7 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -28,6 +28,8 @@ var searchData= ['is_5fa_5fdate_5farg',['is_a_date_arg',['../text_8php.html#a1557112a774ec00fa06ed6b6f6495506',1,'text.php']]], ['is_5fajax',['is_ajax',['../boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c',1,'boot.php']]], ['is_5fcommentable',['is_commentable',['../classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3',1,'Conversation\is_commentable()'],['../classItem.html#ac04525a8be24c12b0a2ae4ca1ba4b967',1,'Item\is_commentable()']]], + ['is_5fforeigner',['is_foreigner',['../identity_8php.html#ae2b140df652a55ca11bb6a99005fce35',1,'identity.php']]], + ['is_5fmember',['is_member',['../identity_8php.html#a9637c557e13d9671f3eeb124ab98212a',1,'identity.php']]], ['is_5fpreview',['is_preview',['../classConversation.html#adf25ce023b69a166c63c6e84e02c136a',1,'Conversation']]], ['is_5fsite_5fadmin',['is_site_admin',['../boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e',1,'boot.php']]], ['is_5fthreaded',['is_threaded',['../classItem.html#a5b2fafdca55aefeaa08993a5a60529f0',1,'Item']]], @@ -39,6 +41,7 @@ var searchData= ['item',['Item',['../classItem.html',1,'']]], ['item_2ephp',['item.php',['../item_8php.html',1,'']]], ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]], + ['item_5fbug',['ITEM_BUG',['../boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34',1,'boot.php']]], ['item_5fbuildblock',['ITEM_BUILDBLOCK',['../boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf',1,'boot.php']]], ['item_5fcheck_5fservice_5fclass',['item_check_service_class',['../item_8php.html#a5b1b36cb301a94b38150074f0d424e74',1,'item.php']]], ['item_5fcontent',['item_content',['../item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221',1,'item.php']]], diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js index 006d47f5f..5239f1a6f 100644 --- a/doc/html/search/all_6d.js +++ b/doc/html/search/all_6d.js @@ -4,9 +4,12 @@ var searchData= ['magic_5finit',['magic_init',['../magic_8php.html#acea2cc792849ca2d71d4b689f66518bf',1,'magic.php']]], ['magic_5flink',['magic_link',['../text_8php.html#a1e510c53624933ce9b7d6715784894db',1,'text.php']]], ['magiclink_5furl',['magiclink_url',['../text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6',1,'text.php']]], + ['mail_2ephp',['mail.php',['../mail_8php.html',1,'']]], + ['mail_5fcontent',['mail_content',['../mail_8php.html#a3c7c485fc69f92371e8b20936040eca1',1,'mail.php']]], ['mail_5fdeleted',['MAIL_DELETED',['../boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8',1,'boot.php']]], ['mail_5fisreply',['MAIL_ISREPLY',['../boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2',1,'boot.php']]], ['mail_5fobscured',['MAIL_OBSCURED',['../boot_8php.html#a44ae1542a805ffd7f826fb511db07374',1,'boot.php']]], + ['mail_5fpost',['mail_post',['../mail_8php.html#acfc2cc0bf4e0b178207758384977f25a',1,'mail.php']]], ['mail_5frecalled',['MAIL_RECALLED',['../boot_8php.html#ae4861de36017fe399c1839f778bad9f5',1,'boot.php']]], ['mail_5freplied',['MAIL_REPLIED',['../boot_8php.html#aa3679df31c8dad1b71816b0322d5baff',1,'boot.php']]], ['mail_5fseen',['MAIL_SEEN',['../boot_8php.html#a1fbb93cf030f07391f22cc2948744869',1,'boot.php']]], @@ -38,10 +41,9 @@ 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_2ephp',['message.php',['../mod_2message_8php.html',1,'']]], ['message_2ephp',['message.php',['../include_2message_8php.html',1,'']]], - ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]], - ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]], + ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]], + ['message_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]], ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32',1,'group.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 991e65ddf..3d3c82550 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -14,8 +14,6 @@ var searchData= ['search_5fac_5finit',['search_ac_init',['../search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138',1,'search_ac.php']]], ['search_5fcontent',['search_content',['../search_8php.html#ab2568591359edde5b483a6cd9a24b2cc',1,'search.php']]], ['search_5finit',['search_init',['../search_8php.html#acf19fd30f07f495781ca0d7a0a08b435',1,'search.php']]], - ['search_5fpost',['search_post',['../search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7',1,'search.php']]], - ['search_5fsaved_5fsearches',['search_saved_searches',['../search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6',1,'search.php']]], ['searchbox',['searchbox',['../text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447',1,'text.php']]], ['security_2ephp',['security.php',['../security_8php.html',1,'']]], ['select_5ftimezone',['select_timezone',['../datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f',1,'datetime.php']]], @@ -87,6 +85,9 @@ var searchData= ['ssl_5fpolicy_5ffull',['SSL_POLICY_FULL',['../boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc',1,'boot.php']]], ['ssl_5fpolicy_5fnone',['SSL_POLICY_NONE',['../boot_8php.html#af86c651547aa8f9e549ee40a09455549',1,'boot.php']]], ['ssl_5fpolicy_5fselfsign',['SSL_POLICY_SELFSIGN',['../boot_8php.html#adca48aee78465ae3064ca4432c0d87b5',1,'boot.php']]], + ['sslify',['sslify',['../text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9',1,'text.php']]], + ['sslify_2ephp',['sslify.php',['../sslify_8php.html',1,'']]], + ['sslify_5finit',['sslify_init',['../sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316',1,'sslify.php']]], ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]], ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]], ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]], @@ -99,8 +100,8 @@ var searchData= ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]], ['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']]], - ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['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,'']]], diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index 878d539c3..9301e9453 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -20,11 +20,15 @@ var searchData= ['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_5fdirsafemode',['widget_dirsafemode',['../widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091',1,'widgets.php']]], + ['widget_5fdirsort',['widget_dirsort',['../widgets_8php.html#a95c06bc9be133e89768746302d2ac395',1,'widgets.php']]], + ['widget_5fdirtags',['widget_dirtags',['../widgets_8php.html#a08035db02ff6a23260146b4c64153422',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_5fmenu_5fpreview',['widget_menu_preview',['../widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013',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']]], diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js index df22b5cc7..c3fc54170 100644 --- a/doc/html/search/all_78.js +++ b/doc/html/search/all_78.js @@ -6,6 +6,7 @@ var searchData= ['xchan_5fflags_5fcensored',['XCHAN_FLAGS_CENSORED',['../boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e',1,'boot.php']]], ['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_5fnormal',['XCHAN_FLAGS_NORMAL',['../boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6',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']]], @@ -16,5 +17,7 @@ var searchData= ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]], ['xpost_5fto_5fhtml2bbcode',['xpost_to_html2bbcode',['../post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66',1,'post_to_red.php']]], ['xrd_2ephp',['xrd.php',['../xrd_8php.html',1,'']]], - ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]] + ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]], + ['xref_2ephp',['xref.php',['../xref_8php.html',1,'']]], + ['xref_5finit',['xref_init',['../xref_8php.html#a9bee399213b8de8226b0d60834307473',1,'xref.php']]] ]; diff --git a/doc/html/search/files_61.js b/doc/html/search/files_61.js index a4965f4fa..9d8a93b78 100644 --- a/doc/html/search/files_61.js +++ b/doc/html/search/files_61.js @@ -1,12 +1,13 @@ var searchData= [ ['account_2ephp',['account.php',['../account_8php.html',1,'']]], + ['achievements_2ephp',['achievements.php',['../achievements_8php.html',1,'']]], ['acl_2ephp',['acl.php',['../acl_8php.html',1,'']]], ['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,'']]], - ['api_2ephp',['api.php',['../include_2api_8php.html',1,'']]], ['api_2ephp',['api.php',['../mod_2api_8php.html',1,'']]], + ['api_2ephp',['api.php',['../include_2api_8php.html',1,'']]], ['apps_2ephp',['apps.php',['../apps_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], diff --git a/doc/html/search/files_64.js b/doc/html/search/files_64.js index 7829f65a6..9d13417b9 100644 --- a/doc/html/search/files_64.js +++ b/doc/html/search/files_64.js @@ -17,6 +17,7 @@ var searchData= ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]], ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]], + ['dirprofile_2ephp',['dirprofile.php',['../dirprofile_8php.html',1,'']]], ['dirsearch_2ephp',['dirsearch.php',['../dirsearch_8php.html',1,'']]], ['display_2ephp',['display.php',['../display_8php.html',1,'']]], ['docblox_5ferrorchecker_2ephp',['docblox_errorchecker.php',['../docblox__errorchecker_8php.html',1,'']]] diff --git a/doc/html/search/files_6d.js b/doc/html/search/files_6d.js index bd759d5c7..1b8fc71cd 100644 --- a/doc/html/search/files_6d.js +++ b/doc/html/search/files_6d.js @@ -1,12 +1,13 @@ var searchData= [ ['magic_2ephp',['magic.php',['../magic_8php.html',1,'']]], + ['mail_2ephp',['mail.php',['../mail_8php.html',1,'']]], ['manage_2ephp',['manage.php',['../manage_8php.html',1,'']]], ['match_2ephp',['match.php',['../match_8php.html',1,'']]], ['menu_2ephp',['menu.php',['../mod_2menu_8php.html',1,'']]], ['menu_2ephp',['menu.php',['../include_2menu_8php.html',1,'']]], - ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]], ['message_2ephp',['message.php',['../include_2message_8php.html',1,'']]], + ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]], ['minimal_2ephp',['minimal.php',['../minimal_8php.html',1,'']]], ['minimalisticdarkness_2ephp',['minimalisticdarkness.php',['../minimalisticdarkness_8php.html',1,'']]], ['mitem_2ephp',['mitem.php',['../mitem_8php.html',1,'']]], diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js index 3ea04e15e..f43a68f92 100644 --- a/doc/html/search/files_73.js +++ b/doc/html/search/files_73.js @@ -12,6 +12,7 @@ var searchData= ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]], ['socgraph_2ephp',['socgraph.php',['../socgraph_8php.html',1,'']]], ['sources_2ephp',['sources.php',['../sources_8php.html',1,'']]], + ['sslify_2ephp',['sslify.php',['../sslify_8php.html',1,'']]], ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], diff --git a/doc/html/search/files_78.js b/doc/html/search/files_78.js index cd29e0cce..e725086d3 100644 --- a/doc/html/search/files_78.js +++ b/doc/html/search/files_78.js @@ -1,5 +1,6 @@ var searchData= [ ['xchan_2ephp',['xchan.php',['../xchan_8php.html',1,'']]], - ['xrd_2ephp',['xrd.php',['../xrd_8php.html',1,'']]] + ['xrd_2ephp',['xrd.php',['../xrd_8php.html',1,'']]], + ['xref_2ephp',['xref.php',['../xref_8php.html',1,'']]] ]; diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index 2d15fcf49..a06da1a37 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -7,6 +7,7 @@ var searchData= ['account_5fremove',['account_remove',['../Contact_8php.html#a6e64de7db60b7243dce45fb6347636ff',1,'Contact.php']]], ['account_5ftotal',['account_total',['../account_8php.html#a43e3042b2723d76915a030bac3c668b6',1,'account.php']]], ['account_5fverify_5fpassword',['account_verify_password',['../auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee',1,'auth.php']]], + ['achievements_5fcontent',['achievements_content',['../achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e',1,'achievements.php']]], ['acknowledge_5fpermissions',['acknowledge_permissions',['../classProtoDriver.html#a1593f3abae050edbd9304f4f8bc4894a',1,'ProtoDriver\acknowledge_permissions()'],['../classZotDriver.html#a3cfdf443da4e5326e205855d7c0054f2',1,'ZotDriver\acknowledge_permissions()']]], ['acl_5finit',['acl_init',['../acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a',1,'acl.php']]], ['activity_5fmatch',['activity_match',['../text_8php.html#af8a3e3a66a7b862d4510f145d2e13186',1,'text.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index d2dc663de..8f6d4350b 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -99,8 +99,8 @@ var searchData= ['count_5fcommon_5ffriends_5fzcid',['count_common_friends_zcid',['../socgraph_8php.html#af175807406d94407a5e11742a3287746',1,'socgraph.php']]], ['count_5fdescendants',['count_descendants',['../classItem.html#aca1e66988ed00cd627b2a359b72cd0ae',1,'Item\count_descendants()'],['../conversation_8php.html#ab2383dff4f823e580399ff469d90ab19',1,'count_descendants(): conversation.php']]], ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]], - ['create_5fdir_5faccount',['create_dir_account',['../identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd',1,'identity.php']]], ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]], + ['create_5fsys_5fchannel',['create_sys_channel',['../identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05',1,'identity.php']]], ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]], ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]], ['cronhooks_5frun',['cronhooks_run',['../cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca',1,'cronhooks.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 635a4e07c..bca5ccd30 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -33,10 +33,10 @@ var searchData= ['dir_5fsort_5flinks',['dir_sort_links',['../dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774',1,'dir_fns.php']]], ['dir_5ftagadelic',['dir_tagadelic',['../taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332',1,'taxonomy.php']]], ['dir_5ftagblock',['dir_tagblock',['../taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1',1,'taxonomy.php']]], - ['directory_5faside',['directory_aside',['../mod_2directory_8php.html#aa1d928543212871491706216742dd73c',1,'directory.php']]], ['directory_5fcontent',['directory_content',['../mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44',1,'directory.php']]], ['directory_5finit',['directory_init',['../mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf',1,'directory.php']]], ['directory_5frun',['directory_run',['../include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0',1,'directory.php']]], + ['dirprofile_5finit',['dirprofile_init',['../dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052',1,'dirprofile.php']]], ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]], ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]], ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 6c1855b87..a2299d1e8 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -70,6 +70,7 @@ var searchData= ['get_5fredirect_5furl',['get_redirect_url',['../classItem.html#a428f448f89a8629055ea3294eb942aea',1,'Item']]], ['get_5frel_5flink',['get_rel_link',['../text_8php.html#a3972701c5c83624ec4e2d06242f614e7',1,'text.php']]], ['get_5frpost_5fpath',['get_rpost_path',['../zot_8php.html#a8e22dbc6f884be3644a892a876cbd972',1,'zot.php']]], + ['get_5fsys_5fchannel',['get_sys_channel',['../identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51',1,'identity.php']]], ['get_5ftags',['get_tags',['../text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623',1,'text.php']]], ['get_5ftemplate',['get_template',['../classItem.html#aba23a0a9d89e316d2b343cc46d695d91',1,'Item']]], ['get_5ftemplate_5fdata',['get_template_data',['../classConversation.html#a2a96b7a6573ae53db861624659e831cb',1,'Conversation\get_template_data()'],['../classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8',1,'Item\get_template_data()']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 97aeb2799..38470b08d 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -24,6 +24,8 @@ var searchData= ['is_5fa_5fdate_5farg',['is_a_date_arg',['../text_8php.html#a1557112a774ec00fa06ed6b6f6495506',1,'text.php']]], ['is_5fajax',['is_ajax',['../boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c',1,'boot.php']]], ['is_5fcommentable',['is_commentable',['../classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3',1,'Conversation\is_commentable()'],['../classItem.html#ac04525a8be24c12b0a2ae4ca1ba4b967',1,'Item\is_commentable()']]], + ['is_5fforeigner',['is_foreigner',['../identity_8php.html#ae2b140df652a55ca11bb6a99005fce35',1,'identity.php']]], + ['is_5fmember',['is_member',['../identity_8php.html#a9637c557e13d9671f3eeb124ab98212a',1,'identity.php']]], ['is_5fpreview',['is_preview',['../classConversation.html#adf25ce023b69a166c63c6e84e02c136a',1,'Conversation']]], ['is_5fsite_5fadmin',['is_site_admin',['../boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e',1,'boot.php']]], ['is_5fthreaded',['is_threaded',['../classItem.html#a5b2fafdca55aefeaa08993a5a60529f0',1,'Item']]], diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js index faa0fc13d..4ceedb978 100644 --- a/doc/html/search/functions_6d.js +++ b/doc/html/search/functions_6d.js @@ -3,6 +3,8 @@ var searchData= ['magic_5finit',['magic_init',['../magic_8php.html#acea2cc792849ca2d71d4b689f66518bf',1,'magic.php']]], ['magic_5flink',['magic_link',['../text_8php.html#a1e510c53624933ce9b7d6715784894db',1,'text.php']]], ['magiclink_5furl',['magiclink_url',['../text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6',1,'text.php']]], + ['mail_5fcontent',['mail_content',['../mail_8php.html#a3c7c485fc69f92371e8b20936040eca1',1,'mail.php']]], + ['mail_5fpost',['mail_post',['../mail_8php.html#acfc2cc0bf4e0b178207758384977f25a',1,'mail.php']]], ['mail_5fstore',['mail_store',['../items_8php.html#a77da7ce9a117601d49ac4a67c71b514f',1,'items.php']]], ['manage_5fcontent',['manage_content',['../manage_8php.html#a2bca247b5296827638959138367db4f5',1,'manage.php']]], ['manual_5fconfig',['manual_config',['../setup_8php.html#abe405d227ba7232971964a706d4f3bce',1,'setup.php']]], @@ -23,8 +25,7 @@ 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_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]], - ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]], + ['message_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]], ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32',1,'group.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 835d6049c..acaf952fd 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -12,8 +12,6 @@ var searchData= ['search_5fac_5finit',['search_ac_init',['../search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138',1,'search_ac.php']]], ['search_5fcontent',['search_content',['../search_8php.html#ab2568591359edde5b483a6cd9a24b2cc',1,'search.php']]], ['search_5finit',['search_init',['../search_8php.html#acf19fd30f07f495781ca0d7a0a08b435',1,'search.php']]], - ['search_5fpost',['search_post',['../search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7',1,'search.php']]], - ['search_5fsaved_5fsearches',['search_saved_searches',['../search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6',1,'search.php']]], ['searchbox',['searchbox',['../text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447',1,'text.php']]], ['select_5ftimezone',['select_timezone',['../datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f',1,'datetime.php']]], ['send',['send',['../classenotify.html#afbc088860f534c6c05788b48cfc262c6',1,'enotify']]], @@ -72,6 +70,8 @@ var searchData= ['sort_5fthr_5fcreated_5frev',['sort_thr_created_rev',['../conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0',1,'conversation.php']]], ['sources_5fcontent',['sources_content',['../sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7',1,'sources.php']]], ['sources_5fpost',['sources_post',['../sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e',1,'sources.php']]], + ['sslify',['sslify',['../text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9',1,'text.php']]], + ['sslify_5finit',['sslify_init',['../sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316',1,'sslify.php']]], ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]], ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]], ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index 5937176b6..90b12c339 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -13,11 +13,15 @@ var searchData= ['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_5fdirsafemode',['widget_dirsafemode',['../widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091',1,'widgets.php']]], + ['widget_5fdirsort',['widget_dirsort',['../widgets_8php.html#a95c06bc9be133e89768746302d2ac395',1,'widgets.php']]], + ['widget_5fdirtags',['widget_dirtags',['../widgets_8php.html#a08035db02ff6a23260146b4c64153422',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_5fmenu_5fpreview',['widget_menu_preview',['../widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013',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']]], diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js index 038aa6810..97e977ea8 100644 --- a/doc/html/search/functions_78.js +++ b/doc/html/search/functions_78.js @@ -8,5 +8,6 @@ var searchData= ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]], ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]], ['xpost_5fto_5fhtml2bbcode',['xpost_to_html2bbcode',['../post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66',1,'post_to_red.php']]], - ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]] + ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]], + ['xref_5finit',['xref_init',['../xref_8php.html#a9bee399213b8de8226b0d60834307473',1,'xref.php']]] ]; diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js index c71968467..dc5368a10 100644 --- a/doc/html/search/variables_69.js +++ b/doc/html/search/variables_69.js @@ -2,6 +2,7 @@ var searchData= [ ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]], ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]], + ['item_5fbug',['ITEM_BUG',['../boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34',1,'boot.php']]], ['item_5fbuildblock',['ITEM_BUILDBLOCK',['../boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf',1,'boot.php']]], ['item_5fdelayed_5fpublish',['ITEM_DELAYED_PUBLISH',['../boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20',1,'boot.php']]], ['item_5fdeleted',['ITEM_DELETED',['../boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49',1,'boot.php']]], diff --git a/doc/html/search/variables_78.js b/doc/html/search/variables_78.js index 2d66c8f08..75be51da5 100644 --- a/doc/html/search/variables_78.js +++ b/doc/html/search/variables_78.js @@ -3,6 +3,7 @@ var searchData= ['xchan_5fflags_5fcensored',['XCHAN_FLAGS_CENSORED',['../boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e',1,'boot.php']]], ['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_5fnormal',['XCHAN_FLAGS_NORMAL',['../boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6',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']]] diff --git a/doc/html/search_8php.html b/doc/html/search_8php.html index 74adf4da0..ec93dbf2b 100644 --- a/doc/html/search_8php.html +++ b/doc/html/search_8php.html @@ -112,12 +112,8 @@ $(document).ready(function(){initNavTree('search_8php.html','');}); - - - -

    Functions

     search_saved_searches ()
     
     search_init (&$a)
     
     search_post (&$a)
     
     search_content (&$a, $update=0, $load=false)
     
    @@ -170,39 +166,6 @@ Functions
    -
    - - -
    -
    - - - - - - - - -
    search_post (& $a)
    -
    - -
    -
    - -
    -
    - - - - - - - -
    search_saved_searches ()
    -
    - -

    Referenced by search_init().

    -
    diff --git a/doc/html/search_8php.js b/doc/html/search_8php.js index ffe2bd8fc..254c8c72e 100644 --- a/doc/html/search_8php.js +++ b/doc/html/search_8php.js @@ -1,7 +1,5 @@ var search_8php = [ [ "search_content", "search_8php.html#ab2568591359edde5b483a6cd9a24b2cc", null ], - [ "search_init", "search_8php.html#acf19fd30f07f495781ca0d7a0a08b435", null ], - [ "search_post", "search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7", null ], - [ "search_saved_searches", "search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6", null ] + [ "search_init", "search_8php.html#acf19fd30f07f495781ca0d7a0a08b435", null ] ]; \ No newline at end of file diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index 7a01392cd..90d2f9892 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -184,7 +184,7 @@ Functions
    -

    Referenced by directory_content().

    +

    Referenced by widget_dirtags().

    diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 14fb70f25..4b44bef8e 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -181,6 +181,8 @@ Functions    linkify ($s)   + sslify ($s) +   get_poke_verbs ()    get_mood_verbs () @@ -360,7 +362,7 @@ Variables
    -

    Referenced by channel_content(), community_content(), directory_content(), message_content(), and network_content().

    +

    Referenced by channel_content(), community_content(), directory_content(), message_content(), and network_content().

    @@ -529,7 +531,7 @@ Variables
    -

    Referenced by message_content(), and micropro().

    +

    Referenced by mail_content(), message_content(), and micropro().

    @@ -547,7 +549,7 @@ Variables
    -

    Referenced by Item\check_wall_to_wall(), directory_content(), fetch_post_tags(), Item\get_template_data(), localize_item(), randprof_init(), suggest_content(), and widget_suggestions().

    +

    Referenced by Item\check_wall_to_wall(), directory_content(), dirprofile_init(), fetch_post_tags(), Item\get_template_data(), localize_item(), randprof_init(), suggest_content(), and widget_suggestions().

    @@ -634,7 +636,7 @@ Variables
    -

    Referenced by mitem_content(), and widget_design_tools().

    +

    Referenced by widget_design_tools().

    @@ -686,7 +688,7 @@ Variables
    Returns
    string
    -

    Referenced by admin_page_logs(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), message_post(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().

    +

    Referenced by admin_page_logs(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().

    @@ -782,7 +784,7 @@ Variables
    -

    Referenced by item_post(), message_post(), and profiles_post().

    +

    Referenced by item_post(), mail_post(), and profiles_post().

    @@ -1051,7 +1053,7 @@ Variables
    -

    Referenced by import_directory_profile().

    +

    Referenced by dirprofile_init(), and import_directory_profile().

    @@ -1259,7 +1261,7 @@ Variables

    Function: linkify

    Replace naked text hyperlink with HTML formatted hyperlink

    -

    Referenced by advanced_profile(), and profile_activity().

    +

    Referenced by advanced_profile(), dirprofile_init(), and profile_activity().

    @@ -1287,7 +1289,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(), 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(), dirprofile_init(), 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_post(), mail_store(), menu_edit(), 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 +1470,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(), 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_post(), mail_store(), 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().

    @@ -1772,7 +1774,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(), 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().

    +

    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(), dirprofile_init(), 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(), mail_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(), 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().

    @@ -1950,7 +1952,33 @@ Variables

    It is expected that this function will be called using HTML text. We will escape text between HTML pre and code blocks from being processed.

    At a higher level, the bbcode [nosmile] tag can be used to prevent this function from being executed by the prepare_text() routine when preparing bbcode source for HTML display

    -

    Referenced by message_content(), and smilies_content().

    +

    Referenced by mail_content(), message_content(), and smilies_content().

    + + + + +
    +
    + + + + + + + + +
    sslify ( $s)
    +
    +

    sslify($s) Replace media element using http url with https to a local redirector if using https locally

    +
    Parameters
    + + +
    string$sLooks for HTML tags containing src elements that are http when we're viewing an https page Typically this throws an insecure content violation in the browser. So we redirect them to a local redirector which uses https and which redirects to the selected content
    +
    +
    +
    Returns
    string
    + +

    Referenced by prepare_body().

    @@ -1996,7 +2024,7 @@ Variables
    -

    Referenced by message_content(), and prepare_body().

    +

    Referenced by mail_content(), and prepare_body().

    diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index 525dbb5d8..5f85d6232 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -73,6 +73,7 @@ var text_8php = [ "smile_decode", "text_8php.html#aca0f589be74fab1a460c57e88dad9779", null ], [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ], [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ], + [ "sslify", "text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9", null ], [ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ], [ "theme_attachments", "text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53", null ], [ "unamp", "text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7", null ], diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 9a08f8c75..6b679743b 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(), 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().

    +

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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(), 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 9272454ca..d3e9c1b08 100644 --- a/doc/html/widgets_8php.html +++ b/doc/html/widgets_8php.html @@ -150,6 +150,14 @@ Functions    widget_vcard ($arr)   + widget_dirsafemode ($arr) +  + widget_dirsort ($arr) +  + widget_dirtags ($arr) +  + widget_menu_preview ($arr) + 

    Function Documentation

    @@ -230,6 +238,55 @@ Functions
    +
    + + +
    +
    + + + + + + + + +
    widget_dirsafemode ( $arr)
    +
    +

    The following directory widgets are only useful on the directory page

    + +
    +
    + +
    +
    + + + + + + + + +
    widget_dirsort ( $arr)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_dirtags ( $arr)
    +
    +
    @@ -310,6 +367,22 @@ Functions
    +
    + + +
    +
    + + + + + + + + +
    widget_menu_preview ( $arr)
    +
    +
    @@ -406,8 +479,6 @@ Functions
    -

    Referenced by directory_content().

    -
    diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js index 6af0e6423..65afb6aae 100644 --- a/doc/html/widgets_8php.js +++ b/doc/html/widgets_8php.js @@ -5,11 +5,15 @@ var widgets_8php = [ "widget_categories", "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b", null ], [ "widget_collections", "widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f", null ], [ "widget_design_tools", "widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b", null ], + [ "widget_dirsafemode", "widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091", null ], + [ "widget_dirsort", "widgets_8php.html#a95c06bc9be133e89768746302d2ac395", null ], + [ "widget_dirtags", "widgets_8php.html#a08035db02ff6a23260146b4c64153422", 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_menu_preview", "widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013", null ], [ "widget_notes", "widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256", null ], [ "widget_photo_albums", "widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e", null ], [ "widget_profile", "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ], diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 1efc34a39..b9e8c7180 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -422,7 +422,7 @@ Functions
    Returns
    array => 'success' (boolean true or false) 'message' (optional error string only if success is false)
    -

    Referenced by chanview_content(), gprobe_run(), magic_init(), message_post(), new_contact(), poco_load(), post_init(), update_directory_entry(), zot_refresh(), and zot_register_hub().

    +

    Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), update_directory_entry(), zot_refresh(), and zot_register_hub().

    @@ -823,7 +823,7 @@ which will be processed and delivered before this function ultimately returns.
    Returns
    : array => see z_post_url and mod/zfinger.php
    -

    Referenced by chanview_content(), gprobe_run(), magic_init(), message_post(), new_contact(), poco_load(), post_init(), probe_content(), and update_directory_entry().

    +

    Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), probe_content(), and update_directory_entry().

    diff --git a/include/features.php b/include/features.php index 40adf1d41..1f83eb319 100644 --- a/include/features.php +++ b/include/features.php @@ -28,7 +28,7 @@ function get_features() { // in any event this setting should probably be a theme option or plugin // array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), //FIXME - needs a description, but how the hell do we explain this to normals? - array('sendzid', t('Extended Identity Sharing'), t(' ')), + array('sendzid', t('Extended Identity Sharing'), t('Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix.')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')), array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel')), ), @@ -39,7 +39,7 @@ function get_features() { array('richtext', t('Richtext Editor'), t('Enable richtext editor')), array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds')), - array('content_encrypt', t('Even More Encryption'), t('Allow encryption of content end-to-end with a shared secret key')), + array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key')), ), // Network Tools diff --git a/mod/sslify.php b/mod/sslify.php index 84afec6dc..ed06d87c1 100644 --- a/mod/sslify.php +++ b/mod/sslify.php @@ -15,7 +15,10 @@ function sslify_init(&$a) { echo $x['body']; killme(); } - + killme(); + // for some reason when this fallback is in place - it gets triggered + // often, (creating mixed content exceptions) even though there is + // nothing obvious missing on the page when we bypass it. goaway($_REQUEST['url']); } diff --git a/util/messages.po b/util/messages.po index 96a8b76f1..a309e9e82 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-12-20.532\n" +"Project-Id-Version: 2013-12-27.539\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-20 00:02-0800\n" +"POT-Creation-Date: 2013-12-27 00:04-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,1186 +53,1452 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/dir_fns.php:15 -msgid "Sort Options" +#: ../../include/api.php:973 +msgid "Public Timeline" msgstr "" -#: ../../include/dir_fns.php:16 -msgid "Alphabetic" +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1415 +msgid "Logout" msgstr "" -#: ../../include/dir_fns.php:17 -msgid "Reverse Alphabetic" +#: ../../include/nav.php:72 ../../include/nav.php:87 +msgid "End this session" msgstr "" -#: ../../include/dir_fns.php:18 -msgid "Newest to Oldest" +#: ../../include/nav.php:75 ../../include/nav.php:121 +msgid "Home" msgstr "" -#: ../../include/dir_fns.php:30 -msgid "Enable Safe Search" +#: ../../include/nav.php:75 +msgid "Your posts and conversations" msgstr "" -#: ../../include/dir_fns.php:32 -msgid "Disable Safe Search" +#: ../../include/nav.php:76 ../../include/conversation.php:929 +#: ../../mod/connedit.php:309 ../../mod/connedit.php:423 +msgid "View Profile" msgstr "" -#: ../../include/dir_fns.php:34 -msgid "Safe Mode" +#: ../../include/nav.php:76 +msgid "Your profile page" msgstr "" -#: ../../include/api.php:973 -msgid "Public Timeline" +#: ../../include/nav.php:78 +msgid "Edit Profiles" msgstr "" -#: ../../include/enotify.php:40 -msgid "Red Matrix Notification" +#: ../../include/nav.php:78 +msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/enotify.php:41 -msgid "redmatrix" +#: ../../include/nav.php:79 ../../include/conversation.php:1459 +#: ../../mod/fbrowser.php:25 +msgid "Photos" msgstr "" -#: ../../include/enotify.php:43 -msgid "Thank You," +#: ../../include/nav.php:79 +msgid "Your photos" msgstr "" -#: ../../include/enotify.php:45 -#, php-format -msgid "%s Administrator" +#: ../../include/nav.php:85 ../../boot.php:1416 +msgid "Login" msgstr "" -#: ../../include/enotify.php:80 -#, php-format -msgid "%s " +#: ../../include/nav.php:85 +msgid "Sign in" msgstr "" -#: ../../include/enotify.php:84 +#: ../../include/nav.php:102 #, php-format -msgid "[Red:Notify] New mail received at %s" +msgid "%s - click to logout" msgstr "" -#: ../../include/enotify.php:86 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." +#: ../../include/nav.php:107 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/enotify.php:87 -#, php-format -msgid "%1$s sent you %2$s." +#: ../../include/nav.php:121 +msgid "Home Page" msgstr "" -#: ../../include/enotify.php:87 -msgid "a private message" +#: ../../include/nav.php:125 ../../mod/register.php:206 ../../boot.php:1392 +msgid "Register" msgstr "" -#: ../../include/enotify.php:88 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." +#: ../../include/nav.php:125 +msgid "Create an account" msgstr "" -#: ../../include/enotify.php:139 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +#: ../../include/nav.php:130 ../../mod/help.php:60 ../../mod/help.php:64 +msgid "Help" msgstr "" -#: ../../include/enotify.php:147 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +#: ../../include/nav.php:130 +msgid "Help and documentation" msgstr "" -#: ../../include/enotify.php:156 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +#: ../../include/nav.php:133 +msgid "Apps" msgstr "" -#: ../../include/enotify.php:167 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" +#: ../../include/nav.php:133 +msgid "Addon applications, utilities, games" msgstr "" -#: ../../include/enotify.php:168 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." +#: ../../include/nav.php:135 ../../include/text.php:736 +#: ../../include/text.php:750 ../../mod/search.php:28 +msgid "Search" msgstr "" -#: ../../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." +#: ../../include/nav.php:135 +msgid "Search site content" msgstr "" -#: ../../include/enotify.php:178 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" +#: ../../include/nav.php:138 ../../mod/directory.php:209 +msgid "Directory" msgstr "" -#: ../../include/enotify.php:180 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" +#: ../../include/nav.php:138 +msgid "Channel Locator" msgstr "" -#: ../../include/enotify.php:182 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +#: ../../include/nav.php:149 +msgid "Matrix" msgstr "" -#: ../../include/enotify.php:206 -#, php-format -msgid "[Red:Notify] %s tagged you" +#: ../../include/nav.php:149 +msgid "Your matrix" msgstr "" -#: ../../include/enotify.php:207 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../include/nav.php:150 +msgid "Mark all matrix notifications seen" msgstr "" -#: ../../include/enotify.php:208 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +#: ../../include/nav.php:152 +msgid "Channel Home" msgstr "" -#: ../../include/enotify.php:221 -#, php-format -msgid "[Red:Notify] %1$s poked you" +#: ../../include/nav.php:152 +msgid "Channel home" msgstr "" -#: ../../include/enotify.php:222 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" +#: ../../include/nav.php:153 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/enotify.php:223 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +#: ../../include/nav.php:156 +msgid "Intros" msgstr "" -#: ../../include/enotify.php:239 -#, php-format -msgid "[Red:Notify] %s tagged your post" +#: ../../include/nav.php:156 ../../mod/connections.php:242 +msgid "New Connections" msgstr "" -#: ../../include/enotify.php:240 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" +#: ../../include/nav.php:159 +msgid "Notices" msgstr "" -#: ../../include/enotify.php:241 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +#: ../../include/nav.php:159 +msgid "Notifications" msgstr "" -#: ../../include/enotify.php:253 -msgid "[Red:Notify] Introduction received" +#: ../../include/nav.php:160 +msgid "See all notifications" msgstr "" -#: ../../include/enotify.php:254 -#, php-format -msgid "%1$s, you've received an introduction from '%2$s' at %3$s" +#: ../../include/nav.php:161 +msgid "Mark all system notifications seen" msgstr "" -#: ../../include/enotify.php:255 -#, php-format -msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." +#: ../../include/nav.php:163 +msgid "Mail" msgstr "" -#: ../../include/enotify.php:259 ../../include/enotify.php:278 -#, php-format -msgid "You may visit their profile at %s" +#: ../../include/nav.php:163 +msgid "Private mail" msgstr "" -#: ../../include/enotify.php:261 -#, php-format -msgid "Please visit %s to approve or reject the introduction." +#: ../../include/nav.php:164 +msgid "See all private messages" msgstr "" -#: ../../include/enotify.php:268 -msgid "[Red:Notify] Friend suggestion received" +#: ../../include/nav.php:165 +msgid "Mark all private messages seen" msgstr "" -#: ../../include/enotify.php:269 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +#: ../../include/nav.php:166 +msgid "Inbox" msgstr "" -#: ../../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." +#: ../../include/nav.php:167 +msgid "Outbox" msgstr "" -#: ../../include/enotify.php:276 -msgid "Name:" +#: ../../include/nav.php:168 ../../include/widgets.php:509 +msgid "New Message" msgstr "" -#: ../../include/enotify.php:277 -msgid "Photo:" +#: ../../include/nav.php:171 ../../include/conversation.php:1470 +#: ../../mod/events.php:354 +msgid "Events" msgstr "" -#: ../../include/enotify.php:280 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../include/nav.php:171 +msgid "Event Calendar" msgstr "" -#: ../../include/ItemObject.php:88 ../../mod/photos.php:959 -msgid "Private Message" +#: ../../include/nav.php:172 +msgid "See all events" msgstr "" -#: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../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" +#: ../../include/nav.php:173 +msgid "Mark all events seen" msgstr "" -#: ../../include/ItemObject.php:107 ../../include/conversation.php:632 -#: ../../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" +#: ../../include/nav.php:175 +msgid "Channel Select" msgstr "" -#: ../../include/ItemObject.php:113 ../../include/conversation.php:631 -msgid "Select" +#: ../../include/nav.php:175 +msgid "Manage Your Channels" msgstr "" -#: ../../include/ItemObject.php:117 -msgid "save to folder" +#: ../../include/nav.php:177 ../../include/widgets.php:487 +#: ../../mod/admin.php:785 ../../mod/admin.php:990 +msgid "Settings" msgstr "" -#: ../../include/ItemObject.php:145 -msgid "add star" +#: ../../include/nav.php:177 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/ItemObject.php:146 -msgid "remove star" +#: ../../include/nav.php:179 ../../mod/connections.php:349 +msgid "Connections" msgstr "" -#: ../../include/ItemObject.php:147 -msgid "toggle star status" +#: ../../include/nav.php:179 +msgid "Manage/Edit Friends and Connections" msgstr "" -#: ../../include/ItemObject.php:151 -msgid "starred" +#: ../../include/nav.php:186 ../../mod/admin.php:111 +msgid "Admin" msgstr "" -#: ../../include/ItemObject.php:160 ../../include/conversation.php:642 -msgid "Message is verified" +#: ../../include/nav.php:186 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/ItemObject.php:168 -msgid "add tag" +#: ../../include/nav.php:212 +msgid "Nothing new here" msgstr "" -#: ../../include/ItemObject.php:174 ../../mod/photos.php:1065 -msgid "I like this (toggle)" +#: ../../include/nav.php:217 +msgid "Please wait..." msgstr "" -#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:251 -msgid "like" +#: ../../include/Contact.php:104 ../../include/widgets.php:115 +#: ../../include/widgets.php:155 ../../include/identity.php:625 +#: ../../mod/directory.php:182 ../../mod/match.php:62 ../../mod/suggest.php:51 +#: ../../mod/dirprofile.php:162 +msgid "Connect" msgstr "" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1066 -msgid "I don't like this (toggle)" +#: ../../include/Contact.php:120 +msgid "New window" msgstr "" -#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:252 -msgid "dislike" +#: ../../include/Contact.php:121 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/ItemObject.php:177 -msgid "Share this" +#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87 +msgid "Categories" msgstr "" -#: ../../include/ItemObject.php:177 -msgid "share" +#: ../../include/widgets.php:117 ../../mod/suggest.php:53 +msgid "Ignore/Hide" msgstr "" -#: ../../include/ItemObject.php:201 ../../include/ItemObject.php:202 +#: ../../include/widgets.php:123 ../../mod/connections.php:236 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:124 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:146 #, php-format -msgid "View %s's profile - %s" +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/widgets.php:152 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:153 +msgid "Enter the channel address" +msgstr "" + +#: ../../include/widgets.php:154 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:171 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:173 ../../include/text.php:738 +#: ../../include/text.php:752 ../../mod/filer.php:36 +msgid "Save" +msgstr "" + +#: ../../include/widgets.php:243 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:252 ../../include/features.php:50 +msgid "Saved Searches" +msgstr "" + +#: ../../include/widgets.php:253 ../../include/group.php:290 +msgid "add" +msgstr "" + +#: ../../include/widgets.php:283 ../../include/features.php:64 +#: ../../include/contact_widgets.php:53 +msgid "Saved Folders" +msgstr "" + +#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56 +#: ../../include/contact_widgets.php:90 +msgid "Everything" +msgstr "" + +#: ../../include/widgets.php:318 ../../include/items.php:3558 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:370 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:371 ../../mod/connedit.php:386 +msgid "Me" +msgstr "" + +#: ../../include/widgets.php:372 ../../mod/connedit.php:388 +msgid "Best Friends" +msgstr "" + +#: ../../include/widgets.php:373 ../../include/profile_selectors.php:42 +#: ../../include/identity.php:310 ../../mod/connedit.php:389 +msgid "Friends" +msgstr "" + +#: ../../include/widgets.php:374 +msgid "Co-workers" +msgstr "" + +#: ../../include/widgets.php:375 ../../mod/connedit.php:390 +msgid "Former Friends" +msgstr "" + +#: ../../include/widgets.php:376 ../../mod/connedit.php:391 +msgid "Acquaintances" +msgstr "" + +#: ../../include/widgets.php:377 +msgid "Everybody" +msgstr "" + +#: ../../include/widgets.php:409 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:415 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:421 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:427 +msgid "Feature settings" +msgstr "" + +#: ../../include/widgets.php:433 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:439 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:445 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:457 +msgid "Automatic Permissions (Advanced)" +msgstr "" + +#: ../../include/widgets.php:467 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:476 ../../include/features.php:41 +#: ../../mod/sources.php:81 +msgid "Channel Sources" +msgstr "" + +#: ../../include/widgets.php:504 +msgid "Check Mail" +msgstr "" + +#: ../../include/contact_selectors.php:30 +msgid "Unknown | Not categorised" +msgstr "" + +#: ../../include/contact_selectors.php:31 +msgid "Block immediately" +msgstr "" + +#: ../../include/contact_selectors.php:32 +msgid "Shady, spammer, self-marketer" +msgstr "" + +#: ../../include/contact_selectors.php:33 +msgid "Known to me, but no opinion" +msgstr "" + +#: ../../include/contact_selectors.php:34 +msgid "OK, probably harmless" +msgstr "" + +#: ../../include/contact_selectors.php:35 +msgid "Reputable, has my trust" +msgstr "" + +#: ../../include/contact_selectors.php:54 +msgid "Frequently" +msgstr "" + +#: ../../include/contact_selectors.php:55 +msgid "Hourly" +msgstr "" + +#: ../../include/contact_selectors.php:56 +msgid "Twice daily" +msgstr "" + +#: ../../include/contact_selectors.php:57 +msgid "Daily" +msgstr "" + +#: ../../include/contact_selectors.php:58 +msgid "Weekly" +msgstr "" + +#: ../../include/contact_selectors.php:59 +msgid "Monthly" +msgstr "" + +#: ../../include/contact_selectors.php:74 +msgid "Friendica" +msgstr "" + +#: ../../include/contact_selectors.php:75 +msgid "OStatus" +msgstr "" + +#: ../../include/contact_selectors.php:76 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 +#: ../../mod/admin.php:698 ../../boot.php:1418 +msgid "Email" +msgstr "" + +#: ../../include/contact_selectors.php:78 +msgid "Diaspora" +msgstr "" + +#: ../../include/contact_selectors.php:79 +msgid "Facebook" +msgstr "" + +#: ../../include/contact_selectors.php:80 +msgid "Zot!" +msgstr "" + +#: ../../include/contact_selectors.php:81 +msgid "LinkedIn" +msgstr "" + +#: ../../include/contact_selectors.php:82 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/contact_selectors.php:83 +msgid "MySpace" +msgstr "" + +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" +msgstr "" + +#: ../../include/datetime.php:152 ../../include/datetime.php:284 +msgid "year" +msgstr "" + +#: ../../include/datetime.php:157 ../../include/datetime.php:285 +msgid "month" +msgstr "" + +#: ../../include/datetime.php:162 ../../include/datetime.php:287 +msgid "day" +msgstr "" + +#: ../../include/datetime.php:275 +msgid "never" +msgstr "" + +#: ../../include/datetime.php:281 +msgid "less than a second ago" +msgstr "" + +#: ../../include/datetime.php:284 +msgid "years" +msgstr "" + +#: ../../include/datetime.php:285 +msgid "months" +msgstr "" + +#: ../../include/datetime.php:286 +msgid "week" +msgstr "" + +#: ../../include/datetime.php:286 +msgid "weeks" msgstr "" -#: ../../include/ItemObject.php:203 -msgid "to" +#: ../../include/datetime.php:287 +msgid "days" msgstr "" -#: ../../include/ItemObject.php:204 -msgid "via" +#: ../../include/datetime.php:288 +msgid "hour" msgstr "" -#: ../../include/ItemObject.php:205 -msgid "Wall-to-Wall" +#: ../../include/datetime.php:288 +msgid "hours" msgstr "" -#: ../../include/ItemObject.php:206 -msgid "via Wall-To-Wall:" +#: ../../include/datetime.php:289 +msgid "minute" msgstr "" -#: ../../include/ItemObject.php:216 ../../include/conversation.php:686 -#, php-format -msgid " from %s" +#: ../../include/datetime.php:289 +msgid "minutes" msgstr "" -#: ../../include/ItemObject.php:219 ../../include/conversation.php:689 -#, php-format -msgid "last edited: %s" +#: ../../include/datetime.php:290 +msgid "second" msgstr "" -#: ../../include/ItemObject.php:246 ../../include/conversation.php:706 -#: ../../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" +#: ../../include/datetime.php:290 +msgid "seconds" msgstr "" -#: ../../include/ItemObject.php:267 +#: ../../include/datetime.php:299 #, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 -#: ../../include/contact_widgets.php:125 -msgid "show more" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/ItemObject.php:527 ../../mod/photos.php:1084 -#: ../../mod/photos.php:1171 -msgid "This is you" +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1086 ../../mod/photos.php:1173 -msgid "Comment" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/ItemObject.php:530 ../../mod/events.php:470 -#: ../../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: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 -msgid "Submit" +#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 +msgid "Starts:" msgstr "" -#: ../../include/ItemObject.php:531 -msgid "Bold" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 +msgid "Finishes:" msgstr "" -#: ../../include/ItemObject.php:532 -msgid "Italic" +#: ../../include/event.php:40 ../../include/identity.php:676 +#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 +#: ../../mod/directory.php:156 ../../mod/dirprofile.php:106 +msgid "Location:" msgstr "" -#: ../../include/ItemObject.php:533 -msgid "Underline" +#: ../../include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../include/ItemObject.php:534 -msgid "Quote" +#: ../../include/group.php:223 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/ItemObject.php:535 -msgid "Code" +#: ../../include/group.php:242 ../../mod/admin.php:698 +msgid "All Channels" msgstr "" -#: ../../include/ItemObject.php:536 -msgid "Image" +#: ../../include/group.php:264 +msgid "edit" msgstr "" -#: ../../include/ItemObject.php:537 -msgid "Link" +#: ../../include/group.php:285 +msgid "Collections" msgstr "" -#: ../../include/ItemObject.php:538 -msgid "Video" +#: ../../include/group.php:286 +msgid "Edit collection" msgstr "" -#: ../../include/ItemObject.php:539 ../../include/conversation.php:1079 -#: ../../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" +#: ../../include/group.php:287 +msgid "Create a new collection" msgstr "" -#: ../../include/ItemObject.php:542 ../../include/conversation.php:1143 -#: ../../mod/message.php:315 ../../mod/message.php:465 -#: ../../mod/editpost.php:134 -msgid "Encrypt text" +#: ../../include/group.php:288 +msgid "Channels not in any collection" msgstr "" -#: ../../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" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" msgstr "" -#: ../../include/Contact.php:120 -msgid "New window" +#: ../../include/js_strings.php:6 ../../include/ItemObject.php:530 +#: ../../mod/photos.php:1081 ../../mod/photos.php:1168 +msgid "Comment" msgstr "" -#: ../../include/Contact.php:121 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125 +#: ../../include/ItemObject.php:269 +msgid "show more" msgstr "" -#: ../../include/widgets.php:26 ../../include/contact_widgets.php:87 -msgid "Categories" +#: ../../include/js_strings.php:8 +msgid "show fewer" msgstr "" -#: ../../include/widgets.php:114 ../../mod/suggest.php:53 -msgid "Ignore/Hide" +#: ../../include/js_strings.php:9 +msgid "Password too short" msgstr "" -#: ../../include/widgets.php:120 ../../mod/connections.php:236 -msgid "Suggestions" +#: ../../include/js_strings.php:10 +msgid "Passwords do not match" msgstr "" -#: ../../include/widgets.php:121 -msgid "See more..." +#: ../../include/js_strings.php:11 ../../mod/photos.php:39 +msgid "everybody" msgstr "" -#: ../../include/widgets.php:143 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +#: ../../include/js_strings.php:12 +msgid "Secret Passphrase" msgstr "" -#: ../../include/widgets.php:149 -msgid "Add New Connection" +#: ../../include/js_strings.php:13 +msgid "Passphrase hint" msgstr "" -#: ../../include/widgets.php:150 -msgid "Enter the channel address" +#: ../../include/js_strings.php:15 +msgid "timeago.prefixAgo" msgstr "" -#: ../../include/widgets.php:151 -msgid "Example: bob@example.com, http://example.com/barbara" +#: ../../include/js_strings.php:16 +msgid "timeago.suffixAgo" msgstr "" -#: ../../include/widgets.php:168 -msgid "Notes" +#: ../../include/js_strings.php:17 +msgid "ago" msgstr "" -#: ../../include/widgets.php:170 ../../include/text.php:738 -#: ../../include/text.php:752 ../../mod/filer.php:36 -msgid "Save" +#: ../../include/js_strings.php:18 +msgid "from now" msgstr "" -#: ../../include/widgets.php:240 ../../mod/search.php:20 -msgid "Remove term" +#: ../../include/js_strings.php:19 +msgid "less than a minute" msgstr "" -#: ../../include/widgets.php:249 ../../include/features.php:48 -#: ../../mod/search.php:17 -msgid "Saved Searches" +#: ../../include/js_strings.php:20 +msgid "about a minute" msgstr "" -#: ../../include/widgets.php:250 ../../include/group.php:290 -msgid "add" +#: ../../include/js_strings.php:21 +#, php-format +msgid "%d minutes" msgstr "" -#: ../../include/widgets.php:280 ../../include/features.php:62 -#: ../../include/contact_widgets.php:53 -msgid "Saved Folders" +#: ../../include/js_strings.php:22 +msgid "about an hour" msgstr "" -#: ../../include/widgets.php:283 ../../include/contact_widgets.php:56 -#: ../../include/contact_widgets.php:90 -msgid "Everything" +#: ../../include/js_strings.php:23 +#, php-format +msgid "about %d hours" msgstr "" -#: ../../include/widgets.php:315 ../../include/items.php:3558 -msgid "Archives" +#: ../../include/js_strings.php:24 +msgid "a day" msgstr "" -#: ../../include/widgets.php:367 -msgid "Refresh" +#: ../../include/js_strings.php:25 +#, php-format +msgid "%d days" msgstr "" -#: ../../include/widgets.php:368 ../../mod/connedit.php:386 -msgid "Me" +#: ../../include/js_strings.php:26 +msgid "about a month" msgstr "" -#: ../../include/widgets.php:369 ../../mod/connedit.php:388 -msgid "Best Friends" +#: ../../include/js_strings.php:27 +#, php-format +msgid "%d months" msgstr "" -#: ../../include/widgets.php:370 ../../include/profile_selectors.php:42 -#: ../../include/identity.php:298 ../../mod/connedit.php:389 -msgid "Friends" +#: ../../include/js_strings.php:28 +msgid "about a year" msgstr "" -#: ../../include/widgets.php:371 -msgid "Co-workers" +#: ../../include/js_strings.php:29 +#, php-format +msgid "%d years" msgstr "" -#: ../../include/widgets.php:372 ../../mod/connedit.php:390 -msgid "Former Friends" +#: ../../include/js_strings.php:30 +msgid " " msgstr "" -#: ../../include/widgets.php:373 ../../mod/connedit.php:391 -msgid "Acquaintances" +#: ../../include/js_strings.php:31 +msgid "timeago.numbers" msgstr "" -#: ../../include/widgets.php:374 -msgid "Everybody" +#: ../../include/message.php:18 +msgid "No recipient provided." msgstr "" -#: ../../include/widgets.php:406 -msgid "Account settings" +#: ../../include/message.php:23 +msgid "[no subject]" msgstr "" -#: ../../include/widgets.php:412 -msgid "Channel settings" +#: ../../include/message.php:42 +msgid "Unable to determine sender." msgstr "" -#: ../../include/widgets.php:418 -msgid "Additional features" +#: ../../include/message.php:143 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/widgets.php:424 -msgid "Feature settings" +#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 +#: ../../mod/photos.php:91 ../../mod/photos.php:767 ../../mod/photos.php:789 +#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 +#: ../../mod/profile_photo.php:336 +msgid "Profile Photos" msgstr "" -#: ../../include/widgets.php:430 -msgid "Display settings" +#: ../../include/network.php:640 +msgid "view full size" msgstr "" -#: ../../include/widgets.php:436 -msgid "Connected apps" +#: ../../include/bbcode.php:94 ../../include/bbcode.php:497 +#: ../../include/bbcode.php:500 +msgid "Image/photo" msgstr "" -#: ../../include/widgets.php:442 -msgid "Export channel" +#: ../../include/bbcode.php:129 ../../include/bbcode.php:505 +msgid "Encrypted content" msgstr "" -#: ../../include/widgets.php:454 -msgid "Automatic Permissions (Advanced)" +#: ../../include/bbcode.php:176 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/widgets.php:464 -msgid "Premium Channel Settings" +#: ../../include/bbcode.php:178 +msgid "post" msgstr "" -#: ../../include/widgets.php:473 ../../include/features.php:39 -#: ../../mod/sources.php:81 -msgid "Channel Sources" +#: ../../include/bbcode.php:457 ../../include/bbcode.php:477 +msgid "$1 wrote:" msgstr "" -#: ../../include/widgets.php:484 ../../include/nav.php:177 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -msgid "Settings" +#: ../../include/oembed.php:150 +msgid "Embedded content" msgstr "" -#: ../../include/widgets.php:501 -msgid "Check Mail" +#: ../../include/oembed.php:159 +msgid "Embedding disabled" msgstr "" -#: ../../include/widgets.php:506 ../../include/nav.php:168 -msgid "New Message" +#: ../../include/features.php:21 +msgid "General Features" msgstr "" -#: ../../include/contact_selectors.php:30 -msgid "Unknown | Not categorised" +#: ../../include/features.php:23 +msgid "Content Expiration" msgstr "" -#: ../../include/contact_selectors.php:31 -msgid "Block immediately" +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/contact_selectors.php:32 -msgid "Shady, spammer, self-marketer" +#: ../../include/features.php:24 +msgid "Multiple Profiles" msgstr "" -#: ../../include/contact_selectors.php:33 -msgid "Known to me, but no opinion" +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/contact_selectors.php:34 -msgid "OK, probably harmless" +#: ../../include/features.php:25 +msgid "Web Pages" msgstr "" -#: ../../include/contact_selectors.php:35 -msgid "Reputable, has my trust" +#: ../../include/features.php:25 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/contact_selectors.php:54 -msgid "Frequently" +#: ../../include/features.php:26 +msgid "Private Notes" msgstr "" -#: ../../include/contact_selectors.php:55 -msgid "Hourly" +#: ../../include/features.php:26 +msgid "Enables a tool to store notes and reminders" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Twice daily" +#: ../../include/features.php:31 +msgid "Extended Identity Sharing" msgstr "" -#: ../../include/contact_selectors.php:57 -msgid "Daily" +#: ../../include/features.php:31 +msgid "" +"Share your identity with all websites on the internet. When disabled, " +"identity is only shared with sites in the matrix." msgstr "" -#: ../../include/contact_selectors.php:58 -msgid "Weekly" +#: ../../include/features.php:32 +msgid "Expert Mode" msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Monthly" +#: ../../include/features.php:32 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/contact_selectors.php:74 -msgid "Friendica" +#: ../../include/features.php:33 +msgid "Premium Channel" msgstr "" -#: ../../include/contact_selectors.php:75 -msgid "OStatus" +#: ../../include/features.php:33 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../include/contact_selectors.php:76 -msgid "RSS/Atom" +#: ../../include/features.php:38 +msgid "Post Composition Features" msgstr "" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 -#: ../../mod/admin.php:698 ../../boot.php:1418 -msgid "Email" +#: ../../include/features.php:39 +msgid "Richtext Editor" msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "Diaspora" +#: ../../include/features.php:39 +msgid "Enable richtext editor" msgstr "" -#: ../../include/contact_selectors.php:79 -msgid "Facebook" +#: ../../include/features.php:40 +msgid "Post Preview" msgstr "" -#: ../../include/contact_selectors.php:80 -msgid "Zot!" +#: ../../include/features.php:40 +msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/contact_selectors.php:81 -msgid "LinkedIn" +#: ../../include/features.php:41 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "XMPP/IM" +#: ../../include/features.php:42 +msgid "Even More Encryption" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "MySpace" +#: ../../include/features.php:42 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" +#: ../../include/features.php:47 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/datetime.php:152 ../../include/datetime.php:284 -msgid "year" +#: ../../include/features.php:48 +msgid "Search by Date" msgstr "" -#: ../../include/datetime.php:157 ../../include/datetime.php:285 -msgid "month" +#: ../../include/features.php:48 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/datetime.php:162 ../../include/datetime.php:287 -msgid "day" +#: ../../include/features.php:49 +msgid "Collections Filter" msgstr "" -#: ../../include/datetime.php:275 -msgid "never" +#: ../../include/features.php:49 +msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/datetime.php:281 -msgid "less than a second ago" +#: ../../include/features.php:50 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/datetime.php:284 -msgid "years" +#: ../../include/features.php:51 +msgid "Network Personal Tab" msgstr "" -#: ../../include/datetime.php:285 -msgid "months" +#: ../../include/features.php:51 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/datetime.php:286 -msgid "week" +#: ../../include/features.php:52 +msgid "Network New Tab" msgstr "" -#: ../../include/datetime.php:286 -msgid "weeks" +#: ../../include/features.php:52 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/datetime.php:287 -msgid "days" +#: ../../include/features.php:53 +msgid "Affinity Tool" msgstr "" -#: ../../include/datetime.php:288 -msgid "hour" +#: ../../include/features.php:53 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/datetime.php:288 -msgid "hours" +#: ../../include/features.php:54 +msgid "Suggest Channels" msgstr "" -#: ../../include/datetime.php:289 -msgid "minute" +#: ../../include/features.php:54 +msgid "Show channel suggestions" msgstr "" -#: ../../include/datetime.php:289 -msgid "minutes" +#: ../../include/features.php:59 +msgid "Post/Comment Tools" msgstr "" -#: ../../include/datetime.php:290 -msgid "second" +#: ../../include/features.php:61 +msgid "Edit Sent Posts" msgstr "" -#: ../../include/datetime.php:290 -msgid "seconds" +#: ../../include/features.php:61 +msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../include/datetime.php:299 -#, php-format -msgid "%1$d %2$s ago" +#: ../../include/features.php:62 +msgid "Tagging" msgstr "" -#: ../../include/dba/dba_driver.php:50 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" +#: ../../include/features.php:62 +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 -msgid "l F d, Y \\@ g:i A" +#: ../../include/features.php:63 +msgid "Post Categories" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 -msgid "Starts:" +#: ../../include/features.php:63 +msgid "Add categories to your posts" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 -msgid "Finishes:" +#: ../../include/features.php:64 +msgid "Ability to file posts under folders" msgstr "" -#: ../../include/event.php:40 ../../include/identity.php:664 -#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 -#: ../../mod/directory.php:172 -msgid "Location:" +#: ../../include/features.php:65 +msgid "Dislike Posts" msgstr "" -#: ../../include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +#: ../../include/features.php:65 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/group.php:223 -msgid "Default privacy group for new contacts" +#: ../../include/features.php:66 +msgid "Star Posts" msgstr "" -#: ../../include/group.php:242 ../../mod/admin.php:698 -msgid "All Channels" +#: ../../include/features.php:66 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/group.php:264 -msgid "edit" +#: ../../include/features.php:67 +msgid "Tag Cloud" msgstr "" -#: ../../include/group.php:285 -msgid "Collections" +#: ../../include/features.php:67 +msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/group.php:286 -msgid "Edit collection" +#: ../../include/conversation.php:117 ../../include/text.php:1653 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 +msgid "photo" msgstr "" -#: ../../include/group.php:287 -msgid "Create a new collection" +#: ../../include/conversation.php:120 ../../include/text.php:1656 +#: ../../mod/tagger.php:49 +msgid "event" msgstr "" -#: ../../include/group.php:288 -msgid "Channels not in any collection" +#: ../../include/conversation.php:123 +msgid "channel" msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" +#: ../../include/conversation.php:145 ../../include/text.php:1659 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 +msgid "status" msgstr "" -#: ../../include/js_strings.php:8 -msgid "show fewer" +#: ../../include/conversation.php:147 ../../include/text.php:1661 +#: ../../mod/tagger.php:55 +msgid "comment" msgstr "" -#: ../../include/js_strings.php:9 -msgid "Password too short" +#: ../../include/conversation.php:161 ../../mod/like.php:134 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/js_strings.php:10 -msgid "Passwords do not match" +#: ../../include/conversation.php:164 ../../mod/like.php:136 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/js_strings.php:11 ../../mod/photos.php:39 -msgid "everybody" +#: ../../include/conversation.php:201 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/js_strings.php:12 -msgid "Secret Passphrase" +#: ../../include/conversation.php:236 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/js_strings.php:13 -msgid "Passphrase hint" +#: ../../include/conversation.php:240 ../../include/text.php:818 +msgid "poked" msgstr "" -#: ../../include/js_strings.php:15 -msgid "timeago.prefixAgo" +#: ../../include/conversation.php:258 ../../mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/js_strings.php:16 -msgid "timeago.suffixAgo" +#: ../../include/conversation.php:631 ../../include/ItemObject.php:113 +msgid "Select" msgstr "" -#: ../../include/js_strings.php:17 -msgid "ago" +#: ../../include/conversation.php:632 ../../include/ItemObject.php:107 +#: ../../mod/connedit.php:356 ../../mod/admin.php:693 ../../mod/group.php:176 +#: ../../mod/photos.php:1132 ../../mod/filestorage.php:82 +#: ../../mod/settings.php:570 +msgid "Delete" msgstr "" -#: ../../include/js_strings.php:18 -msgid "from now" +#: ../../include/conversation.php:642 ../../include/ItemObject.php:160 +msgid "Message is verified" msgstr "" -#: ../../include/js_strings.php:19 -msgid "less than a minute" +#: ../../include/conversation.php:662 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/js_strings.php:20 -msgid "about a minute" +#: ../../include/conversation.php:676 +msgid "Categories:" msgstr "" -#: ../../include/js_strings.php:21 -#, php-format -msgid "%d minutes" +#: ../../include/conversation.php:677 +msgid "Filed under:" msgstr "" -#: ../../include/js_strings.php:22 -msgid "about an hour" +#: ../../include/conversation.php:686 ../../include/ItemObject.php:216 +#, php-format +msgid " from %s" msgstr "" -#: ../../include/js_strings.php:23 +#: ../../include/conversation.php:689 ../../include/ItemObject.php:219 #, php-format -msgid "about %d hours" +msgid "last edited: %s" msgstr "" -#: ../../include/js_strings.php:24 -msgid "a day" +#: ../../include/conversation.php:704 +msgid "View in context" msgstr "" -#: ../../include/js_strings.php:25 -#, php-format -msgid "%d days" +#: ../../include/conversation.php:706 ../../include/conversation.php:1116 +#: ../../include/ItemObject.php:247 ../../mod/photos.php:1063 +#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:109 +#: ../../mod/editwebpage.php:152 ../../mod/editpost.php:106 +#: ../../mod/editblock.php:123 +msgid "Please wait" msgstr "" -#: ../../include/js_strings.php:26 -msgid "about a month" +#: ../../include/conversation.php:830 +msgid "remove" msgstr "" -#: ../../include/js_strings.php:27 -#, php-format -msgid "%d months" +#: ../../include/conversation.php:834 +msgid "Loading..." msgstr "" -#: ../../include/js_strings.php:28 -msgid "about a year" +#: ../../include/conversation.php:835 +msgid "Delete Selected Items" msgstr "" -#: ../../include/js_strings.php:29 -#, php-format -msgid "%d years" +#: ../../include/conversation.php:926 +msgid "View Source" msgstr "" -#: ../../include/js_strings.php:30 ../../include/features.php:29 -msgid " " +#: ../../include/conversation.php:927 +msgid "Follow Thread" msgstr "" -#: ../../include/js_strings.php:31 -msgid "timeago.numbers" +#: ../../include/conversation.php:928 +msgid "View Status" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/conversation.php:930 +msgid "View Photos" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/conversation.php:931 +msgid "Matrix Activity" msgstr "" -#: ../../include/message.php:42 -msgid "Unable to determine sender." +#: ../../include/conversation.php:932 +msgid "Edit Contact" msgstr "" -#: ../../include/message.php:143 -msgid "Stored post could not be verified." +#: ../../include/conversation.php:933 +msgid "Send PM" msgstr "" -#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../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" +#: ../../include/conversation.php:934 +msgid "Poke" msgstr "" -#: ../../include/network.php:640 -msgid "view full size" +#: ../../include/conversation.php:996 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 -#: ../../include/bbcode.php:497 -msgid "Image/photo" +#: ../../include/conversation.php:996 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 -msgid "Encrypted content" +#: ../../include/conversation.php:1000 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1002 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1008 +msgid "and" msgstr "" -#: ../../include/bbcode.php:173 +#: ../../include/conversation.php:1011 #, php-format -msgid "%1$s wrote the following %2$s %3$s" +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1012 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/bbcode.php:175 -msgid "post" +#: ../../include/conversation.php:1012 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 -msgid "$1 wrote:" +#: ../../include/conversation.php:1062 +msgid "Visible to everybody" msgstr "" -#: ../../include/oembed.php:150 -msgid "Embedded content" +#: ../../include/conversation.php:1063 ../../mod/mail.php:171 +#: ../../mod/mail.php:269 +msgid "Please enter a link URL:" msgstr "" -#: ../../include/oembed.php:159 -msgid "Embedding disabled" +#: ../../include/conversation.php:1064 +msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/features.php:21 -msgid "General Features" +#: ../../include/conversation.php:1065 +msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/features.php:23 -msgid "Content Expiration" +#: ../../include/conversation.php:1066 +msgid "Tag term:" msgstr "" -#: ../../include/features.php:23 -msgid "Remove posts/comments and/or private messages at a future time" +#: ../../include/conversation.php:1067 ../../mod/filer.php:35 +msgid "Save to Folder:" msgstr "" -#: ../../include/features.php:24 -msgid "Multiple Profiles" +#: ../../include/conversation.php:1068 +msgid "Where are you right now?" msgstr "" -#: ../../include/features.php:24 -msgid "Ability to create multiple profiles" +#: ../../include/conversation.php:1069 ../../mod/mail.php:172 +#: ../../mod/mail.php:270 ../../mod/editpost.php:52 +msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/features.php:25 -msgid "Web Pages" +#: ../../include/conversation.php:1079 ../../include/ItemObject.php:540 +#: ../../mod/webpages.php:122 ../../mod/photos.php:1083 +#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:176 +#: ../../mod/editpost.php:126 ../../mod/editblock.php:144 +msgid "Preview" msgstr "" -#: ../../include/features.php:25 -msgid "Provide managed web pages on your channel" +#: ../../include/conversation.php:1093 ../../mod/photos.php:1062 +msgid "Share" msgstr "" -#: ../../include/features.php:26 -msgid "Private Notes" +#: ../../include/conversation.php:1095 ../../mod/editwebpage.php:139 +msgid "Page link title" msgstr "" -#: ../../include/features.php:26 -msgid "Enables a tool to store notes and reminders" +#: ../../include/conversation.php:1097 ../../mod/mail.php:219 +#: ../../mod/mail.php:332 ../../mod/editlayout.php:101 +#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:98 +#: ../../mod/editblock.php:115 +msgid "Upload photo" msgstr "" -#: ../../include/features.php:27 -msgid "Enhanced Photo Albums" +#: ../../include/conversation.php:1098 +msgid "upload photo" msgstr "" -#: ../../include/features.php:27 -msgid "Enable photo album with enhanced features" +#: ../../include/conversation.php:1099 ../../mod/mail.php:220 +#: ../../mod/mail.php:333 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:99 +#: ../../mod/editblock.php:116 +msgid "Attach file" msgstr "" -#: ../../include/features.php:29 -msgid "Extended Identity Sharing" +#: ../../include/conversation.php:1100 +msgid "attach file" msgstr "" -#: ../../include/features.php:30 -msgid "Expert Mode" +#: ../../include/conversation.php:1101 ../../mod/mail.php:221 +#: ../../mod/mail.php:334 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:100 +#: ../../mod/editblock.php:117 +msgid "Insert web link" msgstr "" -#: ../../include/features.php:30 -msgid "Enable Expert Mode to provide advanced configuration options" +#: ../../include/conversation.php:1102 +msgid "web link" msgstr "" -#: ../../include/features.php:31 -msgid "Premium Channel" +#: ../../include/conversation.php:1103 +msgid "Insert video link" msgstr "" -#: ../../include/features.php:31 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../include/conversation.php:1104 +msgid "video link" msgstr "" -#: ../../include/features.php:36 -msgid "Post Composition Features" +#: ../../include/conversation.php:1105 +msgid "Insert audio link" msgstr "" -#: ../../include/features.php:37 -msgid "Richtext Editor" +#: ../../include/conversation.php:1106 +msgid "audio link" msgstr "" -#: ../../include/features.php:37 -msgid "Enable richtext editor" +#: ../../include/conversation.php:1107 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:150 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:121 +msgid "Set your location" msgstr "" -#: ../../include/features.php:38 -msgid "Post Preview" +#: ../../include/conversation.php:1108 +msgid "set location" msgstr "" -#: ../../include/features.php:38 -msgid "Allow previewing posts and comments before publishing them" +#: ../../include/conversation.php:1109 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:105 +#: ../../mod/editblock.php:122 +msgid "Clear browser location" msgstr "" -#: ../../include/features.php:39 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/conversation.php:1110 +msgid "clear location" msgstr "" -#: ../../include/features.php:40 -msgid "Even More Encryption" +#: ../../include/conversation.php:1112 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:168 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:136 +msgid "Set title" msgstr "" -#: ../../include/features.php:40 -msgid "Allow encryption of content end-to-end with a shared secret key" +#: ../../include/conversation.php:1115 ../../mod/editlayout.php:123 +#: ../../mod/editwebpage.php:170 ../../mod/editpost.php:120 +#: ../../mod/editblock.php:138 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/features.php:45 -msgid "Network and Stream Filtering" +#: ../../include/conversation.php:1117 ../../mod/editlayout.php:110 +#: ../../mod/editwebpage.php:153 ../../mod/editpost.php:107 +#: ../../mod/editblock.php:124 +msgid "Permission settings" msgstr "" -#: ../../include/features.php:46 -msgid "Search by Date" +#: ../../include/conversation.php:1118 +msgid "permissions" msgstr "" -#: ../../include/features.php:46 -msgid "Ability to select posts by date ranges" +#: ../../include/conversation.php:1126 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:163 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:133 +msgid "Public post" msgstr "" -#: ../../include/features.php:47 -msgid "Collections Filter" +#: ../../include/conversation.php:1128 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:171 ../../mod/editpost.php:121 +#: ../../mod/editblock.php:139 +msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/features.php:47 -msgid "Enable widget to display Network posts only from selected collections" +#: ../../include/conversation.php:1141 ../../mod/mail.php:226 +#: ../../mod/mail.php:339 ../../mod/editlayout.php:134 +#: ../../mod/editwebpage.php:181 ../../mod/editpost.php:132 +#: ../../mod/editblock.php:149 +msgid "Set expiration date" msgstr "" -#: ../../include/features.php:48 -msgid "Save search terms for re-use" +#: ../../include/conversation.php:1143 ../../include/ItemObject.php:543 +#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:134 +msgid "Encrypt text" msgstr "" -#: ../../include/features.php:49 -msgid "Network Personal Tab" +#: ../../include/conversation.php:1145 ../../mod/editpost.php:135 +msgid "OK" msgstr "" -#: ../../include/features.php:49 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/conversation.php:1146 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:94 ../../mod/settings.php:508 +#: ../../mod/settings.php:534 ../../mod/editpost.php:136 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 +msgid "Cancel" msgstr "" -#: ../../include/features.php:50 -msgid "Network New Tab" +#: ../../include/conversation.php:1373 +msgid "Commented Order" msgstr "" -#: ../../include/features.php:50 -msgid "Enable tab to display all new Network activity" +#: ../../include/conversation.php:1376 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/features.php:51 -msgid "Affinity Tool" +#: ../../include/conversation.php:1379 +msgid "Posted Order" msgstr "" -#: ../../include/features.php:51 -msgid "Filter stream activity by depth of relationships" +#: ../../include/conversation.php:1382 +msgid "Sort by Post Date" msgstr "" -#: ../../include/features.php:52 -msgid "Suggest Channels" +#: ../../include/conversation.php:1386 +msgid "Personal" msgstr "" -#: ../../include/features.php:52 -msgid "Show channel suggestions" +#: ../../include/conversation.php:1389 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/features.php:57 -msgid "Post/Comment Tools" +#: ../../include/conversation.php:1392 ../../mod/menu.php:57 +#: ../../mod/connections.php:209 +msgid "New" msgstr "" -#: ../../include/features.php:59 -msgid "Edit Sent Posts" +#: ../../include/conversation.php:1395 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/features.php:59 -msgid "Edit and correct posts and comments after sending" +#: ../../include/conversation.php:1402 +msgid "Starred" msgstr "" -#: ../../include/features.php:60 -msgid "Tagging" +#: ../../include/conversation.php:1405 +msgid "Favourite Posts" msgstr "" -#: ../../include/features.php:60 -msgid "Ability to tag existing posts" +#: ../../include/conversation.php:1412 +msgid "Spam" msgstr "" -#: ../../include/features.php:61 -msgid "Post Categories" +#: ../../include/conversation.php:1415 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/features.php:61 -msgid "Add categories to your posts" +#: ../../include/conversation.php:1445 +msgid "Channel" msgstr "" -#: ../../include/features.php:62 -msgid "Ability to file posts under folders" +#: ../../include/conversation.php:1448 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/features.php:63 -msgid "Dislike Posts" +#: ../../include/conversation.php:1452 +msgid "About" msgstr "" -#: ../../include/features.php:63 -msgid "Ability to dislike posts/comments" +#: ../../include/conversation.php:1455 +msgid "Profile Details" msgstr "" -#: ../../include/features.php:64 -msgid "Star Posts" +#: ../../include/conversation.php:1462 ../../include/photos.php:296 +msgid "Photo Albums" msgstr "" -#: ../../include/features.php:64 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/conversation.php:1473 +msgid "Events and Calendar" msgstr "" -#: ../../include/features.php:65 -msgid "Tag Cloud" +#: ../../include/conversation.php:1478 +msgid "Webpages" msgstr "" -#: ../../include/features.php:65 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/conversation.php:1481 +msgid "Manage Webpages" msgstr "" #: ../../include/notify.php:23 @@ -1250,29 +1516,28 @@ msgstr "" #: ../../include/attach.php:251 ../../include/attach.php:272 #: ../../include/attach.php:464 ../../include/attach.php:539 #: ../../include/items.php:3437 ../../mod/common.php:35 -#: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:102 +#: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:104 #: ../../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/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/photos.php:68 ../../mod/photos.php:646 ../../mod/viewsrc.php:12 +#: ../../mod/menu.php:40 ../../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/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/achievements.php:27 ../../mod/filestorage.php:26 +#: ../../mod/manage.php:6 ../../mod/settings.php:484 ../../mod/mail.php:108 +#: ../../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:26 ../../mod/register.php:68 ../../mod/regmod.php:18 -#: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178 -#: ../../index.php:346 +#: ../../mod/suggest.php:26 ../../mod/message.php:16 ../../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." msgstr "" @@ -1293,12 +1558,8 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:296 ../../include/conversation.php:1457 -msgid "Photo Albums" -msgstr "" - -#: ../../include/photos.php:300 ../../mod/photos.php:809 -#: ../../mod/photos.php:1283 +#: ../../include/photos.php:300 ../../mod/photos.php:805 +#: ../../mod/photos.php:1278 msgid "Upload New Photos" msgstr "" @@ -1596,269 +1857,48 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:732 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1415 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:72 ../../include/nav.php:87 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:75 ../../include/nav.php:121 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:75 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:76 ../../include/conversation.php:929 -#: ../../mod/connedit.php:309 ../../mod/connedit.php:423 -msgid "View Profile" -msgstr "" - -#: ../../include/nav.php:76 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:78 -msgid "Edit Profiles" -msgstr "" - -#: ../../include/nav.php:78 -msgid "Manage/Edit Profiles" -msgstr "" - -#: ../../include/nav.php:79 ../../include/conversation.php:1454 -#: ../../mod/fbrowser.php:25 -msgid "Photos" -msgstr "" - -#: ../../include/nav.php:79 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:85 ../../boot.php:1416 -msgid "Login" -msgstr "" - -#: ../../include/nav.php:85 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:102 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:107 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:121 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1392 -msgid "Register" -msgstr "" - -#: ../../include/nav.php:125 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:130 ../../mod/help.php:60 ../../mod/help.php:64 -msgid "Help" -msgstr "" - -#: ../../include/nav.php:130 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:133 -msgid "Apps" -msgstr "" - -#: ../../include/nav.php:133 -msgid "Addon applications, utilities, games" -msgstr "" - -#: ../../include/nav.php:135 ../../include/text.php:736 -#: ../../include/text.php:750 ../../mod/search.php:96 -msgid "Search" -msgstr "" - -#: ../../include/nav.php:135 -msgid "Search site content" -msgstr "" - -#: ../../include/nav.php:138 ../../mod/directory.php:226 -msgid "Directory" -msgstr "" - -#: ../../include/nav.php:138 -msgid "Channel Locator" -msgstr "" - -#: ../../include/nav.php:149 -msgid "Matrix" -msgstr "" - -#: ../../include/nav.php:149 -msgid "Your matrix" -msgstr "" - -#: ../../include/nav.php:150 -msgid "Mark all matrix notifications seen" -msgstr "" - -#: ../../include/nav.php:152 -msgid "Channel Home" -msgstr "" - -#: ../../include/nav.php:152 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:153 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:156 -msgid "Intros" -msgstr "" - -#: ../../include/nav.php:156 ../../mod/connections.php:242 -msgid "New Connections" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:160 -msgid "See all notifications" -msgstr "" - -#: ../../include/nav.php:161 -msgid "Mark all system notifications seen" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Mail" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:164 -msgid "See all private messages" -msgstr "" - -#: ../../include/nav.php:165 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:166 -msgid "Inbox" -msgstr "" - -#: ../../include/nav.php:167 -msgid "Outbox" -msgstr "" - -#: ../../include/nav.php:171 ../../include/conversation.php:1465 -#: ../../mod/events.php:354 -msgid "Events" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:172 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:173 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:175 -msgid "Channel Select" -msgstr "" - -#: ../../include/nav.php:175 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:177 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:179 ../../mod/connections.php:349 -msgid "Connections" -msgstr "" - -#: ../../include/nav.php:179 -msgid "Manage/Edit Friends and Connections" -msgstr "" - -#: ../../include/nav.php:186 ../../mod/admin.php:111 -msgid "Admin" -msgstr "" - -#: ../../include/nav.php:186 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:212 -msgid "Nothing new here" -msgstr "" - -#: ../../include/nav.php:217 -msgid "Please wait..." +#: ../../include/zot.php:732 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" #: ../../include/taxonomy.php:210 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:224 +#: ../../include/taxonomy.php:227 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:249 +#: ../../include/taxonomy.php:252 msgid "have" msgstr "" -#: ../../include/taxonomy.php:249 +#: ../../include/taxonomy.php:252 msgid "has" msgstr "" -#: ../../include/taxonomy.php:250 +#: ../../include/taxonomy.php:253 msgid "want" msgstr "" -#: ../../include/taxonomy.php:250 +#: ../../include/taxonomy.php:253 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:251 +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:174 +msgid "like" +msgstr "" + +#: ../../include/taxonomy.php:254 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:252 +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:175 +msgid "dislike" +msgstr "" + +#: ../../include/taxonomy.php:255 msgid "dislikes" msgstr "" @@ -1918,392 +1958,222 @@ msgstr "" msgid "Registration revoked for %s" msgstr "" -#: ../../include/conversation.php:117 ../../include/text.php:1621 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 -msgid "photo" +#: ../../include/dir_fns.php:15 +msgid "Sort Options" msgstr "" -#: ../../include/conversation.php:120 ../../include/text.php:1624 -#: ../../mod/tagger.php:49 -msgid "event" +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" msgstr "" -#: ../../include/conversation.php:123 -msgid "channel" +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" msgstr "" -#: ../../include/conversation.php:145 ../../include/text.php:1627 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 -msgid "status" +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" msgstr "" -#: ../../include/conversation.php:147 ../../include/text.php:1629 -#: ../../mod/tagger.php:55 -msgid "comment" +#: ../../include/dir_fns.php:30 +msgid "Enable Safe Search" msgstr "" -#: ../../include/conversation.php:161 ../../mod/like.php:134 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../include/dir_fns.php:32 +msgid "Disable Safe Search" msgstr "" -#: ../../include/conversation.php:164 ../../mod/like.php:136 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../include/dir_fns.php:34 +msgid "Safe Mode" msgstr "" -#: ../../include/conversation.php:201 -#, php-format -msgid "%1$s is now connected with %2$s" +#: ../../include/enotify.php:40 +msgid "Red Matrix Notification" msgstr "" -#: ../../include/conversation.php:236 -#, php-format -msgid "%1$s poked %2$s" +#: ../../include/enotify.php:41 +msgid "redmatrix" msgstr "" -#: ../../include/conversation.php:240 ../../include/text.php:790 -msgid "poked" +#: ../../include/enotify.php:43 +msgid "Thank You," msgstr "" -#: ../../include/conversation.php:258 ../../mod/mood.php:63 +#: ../../include/enotify.php:45 #, php-format -msgid "%1$s is currently %2$s" +msgid "%s Administrator" msgstr "" -#: ../../include/conversation.php:662 +#: ../../include/enotify.php:80 #, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:676 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:677 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:704 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:830 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:834 -msgid "Loading..." -msgstr "" - -#: ../../include/conversation.php:835 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:926 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:927 -msgid "Follow Thread" -msgstr "" - -#: ../../include/conversation.php:928 -msgid "View Status" -msgstr "" - -#: ../../include/conversation.php:930 -msgid "View Photos" -msgstr "" - -#: ../../include/conversation.php:931 -msgid "Matrix Activity" -msgstr "" - -#: ../../include/conversation.php:932 -msgid "Edit Contact" -msgstr "" - -#: ../../include/conversation.php:933 -msgid "Send PM" -msgstr "" - -#: ../../include/conversation.php:934 -msgid "Poke" +msgid "%s " msgstr "" -#: ../../include/conversation.php:996 +#: ../../include/enotify.php:84 #, php-format -msgid "%s likes this." +msgid "[Red:Notify] New mail received at %s" msgstr "" -#: ../../include/conversation.php:996 +#: ../../include/enotify.php:86 #, php-format -msgid "%s doesn't like this." +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" -#: ../../include/conversation.php:1000 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1002 +#: ../../include/enotify.php:87 #, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1008 -msgid "and" +msgid "%1$s sent you %2$s." msgstr "" -#: ../../include/conversation.php:1011 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1012 -#, php-format -msgid "%s like this." +#: ../../include/enotify.php:87 +msgid "a private message" msgstr "" -#: ../../include/conversation.php:1012 +#: ../../include/enotify.php:88 #, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:1062 -msgid "Visible to everybody" -msgstr "" - -#: ../../include/conversation.php:1063 ../../mod/message.php:258 -#: ../../mod/message.php:393 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../include/conversation.php:1064 -msgid "Please enter a video link/URL:" -msgstr "" - -#: ../../include/conversation.php:1065 -msgid "Please enter an audio link/URL:" -msgstr "" - -#: ../../include/conversation.php:1066 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1067 ../../mod/filer.php:35 -msgid "Save to Folder:" -msgstr "" - -#: ../../include/conversation.php:1068 -msgid "Where are you right now?" -msgstr "" - -#: ../../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:1067 -msgid "Share" -msgstr "" - -#: ../../include/conversation.php:1095 ../../mod/editwebpage.php:139 -msgid "Page link title" -msgstr "" - -#: ../../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" -msgstr "" - -#: ../../include/conversation.php:1098 -msgid "upload photo" -msgstr "" - -#: ../../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" -msgstr "" - -#: ../../include/conversation.php:1100 -msgid "attach file" -msgstr "" - -#: ../../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" -msgstr "" - -#: ../../include/conversation.php:1102 -msgid "web link" -msgstr "" - -#: ../../include/conversation.php:1103 -msgid "Insert video link" -msgstr "" - -#: ../../include/conversation.php:1104 -msgid "video link" -msgstr "" - -#: ../../include/conversation.php:1105 -msgid "Insert audio link" -msgstr "" - -#: ../../include/conversation.php:1106 -msgid "audio link" -msgstr "" - -#: ../../include/conversation.php:1107 ../../mod/editlayout.php:107 -#: ../../mod/editwebpage.php:150 ../../mod/editpost.php:104 -#: ../../mod/editblock.php:121 -msgid "Set your location" +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../include/conversation.php:1108 -msgid "set location" +#: ../../include/enotify.php:139 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../include/conversation.php:1109 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:105 -#: ../../mod/editblock.php:122 -msgid "Clear browser location" +#: ../../include/enotify.php:147 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../include/conversation.php:1110 -msgid "clear location" +#: ../../include/enotify.php:156 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../include/conversation.php:1112 ../../mod/editlayout.php:121 -#: ../../mod/editwebpage.php:168 ../../mod/editpost.php:118 -#: ../../mod/editblock.php:136 -msgid "Set title" +#: ../../include/enotify.php:167 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../include/conversation.php:1115 ../../mod/editlayout.php:123 -#: ../../mod/editwebpage.php:170 ../../mod/editpost.php:120 -#: ../../mod/editblock.php:138 -msgid "Categories (comma-separated list)" +#: ../../include/enotify.php:168 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../include/conversation.php:1117 ../../mod/editlayout.php:110 -#: ../../mod/editwebpage.php:153 ../../mod/editpost.php:107 -#: ../../mod/editblock.php:124 -msgid "Permission settings" +#: ../../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 "" -#: ../../include/conversation.php:1118 -msgid "permissions" +#: ../../include/enotify.php:178 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" msgstr "" -#: ../../include/conversation.php:1126 ../../mod/editlayout.php:118 -#: ../../mod/editwebpage.php:163 ../../mod/editpost.php:115 -#: ../../mod/editblock.php:133 -msgid "Public post" +#: ../../include/enotify.php:180 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../include/conversation.php:1128 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:171 ../../mod/editpost.php:121 -#: ../../mod/editblock.php:139 -msgid "Example: bob@example.com, mary@example.com" +#: ../../include/enotify.php:182 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../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" +#: ../../include/enotify.php:206 +#, php-format +msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../include/conversation.php:1368 -msgid "Commented Order" +#: ../../include/enotify.php:207 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../include/conversation.php:1371 -msgid "Sort by Comment Date" +#: ../../include/enotify.php:208 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../include/conversation.php:1374 -msgid "Posted Order" +#: ../../include/enotify.php:221 +#, php-format +msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../include/conversation.php:1377 -msgid "Sort by Post Date" +#: ../../include/enotify.php:222 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../include/conversation.php:1381 -msgid "Personal" +#: ../../include/enotify.php:223 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../include/conversation.php:1384 -msgid "Posts that mention or involve you" +#: ../../include/enotify.php:239 +#, php-format +msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../include/conversation.php:1387 ../../mod/menu.php:57 -#: ../../mod/connections.php:209 -msgid "New" +#: ../../include/enotify.php:240 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" msgstr "" -#: ../../include/conversation.php:1390 -msgid "Activity Stream - by date" +#: ../../include/enotify.php:241 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../include/conversation.php:1397 -msgid "Starred" +#: ../../include/enotify.php:253 +msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../include/conversation.php:1400 -msgid "Favourite Posts" +#: ../../include/enotify.php:254 +#, php-format +msgid "%1$s, you've received an introduction from '%2$s' at %3$s" msgstr "" -#: ../../include/conversation.php:1407 -msgid "Spam" +#: ../../include/enotify.php:255 +#, php-format +msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." msgstr "" -#: ../../include/conversation.php:1410 -msgid "Posts flagged as SPAM" +#: ../../include/enotify.php:259 ../../include/enotify.php:278 +#, php-format +msgid "You may visit their profile at %s" msgstr "" -#: ../../include/conversation.php:1440 -msgid "Channel" +#: ../../include/enotify.php:261 +#, php-format +msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/conversation.php:1443 -msgid "Status Messages and Posts" +#: ../../include/enotify.php:268 +msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../include/conversation.php:1447 -msgid "About" +#: ../../include/enotify.php:269 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../include/conversation.php:1450 -msgid "Profile Details" +#: ../../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/conversation.php:1468 -msgid "Events and Calendar" +#: ../../include/enotify.php:276 +msgid "Name:" msgstr "" -#: ../../include/conversation.php:1473 -msgid "Webpages" +#: ../../include/enotify.php:277 +msgid "Photo:" msgstr "" -#: ../../include/conversation.php:1476 -msgid "Manage Webpages" +#: ../../include/enotify.php:280 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." msgstr "" #: ../../include/auth.php:69 @@ -2341,8 +2211,8 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:24 ../../mod/connections.php:355 -#: ../../mod/directory.php:222 ../../mod/directory.php:227 +#: ../../include/contact_widgets.php:24 ../../mod/directory.php:205 +#: ../../mod/directory.php:210 ../../mod/connections.php:355 msgid "Find" msgstr "" @@ -2369,6 +2239,14 @@ msgstr[1] "" msgid "New Page" msgstr "" +#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:95 +#: ../../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/text.php:315 msgid "prev" msgstr "" @@ -2408,267 +2286,267 @@ msgstr[1] "" msgid "View Connections" msgstr "" -#: ../../include/text.php:790 +#: ../../include/text.php:818 msgid "poke" msgstr "" -#: ../../include/text.php:791 +#: ../../include/text.php:819 msgid "ping" msgstr "" -#: ../../include/text.php:791 +#: ../../include/text.php:819 msgid "pinged" msgstr "" -#: ../../include/text.php:792 +#: ../../include/text.php:820 msgid "prod" msgstr "" -#: ../../include/text.php:792 +#: ../../include/text.php:820 msgid "prodded" msgstr "" -#: ../../include/text.php:793 +#: ../../include/text.php:821 msgid "slap" msgstr "" -#: ../../include/text.php:793 +#: ../../include/text.php:821 msgid "slapped" msgstr "" -#: ../../include/text.php:794 +#: ../../include/text.php:822 msgid "finger" msgstr "" -#: ../../include/text.php:794 +#: ../../include/text.php:822 msgid "fingered" msgstr "" -#: ../../include/text.php:795 +#: ../../include/text.php:823 msgid "rebuff" msgstr "" -#: ../../include/text.php:795 +#: ../../include/text.php:823 msgid "rebuffed" msgstr "" -#: ../../include/text.php:807 +#: ../../include/text.php:835 msgid "happy" msgstr "" -#: ../../include/text.php:808 +#: ../../include/text.php:836 msgid "sad" msgstr "" -#: ../../include/text.php:809 +#: ../../include/text.php:837 msgid "mellow" msgstr "" -#: ../../include/text.php:810 +#: ../../include/text.php:838 msgid "tired" msgstr "" -#: ../../include/text.php:811 +#: ../../include/text.php:839 msgid "perky" msgstr "" -#: ../../include/text.php:812 +#: ../../include/text.php:840 msgid "angry" msgstr "" -#: ../../include/text.php:813 +#: ../../include/text.php:841 msgid "stupified" msgstr "" -#: ../../include/text.php:814 +#: ../../include/text.php:842 msgid "puzzled" msgstr "" -#: ../../include/text.php:815 +#: ../../include/text.php:843 msgid "interested" msgstr "" -#: ../../include/text.php:816 +#: ../../include/text.php:844 msgid "bitter" msgstr "" -#: ../../include/text.php:817 +#: ../../include/text.php:845 msgid "cheerful" msgstr "" -#: ../../include/text.php:818 +#: ../../include/text.php:846 msgid "alive" msgstr "" -#: ../../include/text.php:819 +#: ../../include/text.php:847 msgid "annoyed" msgstr "" -#: ../../include/text.php:820 +#: ../../include/text.php:848 msgid "anxious" msgstr "" -#: ../../include/text.php:821 +#: ../../include/text.php:849 msgid "cranky" msgstr "" -#: ../../include/text.php:822 +#: ../../include/text.php:850 msgid "disturbed" msgstr "" -#: ../../include/text.php:823 +#: ../../include/text.php:851 msgid "frustrated" msgstr "" -#: ../../include/text.php:824 +#: ../../include/text.php:852 msgid "motivated" msgstr "" -#: ../../include/text.php:825 +#: ../../include/text.php:853 msgid "relaxed" msgstr "" -#: ../../include/text.php:826 +#: ../../include/text.php:854 msgid "surprised" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Monday" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Tuesday" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Wednesday" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Thursday" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Friday" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Saturday" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:1016 msgid "Sunday" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "January" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "February" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "March" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "April" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "May" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "June" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "July" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "August" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "September" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "October" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "November" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1020 msgid "December" msgstr "" -#: ../../include/text.php:1070 +#: ../../include/text.php:1098 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1071 +#: ../../include/text.php:1099 msgid "bytes" msgstr "" -#: ../../include/text.php:1106 +#: ../../include/text.php:1134 msgid "remove category" msgstr "" -#: ../../include/text.php:1128 +#: ../../include/text.php:1156 msgid "remove from file" msgstr "" -#: ../../include/text.php:1182 ../../include/text.php:1194 +#: ../../include/text.php:1214 ../../include/text.php:1226 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1370 ../../mod/events.php:332 +#: ../../include/text.php:1402 ../../mod/events.php:332 msgid "link to source" msgstr "" -#: ../../include/text.php:1389 +#: ../../include/text.php:1421 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1392 ../../include/text.php:1457 +#: ../../include/text.php:1424 ../../include/text.php:1489 msgid "default" msgstr "" -#: ../../include/text.php:1428 +#: ../../include/text.php:1460 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1469 +#: ../../include/text.php:1501 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1634 +#: ../../include/text.php:1666 msgid "activity" msgstr "" -#: ../../include/text.php:1896 +#: ../../include/text.php:1928 msgid "Design" msgstr "" -#: ../../include/text.php:1898 +#: ../../include/text.php:1930 msgid "Blocks" msgstr "" -#: ../../include/text.php:1899 +#: ../../include/text.php:1931 msgid "Menus" msgstr "" -#: ../../include/text.php:1900 +#: ../../include/text.php:1932 msgid "Layouts" msgstr "" -#: ../../include/text.php:1901 +#: ../../include/text.php:1933 msgid "Pages" msgstr "" @@ -2801,7 +2679,7 @@ msgstr "" msgid "Default" msgstr "" -#: ../../include/identity.php:29 ../../mod/item.php:1151 +#: ../../include/identity.php:29 ../../mod/item.php:1152 msgid "Unable to obtain identity information from database" msgstr "" @@ -2813,219 +2691,354 @@ msgstr "" msgid "Name too long" msgstr "" -#: ../../include/identity.php:132 +#: ../../include/identity.php:143 msgid "No account identifier" msgstr "" -#: ../../include/identity.php:142 +#: ../../include/identity.php:153 msgid "Nickname is required." msgstr "" -#: ../../include/identity.php:156 +#: ../../include/identity.php:167 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:215 +#: ../../include/identity.php:226 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:273 +#: ../../include/identity.php:285 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:465 +#: ../../include/identity.php:477 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:477 +#: ../../include/identity.php:489 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../include/identity.php:512 ../../mod/webpages.php:8 +#: ../../include/identity.php:524 ../../mod/webpages.php:8 #: ../../mod/connect.php:13 ../../mod/layouts.php:8 -#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 -#: ../../mod/profile.php:16 +#: ../../mod/achievements.php:8 ../../mod/filestorage.php:8 +#: ../../mod/blocks.php:10 ../../mod/profile.php:16 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:627 ../../mod/profiles.php:613 +#: ../../include/identity.php:639 ../../mod/profiles.php:613 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:633 +#: ../../include/identity.php:645 msgid "Profiles" msgstr "" -#: ../../include/identity.php:633 +#: ../../include/identity.php:645 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:634 ../../mod/profiles.php:614 +#: ../../include/identity.php:646 ../../mod/profiles.php:614 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:637 +#: ../../include/identity.php:649 msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:648 ../../mod/profiles.php:625 +#: ../../include/identity.php:660 ../../mod/profiles.php:625 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:651 ../../mod/profiles.php:628 +#: ../../include/identity.php:663 ../../mod/profiles.php:628 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:652 ../../mod/profiles.php:629 +#: ../../include/identity.php:664 ../../mod/profiles.php:629 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:666 ../../include/identity.php:891 -#: ../../mod/directory.php:174 +#: ../../include/identity.php:678 ../../include/identity.php:903 +#: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:667 ../../include/identity.php:911 -#: ../../mod/directory.php:176 +#: ../../include/identity.php:679 ../../include/identity.php:923 +#: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:668 ../../include/identity.php:922 -#: ../../mod/directory.php:178 +#: ../../include/identity.php:680 ../../include/identity.php:934 +#: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:735 ../../include/identity.php:815 +#: ../../include/identity.php:747 ../../include/identity.php:827 #: ../../mod/ping.php:230 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:736 ../../include/identity.php:816 +#: ../../include/identity.php:748 ../../include/identity.php:828 msgid "F d" msgstr "" -#: ../../include/identity.php:781 ../../include/identity.php:856 +#: ../../include/identity.php:793 ../../include/identity.php:868 #: ../../mod/ping.php:252 msgid "[today]" msgstr "" -#: ../../include/identity.php:793 +#: ../../include/identity.php:805 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:794 +#: ../../include/identity.php:806 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:849 +#: ../../include/identity.php:861 msgid "[No description]" msgstr "" -#: ../../include/identity.php:867 +#: ../../include/identity.php:879 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:868 +#: ../../include/identity.php:880 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:881 ../../include/identity.php:992 +#: ../../include/identity.php:893 ../../include/identity.php:1004 #: ../../mod/profperm.php:103 msgid "Profile" msgstr "" -#: ../../include/identity.php:889 ../../mod/settings.php:911 +#: ../../include/identity.php:901 ../../mod/settings.php:911 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:896 +#: ../../include/identity.php:908 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:897 +#: ../../include/identity.php:909 msgid "j F" msgstr "" -#: ../../include/identity.php:904 +#: ../../include/identity.php:916 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:908 +#: ../../include/identity.php:920 msgid "Age:" msgstr "" -#: ../../include/identity.php:917 +#: ../../include/identity.php:929 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:920 ../../mod/profiles.php:538 +#: ../../include/identity.php:932 ../../mod/profiles.php:538 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:924 ../../mod/profiles.php:540 +#: ../../include/identity.php:936 ../../mod/profiles.php:540 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:926 +#: ../../include/identity.php:938 msgid "Tags:" msgstr "" -#: ../../include/identity.php:928 ../../mod/profiles.php:541 +#: ../../include/identity.php:940 ../../mod/profiles.php:541 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:930 +#: ../../include/identity.php:942 msgid "Religion:" msgstr "" -#: ../../include/identity.php:932 ../../mod/directory.php:180 +#: ../../include/identity.php:944 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:934 +#: ../../include/identity.php:946 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:936 ../../mod/profiles.php:544 -msgid "Likes:" +#: ../../include/identity.php:948 ../../mod/profiles.php:544 +msgid "Likes:" +msgstr "" + +#: ../../include/identity.php:950 ../../mod/profiles.php:545 +msgid "Dislikes:" +msgstr "" + +#: ../../include/identity.php:953 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/identity.php:955 +msgid "Musical interests:" +msgstr "" + +#: ../../include/identity.php:957 +msgid "Books, literature:" +msgstr "" + +#: ../../include/identity.php:959 +msgid "Television:" +msgstr "" + +#: ../../include/identity.php:961 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/identity.php:963 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/identity.php:965 +msgid "Work/employment:" +msgstr "" + +#: ../../include/identity.php:967 +msgid "School/education:" +msgstr "" + +#: ../../include/ItemObject.php:88 ../../mod/photos.php:954 +msgid "Private Message" +msgstr "" + +#: ../../include/ItemObject.php:117 +msgid "save to folder" +msgstr "" + +#: ../../include/ItemObject.php:145 +msgid "add star" +msgstr "" + +#: ../../include/ItemObject.php:146 +msgid "remove star" +msgstr "" + +#: ../../include/ItemObject.php:147 +msgid "toggle star status" +msgstr "" + +#: ../../include/ItemObject.php:151 +msgid "starred" +msgstr "" + +#: ../../include/ItemObject.php:168 +msgid "add tag" +msgstr "" + +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1060 +msgid "I like this (toggle)" +msgstr "" + +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1061 +msgid "I don't like this (toggle)" +msgstr "" + +#: ../../include/ItemObject.php:177 +msgid "Share this" +msgstr "" + +#: ../../include/ItemObject.php:177 +msgid "share" +msgstr "" + +#: ../../include/ItemObject.php:201 ../../include/ItemObject.php:202 +#, php-format +msgid "View %s's profile - %s" +msgstr "" + +#: ../../include/ItemObject.php:203 +msgid "to" +msgstr "" + +#: ../../include/ItemObject.php:204 +msgid "via" +msgstr "" + +#: ../../include/ItemObject.php:205 +msgid "Wall-to-Wall" +msgstr "" + +#: ../../include/ItemObject.php:206 +msgid "via Wall-To-Wall:" +msgstr "" + +#: ../../include/ItemObject.php:220 +#, php-format +msgid "Expires: %s" +msgstr "" + +#: ../../include/ItemObject.php:268 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/ItemObject.php:528 ../../mod/photos.php:1079 +#: ../../mod/photos.php:1166 +msgid "This is you" msgstr "" -#: ../../include/identity.php:938 ../../mod/profiles.php:545 -msgid "Dislikes:" +#: ../../include/ItemObject.php:531 ../../mod/events.php:470 +#: ../../mod/thing.php:190 ../../mod/invite.php:156 ../../mod/connedit.php:434 +#: ../../mod/setup.php:302 ../../mod/setup.php:345 ../../mod/connect.php:92 +#: ../../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:81 ../../mod/photos.php:677 +#: ../../mod/photos.php:782 ../../mod/photos.php:1042 +#: ../../mod/photos.php:1082 ../../mod/photos.php:1169 +#: ../../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/mail.php:223 ../../mod/mail.php:335 ../../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 +msgid "Submit" msgstr "" -#: ../../include/identity.php:941 -msgid "Contact information and Social Networks:" +#: ../../include/ItemObject.php:532 +msgid "Bold" msgstr "" -#: ../../include/identity.php:943 -msgid "Musical interests:" +#: ../../include/ItemObject.php:533 +msgid "Italic" msgstr "" -#: ../../include/identity.php:945 -msgid "Books, literature:" +#: ../../include/ItemObject.php:534 +msgid "Underline" msgstr "" -#: ../../include/identity.php:947 -msgid "Television:" +#: ../../include/ItemObject.php:535 +msgid "Quote" msgstr "" -#: ../../include/identity.php:949 -msgid "Film/dance/culture/entertainment:" +#: ../../include/ItemObject.php:536 +msgid "Code" msgstr "" -#: ../../include/identity.php:951 -msgid "Love/Romance:" +#: ../../include/ItemObject.php:537 +msgid "Image" msgstr "" -#: ../../include/identity.php:953 -msgid "Work/employment:" +#: ../../include/ItemObject.php:538 +msgid "Link" msgstr "" -#: ../../include/identity.php:955 -msgid "School/education:" +#: ../../include/ItemObject.php:539 +msgid "Video" msgstr "" #: ../../include/security.php:49 @@ -3205,74 +3218,73 @@ msgstr "" msgid "Total invitation limit exceeded." msgstr "" -#: ../../mod/invite.php:47 +#: ../../mod/invite.php:49 #, php-format msgid "%s : Not a valid email address." msgstr "" -#: ../../mod/invite.php:74 +#: ../../mod/invite.php:76 msgid "Please join us on Red" msgstr "" -#: ../../mod/invite.php:85 +#: ../../mod/invite.php:87 msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../mod/invite.php:90 +#: ../../mod/invite.php:92 #, php-format msgid "%s : Message delivery failed." msgstr "" -#: ../../mod/invite.php:94 +#: ../../mod/invite.php:96 #, php-format msgid "%d message sent." msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: ../../mod/invite.php:113 +#: ../../mod/invite.php:115 msgid "You have no more invitations available" msgstr "" -#: ../../mod/invite.php:139 +#: ../../mod/invite.php:141 msgid "Send invitations" msgstr "" -#: ../../mod/invite.php:140 +#: ../../mod/invite.php:142 msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:303 -#: ../../mod/message.php:452 +#: ../../mod/invite.php:143 ../../mod/mail.php:216 ../../mod/mail.php:328 msgid "Your message:" msgstr "" -#: ../../mod/invite.php:142 +#: ../../mod/invite.php:144 msgid "" "You are cordially invited to join me and some other close friends on the Red " "Matrix - a revolutionary new decentralised communication and information " "tool." msgstr "" -#: ../../mod/invite.php:144 +#: ../../mod/invite.php:146 msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../mod/invite.php:145 +#: ../../mod/invite.php:147 msgid "Please visit my channel at" msgstr "" -#: ../../mod/invite.php:149 +#: ../../mod/invite.php:151 msgid "" "Once you have registered (on ANY Red Matrix site - they are all inter-" "connected), please connect with my Red Matrix channel address:" msgstr "" -#: ../../mod/invite.php:151 +#: ../../mod/invite.php:153 msgid "Click the [Register] link on the following page to join." msgstr "" -#: ../../mod/invite.php:153 +#: ../../mod/invite.php:155 msgid "" "For more information about the Red Matrix Project and why it has the " "potential to change the internet as we know it, please visit http://getzot." @@ -4020,9 +4032,9 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/viewconnections.php:17 ../../mod/search.php:80 -#: ../../mod/photos.php:570 ../../mod/display.php:9 ../../mod/community.php:18 -#: ../../mod/directory.php:31 +#: ../../mod/viewconnections.php:17 ../../mod/search.php:12 +#: ../../mod/photos.php:566 ../../mod/directory.php:15 ../../mod/display.php:9 +#: ../../mod/community.php:18 ../../mod/dirprofile.php:9 msgid "Public access denied." msgstr "" @@ -4039,12 +4051,6 @@ 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 "" @@ -4061,46 +4067,46 @@ msgstr "" msgid "Remove" msgstr "" -#: ../../mod/connect.php:59 ../../mod/connect.php:107 +#: ../../mod/connect.php:55 ../../mod/connect.php:103 msgid "Continue" msgstr "" -#: ../../mod/connect.php:88 +#: ../../mod/connect.php:84 msgid "Premium Channel Setup" msgstr "" -#: ../../mod/connect.php:90 +#: ../../mod/connect.php:86 msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../mod/connect.php:91 +#: ../../mod/connect.php:87 msgid "" "Please enter your restrictions or conditions, such as paypal receipt, usage " "guidelines, etc." msgstr "" -#: ../../mod/connect.php:93 ../../mod/connect.php:113 +#: ../../mod/connect.php:89 ../../mod/connect.php:109 msgid "" "This channel may require additional steps or acknowledgement of the " "following conditions prior to connecting:" msgstr "" -#: ../../mod/connect.php:94 +#: ../../mod/connect.php:90 msgid "" "Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../mod/connect.php:95 ../../mod/connect.php:116 +#: ../../mod/connect.php:91 ../../mod/connect.php:112 msgid "" "By continuing, I certify that I have complied with any instructions provided " "on this page." msgstr "" -#: ../../mod/connect.php:104 +#: ../../mod/connect.php:100 msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../mod/connect.php:112 +#: ../../mod/connect.php:108 msgid "Restricted or Premium Channel" msgstr "" @@ -4308,7 +4314,7 @@ msgstr "" msgid "Tiered Access" msgstr "" -#: ../../mod/admin.php:421 ../../mod/register.php:180 +#: ../../mod/admin.php:421 ../../mod/register.php:189 msgid "Registration" msgstr "" @@ -4746,102 +4752,103 @@ msgid "Unable to add menu element." msgstr "" #: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113 +#: ../../mod/dirprofile.php:173 msgid "Not found." msgstr "" -#: ../../mod/mitem.php:99 +#: ../../mod/mitem.php:96 msgid "Manage Menu Elements" msgstr "" -#: ../../mod/mitem.php:102 +#: ../../mod/mitem.php:99 msgid "Edit menu" msgstr "" -#: ../../mod/mitem.php:105 +#: ../../mod/mitem.php:102 msgid "Edit element" msgstr "" -#: ../../mod/mitem.php:106 +#: ../../mod/mitem.php:103 msgid "Drop element" msgstr "" -#: ../../mod/mitem.php:107 +#: ../../mod/mitem.php:104 msgid "New element" msgstr "" -#: ../../mod/mitem.php:108 +#: ../../mod/mitem.php:105 msgid "Edit this menu container" msgstr "" -#: ../../mod/mitem.php:109 +#: ../../mod/mitem.php:106 msgid "Add menu element" msgstr "" -#: ../../mod/mitem.php:110 +#: ../../mod/mitem.php:107 msgid "Delete this menu item" msgstr "" -#: ../../mod/mitem.php:111 +#: ../../mod/mitem.php:108 msgid "Edit this menu item" msgstr "" -#: ../../mod/mitem.php:134 +#: ../../mod/mitem.php:131 msgid "New Menu Element" msgstr "" -#: ../../mod/mitem.php:136 ../../mod/mitem.php:179 +#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 msgid "Menu Item Permissions" msgstr "" -#: ../../mod/mitem.php:137 ../../mod/mitem.php:180 ../../mod/settings.php:930 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:930 msgid "(click to open/close)" msgstr "" -#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 +#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 msgid "Link text" msgstr "" -#: ../../mod/mitem.php:140 ../../mod/mitem.php:184 +#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 msgid "URL of link" msgstr "" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/mitem.php:142 ../../mod/mitem.php:186 +#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 msgid "Open link in new window" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:188 +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 msgid "Order in list" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:188 +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/mitem.php:145 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +#: ../../mod/mitem.php:142 ../../mod/menu.php:79 ../../mod/new_channel.php:117 msgid "Create" msgstr "" -#: ../../mod/mitem.php:157 +#: ../../mod/mitem.php:154 msgid "Menu item not found." msgstr "" -#: ../../mod/mitem.php:166 +#: ../../mod/mitem.php:163 msgid "Menu item deleted." msgstr "" -#: ../../mod/mitem.php:168 +#: ../../mod/mitem.php:165 msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/mitem.php:177 +#: ../../mod/mitem.php:174 msgid "Edit Menu Element" msgstr "" -#: ../../mod/mitem.php:189 ../../mod/menu.php:107 +#: ../../mod/mitem.php:186 ../../mod/menu.php:107 msgid "Modify" msgstr "" @@ -4901,146 +4908,134 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:787 +#: ../../mod/photos.php:119 ../../mod/photos.php:783 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:159 ../../mod/photos.php:1048 +#: ../../mod/photos.php:159 ../../mod/photos.php:1043 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:504 +#: ../../mod/photos.php:500 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/photos.php:504 +#: ../../mod/photos.php:500 msgid "a photo" msgstr "" -#: ../../mod/photos.php:580 +#: ../../mod/photos.php:576 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:627 +#: ../../mod/photos.php:623 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:692 +#: ../../mod/photos.php:688 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:695 +#: ../../mod/photos.php:691 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:714 +#: ../../mod/photos.php:710 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:718 ../../mod/photos.php:782 +#: ../../mod/photos.php:714 ../../mod/photos.php:778 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:719 +#: ../../mod/photos.php:715 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:720 +#: ../../mod/photos.php:716 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:722 ../../mod/photos.php:1043 +#: ../../mod/photos.php:718 ../../mod/photos.php:1038 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:771 ../../mod/photos.php:793 ../../mod/photos.php:1219 -#: ../../mod/photos.php:1234 +#: ../../mod/photos.php:767 ../../mod/photos.php:789 ../../mod/photos.php:1214 +#: ../../mod/photos.php:1229 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:797 +#: ../../mod/photos.php:793 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:803 +#: ../../mod/photos.php:799 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:805 +#: ../../mod/photos.php:801 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:849 ../../mod/photos.php:1266 +#: ../../mod/photos.php:844 ../../mod/photos.php:1261 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:893 +#: ../../mod/photos.php:888 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:895 +#: ../../mod/photos.php:890 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:953 +#: ../../mod/photos.php:948 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:977 +#: ../../mod/photos.php:972 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1031 +#: ../../mod/photos.php:1026 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1033 +#: ../../mod/photos.php:1028 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1034 +#: ../../mod/photos.php:1029 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1036 +#: ../../mod/photos.php:1031 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1039 +#: ../../mod/photos.php:1034 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1041 +#: ../../mod/photos.php:1036 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1045 +#: ../../mod/photos.php:1040 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1272 +#: ../../mod/photos.php:1267 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1281 +#: ../../mod/photos.php:1276 msgid "Recent Photos" msgstr "" -#: ../../mod/ping.php:160 -msgid "sent you a private message" -msgstr "" - -#: ../../mod/ping.php:218 -msgid "added your channel" -msgstr "" - -#: ../../mod/ping.php:262 -msgid "posted an event" -msgstr "" - #: ../../mod/filer.php:35 msgid "- select -" msgstr "" @@ -5126,90 +5121,29 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: ../../mod/message.php:33 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../mod/message.php:41 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../mod/message.php:48 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../mod/message.php:74 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../mod/message.php:200 -msgid "Messages" -msgstr "" - -#: ../../mod/message.php:211 -msgid "Message deleted." -msgstr "" - -#: ../../mod/message.php:218 -msgid "Conversation removed." -msgstr "" - -#: ../../mod/message.php:235 -msgid "Message recalled." -msgstr "" - -#: ../../mod/message.php:293 -msgid "Send Private Message" -msgstr "" - -#: ../../mod/message.php:294 ../../mod/message.php:447 -msgid "To:" -msgstr "" - -#: ../../mod/message.php:299 ../../mod/message.php:449 -msgid "Subject:" -msgstr "" - -#: ../../mod/message.php:336 -msgid "No messages." -msgstr "" - -#: ../../mod/message.php:352 ../../mod/message.php:416 -msgid "Delete message" -msgstr "" - -#: ../../mod/message.php:354 -msgid "D, d M Y - g:i A" -msgstr "" - -#: ../../mod/message.php:373 -msgid "Message not found." -msgstr "" - -#: ../../mod/message.php:417 -msgid "Recall message" +#: ../../mod/directory.php:143 ../../mod/profiles.php:573 +#: ../../mod/dirprofile.php:93 +msgid "Age: " msgstr "" -#: ../../mod/message.php:419 -msgid "Message has been recalled." +#: ../../mod/directory.php:146 ../../mod/dirprofile.php:96 +msgid "Gender: " msgstr "" -#: ../../mod/message.php:436 -msgid "Private Conversation" +#: ../../mod/directory.php:206 +msgid "Finding:" msgstr "" -#: ../../mod/message.php:440 -msgid "Delete conversation" +#: ../../mod/directory.php:214 +msgid "next page" msgstr "" -#: ../../mod/message.php:442 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." +#: ../../mod/directory.php:214 +msgid "previous page" msgstr "" -#: ../../mod/message.php:446 -msgid "Send Reply" +#: ../../mod/directory.php:221 +msgid "No entries (some entries may be hidden)." msgstr "" #: ../../mod/connections.php:189 ../../mod/connections.php:261 @@ -5349,13 +5283,13 @@ msgstr "" msgid "Channel added." msgstr "" -#: ../../mod/post.php:222 +#: ../../mod/post.php:226 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../mod/post.php:251 +#: ../../mod/post.php:256 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" @@ -5612,10 +5546,6 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:573 ../../mod/directory.php:159 -msgid "Age: " -msgstr "" - #: ../../mod/profiles.php:612 msgid "Edit/Manage Profiles" msgstr "" @@ -6246,6 +6176,80 @@ msgstr "" msgid "Change the behaviour of this account for special situations" msgstr "" +#: ../../mod/mail.php:33 +msgid "Unable to lookup recipient." +msgstr "" + +#: ../../mod/mail.php:41 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../mod/mail.php:48 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../mod/mail.php:74 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + +#: ../../mod/mail.php:121 ../../mod/message.php:31 +msgid "Messages" +msgstr "" + +#: ../../mod/mail.php:132 +msgid "Message deleted." +msgstr "" + +#: ../../mod/mail.php:149 +msgid "Message recalled." +msgstr "" + +#: ../../mod/mail.php:206 +msgid "Send Private Message" +msgstr "" + +#: ../../mod/mail.php:207 ../../mod/mail.php:323 +msgid "To:" +msgstr "" + +#: ../../mod/mail.php:212 ../../mod/mail.php:325 +msgid "Subject:" +msgstr "" + +#: ../../mod/mail.php:249 +msgid "Message not found." +msgstr "" + +#: ../../mod/mail.php:292 ../../mod/message.php:72 +msgid "Delete message" +msgstr "" + +#: ../../mod/mail.php:293 +msgid "Recall message" +msgstr "" + +#: ../../mod/mail.php:295 +msgid "Message has been recalled." +msgstr "" + +#: ../../mod/mail.php:312 +msgid "Private Conversation" +msgstr "" + +#: ../../mod/mail.php:316 +msgid "Delete conversation" +msgstr "" + +#: ../../mod/mail.php:318 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "" + +#: ../../mod/mail.php:322 +msgid "Send Reply" +msgstr "" + #: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:32 #: ../../mod/editpost.php:20 ../../mod/editblock.php:36 msgid "Item not found" @@ -6414,7 +6418,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1078 msgid "Wall Photos" msgstr "" @@ -6491,24 +6495,24 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:341 +#: ../../mod/item.php:342 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:383 +#: ../../mod/item.php:384 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:793 +#: ../../mod/item.php:794 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1156 +#: ../../mod/item.php:1157 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1162 +#: ../../mod/item.php:1163 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6562,6 +6566,18 @@ msgid "" "hours." msgstr "" +#: ../../mod/message.php:41 +msgid "Conversation removed." +msgstr "" + +#: ../../mod/message.php:56 +msgid "No messages." +msgstr "" + +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" +msgstr "" + #: ../../mod/pubsites.php:22 msgid "Public Sites" msgstr "" @@ -6613,43 +6629,51 @@ msgstr "" msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:149 +#: ../../mod/register.php:147 +msgid "Registration on this site/hub is by approval only." +msgstr "" + +#: ../../mod/register.php:148 +msgid "Register at another affiliated site/hub" +msgstr "" + +#: ../../mod/register.php:156 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:160 +#: ../../mod/register.php:167 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:166 +#: ../../mod/register.php:173 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:168 +#: ../../mod/register.php:175 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:183 +#: ../../mod/register.php:194 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:184 +#: ../../mod/register.php:195 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:187 +#: ../../mod/register.php:198 msgid "Your email address" msgstr "" -#: ../../mod/register.php:188 +#: ../../mod/register.php:199 msgid "Choose a password" msgstr "" -#: ../../mod/register.php:189 +#: ../../mod/register.php:200 msgid "Please re-enter your password" msgstr "" @@ -6685,32 +6709,48 @@ msgstr "" msgid "Remove My Account" msgstr "" -#: ../../mod/directory.php:162 -msgid "Gender: " +#: ../../mod/mood.php:133 +msgid "Mood" msgstr "" -#: ../../mod/directory.php:223 -msgid "Finding:" +#: ../../mod/mood.php:134 +msgid "Set your current mood and tell your friends" msgstr "" -#: ../../mod/directory.php:231 -msgid "next page" +#: ../../mod/ping.php:160 +msgid "sent you a private message" msgstr "" -#: ../../mod/directory.php:231 -msgid "previous page" +#: ../../mod/ping.php:218 +msgid "added your channel" msgstr "" -#: ../../mod/directory.php:238 -msgid "No entries (some entries may be hidden)." +#: ../../mod/ping.php:262 +msgid "posted an event" msgstr "" -#: ../../mod/mood.php:133 -msgid "Mood" +#: ../../mod/dirprofile.php:109 +msgid "Status: " msgstr "" -#: ../../mod/mood.php:134 -msgid "Set your current mood and tell your friends" +#: ../../mod/dirprofile.php:110 +msgid "Sexual Preference: " +msgstr "" + +#: ../../mod/dirprofile.php:112 +msgid "Homepage: " +msgstr "" + +#: ../../mod/dirprofile.php:113 +msgid "Hometown: " +msgstr "" + +#: ../../mod/dirprofile.php:115 +msgid "About: " +msgstr "" + +#: ../../mod/dirprofile.php:160 +msgid "Keywords: " msgstr "" #: ../../view/theme/redbasic/php/config.php:74 diff --git a/version.inc b/version.inc index a5b44289f..5f829f0e0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-26.538 +2013-12-27.539 -- cgit v1.2.3 From 2cafe172dc2ea3ed968abe90ce35cec0e4b81580 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 27 Dec 2013 21:21:03 -0800 Subject: more doc updates --- doc/html/achievements_8php.html | 137 +++++++++++++++++++++++++++++++++++ doc/html/achievements_8php.js | 4 ++ doc/html/dirprofile_8php.html | 137 +++++++++++++++++++++++++++++++++++ doc/html/dirprofile_8php.js | 4 ++ doc/html/mail_8php.html | 155 ++++++++++++++++++++++++++++++++++++++++ doc/html/mail_8php.js | 5 ++ doc/html/sslify_8php.html | 137 +++++++++++++++++++++++++++++++++++ doc/html/sslify_8php.js | 4 ++ doc/html/xref_8php.html | 137 +++++++++++++++++++++++++++++++++++ doc/html/xref_8php.js | 4 ++ 10 files changed, 724 insertions(+) create mode 100644 doc/html/achievements_8php.html create mode 100644 doc/html/achievements_8php.js create mode 100644 doc/html/dirprofile_8php.html create mode 100644 doc/html/dirprofile_8php.js create mode 100644 doc/html/mail_8php.html create mode 100644 doc/html/mail_8php.js create mode 100644 doc/html/sslify_8php.html create mode 100644 doc/html/sslify_8php.js create mode 100644 doc/html/xref_8php.html create mode 100644 doc/html/xref_8php.js diff --git a/doc/html/achievements_8php.html b/doc/html/achievements_8php.html new file mode 100644 index 000000000..894abb4a4 --- /dev/null +++ b/doc/html/achievements_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/achievements.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    achievements.php File Reference
    +
    +
    + + + + +

    +Functions

     achievements_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    achievements_content (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/achievements_8php.js b/doc/html/achievements_8php.js new file mode 100644 index 000000000..319ac33da --- /dev/null +++ b/doc/html/achievements_8php.js @@ -0,0 +1,4 @@ +var achievements_8php = +[ + [ "achievements_content", "achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e", null ] +]; \ No newline at end of file diff --git a/doc/html/dirprofile_8php.html b/doc/html/dirprofile_8php.html new file mode 100644 index 000000000..94bcb7aad --- /dev/null +++ b/doc/html/dirprofile_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/dirprofile.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    dirprofile.php File Reference
    +
    +
    + + + + +

    +Functions

     dirprofile_init (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    dirprofile_init (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/dirprofile_8php.js b/doc/html/dirprofile_8php.js new file mode 100644 index 000000000..45cc06441 --- /dev/null +++ b/doc/html/dirprofile_8php.js @@ -0,0 +1,4 @@ +var dirprofile_8php = +[ + [ "dirprofile_init", "dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052", null ] +]; \ No newline at end of file diff --git a/doc/html/mail_8php.html b/doc/html/mail_8php.html new file mode 100644 index 000000000..830975bf1 --- /dev/null +++ b/doc/html/mail_8php.html @@ -0,0 +1,155 @@ + + + + + + +The Red Matrix: mod/mail.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    mail.php File Reference
    +
    +
    + + + + + + +

    +Functions

     mail_post (&$a)
     
     mail_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    mail_content (& $a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    mail_post (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/mail_8php.js b/doc/html/mail_8php.js new file mode 100644 index 000000000..8c79edcb0 --- /dev/null +++ b/doc/html/mail_8php.js @@ -0,0 +1,5 @@ +var mail_8php = +[ + [ "mail_content", "mail_8php.html#a3c7c485fc69f92371e8b20936040eca1", null ], + [ "mail_post", "mail_8php.html#acfc2cc0bf4e0b178207758384977f25a", null ] +]; \ No newline at end of file diff --git a/doc/html/sslify_8php.html b/doc/html/sslify_8php.html new file mode 100644 index 000000000..e408329b5 --- /dev/null +++ b/doc/html/sslify_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/sslify.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    sslify.php File Reference
    +
    +
    + + + + +

    +Functions

     sslify_init (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    sslify_init (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/sslify_8php.js b/doc/html/sslify_8php.js new file mode 100644 index 000000000..ec3ef3c09 --- /dev/null +++ b/doc/html/sslify_8php.js @@ -0,0 +1,4 @@ +var sslify_8php = +[ + [ "sslify_init", "sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316", null ] +]; \ No newline at end of file diff --git a/doc/html/xref_8php.html b/doc/html/xref_8php.html new file mode 100644 index 000000000..2f08a643f --- /dev/null +++ b/doc/html/xref_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/xref.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    xref.php File Reference
    +
    +
    + + + + +

    +Functions

     xref_init (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    xref_init (& $a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/xref_8php.js b/doc/html/xref_8php.js new file mode 100644 index 000000000..01291c5c5 --- /dev/null +++ b/doc/html/xref_8php.js @@ -0,0 +1,4 @@ +var xref_8php = +[ + [ "xref_init", "xref_8php.html#a9bee399213b8de8226b0d60834307473", null ] +]; \ No newline at end of file -- cgit v1.2.3 From 1d0fddd39c50205f697b040aab1655b282afa53d Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Dec 2013 13:28:49 -0800 Subject: things can now have (consistent sized) photos - plus I found a couple of issues with duplicate notifications and contact photos not getting an album name (it was crossed with filename). The last one doesn't matter as neither is used, but it was wrong so it has been corrected. Oh and thing photos weren't working at all because the form element name was different than what the module was looking for. But that had never been tested as I was waiting to get the import/resize finished. Next up for that module is display and deletion of things; but the priority is pretty low. --- include/photo/photo_driver.php | 26 +++++++++++++++++--------- mod/thing.php | 23 +++++++++++++++++------ version.inc | 2 +- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 3d8ee2196..4896f300b 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -513,20 +513,28 @@ function guess_image_type($filename, $headers = '') { } -function import_profile_photo($photo,$xchan) { +function import_profile_photo($photo,$xchan,$thing = false) { $a = get_app(); + $flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN); + $album = (($thing) ? 'Things' : 'Contact Photos'); + logger('import_profile_photo: updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG); - $r = q("select resource_id from photo where xchan = '%s' and scale = 4 limit 1", - dbesc($xchan) - ); - if($r) { - $hash = $r[0]['resource_id']; - } - else { + if($thing) $hash = photo_new_resource(); + else { + $r = q("select resource_id from photo where xchan = '%s' and (photo_flags & %d ) scale = 4 limit 1", + dbesc($xchan), + intval(PHOTO_XCHAN) + ); + if($r) { + $hash = $r[0]['resource_id']; + } + else { + $hash = photo_new_resource(); + } } $photo_failure = false; @@ -544,7 +552,7 @@ function import_profile_photo($photo,$xchan) { $img->scaleImageSquare(175); - $p = array('xchan' => $xchan,'resource_id' => $hash, 'filename' => 'Contact Photos', 'photo_flags' => PHOTO_XCHAN, 'scale' => 4); + $p = array('xchan' => $xchan,'resource_id' => $hash, 'filename' => basename($photo), 'album' => $album, 'photo_flags' => $flags, 'scale' => 4); $r = $img->save($p); diff --git a/mod/thing.php b/mod/thing.php index 91bdca78a..955a6c173 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -16,7 +16,7 @@ function thing_init(&$a) { $verb = escape_tags($_REQUEST['verb']); $profile_guid = escape_tags($_REQUEST['profile']); $url = $_REQUEST['link']; - $photo = $_REQUEST['photo']; + $photo = $_REQUEST['img']; $hash = random_string(); @@ -68,6 +68,14 @@ function thing_init(&$a) { else return; + $local_photo = null; + + if($photo) { + $arr = import_profile_photo($photo,get_observer_hash(),true); + $local_photo = $arr[0]; + $local_photo_type = $arr[3]; + } + $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1", intval(local_user()), @@ -85,7 +93,7 @@ function thing_init(&$a) { intval(TERM_THING), dbesc($name), dbesc(($url) ? $url : z_root() . '/thing/' . $hash), - dbesc(($photo) ? $photo : ''), + dbesc(($photo) ? $local_photo : ''), dbesc($hash) ); $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1", @@ -113,8 +121,10 @@ function thing_init(&$a) { info( t('thing/stuff added')); $arr = array(); - $links = array(array('rel' => 'alternate','type' => 'text/html', - 'href' => $term['url'])); + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $term['url'])); + if($local_photo) + $links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo); + $objtype = ACTIVITY_OBJ_THING; @@ -139,6 +149,9 @@ function thing_init(&$a) { $arr['body'] = sprintf( $bodyverb, $ulink, $translated_verb, $plink ); + if($local_photo) + $arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]"; + $arr['verb'] = $verb; $arr['obj_type'] = $objtype; $arr['object'] = $obj; @@ -161,8 +174,6 @@ function thing_init(&$a) { $ret = post_activity_item($arr); - if($ret['success']) - proc_run('php','include/notifier.php','tag',$ret['activity']['id']); } diff --git a/version.inc b/version.inc index 5f829f0e0..e4679339c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-27.539 +2013-12-28.540 -- cgit v1.2.3 From aacd3164fa9efdb4dc3f835f67a61dfc14dc8d11 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Dec 2013 16:05:03 -0800 Subject: allow objects to have permissions --- boot.php | 2 +- install/database.sql | 4 ++++ install/update.php | 12 +++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index eeaae7c8c..79f1b4f79 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1088 ); +define ( 'DB_UPDATE_VERSION', 1089 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 6be73f193..ac8382162 100644 --- a/install/database.sql +++ b/install/database.sql @@ -592,6 +592,10 @@ CREATE TABLE IF NOT EXISTS `obj` ( `obj_type` int(10) unsigned NOT NULL DEFAULT '0', `obj_obj` char(255) NOT NULL DEFAULT '', `obj_channel` int(10) unsigned NOT NULL DEFAULT '0', + `allow_cid` MEDIUMTEXT NOT NULL DEFAULT '', + `allow_gid` MEDIUMTEXT NOT NULL DEFAULT '', + `deny_cid` MEDIUMTEXT NOT NULL DEFAULT '', + `deny_gid` MEDIUMTEXT NOT NULL DEFAULT '', PRIMARY KEY (`obj_id`), KEY `obj_verb` (`obj_verb`), KEY `obj_page` (`obj_page`), diff --git a/install/update.php b/install/update.php index 8e64413dc..5025222a6 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sat, 28 Dec 2013 17:04:23 -0800 Subject: a bit more backend work on things --- include/identity.php | 35 +++---------------------- include/taxonomy.php | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ view/tpl/list_things.tpl | 13 +++++++++ 3 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 view/tpl/list_things.tpl diff --git a/include/identity.php b/include/identity.php index 63b05f4bb..5e25244e6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -966,44 +966,15 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt ); - $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_page = '%s' and uid = %d and obj_type = %d - order by obj_verb, term", - dbesc($a->profile['profile_guid']), - intval($a->profile['profile_uid']), - intval(TERM_OBJ_THING) - ); - - $things = null; - - if($r) { - $things = array(); - // Use the system obj_verbs array as a sort key, since we don't really - // want an alphabetic sort. To change the order, use a plugin to - // alter the obj_verbs() array or alter it in code. Unknown verbs come - // after the known ones - in no particular order. - - $v = obj_verbs(); - foreach($v as $k => $foo) - $things[$k] = null; - foreach($r as $rr) { - if(! $things[$rr['obj_verb']]) - $things[$rr['obj_verb']] = array(); - $things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl']); - } - $sorted_things = array(); - if($things) - foreach($things as $k => $v) - if(is_array($things[$k])) - $sorted_things[$k] = $v; - } + $things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']); - logger('mod_profile: things: ' . print_r($sorted_things,true), LOGGER_DATA); + logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); return replace_macros($tpl, array( '$title' => t('Profile'), '$profile' => $profile, - '$things' => $sorted_things + '$things' => $things )); } diff --git a/include/taxonomy.php b/include/taxonomy.php index 7887f7687..065f904fc 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -270,4 +270,72 @@ function obj_verb_selector() { $o .= ''; return $o; +} + +function get_things($profile_hash,$uid) { + + $sql_extra = (($profile_hash) ? " and obj_page = '" . $profile_hash . "' " : ''); + + $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and uid = %d and obj_type = %d $sql_extra order by obj_verb, term", + intval($uid), + intval(TERM_OBJ_THING) + ); + + + $things = $sorted_things = null; + + $profile_hashes = array(); + + if($r) { + + // if no profile_hash was specified (display on profile page mode), match each of the things to a profile name + // (list all my things mode). This is harder than it sounds. + + foreach($r as $rr) { + $rr['profile_name'] = ''; + if(! in_array($rr['term_hash'],$profile_hashes)) + $profile_hashes[] = $rr['term_hash']; + } + stringify_array_elms($profile_hashes); + if(! $profile_hash) { + $exp = explode(',',$profile_hashes); + $p = q("select profile_guid as hash, profile_name as name from profile where profile_guid in ( $exp ) "); + if($p) { + foreach($r as $rr) { + foreach($p as $pp) { + if($rr['obj_page'] == $pp['hash']) { + $rr['profile_name'] == $pp['name']; + } + } + } + } + } + + $things = array(); + + // Use the system obj_verbs array as a sort key, since we don't really + // want an alphabetic sort. To change the order, use a plugin to + // alter the obj_verbs() array or alter it in code. Unknown verbs come + // after the known ones - in no particular order. + + $v = obj_verbs(); + foreach($v as $k => $foo) + $things[$k] = null; + foreach($r as $rr) { + if(! $things[$rr['obj_verb']]) + $things[$rr['obj_verb']] = array(); + $things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl'], 'profile' => $rr['profile_name']); + } + $sorted_things = array(); + if($things) { + foreach($things as $k => $v) { + if(is_array($things[$k])) { + $sorted_things[$k] = $v; + } + } + } + } + + return $sorted_things; + } \ No newline at end of file diff --git a/view/tpl/list_things.tpl b/view/tpl/list_things.tpl new file mode 100644 index 000000000..fb8935d82 --- /dev/null +++ b/view/tpl/list_things.tpl @@ -0,0 +1,13 @@ +{{if $things}} +{{foreach $things as $key => $items}} +{{$items.profile}} {{$key}} +
      +{{foreach $items as $item}} +
    • {{if $item.img}}{{$item.term}}{{/if}} +{{$item.term}} +
      • +{{/foreach}} +
    +
    +{{/foreach}} +{{/if}} -- cgit v1.2.3 From f36be066af66e4e21913de3e8b4da0c7a05349b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Dec 2013 00:51:27 -0800 Subject: display_thing: it ain't much, but it's implemented. --- include/taxonomy.php | 1 - mod/thing.php | 16 +++++++++++++--- version.inc | 2 +- view/tpl/show_thing.tpl | 8 ++++++++ 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 view/tpl/show_thing.tpl diff --git a/include/taxonomy.php b/include/taxonomy.php index 065f904fc..67263100f 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -281,7 +281,6 @@ function get_things($profile_hash,$uid) { intval(TERM_OBJ_THING) ); - $things = $sorted_things = null; $profile_hashes = array(); diff --git a/mod/thing.php b/mod/thing.php index 955a6c173..3e2612c68 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -180,10 +180,20 @@ function thing_init(&$a) { function thing_content(&$a) { - /* placeholders */ - if(argc() > 1) { - return t('not yet implemented.'); + + $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_type = %d and term_hash = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc(argv(1)) + ); + + if($r) { + return replace_macros(get_markup_template('show_thing.tpl'), array( '$header' => t('Show Thing'), '$thing' => $r[0] )); + } + else { + notice( t('item not found.') . EOL); + return; + } } require_once('include/contact_selectors.php'); diff --git a/version.inc b/version.inc index e4679339c..ad14d79b1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-28.540 +2013-12-29.541 diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl new file mode 100644 index 000000000..d37c9bb1a --- /dev/null +++ b/view/tpl/show_thing.tpl @@ -0,0 +1,8 @@ +

    {{$header}}

    +{{if $thing}} +
    +{{if $thing.imgurl}}{{$thing.term}}{{/if}} +{{$thing.term}} +
    +{{/if}} + -- cgit v1.2.3 From c03c0724ed5190c720e8f6446c742d4078db43db Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Dec 2013 16:12:39 -0800 Subject: basic support for exclusion tags - we just need to use the results to tweak the ACL. --- js/fk.autocomplete.js | 4 +- mod/item.php | 155 +++++++++++++++++++++----------------------------- 2 files changed, 68 insertions(+), 91 deletions(-) diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index 8bac41936..763ca354d 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -151,7 +151,7 @@ ACPopup.prototype.onkey = function(event){ } function ContactAutocomplete(element,backend_url){ - this.pattern=/@([^ \n]+)$/; + this.pattern=/@(\!*)([^ \n]+)$/; this.popup=null; var that = this; @@ -170,7 +170,7 @@ function ContactAutocomplete(element,backend_url){ if (that.popup===null){ that.popup = new ACPopup(this, backend_url); } - if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]); + if (that.popup.ready && match[2]!==that.popup.searchText) that.popup.search(match[2]); if (!that.popup.ready) that.popup=null; } else { diff --git a/mod/item.php b/mod/item.php index b7ad6b97c..8eec4aad9 100644 --- a/mod/item.php +++ b/mod/item.php @@ -492,7 +492,9 @@ function item_post(&$a) { $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); logger('handle_tag: ' . print_r($success,tue)); - + if($inform) { + logger('inform: ' . $tag . ' ' . print_r($inform,true)); + } if($success['replaced']) { $tagged[] = $tag; $post_tags[] = array( @@ -893,13 +895,14 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { //is it a hash tag? if(strpos($tag,'#') === 0) { - //if the tag is replaced... - if(strpos($tag,'[zrl=')) + // if the tag is replaced... + if(strpos($tag,'[zrl=')) { //...do nothing return $replaced; + } if($tag == '#getzot') { - $basetag = 'getzot'; - $url = 'http://getzot.com'; + $basetag = 'getzot'; + $url = 'https://redmatrix.me'; $newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]'; $body = str_replace($tag,$newtag,$body); $replaced = true; @@ -923,116 +926,90 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { } return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $basetag, 'url' => $url, 'contact' => $r[0]); } + //is it a person tag? if(strpos($tag,'@') === 0) { + $exclusive = ((strpos($tag,'!') === 1) ? true : false); //is it already replaced? if(strpos($tag,'[zrl=')) return $replaced; $stat = false; //get the person's name - $name = substr($tag,1); - //is it a link or a full dfrn address? - if((strpos($name,'@')) || (strpos($name,'http://'))) { - $newname = $name; - //get the profile links - $links = @lrdd($name); - if(count($links)) { - //for all links, collect how is to inform and how's profile is to link - foreach($links as $link) { - if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') - $profile = $link['@attributes']['href']; - if($link['@attributes']['rel'] === 'salmon') { - if(strlen($inform)) - $inform .= ','; - $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']); - } - } + $name = substr($tag,(($exclusive) ? 2 : 1)); + $newname = $name; + $alias = ''; + $tagcid = 0; + + //is it some generated name? + + if(strrpos($newname,'+')) { + //get the id + $tagcid = intval(substr($newname,strrpos($newname,'+') + 1)); + //remove the next word from tag's name + if(strpos($name,' ')) { + $name = substr($name,0,strpos($name,' ')); } - } else { //if it is a name rather than an address - $newname = $name; - $alias = ''; - $tagcid = 0; - //is it some generated name? - if(strrpos($newname,'+')) { - //get the id - $tagcid = intval(substr($newname,strrpos($newname,'+') + 1)); - //remove the next word from tag's name - if(strpos($name,' ')) { - $name = substr($name,0,strpos($name,' ')); - } - } - if($tagcid) { //if there was an id - //select contact with that id from the logged in user's contact list + if($tagcid) { // if there was an id + // select channel with that id from the logged in user's address book $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($tagcid), intval($profile_uid) ); - } - else { - $newname = str_replace('_',' ',$name); + } - //select someone from this user's contacts by name - $r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash - WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1", - dbesc($newname), - intval($profile_uid) - ); + else { + $newname = str_replace('_',' ',$name); - if(! $r) { - //select someone by attag or nick and the name passed in -/* $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", - dbesc($name), - dbesc($name), - intval($profile_uid) - ); -*/ } - } -/* } elseif(strstr($name,'_') || strstr($name,' ')) { //no id - //get the real name - $newname = str_replace('_',' ',$name); - //select someone from this user's contacts by name - $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", - dbesc($newname), - intval($profile_uid) - ); - } else { + //select someone from this user's contacts by name + $r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash + WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1", + dbesc($newname), + intval($profile_uid) + ); + + if(! $r) { //select someone by attag or nick and the name passed in - $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", - dbesc($name), - dbesc($name), + $r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash + WHERE xchan_addr like ('%s') AND abook_channel = %d LIMIT 1", + dbesc($newname . '@%'), intval($profile_uid) ); - }*/ - //$r is set, if someone could be selected - if($r) { - $profile = $r[0]['xchan_url']; - $newname = $r[0]['xchan_name']; - //add person's id to $inform + } + } + + //$r is set, if someone could be selected + + if($r) { + $profile = $r[0]['xchan_url']; + $newname = $r[0]['xchan_name']; + //add person's id to $inform if exclusive + if($exclusive) { if(strlen($inform)) $inform .= ','; - $inform .= 'cid:' . $r[0]['id']; + $inform .= 'cid:' . $r[0]['abook_id']; } } - //if there is an url for this persons profile - if(isset($profile)) { - $replaced = true; - //create profile link - $profile = str_replace(',','%2c',$profile); - $url = $profile; - $newtag = '@[zrl=' . $profile . ']' . $newname . '[/zrl]'; - $body = str_replace('@' . $name, $newtag, $body); - //append tag to str_tags - if(! stristr($str_tags,$newtag)) { - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= $newtag; - } + + + //if there is an url for this persons profile + if(isset($profile)) { + $replaced = true; + //create profile link + $profile = str_replace(',','%2c',$profile); + $url = $profile; + $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; + $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); + //append tag to str_tags + if(! stristr($str_tags,$newtag)) { + if(strlen($str_tags)) + $str_tags .= ','; + $str_tags .= $newtag; } } - +} return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]); } -- cgit v1.2.3 From 3f110567a1cf82b1bcf324cfe15e53460fb5dd04 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Dec 2013 16:30:11 -0800 Subject: handle exclusive tags and add to ACL --- mod/item.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mod/item.php b/mod/item.php index 8eec4aad9..74d87e732 100644 --- a/mod/item.php +++ b/mod/item.php @@ -494,6 +494,10 @@ function item_post(&$a) { logger('handle_tag: ' . print_r($success,tue)); if($inform) { logger('inform: ' . $tag . ' ' . print_r($inform,true)); + if(strpos($inform,'cid:') === 0) { + $str_contact_allow .= '<' . substr($inform,4) . '>'; + $inform = ''; + } } if($success['replaced']) { $tagged[] = $tag; @@ -987,9 +991,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { $newname = $r[0]['xchan_name']; //add person's id to $inform if exclusive if($exclusive) { - if(strlen($inform)) - $inform .= ','; - $inform .= 'cid:' . $r[0]['abook_id']; + $inform .= 'cid:' . $r[0]['xchan_hash']; } } -- cgit v1.2.3 From a331e1acde66a409bc26562e81ba9155e077b457 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Dec 2013 19:45:54 -0800 Subject: modify tag_deliver and tgroup_check to handle exclusion tags --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 465fda543..9824d2434 100755 --- a/include/items.php +++ b/include/items.php @@ -2284,7 +2284,7 @@ function tag_deliver($uid,$item_id) { $body = preg_replace('/\[share(.*?)\[\/share\]/','',$body); - $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; if(! preg_match($pattern,$body,$matches)) { logger('tag_deliver: mention was in a reshare - ignoring'); @@ -2418,7 +2418,7 @@ function tgroup_check($uid,$item) { $body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']); - $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; if(! preg_match($pattern,$body,$matches)) { logger('tgroup_check: mention was in a reshare - ignoring'); -- cgit v1.2.3 From 6e81c332b78e5eac78db4f7a26fd3018c8ba5d0a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Dec 2013 23:47:19 -0800 Subject: group ACL control using tags (group must be "visible") --- mod/item.php | 88 ++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/mod/item.php b/mod/item.php index 74d87e732..b2afc9b1a 100644 --- a/mod/item.php +++ b/mod/item.php @@ -490,15 +490,20 @@ function item_post(&$a) { if($fullnametagged) continue; - $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); - logger('handle_tag: ' . print_r($success,tue)); - if($inform) { - logger('inform: ' . $tag . ' ' . print_r($inform,true)); - if(strpos($inform,'cid:') === 0) { - $str_contact_allow .= '<' . substr($inform,4) . '>'; - $inform = ''; + $success = handle_tag($a, $body, $access_tag, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); + logger('handle_tag: ' . print_r($success,tue), LOGGER_DEBUG); + if(($access_tag) && (! $parent_item)) { + logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DEBUG); + if(strpos($access_tag,'cid:') === 0) { + $str_contact_allow .= '<' . substr($access_tag,4) . '>'; + $access_tag = ''; + } + elseif(strpos($access_tag,'gid:') === 0) { + $str_group_allow .= '<' . substr($access_tag,4) . '>'; + $access_tag = ''; } } + if($success['replaced']) { $tagged[] = $tag; $post_tags[] = array( @@ -882,14 +887,14 @@ function item_content(&$a) { * the appropiate link. * * @param unknown_type $body the text to replace the tag in - * @param unknown_type $inform a comma-seperated string containing everybody to inform + * @param unknown_type $access_tag - used to return tag ACL exclusions e.g. @!foo * @param unknown_type $str_tags string to add the tag to * @param unknown_type $profile_uid * @param unknown_type $tag the tag to replace * * @return boolean true if replaced, false if not replaced */ -function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { +function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { $replaced = false; $r = null; @@ -944,7 +949,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { $alias = ''; $tagcid = 0; - //is it some generated name? + // is it some generated name? if(strrpos($newname,'+')) { //get the id @@ -984,35 +989,60 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { } } - //$r is set, if someone could be selected + // $r is set, if someone could be selected if($r) { $profile = $r[0]['xchan_url']; $newname = $r[0]['xchan_name']; - //add person's id to $inform if exclusive + //add person's id to $access_tag if exclusive if($exclusive) { - $inform .= 'cid:' . $r[0]['xchan_hash']; + $access_tag .= 'cid:' . $r[0]['xchan_hash']; + } + } + else { + // check for a group/collection exclusion tag + + // note that we aren't setting $replaced even though we're replacing text. + // This tag isn't going to get a term attached to it. It's only used for + // access control. The link points to out own channel just so it doesn't look + // weird - as all the other tags are linked to something. + + if(local_user() && local_user() == $profile_uid) { + require_once('include/group.php'); + $grp = group_byname($profile_uid,$name); + if($grp) { + $g = q("select hash from groups where id = %d and visible = 1 limit 1", + intval($grp[0]['id']) + ); + if($g && $exclusive) { + $access_tag .= 'gid:' . $g[0]['hash']; + } + $channel = get_app()->get_channel(); + if($channel) { + $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $newname . '[/zrl]'; + $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); + } + } } } - - //if there is an url for this persons profile - if(isset($profile)) { - $replaced = true; - //create profile link - $profile = str_replace(',','%2c',$profile); - $url = $profile; - $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; - $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); - //append tag to str_tags - if(! stristr($str_tags,$newtag)) { - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= $newtag; + //if there is an url for this persons profile + if(isset($profile)) { + $replaced = true; + //create profile link + $profile = str_replace(',','%2c',$profile); + $url = $profile; + $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; + $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); + //append tag to str_tags + if(! stristr($str_tags,$newtag)) { + if(strlen($str_tags)) + $str_tags .= ','; + $str_tags .= $newtag; + } } } -} - return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]); + return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]); } -- cgit v1.2.3 From 0dd7d936744cccfac4228cabecddc59ce05eb26c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 04:25:55 -0800 Subject: basic edit and delete for things --- include/taxonomy.php | 5 +- mod/thing.php | 121 +++++++++++++++++++++++++++++++++++--- version.inc | 2 +- view/theme/redbasic/css/style.css | 5 ++ view/tpl/show_thing.tpl | 8 +++ view/tpl/thing_edit.tpl | 29 +++++++++ 6 files changed, 159 insertions(+), 11 deletions(-) create mode 100644 view/tpl/thing_edit.tpl diff --git a/include/taxonomy.php b/include/taxonomy.php index 67263100f..4f2b5e8fd 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -261,11 +261,12 @@ function obj_verbs() { } -function obj_verb_selector() { +function obj_verb_selector($current = '') { $verbs = obj_verbs(); $o .= ''; return $o; diff --git a/mod/thing.php b/mod/thing.php index 3e2612c68..b4fdfa039 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -1,6 +1,7 @@ get_account(); $channel = $a->get_channel(); + $term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : ''); $name = escape_tags($_REQUEST['term']); $verb = escape_tags($_REQUEST['verb']); @@ -59,6 +61,40 @@ function thing_init(&$a) { if((! $name) || (! $translated_verb)) return; + + + + + if($term_hash) { + $t = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_type = %d and term_hash = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc($term_hash) + ); + if(! $t) { + notice( t('Item not found.') . EOL); + return; + } + $orig_record = $t[0]; + if($photo != $orig_record['imgurl']) { + $arr = import_profile_photo($photo,get_observer_hash(),true); + $local_photo = $arr[0]; + $local_photo_type = $arr[3]; + } + else + $local_photo = $orig_record['imgurl']; + + $r = q("update term set term = '%s', url = '%s', imgurl = '%s' where term_hash = '%s' and uid = %d limit 1", + dbesc($name), + dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash), + dbesc($local_photo), + dbesc($term_hash), + intval(local_user()) + ); + + info( t('Thing updated') . EOL); + return; + } + $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 "); $p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1", intval(local_user()) @@ -118,7 +154,7 @@ function thing_init(&$a) { return; } - info( t('thing/stuff added')); + info( t('Thing added')); $arr = array(); $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $term['url'])); @@ -180,7 +216,7 @@ function thing_init(&$a) { function thing_content(&$a) { - if(argc() > 1) { + if(argc() == 2) { $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_type = %d and term_hash = '%s' limit 1", intval(TERM_OBJ_THING), @@ -188,7 +224,12 @@ function thing_content(&$a) { ); if($r) { - return replace_macros(get_markup_template('show_thing.tpl'), array( '$header' => t('Show Thing'), '$thing' => $r[0] )); + return replace_macros(get_markup_template('show_thing.tpl'), array( + '$header' => t('Show Thing'), + '$edit' => t('Edit'), + '$delete' => t('Delete'), + '$canedit' => ((local_user() && local_user() == $r[0]['obj_channel']) ? true : false), + '$thing' => $r[0] )); } else { notice( t('item not found.') . EOL); @@ -196,18 +237,82 @@ function thing_content(&$a) { } } - require_once('include/contact_selectors.php'); + if(! local_user()) + return; + + $thing_hash = ''; + + if(argc() == 3 && argv(1) === 'edit') { + $thing_hash = argv(2); + + + $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_type = %d and term_hash = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc($thing_hash) + ); + + if((! $r) || ($r[0]['obj_channel'] != local_user())) { + notice( t('Permission denied.') . EOL); + return ''; + } + + + $o .= replace_macros(get_markup_template('thing_edit.tpl'),array( + '$thing_hdr' => t('Edit Thing'), + '$multiprof' => feature_enabled(local_user(),'multi_profiles'), + '$profile_lbl' => t('Select a profile'), + '$profile_select' => contact_profile_assign($r[0]['obj_page']), + '$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'), + '$verb_select' => obj_verb_selector($r[0]['obj_verb']), + '$thing_hash' => $thing_hash, + '$thing_lbl' => t('Name of thing e.g. something'), + '$thething' => $r[0]['term'], + '$url_lbl' => t('URL of thing (optional)'), + '$theurl' => $r[0]['url'], + '$img_lbl' => t('URL for photo of thing (optional)'), + '$imgurl' => $r[0]['imgurl'], + '$submit' => t('Submit') + )); + + return $o; + } + + if(argc() == 3 && argv(1) === 'drop') { + $thing_hash = argv(2); + + $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_type = %d and term_hash = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc($thing_hash) + ); + + if((! $r) || ($r[0]['obj_channel'] != local_user())) { + notice( t('Permission denied.') . EOL); + return ''; + } + + + $x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d limit 1", + dbesc($thing_hash), + intval(TERM_OBJ_THING), + intval(local_user()) + ); + $x = q("delete from term where term_hash = '%s' and uid = %d limit 1", + dbesc($thing_hash), + intval(local_user()) + ); + return $o; + } $o .= replace_macros(get_markup_template('thing_input.tpl'),array( - '$thing_hdr' => t('Add Stuff to your Profile'), + '$thing_hdr' => t('Add Thing to your Profile'), '$multiprof' => feature_enabled(local_user(),'multi_profiles'), '$profile_lbl' => t('Select a profile'), '$profile_select' => contact_profile_assign(''), '$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'), '$verb_select' => obj_verb_selector(), - '$thing_lbl' => t('Name of thing or stuff e.g. something'), - '$url_lbl' => t('URL of thing or stuff (optional)'), - '$img_lbl' => t('URL for photo of thing or stuff (optional)'), + '$thing_lbl' => t('Name of thing e.g. something'), + '$url_lbl' => t('URL of thing (optional)'), + '$img_lbl' => t('URL for photo of thing (optional)'), '$submit' => t('Submit') )); diff --git a/version.inc b/version.inc index ad14d79b1..37ed2c8fd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-29.541 +2013-12-30.542 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5f532a861..397148c05 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2445,3 +2445,8 @@ img.mail-list-sender-photo { #sidebar-group-list ul { list-style-type: none; } + +.profile-thing-list img, .thing-show img, .thing-edit-links a { + margin-top: 8px; + margin-right: 15px; +} diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index d37c9bb1a..2a8c06076 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -4,5 +4,13 @@ {{if $thing.imgurl}}{{$thing.term}}{{/if}} {{$thing.term}} +{{if $canedit}} +
    + + +
    +
    +{{/if}} + {{/if}} diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl new file mode 100644 index 000000000..8379c15ae --- /dev/null +++ b/view/tpl/thing_edit.tpl @@ -0,0 +1,29 @@ +

    {{$thing_hdr}}

    + + + +{{if $multiprof }} +
    {{$profile_lbl}}
    + +
    {{$profile_select}}
    +{{/if}} + +
    {{$verb_lbl}}
    + +
    {{$verb_select}}
    + + + + +
    + + +
    + + +
    + +
    + + + -- cgit v1.2.3 From 4c541bb680823b7488a2614b5ef0231ad38b42c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 15:41:42 -0800 Subject: expose profile things in the UI --- mod/profiles.php | 2 ++ mod/thing.php | 4 +++- view/css/mod_profiles.css | 10 ++++++++++ view/theme/redbasic/css/style.css | 9 --------- view/tpl/profile_listing_header.tpl | 5 ++++- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index 4625a8805..b94e4bf03 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -610,6 +610,8 @@ function profiles_content(&$a) { $tpl_header = get_markup_template('profile_listing_header.tpl'); $o .= replace_macros($tpl_header,array( '$header' => t('Edit/Manage Profiles'), + '$addstuff' => t('Add profile things'), + '$stuff_desc' => t('Include desirable objects in your profile'), '$chg_photo' => t('Change profile photo'), '$cr_new' => t('Create New Profile'), '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new") diff --git a/mod/thing.php b/mod/thing.php index b4fdfa039..d3b47ebb9 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -237,8 +237,10 @@ function thing_content(&$a) { } } - if(! local_user()) + if(! local_user()) { + notice( t('Permission denied.') . EOL); return; + } $thing_hash = ''; diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css index 6d935ee4d..5f930248f 100644 --- a/view/css/mod_profiles.css +++ b/view/css/mod_profiles.css @@ -13,6 +13,16 @@ } +#profile-listing-desc, #profile-stuff-link { + margin-left: 30px; +} + +#profile-listing-new-link-wrapper { + margin-left: 30px; + margin-bottom: 30px; +} + + #profile-edit-links-end { clear: both; margin-bottom: 15px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 397148c05..325685607 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -582,15 +582,6 @@ footer { .thread-end-wrapper { margin-left: 50px; } - -#profile-listing-desc { - margin-left: 30px; -} - -#profile-listing-new-link-wrapper { - margin-left: 30px; - margin-bottom: 30px; -} .profile-listing-photo-wrapper { float: left; } diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index b771a1ea2..856d689f1 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -2,7 +2,10 @@

    {{$chg_photo}}

    - -- cgit v1.2.3 From 5455a156b05eef1c46219297d51b51c2c688fb55 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 15:46:38 -0800 Subject: for once the to-do list is actually shrinking. --- doc/To-Do-Code.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 95d2decd9..f09a2537e 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -3,8 +3,6 @@ Project Code To-Do List We need much more than this, but here are areas where developers can help. Please edit this page when items are finished. Another place for developers to start is with the issues list. -* ACL widget - provide cc/bcc toggle to allow recipients to be discoverable at receiving end. This should integrate with public/private collections which currently exist but have no defined function. - * Turn top-level Apps menu into an Apps page - which will probably require App plugins to have icons. Add documentation specifically to the plugin/addon documentation for creating apps. Add links to the App Store (which doesn't currently exist). * Documentation - see [Red Documentation Project To-Do List](help/To-Do) @@ -31,7 +29,7 @@ We need much more than this, but here are areas where developers can help. Pleas * Provide RSS feed support which look like channels (in matrix only - copyright issues) -* Fully implement "things". +* provide either auto-crop or manual crop for "thing" photos to preserve aspect ratio when scaled * Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from. -- cgit v1.2.3 From c95909921ea50abcb9e5f8b536ffaa52a68e6a9a Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 21:41:13 -0800 Subject: auto-crop imported photos for things and xchans. This results in undistorted images but may result in cropping important parts of the picture. Still this will work well for 95 out of 100 cases. If the width exceeds the height by greater than 1.2 we will remove an equal margin from either side of the photo leaving the center intact. If the height exceeds the width we will chop off the bottom to make it square. This is good for most single person photographs, unless the object of interest is off-center horizontally in a wide photo - or one is trying to emphasize aspects of human anatomy which may be at the bottom of a tall photo. --- include/photo/photo_driver.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 4896f300b..debe1bc38 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -549,8 +549,28 @@ function import_profile_photo($photo,$xchan,$thing = false) { $img = photo_factory($img_str, $type); if($img->is_valid()) { + $width = $img->getWidth(); + $height = $img->getHeight(); + + if($width && $height) { + if(($width / $height) > 1.2) { + // crop out the sides + $margin = $width - $height; + $img->cropImage(175,($margin / 2),0,$height,$height); + } + elseif(($height / $width) > 1.2) { + // crop out the bottom + $margin = $height - $width; + $img->cropImage(175,0,0,$width,$width); - $img->scaleImageSquare(175); + } + else { + $img->scaleImageSquare(175); + } + + } + else + $photo_failure = true; $p = array('xchan' => $xchan,'resource_id' => $hash, 'filename' => basename($photo), 'album' => $album, 'photo_flags' => $flags, 'scale' => 4); -- cgit v1.2.3 From ca8bf551d1684966d377e9d316c00fd40bd08e6e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 21:50:59 -0800 Subject: Shorten the to-do list some more. --- doc/To-Do-Code.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index f09a2537e..5bba2571e 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -29,8 +29,6 @@ We need much more than this, but here are areas where developers can help. Pleas * Provide RSS feed support which look like channels (in matrix only - copyright issues) -* provide either auto-crop or manual crop for "thing" photos to preserve aspect ratio when scaled - * Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from. * Activity Stream generation for liking things, liking channels and other combinations. -- cgit v1.2.3 From 22e94d7d684005d01a900a23d02f8e9dd0f283d8 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 31 Dec 2013 16:03:25 +0100 Subject: Correct wrong service class check for webpages --- mod/item.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index 7f881d28d..d3e88fdfa 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1135,8 +1135,9 @@ function item_check_service_class($channel_id,$iswebpage) { if ($iswebpage) { $r = q("select count(i.id) as total from item i right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) - and i.parent=i.id and (i.item_restrict & %d) and i.uid= %d ", + and i.parent=i.id and (i.item_restrict & %d) and not (i.item_restrict & %d) and i.uid= %d ", intval(ITEM_WEBPAGE), + intval(ITEM_DELETED), intval($channel_id) ); } -- cgit v1.2.3 From 575f2b3280049eba2bbead023d8fe7fc345af0b1 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 31 Dec 2013 18:28:07 +0100 Subject: Fix page not found error after editing a webpage --- mod/page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/page.php b/mod/page.php index df17dbf52..125c0141f 100644 --- a/mod/page.php +++ b/mod/page.php @@ -58,7 +58,7 @@ function page_content(&$a) { $r = q("select item.* from item left join item_id on item.id = item_id.iid where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and - item_restrict = %d $sql_options $revision limit 1", + (item_restrict & %d) $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), intval(ITEM_WEBPAGE) -- cgit v1.2.3 From aafc40069bf0955d935adb4632650c7c990063a7 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Wed, 1 Jan 2014 16:18:39 +0100 Subject: Confirm webpage deletion prompt --- mod/editpost.php | 1 + mod/editwebpage.php | 5 +++-- view/tpl/jot-header.tpl | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mod/editpost.php b/mod/editpost.php index f012c47cd..7cc33d60d 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -50,6 +50,7 @@ function editpost_content(&$a) { '$geotag' => $geotag, '$nickname' => $channel['channel_address'], '$expireswhen' => t('Expires YYYY-MM-DD HH:MM'), + '$confirmdelete' => t('Delete item?'), )); diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 85bd9e918..00659b4b7 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -112,7 +112,8 @@ function editwebpage_content(&$a) { '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$ispublic' => ' ', // t('Visible to everybody'), '$geotag' => $geotag, - '$nickname' => $a->user['nickname'] + '$nickname' => $a->user['nickname'], + '$confirmdelete' => t('Delete webpage?') )); @@ -185,7 +186,7 @@ function editwebpage_content(&$a) { $ob = get_observer_hash(); if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) - $o .= '

    ' . t('Delete Webpage') . '
    '; + $o .= '

    ' . t('Delete Webpage') . '
    '; return $o; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 09d035979..75239c179 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -306,16 +306,15 @@ function enableOnUser(){ - + -- cgit v1.2.3 From 057d885baf670467443dea0da0797b9289b919b4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 1 Jan 2014 16:07:36 -0800 Subject: return to working on red-dav; This is a bit of a slog at the moment and the basic framework isn't even close to working. This does break the working test we did have (which was never connected to the Red backend). Now we're starting to connect Red and DAV together intimately. There will probably be some twists and turns along the way as we get the information we need into all the class objects that need them. But the important part is that the RedDirectory and RedFile classes are loading without throwing white screens and from here we can use logging to figure out what the DAV front end is trying to do and what it is passing to the backend and hopefully figure out what it expects to do with the results. Unless you're a competent developer with a strong background in OOP and are helping develop this code, you should keep it an arm's length away from any production site and don't even think of enabling it. By default it is turned off. --- include/reddav.php | 116 ++++++++++++++++++++++++++++++++++++++++++++++------- mod/cloud.php | 24 +++++++++-- version.inc | 2 +- 3 files changed, 124 insertions(+), 18 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index c24414610..ab127afaa 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -1,7 +1,7 @@ red_path = $red_path; $this->auth = $auth_plugin; + logger('RedDirectory: ' . print_r($this->auth,true)); + } function getChildren() { - if(! perm_is_allowed($this->channel_id,'','view_storage')) + logger('RedDirectory::getChildren : ' . print_r($this->auth,true)); + + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) return array(); + if($this->red_path === '/' . $this->auth->channel_name) { + + return new RedFile('/' . $this->auth->channel_name . '/' . 'test',$this->auth); + + } + + + $ret = array(); $r = q("select distinct filename from attach where folder = '%s' and uid = %d group by filename", dbesc($this->dir_key), @@ -103,23 +118,51 @@ abstract class RedDirectory extends DAV\Node implements DAV\ICollection { function getChild($name) { - if(! perm_is_allowed($this->channel_id,'','view_storage')) { + + + logger('RedDirectory::getChild : ' . $name); + logger('RedDirectory::getChild red_path : ' . $this->red_path); + + logger('RedDirectory::getChild : ' . print_r($this->auth,true)); + + + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) { throw new DAV\Exception\Forbidden('Permission denied.'); return; } -// FIXME check revisions + + // These should be constants + + if($this->red_path == 'store' && $name == 'cloud') { + return new RedDirectory('/' . $this->auth->channel_name,$this->auth); + } + + if($this->red_path === '/' . $this->auth->channel_name) { + + return new RedFile('/' . $this->auth->channel_name . '/' . 'test',$this->auth); + + } + + // FIXME check file revisions + $r = q("select * from attach where folder = '%s' and filename = '%s' and uid = %d limit 1", dbesc($this->dir_key), dbesc($name), - dbesc($this->channel_id) + dbesc($this->auth->channel_id) ); if(! $r) { throw new DAV\Exception\NotFound('The file with name: ' . $name . ' could not be found'); } + } + + function getName() { + logger('RedDirectory::getName : ' . print_r($this->auth,true)); + + } @@ -136,10 +179,13 @@ abstract class RedDirectory extends DAV\Node implements DAV\ICollection { function childExists($name) { + + logger('RedDirectory::childExists : ' . print_r($this->auth,true)); + $r = q("select distinct filename from attach where folder = '%s' and filename = '%s' and uid = %d group by filename", dbesc($this->dir_key), dbesc($name), - intval($this->channel_id) + intval($this->auth->channel_id) ); if($r) return true; @@ -150,17 +196,27 @@ abstract class RedDirectory extends DAV\Node implements DAV\ICollection { } -abstract class RedFile extends DAV\Node implements DAV\IFile { +class RedFile extends DAV\Node implements DAV\IFile { private $data; + private $auth; + private $name; + function __construct($name, &$auth) { + logger('RedFile::_construct: ' . $name); + $this->name = $name; + $this->auth = $auth; + $this->data = RedFileData($name,$auth); - function __construct($data) { - $this->data = $data; - + logger('RedFile::_construct: ' . print_r($this->data,true)); } + function getName() { + logger('RedFile::getName'); + return basename($data); + + } function put($data) { @@ -180,17 +236,49 @@ abstract class RedFile extends DAV\Node implements DAV\IFile { function getContentType() { - return $this->data['filetype']; + $type = 'text/plain'; + return $type; + +// return $this->data['filetype']; } function getSize() { - return $this->data['filesize']; + return 33122; +// return $this->data['filesize']; } } +function RedFileData($file, $auth) { + + if(substr($file,0,1) !== '/') + return null; + $path_arr = explode('/',$file); + if(! $path_arr) + return null; + + $channel_name = $path_arr[0]; + + $folder = ''; + + for($x = 1; $x < count($path_arr); $x ++) { + + $r = q("select distinct filename from attach where folder = '%s' and filename = '%s' and uid = %d group by filename", + dbesc($folder), + dbesc($path_arr[$x]), + intval($this->auth->channel_id) + ); + + if($r && ( $r[0]['flags'] && ATTACH_FLAG_DIR)) { + $folder = $r[0]['filename']; + } + } + + return $r[0]; + +} diff --git a/mod/cloud.php b/mod/cloud.php index cdd926444..3a4cf01b1 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -46,6 +46,11 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic { + public $channel_name = ''; + public $channel_id = 0; + public $channel_hash = ''; + public $observer = ''; + protected function validateUserPass($username, $password) { require_once('include/auth.php'); $record = account_verify_password($email,$pass); @@ -56,10 +61,13 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic { ); if($r) { $this->currentUser = $r[0]['channel_address']; + $this->channel_name = $r[0]['channel_address']; + $this->channel_id = $r[0]['channel_id']; + $this->channel_hash = $this->observer = $r[0]['channel_hash']; return true; } } - $r = q("select channel_account_id from channel where channel_address = '%s' limit 1", + $r = q("select * from channel where channel_address = '%s' limit 1", dbesc($username) ); if($r) { @@ -71,6 +79,9 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic { if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED) && (hash('whirlpool',$record['account_salt'] . $password) === $record['account_password'])) { logger('(DAV) RedBasicAuth: password verified for ' . $username); + $this->channel_name = $r[0]['channel_address']; + $this->channel_id = $r[0]['channel_id']; + $this->channel_hash = $r[0]['channel_hash']; return true; } } @@ -87,18 +98,25 @@ function cloud_init() { if(! get_config('system','enable_cloud')) killme(); - $rootDirectory = new DAV\FS\Directory('store'); + require_once('include/reddav.php'); + + $auth = new RedBasicAuth(); + + $rootDirectory = new RedDirectory('store',$auth); $server = new DAV\Server($rootDirectory); $lockBackend = new DAV\Locks\Backend\File('store/data/locks'); $lockPlugin = new DAV\Locks\Plugin($lockBackend); $server->addPlugin($lockPlugin); - $auth = new RedBasicAuth(); $auth->Authenticate($server,'Red Matrix'); + $browser = new DAV\Browser\Plugin(); + $server->addPlugin($browser); + + // All we need to do now, is to fire up the server $server->exec(); diff --git a/version.inc b/version.inc index 37ed2c8fd..a5ad50190 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-30.542 +2014-01-01.544 -- cgit v1.2.3 From 76106e16d5ac3eaa0327cd4781914733f4c08448 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 1 Jan 2014 21:09:12 -0800 Subject: fix attachment rendering for preview --- mod/item.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/item.php b/mod/item.php index b2afc9b1a..444248846 100644 --- a/mod/item.php +++ b/mod/item.php @@ -651,6 +651,7 @@ function item_post(&$a) { $datarray['owner'] = $owner_xchan; $datarray['author'] = $observer; + $datarray['attach'] = json_encode($datarray['attach']); $o = conversation($a,array($datarray),'search',false,'preview'); logger('preview: ' . $o, LOGGER_DEBUG); echo json_encode(array('preview' => $o)); -- cgit v1.2.3 From ad08561d84fa73e672b3621c511a95714f4ba99e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 2 Jan 2014 01:09:57 -0800 Subject: some DAV tweaks before the next round of heavy lifting --- include/reddav.php | 260 +++++++++++++++++++++++++++++++++++++++-------------- mod/cloud.php | 8 +- version.inc | 2 +- 3 files changed, 197 insertions(+), 73 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index ab127afaa..704c13017 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -73,46 +73,39 @@ class RedInode implements DAV\INode { class RedDirectory extends DAV\Node implements DAV\ICollection { private $red_path; + private $ext_path; private $root_dir = ''; - private $dir_key; +// private $dir_key; private $auth; - private $channel_id; +// private $channel_id; - function __construct($red_path,&$auth_plugin) { - logger('RedDirectory::__construct()'); - $this->red_path = $red_path; + function __construct($ext_path,&$auth_plugin) { + logger('RedDirectory::__construct() ' . $ext_path); + $this->ext_path = $ext_path; + $this->red_path = ((strpos($ext_path,'/cloud') === 0) ? substr($ext_path,6) : $ext_path); + if(! $this->red_path) + $this->red_path = '/'; $this->auth = $auth_plugin; - logger('RedDirectory: ' . print_r($this->auth,true)); + logger('Red_Directory: ' . print_r($this,true)); + } function getChildren() { - logger('RedDirectory::getChildren : ' . print_r($this->auth,true)); - - if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) - return array(); - - if($this->red_path === '/' . $this->auth->channel_name) { - - return new RedFile('/' . $this->auth->channel_name . '/' . 'test',$this->auth); + logger('RedDirectory::getChildren : ' . print_r($this,true)); + if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; } + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) + return array(); - $ret = array(); - $r = q("select distinct filename from attach where folder = '%s' and uid = %d group by filename", - dbesc($this->dir_key), - intval($this->channel_id) - ); - if($r) { - foreach($r as $rr) { - $ret[] = $rr['filename']; - } - } - return $ret; + return RedCollectionData($this->red_path,$this->auth); } @@ -121,48 +114,34 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { logger('RedDirectory::getChild : ' . $name); - logger('RedDirectory::getChild red_path : ' . $this->red_path); - - logger('RedDirectory::getChild : ' . print_r($this->auth,true)); - + logger('RedDirectory::getChild : ' . print_r($this,true)); - if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) { + if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { throw new DAV\Exception\Forbidden('Permission denied.'); return; } - - - // These should be constants - - if($this->red_path == 'store' && $name == 'cloud') { - return new RedDirectory('/' . $this->auth->channel_name,$this->auth); + + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; } - - if($this->red_path === '/' . $this->auth->channel_name) { - - return new RedFile('/' . $this->auth->channel_name . '/' . 'test',$this->auth); + if($this->red_path === '/' && $name === 'cloud') { + return new RedDirectory('/cloud', $this->auth); } - // FIXME check file revisions - - - $r = q("select * from attach where folder = '%s' and filename = '%s' and uid = %d limit 1", - dbesc($this->dir_key), - dbesc($name), - dbesc($this->auth->channel_id) - ); - if(! $r) { - throw new DAV\Exception\NotFound('The file with name: ' . $name . ' could not be found'); - } + $x = RedFileData('/cloud' . (($this->red_path === '/') ? '' : '/') . '/' . $name, $this->auth); + logger('RedFileData returns: ' . print_r($x,true)); + if($x) + return $x; + throw new DAV\Exception\NotFound('The file with name: ' . $name . ' could not be found'); } function getName() { - logger('RedDirectory::getName : ' . print_r($this->auth,true)); - - + logger('RedDirectory::getName : ' . print_r($this,true)); + return (basename($this->red_path)); } @@ -250,34 +229,181 @@ class RedFile extends DAV\Node implements DAV\IFile { } +function RedChannelList(&$auth) { -function RedFileData($file, $auth) { + $ret = array(); + $r = q("select channel_address from channel where not (channel_pageflags & %d)", + intval(PAGE_REMOVED) + ); - if(substr($file,0,1) !== '/') - return null; - $path_arr = explode('/',$file); + if($r) { + foreach($r as $rr) { + $ret[] = new RedDirectory('/cloud/' . $rr['channel_address'],$auth); + } + } + return $ret; + +} + + +function RedCollectionData($file,&$auth) { + + $ret = array(); + + + $x = strpos($file,'/cloud'); + if($x === 0) { + $file = substr($file,6); + } + + if((! $file) || ($file === '/')) { + return RedChannelList($auth); + + } + + $file = trim($file,'/'); + $path_arr = explode('/', $file); + if(! $path_arr) return null; $channel_name = $path_arr[0]; + $r = q("select channel_id from channel where channel_name = '%s' limit 1", + dbesc($channel_name) + ); + if(! $r) + return null; + + $channel_id = $r[0]['channel_id']; + + $path = '/' . $channel_name; + $folder = ''; - for($x = 1; $x < count($path_arr); $x ++) { - - $r = q("select distinct filename from attach where folder = '%s' and filename = '%s' and uid = %d group by filename", + for($x = 1; $x < count($path_arr); $x ++) { + $r = q("hash, filename, flags from attach where folder = '%s' and (flags & %d)", dbesc($folder), - dbesc($path_arr[$x]), - intval($this->auth->channel_id) + intval($channel_id), + intval(ATTACH_FLAG_DIR) ); + if($r && ( $r[0]['flags'] & ATTACH_FLAG_DIR)) { + $folder = $r[0]['hash']; + $path = $path . '/' . $r[0]['filename']; + } + } - if($r && ( $r[0]['flags'] && ATTACH_FLAG_DIR)) { - $folder = $r[0]['filename']; - } + if($path !== '/' . $file) { + logger("RedCollectionData: Path mismatch: $path !== /$file"); + return NULL; + } + + $ret = array(); + + $r = q("select filename from attach where folder = '%s' group by filename", + dbesc($folder), + intval($channel_id), + intval(ATTACH_FLAG_DIR) + ); + + foreach($r as $rr) { + if($rr['flags'] & ATTACH_FLAG_DIR) + $ret[] = new RedDirectory('/cloud' . $path . '/' . $rr['filename'],$auth); + else + $ret[] = newRedFile('/cloud' . $path . '/' . $rr['filename'],$auth); + } + + return $ret; + +} + +function RedFileData($file, &$auth) { + +logger('RedFileData:' . $file); + + + $x = strpos($file,'/cloud'); + if($x === 0) { + $file = substr($file,6); + } + +logger('RedFileData2: ' . $file); + + if((! $file) || ($file === '/')) { + return RedDirectory('/',$auth); + + } + + $file = trim($file,'/'); + +logger('file=' . $file); + + $path_arr = explode('/', $file); + + if(! $path_arr) + return null; + + logger("file = $file - path = " . print_r($path_arr,true)); + + $channel_name = $path_arr[0]; +//dbg(1); + + $r = q("select channel_id from channel where channel_address = '%s' limit 1", + dbesc($channel_name) + ); + +//dbg(0); + + if(! $r) + return null; + + $channel_id = $r[0]['channel_id']; + + $path = '/' . $channel_name; + + $folder = ''; +//dbg(1); + for($x = 1; $x < count($path_arr); $x ++) { + $r = q("hash, filename, flags from attach where folder = '%s' and uid = %d and (flags & %d)", + dbesc($folder), + intval($channel_id), + intval(ATTACH_FLAG_DIR) + ); + if($r && ( $r[0]['flags'] & ATTACH_FLAG_DIR)) { + $folder = $r[0]['hash']; + $path = $path . '/' . $r[0]['filename']; + } + } +//dbg(0); + + if($path === '/' . $file) { + // final component was a directory. + return new RedDirectory('/cloud/' . $file,$auth); + } + +// //if($path !== dirname($file)) { +// logger("RedFileData: Path mismatch: $path !== dirname($file)"); +// return NULL; +// } + + $ret = array(); +//dbg(1); + $r = q("select filename from attach where folder = '%s' and filename = '%s' and uid = %d group by filename limit 1", + dbesc($folder), + basename($file), + intval($channel_id) + + ); +//dbg(0); + foreach($r as $rr) { + if($rr['flags'] & ATTACH_FLAG_DIR) + $ret[] = new RedDirectory($path . '/' . $rr['filename'],$auth); + else + $ret[] = newRedFile($path . '/' . $rr['filename'],$auth); } - return $r[0]; + return $ret[0]; } diff --git a/mod/cloud.php b/mod/cloud.php index 3a4cf01b1..209a74c74 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -93,7 +93,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic { } -function cloud_init() { +function cloud_init(&$a) { if(! get_config('system','enable_cloud')) killme(); @@ -102,7 +102,7 @@ function cloud_init() { $auth = new RedBasicAuth(); - $rootDirectory = new RedDirectory('store',$auth); + $rootDirectory = new RedDirectory('/cloud',$auth); $server = new DAV\Server($rootDirectory); $lockBackend = new DAV\Locks\Backend\File('store/data/locks'); $lockPlugin = new DAV\Locks\Plugin($lockBackend); @@ -112,7 +112,6 @@ function cloud_init() { $auth->Authenticate($server,'Red Matrix'); - $browser = new DAV\Browser\Plugin(); $server->addPlugin($browser); @@ -120,6 +119,5 @@ function cloud_init() { // All we need to do now, is to fire up the server $server->exec(); - exit; - + killme(); } \ No newline at end of file diff --git a/version.inc b/version.inc index a5ad50190..1ccd4beb1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-01.544 +2014-01-02.545 -- cgit v1.2.3 From a1c198814d4ae82314f87610b2ea2157e11e6b7c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 2 Jan 2014 17:49:39 -0800 Subject: basic browsing and file retrieval for webdav working - uploads not yet. A lot of permissions stuff is in place so it's marginally (but probably not completely) permission controlled --- include/reddav.php | 185 ++++++++++++++++++++++++++++++++++++----------------- mod/cloud.php | 2 +- 2 files changed, 127 insertions(+), 60 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index 704c13017..97903edb2 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -75,9 +75,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { private $red_path; private $ext_path; private $root_dir = ''; -// private $dir_key; private $auth; -// private $channel_id; + function __construct($ext_path,&$auth_plugin) { @@ -101,9 +100,10 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { return; } - if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) - return array(); - + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; + } return RedCollectionData($this->red_path,$this->auth); @@ -130,8 +130,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { return new RedDirectory('/cloud', $this->auth); } - - $x = RedFileData('/cloud' . (($this->red_path === '/') ? '' : '/') . '/' . $name, $this->auth); + $x = RedFileData($this->ext_path . '/' . $name, $this->auth); logger('RedFileData returns: ' . print_r($x,true)); if($x) return $x; @@ -141,16 +140,29 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { function getName() { logger('RedDirectory::getName : ' . print_r($this,true)); + logger('RedDirectory::getName returns: ' . basename($this->red_path)); + return (basename($this->red_path)); } + + function createFile($name,$data = null) { + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'write_storage')) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; + } + } function createDirectory($name) { + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'write_storage')) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; + } @@ -161,12 +173,13 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { logger('RedDirectory::childExists : ' . print_r($this->auth,true)); - $r = q("select distinct filename from attach where folder = '%s' and filename = '%s' and uid = %d group by filename", - dbesc($this->dir_key), - dbesc($name), - intval($this->auth->channel_id) - ); - if($r) + if($this->red_path === '/' && $name === 'cloud') { + return true; + } + + $x = RedFileData($this->ext_path . '/' . $name, $this->auth); + logger('RedFileData returns: ' . print_r($x,true)); + if($x) return true; return false; @@ -181,65 +194,101 @@ class RedFile extends DAV\Node implements DAV\IFile { private $auth; private $name; - function __construct($name, &$auth) { + function __construct($name, $data, &$auth) { logger('RedFile::_construct: ' . $name); $this->name = $name; + $this->data = $data; $this->auth = $auth; - $this->data = RedFileData($name,$auth); logger('RedFile::_construct: ' . print_r($this->data,true)); } function getName() { - logger('RedFile::getName'); - return basename($data); + logger('RedFile::getName: ' . basename($this->name)); + return basename($this->name); } - function put($data) { + + function setName($newName) { + logger('RedFile::setName: ' . basename($this->name) . ' -> ' . $newName); + + if((! $newName) || (! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'write_storage'))) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; + } + + $newName = str_replace('/','%2F',$newName); + + $r = q("update attach set filename = '%s' where hash = '%s' and id = %d limit 1", + dbesc($this->data['filename']), + intval($this->data['id']) + ); } + + function put($data) { + logger('RedFile::put: ' . basename($this->name)); + $r = q("update attach set data = '%s' where hash = '%s' and uid = %d limit 1", + dbesc($data), + dbesc($this->data['hash']), + intval($this->data['uid']) + ); + } + + function get() { + logger('RedFile::get: ' . basename($this->name)); + $r = q("select data from attach where hash = '%s' and uid = %d limit 1", + dbesc($this->data['hash']), + intval($this->data['uid']) + ); + if($r) return $r[0]['data']; } function getETag() { - - + logger('RedFile::getETag: ' . basename($this->name)); + return $this->data['hash']; } function getContentType() { - $type = 'text/plain'; - return $type; - -// return $this->data['filetype']; + return $this->data['filetype']; } function getSize() { - return 33122; -// return $this->data['filesize']; + return $this->data['filesize']; } + + function getLastModified() { + logger('RedFile::getLastModified: ' . basename($this->name)); + return $this->data['edited']; + } + + } function RedChannelList(&$auth) { $ret = array(); - $r = q("select channel_address from channel where not (channel_pageflags & %d)", + $r = q("select channel_id, channel_address from channel where not (channel_pageflags & %d)", intval(PAGE_REMOVED) ); if($r) { foreach($r as $rr) { - $ret[] = new RedDirectory('/cloud/' . $rr['channel_address'],$auth); + if(perm_is_allowed($rr['channel_id'],$auth->observer,'view_storage')) { + $ret[] = new RedDirectory('/cloud/' . $rr['channel_address'],$auth); + } } } return $ret; @@ -251,12 +300,14 @@ function RedCollectionData($file,&$auth) { $ret = array(); - $x = strpos($file,'/cloud'); if($x === 0) { $file = substr($file,6); } + +logger('RedCollectionData: ' . $file); + if((! $file) || ($file === '/')) { return RedChannelList($auth); @@ -270,9 +321,12 @@ function RedCollectionData($file,&$auth) { $channel_name = $path_arr[0]; - $r = q("select channel_id from channel where channel_name = '%s' limit 1", + $r = q("select channel_id from channel where channel_address = '%s' limit 1", dbesc($channel_name) ); + +logger('dbg1: ' . print_r($r,true)); + if(! $r) return null; @@ -283,7 +337,7 @@ function RedCollectionData($file,&$auth) { $folder = ''; for($x = 1; $x < count($path_arr); $x ++) { - $r = q("hash, filename, flags from attach where folder = '%s' and (flags & %d)", + $r = q("select id, hash, filename, flags from attach where folder = '%s' and (flags & %d)", dbesc($folder), intval($channel_id), intval(ATTACH_FLAG_DIR) @@ -294,6 +348,8 @@ function RedCollectionData($file,&$auth) { } } +logger('dbg2: ' . print_r($r,true)); + if($path !== '/' . $file) { logger("RedCollectionData: Path mismatch: $path !== /$file"); return NULL; @@ -301,17 +357,19 @@ function RedCollectionData($file,&$auth) { $ret = array(); - $r = q("select filename from attach where folder = '%s' group by filename", + + $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited from attach where folder = '%s' and uid = %d group by filename", dbesc($folder), - intval($channel_id), - intval(ATTACH_FLAG_DIR) + intval($channel_id) ); +logger('dbg2: ' . print_r($r,true)); + foreach($r as $rr) { if($rr['flags'] & ATTACH_FLAG_DIR) $ret[] = new RedDirectory('/cloud' . $path . '/' . $rr['filename'],$auth); else - $ret[] = newRedFile('/cloud' . $path . '/' . $rr['filename'],$auth); + $ret[] = new RedFile('/cloud' . $path . '/' . $rr['filename'],$rr,$auth); } return $ret; @@ -347,13 +405,13 @@ logger('file=' . $file); logger("file = $file - path = " . print_r($path_arr,true)); $channel_name = $path_arr[0]; -//dbg(1); + $r = q("select channel_id from channel where channel_address = '%s' limit 1", dbesc($channel_name) ); -//dbg(0); + logger('dbg0: ' . print_r($r,true)); if(! $r) return null; @@ -364,46 +422,55 @@ logger('file=' . $file); $folder = ''; //dbg(1); + + require_once('include/security.php'); + $perms = permissions_sql($channel_id); + + $errors = false; + for($x = 1; $x < count($path_arr); $x ++) { - $r = q("hash, filename, flags from attach where folder = '%s' and uid = %d and (flags & %d)", +dbg(1); + $r = q("select id, hash, filename, flags from attach where folder = '%s' and uid = %d and (flags & %d) $perms", dbesc($folder), intval($channel_id), intval(ATTACH_FLAG_DIR) ); +dbg(0); + logger('dbg1: ' . print_r($r,true)); + if($r && ( $r[0]['flags'] & ATTACH_FLAG_DIR)) { $folder = $r[0]['hash']; $path = $path . '/' . $r[0]['filename']; } + if(! $r) { + $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited from attach + where folder = '%s' and filename = '%s' and uid = %d $perms group by filename limit 1", + dbesc($folder), + basename($file), + intval($channel_id) + + ); + } + if(! $r) + $errors = true; } -//dbg(0); + + logger('dbg1: ' . print_r($r,true)); if($path === '/' . $file) { // final component was a directory. return new RedDirectory('/cloud/' . $file,$auth); } -// //if($path !== dirname($file)) { -// logger("RedFileData: Path mismatch: $path !== dirname($file)"); -// return NULL; -// } - - $ret = array(); -//dbg(1); - $r = q("select filename from attach where folder = '%s' and filename = '%s' and uid = %d group by filename limit 1", - dbesc($folder), - basename($file), - intval($channel_id) - - ); -//dbg(0); - foreach($r as $rr) { - if($rr['flags'] & ATTACH_FLAG_DIR) - $ret[] = new RedDirectory($path . '/' . $rr['filename'],$auth); - else - $ret[] = newRedFile($path . '/' . $rr['filename'],$auth); + if($errors) { + throw new DAV\Exception\Forbidden('Permission denied.'); + return; } - return $ret[0]; + if($r[0]['flags'] & ATTACH_FLAG_DIR) + return new RedDirectory('/cloud' . $path . '/' . $r[0]['filename'],$auth); + else + return new RedFile('/cloud' . $path . '/' . $r[0]['filename'],$r[0],$auth); } diff --git a/mod/cloud.php b/mod/cloud.php index 209a74c74..3880c1fd5 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -102,7 +102,7 @@ function cloud_init(&$a) { $auth = new RedBasicAuth(); - $rootDirectory = new RedDirectory('/cloud',$auth); + $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); $lockBackend = new DAV\Locks\Backend\File('store/data/locks'); $lockPlugin = new DAV\Locks\Plugin($lockBackend); -- cgit v1.2.3 From d2d071029f38942496aa52e42048ae53c5d04d48 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 3 Jan 2014 01:41:55 -0800 Subject: doc updates --- doc/html/apw_2php_2style_8php.html | 2 +- doc/html/boot_8php.html | 38 +++---- doc/html/classRedBasicAuth-members.html | 4 + doc/html/classRedBasicAuth.html | 61 +++++++++++ doc/html/classRedBasicAuth.js | 6 +- doc/html/classRedDirectory-members.html | 9 +- doc/html/classRedDirectory.html | 51 ++++++--- doc/html/classRedDirectory.js | 9 +- doc/html/classRedFile-members.html | 9 +- doc/html/classRedFile.html | 126 ++++++++++++++++++++++- doc/html/classRedFile.js | 9 +- doc/html/cloud_8php.html | 9 +- doc/html/cloud_8php.js | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 6 +- doc/html/dir_d44c64559bbebec7f509842c48db8b23.js | 6 +- doc/html/functions.html | 24 +++-- doc/html/functions_0x5f.html | 4 +- doc/html/functions_0x67.html | 9 +- doc/html/functions_0x73.html | 9 +- doc/html/functions_func.html | 4 +- doc/html/functions_func_0x67.html | 9 +- doc/html/functions_func_0x73.html | 9 +- doc/html/functions_vars.html | 24 +++-- doc/html/globals_0x63.html | 2 +- doc/html/globals_0x67.html | 3 + doc/html/globals_0x68.html | 2 +- doc/html/globals_0x69.html | 2 +- doc/html/globals_0x6f.html | 2 +- doc/html/globals_0x72.html | 9 ++ doc/html/globals_func_0x63.html | 2 +- doc/html/globals_func_0x67.html | 3 + doc/html/globals_func_0x68.html | 2 +- doc/html/globals_func_0x69.html | 2 +- doc/html/globals_func_0x6f.html | 2 +- doc/html/globals_func_0x72.html | 9 ++ doc/html/identity_8php.html | 2 +- doc/html/include_2attach_8php.html | 2 +- doc/html/include_2config_8php.html | 2 +- doc/html/include_2group_8php.html | 2 +- doc/html/include_2network_8php.html | 2 +- doc/html/item_8php.html | 10 +- doc/html/item_8php.js | 2 +- doc/html/minimalisticdarkness_8php.html | 2 +- doc/html/navtree.js | 12 +-- doc/html/navtreeindex2.js | 40 +++---- doc/html/navtreeindex3.js | 24 ++--- doc/html/navtreeindex4.js | 26 ++--- doc/html/navtreeindex5.js | 28 ++--- doc/html/navtreeindex6.js | 28 ++--- doc/html/navtreeindex7.js | 44 ++++---- doc/html/navtreeindex8.js | 14 +++ doc/html/permissions_8php.html | 2 +- doc/html/photo__driver_8php.html | 20 ++-- doc/html/photo__driver_8php.js | 2 +- doc/html/php2po_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/reddav_8php.html | 93 ++++++++++++++++- doc/html/reddav_8php.js | 9 ++ doc/html/search/all_24.js | 13 ++- doc/html/search/all_5f.js | 2 +- doc/html/search/all_63.js | 2 +- doc/html/search/all_67.js | 5 +- doc/html/search/all_68.js | 2 +- doc/html/search/all_69.js | 2 +- doc/html/search/all_6f.js | 2 +- doc/html/search/all_72.js | 3 + doc/html/search/all_73.js | 2 +- doc/html/search/functions_5f.js | 2 +- doc/html/search/functions_63.js | 2 +- doc/html/search/functions_67.js | 5 +- doc/html/search/functions_68.js | 2 +- doc/html/search/functions_69.js | 2 +- doc/html/search/functions_6f.js | 2 +- doc/html/search/functions_72.js | 3 + doc/html/search/functions_73.js | 2 +- doc/html/search/variables_24.js | 13 ++- doc/html/security_8php.html | 2 +- doc/html/taxonomy_8php.html | 41 +++++++- doc/html/taxonomy_8php.js | 3 +- doc/html/text_8php.html | 8 +- doc/html/typo_8php.html | 2 +- 82 files changed, 704 insertions(+), 269 deletions(-) create mode 100644 doc/html/reddav_8php.js diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index 5493b91c9..e27362462 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -128,7 +128,7 @@ Variables
    -

    Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().

    +

    Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().

    diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 2d9cc399a..3f5fecbe2 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -200,7 +200,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1088 +const DB_UPDATE_VERSION 1089   const EOL '<br />' . "\r\n"   @@ -726,7 +726,7 @@ Variables
    -

    Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), mail_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(), xref_init(), and zotfeed_init().

    +

    Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), mail_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(), thing_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(), xref_init(), and zotfeed_init().

    @@ -946,7 +946,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(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dir_tagblock(), 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_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), 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(), dir_tagblock(), 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(), handle_tag(), 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_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    @@ -1128,7 +1128,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(), dirprofile_init(), 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(), sslify_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(), dirprofile_init(), 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(), sslify_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().

    @@ -1163,7 +1163,7 @@ Variables
    -

    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_content(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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().

    +

    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_content(), dirprofile_init(), 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(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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().

    @@ -1215,7 +1215,7 @@ Variables
    -

    Referenced by achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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().

    +

    Referenced by achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -1237,7 +1237,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_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(), mail_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(), mail_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(), zid_init(), and zot_refresh().

    @@ -1349,7 +1349,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(), dirprofile_init(), 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(), mail_post(), 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(), sslify(), 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_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), 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(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), 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(), mail_post(), 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(), sslify(), 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_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    @@ -1994,7 +1994,7 @@ Variables
    -

    Referenced by attach_mkdir(), RedInode\delete(), and z_readdir().

    +

    Referenced by attach_mkdir(), RedInode\delete(), RedCollectionData(), RedFileData(), and z_readdir().

    @@ -2098,7 +2098,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1088const DB_UPDATE_VERSION 1089
    @@ -2212,7 +2212,7 @@ Variables
    -

    Referenced by achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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 achievements_content(), 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(), dirprofile_init(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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(), thing_content(), thing_init(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -2795,7 +2795,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(), dirprofile_init(), 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().

    +

    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(), dirprofile_init(), 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().

    @@ -3599,7 +3599,7 @@ Variables
    -

    Referenced by change_channel(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), manage_content(), post_init(), profile_load(), and zfinger_init().

    +

    Referenced by change_channel(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), manage_content(), post_init(), profile_load(), RedChannelList(), and zfinger_init().

    @@ -3965,6 +3965,8 @@ Variables
    +

    Referenced by import_profile_photo().

    +
    @@ -3977,7 +3979,7 @@ Variables
    -

    Referenced by import_profile_photo().

    +

    Referenced by import_profile_photo().

    @@ -4214,7 +4216,7 @@ Variables
    -

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

    +

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

    @@ -4228,7 +4230,7 @@ Variables
    -

    Referenced by conversation(), decode_tags(), encode_item_terms(), fetch_post_tags(), format_term_for_display(), get_atom_elements(), get_mentions(), handle_tag(), item_getfeedtags(), tag_deliver(), and tgroup_check().

    +

    Referenced by conversation(), decode_tags(), encode_item_terms(), fetch_post_tags(), format_term_for_display(), get_atom_elements(), get_mentions(), handle_tag(), item_getfeedtags(), tag_deliver(), and tgroup_check().

    @@ -4304,7 +4306,7 @@ Variables
    -

    Referenced by advanced_profile(), and thing_init().

    +

    Referenced by get_things(), thing_content(), and thing_init().

    @@ -4361,7 +4363,7 @@ Variables

    Tag/term types

    -

    Referenced by conversation(), decode_tags(), encode_item_terms(), get_atom_elements(), and handle_tag().

    +

    Referenced by conversation(), decode_tags(), encode_item_terms(), get_atom_elements(), and handle_tag().

    diff --git a/doc/html/classRedBasicAuth-members.html b/doc/html/classRedBasicAuth-members.html index 10817e697..8c40f11d0 100644 --- a/doc/html/classRedBasicAuth-members.html +++ b/doc/html/classRedBasicAuth-members.html @@ -112,6 +112,10 @@ $(document).ready(function(){initNavTree('classRedBasicAuth.html','');});

    This is the complete list of members for RedBasicAuth, including all inherited members.

    + + + +
    $channel_hashRedBasicAuth
    $channel_idRedBasicAuth
    $channel_nameRedBasicAuth
    $observerRedBasicAuth
    validateUserPass($username, $password)RedBasicAuthprotected
    diff --git a/doc/html/classRedBasicAuth.html b/doc/html/classRedBasicAuth.html index 8bf5996ca..b83941f57 100644 --- a/doc/html/classRedBasicAuth.html +++ b/doc/html/classRedBasicAuth.html @@ -106,6 +106,7 @@ $(document).ready(function(){initNavTree('classRedBasicAuth.html','');});
    +Public Attributes | Protected Member Functions | List of all members
    @@ -121,6 +122,17 @@ Inheritance diagram for RedBasicAuth:
    + + + + + + + + + +

    +Public Attributes

     $channel_name = ''
     
     $channel_id = 0
     
     $channel_hash = ''
     
     $observer = ''
     
    @@ -159,6 +171,55 @@ Protected Member Functions

    Protected Member Functions

     validateUserPass ($username, $password)
    +
    + +

    Member Data Documentation

    + +
    +
    + + + + +
    RedBasicAuth::$channel_hash = ''
    +
    + +
    +
    + +
    +
    + + + + +
    RedBasicAuth::$channel_id = 0
    +
    + +
    +
    + +
    +
    + + + + +
    RedBasicAuth::$channel_name = ''
    +
    + +
    +
    + +
    +
    + + + + +
    RedBasicAuth::$observer = ''
    +
    +
    The documentation for this class was generated from the following file: diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index e130efc78..baad731c4 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -139,7 +139,8 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : RedInode
  • $auth -: RedDirectory +: RedFile +, RedDirectory
  • $baseurl : App @@ -157,8 +158,14 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : App , Item
    • +
  • $channel_hash +: RedBasicAuth +
  • $channel_id -: RedDirectory +: RedBasicAuth +
    • +
  • $channel_name +: RedBasicAuth
  • $children : Item @@ -222,9 +229,6 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : dba_driver , Template
    • -
  • $dir_key -: RedDirectory -
  • $done : Template
    • @@ -232,6 +236,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : App , dba_driver +
  • $ext_path +: RedDirectory +
  • $filename : FriendicaSmarty
    • @@ -284,8 +291,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : App
  • $name -: FriendicaSmartyEngine +: RedFile , Template +, FriendicaSmartyEngine
  • $nav_sel : App @@ -295,6 +303,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
  • $observer : App +, RedBasicAuth , Conversation
  • $owner_name @@ -360,6 +369,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
  • $replace : Template
    • +
  • $root_dir +: RedDirectory +
  • $scheme : App
    • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 3636da120..34b4df9fe 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -274,7 +274,7 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');}); : boot.php
  • cloud_init() -: cloud.php +: cloud.php
  • collect_recipients() : items.php diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index f8eeb72dc..2b931a7a1 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -294,6 +294,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
  • get_theme_uid() : identity.php
    • +
  • get_things() +: taxonomy.php +
  • get_xconfig() : config.php
    • diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index 7a78e7aae..9d9ea946c 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -145,7 +145,7 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});

    - h -

    • handle_tag() -: item.php +: item.php
    • has_permissions() : items.php diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 665d44944..14705638b 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -182,7 +182,7 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');}); : import.php
    • import_profile_photo() -: photo_driver.php +: photo_driver.php
    • import_site() : zot.php diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html index 0d80bf4f8..b2ee6bc3a 100644 --- a/doc/html/globals_0x6f.html +++ b/doc/html/globals_0x6f.html @@ -148,7 +148,7 @@ $(document).ready(function(){initNavTree('globals_0x6f.html','');}); : api.php
    • obj_verb_selector() -: taxonomy.php +: taxonomy.php
    • obj_verbs() : taxonomy.php diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 44466610f..147b9d5a1 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -186,6 +186,15 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
    • redbasic_init() : theme.php
      • +
    • RedChannelList() +: reddav.php +
      • +
    • RedCollectionData() +: reddav.php +
      • +
    • RedFileData() +: reddav.php +
    • reduce() : docblox_errorchecker.php
      • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 2a9402889..968819dd8 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -264,7 +264,7 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');}); : cli_suggest.php
    • cloud_init() -: cloud.php +: cloud.php
    • collect_recipients() : items.php diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 3e0687555..52024155c 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -293,6 +293,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
    • get_theme_uid() : identity.php
      • +
    • get_things() +: taxonomy.php +
    • get_xconfig() : config.php
      • diff --git a/doc/html/globals_func_0x68.html b/doc/html/globals_func_0x68.html index ca8cf634e..8917d5efa 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.html @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});

      - h -

      Well, this not much better, but at least it comes from the data inside the image, we won't be tricked by a manipulated extension

      -

      Referenced by import_profile_photo(), photo_upload(), profile_photo_post(), and scale_external_images().

      +

      Referenced by import_profile_photo(), photo_upload(), profile_photo_post(), and scale_external_images().

      @@ -202,7 +202,7 @@ Functions - +
      @@ -216,7 +216,13 @@ Functions - + + + + + + + @@ -226,7 +232,7 @@ Functions
       $xchan $xchan,
       $thing = false 
      -

      Referenced by import_post(), import_xchan(), and poller_run().

      +

      Referenced by import_post(), import_xchan(), poller_run(), and thing_init().

      @@ -254,7 +260,7 @@ Functions
      -

      Referenced by fbrowser_content(), fix_private_photos(), guess_image_type(), import_channel_photo(), import_profile_photo(), photo_init(), photo_upload(), photos_content(), photos_post(), profile_photo_post(), and scale_external_images().

      +

      Referenced by fbrowser_content(), fix_private_photos(), guess_image_type(), import_channel_photo(), import_profile_photo(), photo_init(), photo_upload(), photos_content(), photos_post(), profile_photo_post(), and scale_external_images().

      diff --git a/doc/html/photo__driver_8php.js b/doc/html/photo__driver_8php.js index 8ac064d4e..cabd3c93b 100644 --- a/doc/html/photo__driver_8php.js +++ b/doc/html/photo__driver_8php.js @@ -3,6 +3,6 @@ var photo__driver_8php = [ "photo_driver", "classphoto__driver.html", "classphoto__driver" ], [ "guess_image_type", "photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa", null ], [ "import_channel_photo", "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a", null ], - [ "import_profile_photo", "photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca", null ], + [ "import_profile_photo", "photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887", null ], [ "photo_factory", "photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035", null ] ]; \ No newline at end of file diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index 8f9d5b998..53028c92e 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_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), 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(), mail_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(), sslify_init(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().

      +

      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), mail_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(), sslify_init(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().

      diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index a2d52fdb9..870ffca5e 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_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(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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().

      +

      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(), handle_tag(), home_init(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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/reddav_8php.html b/doc/html/reddav_8php.html index 49b7d62ff..27de96d58 100644 --- a/doc/html/reddav_8php.html +++ b/doc/html/reddav_8php.html @@ -104,7 +104,8 @@ $(document).ready(function(){initNavTree('reddav_8php.html','');});
      -Classes
      +Classes | +Functions
      reddav.php File Reference
      @@ -118,7 +119,97 @@ Classes   class  RedFile   + + + + + + + +

      +Functions

       RedChannelList (&$auth)
       
       RedCollectionData ($file, &$auth)
       
       RedFileData ($file, &$auth, $test=false)
       
      +

      Function Documentation

      + +
      +
      + + + + + + + + +
      RedChannelList (& $auth)
      +
      + +

      Referenced by RedCollectionData().

      + +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + +
      RedCollectionData ( $file,
      & $auth 
      )
      +
      + +

      Referenced by RedDirectory\getChildren().

      + +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      RedFileData ( $file,
      & $auth,
       $test = false 
      )
      +
      + +

      Referenced by RedDirectory\childExists(), and RedDirectory\getChild().

      + +
      +
      diff --git a/doc/html/reddav_8php.js b/doc/html/reddav_8php.js new file mode 100644 index 000000000..41660949e --- /dev/null +++ b/doc/html/reddav_8php.js @@ -0,0 +1,9 @@ +var reddav_8php = +[ + [ "RedInode", "classRedInode.html", "classRedInode" ], + [ "RedDirectory", "classRedDirectory.html", "classRedDirectory" ], + [ "RedFile", "classRedFile.html", "classRedFile" ], + [ "RedChannelList", "reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66", null ], + [ "RedCollectionData", "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266", null ], + [ "RedFileData", "reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088", null ] +]; \ No newline at end of file diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 3bf81aaa0..926aa0a82 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -10,7 +10,7 @@ var searchData= ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]], ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]], ['_24attach',['$attach',['../classRedInode.html#a7b317eb1230930154107ed51e54193f5',1,'RedInode']]], - ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory']]], + ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory\$auth()'],['../classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2',1,'RedFile\$auth()']]], ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]], ['_24banner_5fcolour',['$banner_colour',['../redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0',1,'style.php']]], ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], @@ -22,7 +22,9 @@ var searchData= ['_24called_5fapi',['$called_api',['../include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d',1,'api.php']]], ['_24category',['$category',['../classApp.html#a5cfc098c061b7d765add58fd2ca97445',1,'App']]], ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], - ['_24channel_5fid',['$channel_id',['../classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d',1,'RedDirectory']]], + ['_24channel_5fhash',['$channel_hash',['../classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef',1,'RedBasicAuth']]], + ['_24channel_5fid',['$channel_id',['../classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354',1,'RedBasicAuth']]], + ['_24channel_5fname',['$channel_name',['../classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac',1,'RedBasicAuth']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cipher',['$cipher',['../classConversation.html#aa95c1a62af38bdfba7add9549bec083b',1,'Conversation']]], @@ -45,11 +47,11 @@ var searchData= ['_24db',['$db',['../classApp.html#a330410a288f3393d53772f5e98f857ea',1,'App\$db()'],['../classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6',1,'dba_driver\$db()']]], ['_24debug',['$debug',['../classdba__driver.html#af48e2afeded5285766bf92e22123ed03',1,'dba_driver\$debug()'],['../classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a',1,'Template\$debug()']]], ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]], - ['_24dir_5fkey',['$dir_key',['../classRedDirectory.html#a8d5df814b2f825dd14c628a51b5829b5',1,'RedDirectory']]], ['_24dirs',['$dirs',['../typo_8php.html#a1b709c1d79631ebc8320b41bda028b54',1,'typo.php']]], ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]], ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]], ['_24error',['$error',['../classApp.html#ac1a8b2cd40609b231a560201a08852ba',1,'App\$error()'],['../classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c',1,'dba_driver\$error()']]], + ['_24ext_5fpath',['$ext_path',['../classRedDirectory.html#a0f113244cd85c17848df991001d024f4',1,'RedDirectory']]], ['_24filelist',['$filelist',['../docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b',1,'docblox_errorchecker.php']]], ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]], ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]], @@ -83,14 +85,14 @@ var searchData= ['_24mode',['$mode',['../classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a',1,'Conversation']]], ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]], ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]], - ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], + ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba',1,'RedFile\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]], ['_24nav_5fmin_5fopacity',['$nav_min_opacity',['../redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1',1,'style.php']]], ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]], ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]], ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]], ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]], - ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()']]], + ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1',1,'RedBasicAuth\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()']]], ['_24out',['$out',['../php2po_8php.html#a48cb304902320d173a4eaa41543327b9',1,'php2po.php']]], ['_24owner_5fname',['$owner_name',['../classItem.html#a9594df6014b0b6f45364ea7a34510130',1,'Item']]], ['_24owner_5fphoto',['$owner_photo',['../classItem.html#a078f95b4134ce3a1df344cf8d386f986',1,'Item']]], @@ -123,6 +125,7 @@ var searchData= ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24reply_5fphoto',['$reply_photo',['../redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4',1,'style.php']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], + ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], diff --git a/doc/html/search/all_5f.js b/doc/html/search/all_5f.js index 889fced66..79e9ec4d5 100644 --- a/doc/html/search/all_5f.js +++ b/doc/html/search/all_5f.js @@ -1,6 +1,6 @@ var searchData= [ - ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb',1,'RedInode\__construct()'],['../classRedDirectory.html#add0bf2c049230fec4913e769d126e6e6',1,'RedDirectory\__construct()'],['../classRedFile.html#ad4588b90004a2741b1a4ced10355904c',1,'RedFile\__construct()']]], + ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb',1,'RedInode\__construct()'],['../classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180',1,'RedDirectory\__construct()'],['../classRedFile.html#a9a67bdb34c9db6ce144b3f371148b183',1,'RedFile\__construct()']]], ['_5f_5fdestruct',['__destruct',['../classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721',1,'dba_driver\__destruct()'],['../classphoto__driver.html#ae4501abdc9651359f81d036b63625686',1,'photo_driver\__destruct()']]], ['_5fbuild_5fnodes',['_build_nodes',['../classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4',1,'Template']]], ['_5fget_5fvar',['_get_var',['../classTemplate.html#aae9c4d761ea1298e745e8052d7910194',1,'Template']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 151b69171..f3dc96de5 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -57,7 +57,7 @@ var searchData= ['client_5fmode_5fupdate',['CLIENT_MODE_UPDATE',['../boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77',1,'boot.php']]], ['close',['close',['../classdba__driver.html#a5afa54172f3c837df61643f8f5b2c975',1,'dba_driver\close()'],['../classdba__mysql.html#a850586714ef897bd25f643c89b4ef76e',1,'dba_mysql\close()'],['../classdba__mysqli.html#acb38f2c851187ad632ecfab30fdfab55',1,'dba_mysqli\close()']]], ['cloud_2ephp',['cloud.php',['../cloud_8php.html',1,'']]], - ['cloud_5finit',['cloud_init',['../cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8',1,'cloud.php']]], + ['cloud_5finit',['cloud_init',['../cloud_8php.html#a0717860601aaa775e7cb65fd9d4011b4',1,'cloud.php']]], ['collect',['collect',['../classProtoDriver.html#a2ba1758f0f9e3564580b6ff85292804d',1,'ProtoDriver\collect()'],['../classZotDriver.html#af65febb26031eb7f39871b9e2a539797',1,'ZotDriver\collect()']]], ['collect_5fprivate',['collect_private',['../classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b',1,'ProtoDriver\collect_private()'],['../classZotDriver.html#a2e15ff09772f0608203dad1c98299394',1,'ZotDriver\collect_private()']]], ['collect_5frecipients',['collect_recipients',['../items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70',1,'items.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 4b0189bce..58b90b4f9 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -82,6 +82,7 @@ var searchData= ['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]], ['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]], ['get_5ftheme_5fuid',['get_theme_uid',['../identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'identity.php']]], + ['get_5fthings',['get_things',['../taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de',1,'taxonomy.php']]], ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]], ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]], ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]], @@ -92,8 +93,8 @@ var searchData= ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]], ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]], ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], - ['getlastmodified',['getLastModified',['../classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6',1,'RedInode']]], - ['getname',['getName',['../classRedInode.html#aec5706105400764124db39d4bc68d458',1,'RedInode']]], + ['getlastmodified',['getLastModified',['../classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6',1,'RedInode\getLastModified()'],['../classRedFile.html#a41562a28007789bbe7fe06d6a20eef47',1,'RedFile\getLastModified()']]], + ['getname',['getName',['../classRedInode.html#aec5706105400764124db39d4bc68d458',1,'RedInode\getName()'],['../classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583',1,'RedDirectory\getName()'],['../classRedFile.html#a0c961c5f49544d2502420361fa526437',1,'RedFile\getName()']]], ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], diff --git a/doc/html/search/all_68.js b/doc/html/search/all_68.js index e9d7e3976..6fcf626c5 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -1,6 +1,6 @@ var searchData= [ - ['handle_5ftag',['handle_tag',['../item_8php.html#abd0e603a6696051af16476eb968d52e7',1,'item.php']]], + ['handle_5ftag',['handle_tag',['../item_8php.html#aa22feef4de326e1d7078dedd892e615c',1,'item.php']]], ['has_5fpermissions',['has_permissions',['../items_8php.html#a77051724d1784074ff187e73a4db93fe',1,'items.php']]], ['head_5fadd_5fcss',['head_add_css',['../plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a',1,'plugin.php']]], ['head_5fadd_5fjs',['head_add_js',['../plugin_8php.html#a516591850f4fd49fd1425cfa54089db8',1,'plugin.php']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index dd7a0efc7..c00bab0c3 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -14,7 +14,7 @@ var searchData= ['import_5fdirectory_5fkeywords',['import_directory_keywords',['../zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a',1,'zot.php']]], ['import_5fdirectory_5fprofile',['import_directory_profile',['../zot_8php.html#aeec89da5b6ff090c63a79de4de884a35',1,'zot.php']]], ['import_5fpost',['import_post',['../import_8php.html#af17fef0410518f7eac205d0ea416eaa2',1,'import.php']]], - ['import_5fprofile_5fphoto',['import_profile_photo',['../photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca',1,'photo_driver.php']]], + ['import_5fprofile_5fphoto',['import_profile_photo',['../photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887',1,'photo_driver.php']]], ['import_5fsite',['import_site',['../zot_8php.html#a2657e141d62d5f67ad3c87651b585299',1,'zot.php']]], ['import_5fxchan',['import_xchan',['../zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1',1,'zot.php']]], ['in_5farrayi',['in_arrayi',['../text_8php.html#a75c326298519ed14ebe762194c8a3f2a',1,'text.php']]], diff --git a/doc/html/search/all_6f.js b/doc/html/search/all_6f.js index 8c0214b94..a87eb552b 100644 --- a/doc/html/search/all_6f.js +++ b/doc/html/search/all_6f.js @@ -2,7 +2,7 @@ var searchData= [ ['oauth_2ephp',['oauth.php',['../oauth_8php.html',1,'']]], ['oauth_5fget_5fclient',['oauth_get_client',['../mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117',1,'api.php']]], - ['obj_5fverb_5fselector',['obj_verb_selector',['../taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2',1,'taxonomy.php']]], + ['obj_5fverb_5fselector',['obj_verb_selector',['../taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7',1,'taxonomy.php']]], ['obj_5fverbs',['obj_verbs',['../taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce',1,'taxonomy.php']]], ['oe_5fbuild_5fxpath',['oe_build_xpath',['../include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319',1,'oembed.php']]], ['oe_5fget_5finner_5fhtml',['oe_get_inner_html',['../include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487',1,'oembed.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 692fa4835..969a54ab7 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -20,9 +20,12 @@ var searchData= ['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']]], ['redbasicauth',['RedBasicAuth',['../classRedBasicAuth.html',1,'']]], + ['redchannellist',['RedChannelList',['../reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66',1,'reddav.php']]], + ['redcollectiondata',['RedCollectionData',['../reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266',1,'reddav.php']]], ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], ['reddirectory',['RedDirectory',['../classRedDirectory.html',1,'']]], ['redfile',['RedFile',['../classRedFile.html',1,'']]], + ['redfiledata',['RedFileData',['../reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088',1,'reddav.php']]], ['redinode',['RedInode',['../classRedInode.html',1,'']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], ['ref_5fsession_5fclose',['ref_session_close',['../session_8php.html#a5e1c616e02b863d5450317d101366bb7',1,'session.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 3d3c82550..93908d42e 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -50,7 +50,7 @@ var searchData= ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]], ['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']]], + ['setname',['setName',['../classRedInode.html#a3d76322f25d847b123b3df37a26dd04e',1,'RedInode\setName()'],['../classRedFile.html#a38a82bfc1b30028ea6ac75923e90fa25',1,'RedFile\setName()']]], ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]], diff --git a/doc/html/search/functions_5f.js b/doc/html/search/functions_5f.js index ada7b7fbb..936e9f836 100644 --- a/doc/html/search/functions_5f.js +++ b/doc/html/search/functions_5f.js @@ -1,6 +1,6 @@ var searchData= [ - ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb',1,'RedInode\__construct()'],['../classRedDirectory.html#add0bf2c049230fec4913e769d126e6e6',1,'RedDirectory\__construct()'],['../classRedFile.html#ad4588b90004a2741b1a4ced10355904c',1,'RedFile\__construct()']]], + ['_5f_5fconstruct',['__construct',['../classApp.html#af6d39f63fb7116bbeb04e51696f99474',1,'App\__construct()'],['../classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09',1,'Conversation\__construct()'],['../classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186',1,'dba_driver\__construct()'],['../classFriendicaSmarty.html#af12091b920b95eeef1218cbc48066ca6',1,'FriendicaSmarty\__construct()'],['../classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6',1,'FriendicaSmartyEngine\__construct()'],['../classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2',1,'Item\__construct()'],['../classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6',1,'FKOAuth1\__construct()'],['../classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae',1,'photo_driver\__construct()'],['../classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb',1,'RedInode\__construct()'],['../classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180',1,'RedDirectory\__construct()'],['../classRedFile.html#a9a67bdb34c9db6ce144b3f371148b183',1,'RedFile\__construct()']]], ['_5f_5fdestruct',['__destruct',['../classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721',1,'dba_driver\__destruct()'],['../classphoto__driver.html#ae4501abdc9651359f81d036b63625686',1,'photo_driver\__destruct()']]], ['_5fbuild_5fnodes',['_build_nodes',['../classTemplate.html#ac41c96e1f407b1a910029e5f4b7de8e4',1,'Template']]], ['_5fget_5fvar',['_get_var',['../classTemplate.html#aae9c4d761ea1298e745e8052d7910194',1,'Template']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 8f6d4350b..449ff95a3 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -45,7 +45,7 @@ var searchData= ['cli_5fstartup',['cli_startup',['../cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b',1,'cli_startup.php']]], ['cli_5fsuggest_5frun',['cli_suggest_run',['../cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2',1,'cli_suggest.php']]], ['close',['close',['../classdba__driver.html#a5afa54172f3c837df61643f8f5b2c975',1,'dba_driver\close()'],['../classdba__mysql.html#a850586714ef897bd25f643c89b4ef76e',1,'dba_mysql\close()'],['../classdba__mysqli.html#acb38f2c851187ad632ecfab30fdfab55',1,'dba_mysqli\close()']]], - ['cloud_5finit',['cloud_init',['../cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8',1,'cloud.php']]], + ['cloud_5finit',['cloud_init',['../cloud_8php.html#a0717860601aaa775e7cb65fd9d4011b4',1,'cloud.php']]], ['collect',['collect',['../classProtoDriver.html#a2ba1758f0f9e3564580b6ff85292804d',1,'ProtoDriver\collect()'],['../classZotDriver.html#af65febb26031eb7f39871b9e2a539797',1,'ZotDriver\collect()']]], ['collect_5fprivate',['collect_private',['../classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b',1,'ProtoDriver\collect_private()'],['../classZotDriver.html#a2e15ff09772f0608203dad1c98299394',1,'ZotDriver\collect_private()']]], ['collect_5frecipients',['collect_recipients',['../items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70',1,'items.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index a2299d1e8..2595521a8 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -82,6 +82,7 @@ var searchData= ['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]], ['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]], ['get_5ftheme_5fuid',['get_theme_uid',['../identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'identity.php']]], + ['get_5fthings',['get_things',['../taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de',1,'taxonomy.php']]], ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]], ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]], ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]], @@ -92,8 +93,8 @@ var searchData= ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]], ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]], ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], - ['getlastmodified',['getLastModified',['../classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6',1,'RedInode']]], - ['getname',['getName',['../classRedInode.html#aec5706105400764124db39d4bc68d458',1,'RedInode']]], + ['getlastmodified',['getLastModified',['../classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6',1,'RedInode\getLastModified()'],['../classRedFile.html#a41562a28007789bbe7fe06d6a20eef47',1,'RedFile\getLastModified()']]], + ['getname',['getName',['../classRedInode.html#aec5706105400764124db39d4bc68d458',1,'RedInode\getName()'],['../classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583',1,'RedDirectory\getName()'],['../classRedFile.html#a0c961c5f49544d2502420361fa526437',1,'RedFile\getName()']]], ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], diff --git a/doc/html/search/functions_68.js b/doc/html/search/functions_68.js index 6d085bdc8..896a1c2c8 100644 --- a/doc/html/search/functions_68.js +++ b/doc/html/search/functions_68.js @@ -1,6 +1,6 @@ var searchData= [ - ['handle_5ftag',['handle_tag',['../item_8php.html#abd0e603a6696051af16476eb968d52e7',1,'item.php']]], + ['handle_5ftag',['handle_tag',['../item_8php.html#aa22feef4de326e1d7078dedd892e615c',1,'item.php']]], ['has_5fpermissions',['has_permissions',['../items_8php.html#a77051724d1784074ff187e73a4db93fe',1,'items.php']]], ['head_5fadd_5fcss',['head_add_css',['../plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a',1,'plugin.php']]], ['head_5fadd_5fjs',['head_add_js',['../plugin_8php.html#a516591850f4fd49fd1425cfa54089db8',1,'plugin.php']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 38470b08d..e50061ae5 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -11,7 +11,7 @@ var searchData= ['import_5fdirectory_5fkeywords',['import_directory_keywords',['../zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a',1,'zot.php']]], ['import_5fdirectory_5fprofile',['import_directory_profile',['../zot_8php.html#aeec89da5b6ff090c63a79de4de884a35',1,'zot.php']]], ['import_5fpost',['import_post',['../import_8php.html#af17fef0410518f7eac205d0ea416eaa2',1,'import.php']]], - ['import_5fprofile_5fphoto',['import_profile_photo',['../photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca',1,'photo_driver.php']]], + ['import_5fprofile_5fphoto',['import_profile_photo',['../photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887',1,'photo_driver.php']]], ['import_5fsite',['import_site',['../zot_8php.html#a2657e141d62d5f67ad3c87651b585299',1,'zot.php']]], ['import_5fxchan',['import_xchan',['../zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1',1,'zot.php']]], ['in_5farrayi',['in_arrayi',['../text_8php.html#a75c326298519ed14ebe762194c8a3f2a',1,'text.php']]], diff --git a/doc/html/search/functions_6f.js b/doc/html/search/functions_6f.js index b6278b300..33c7a2134 100644 --- a/doc/html/search/functions_6f.js +++ b/doc/html/search/functions_6f.js @@ -1,7 +1,7 @@ var searchData= [ ['oauth_5fget_5fclient',['oauth_get_client',['../mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117',1,'api.php']]], - ['obj_5fverb_5fselector',['obj_verb_selector',['../taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2',1,'taxonomy.php']]], + ['obj_5fverb_5fselector',['obj_verb_selector',['../taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7',1,'taxonomy.php']]], ['obj_5fverbs',['obj_verbs',['../taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce',1,'taxonomy.php']]], ['oe_5fbuild_5fxpath',['oe_build_xpath',['../include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319',1,'oembed.php']]], ['oe_5fget_5finner_5fhtml',['oe_get_inner_html',['../include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487',1,'oembed.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index 79de86bff..a37fda950 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -10,6 +10,9 @@ 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']]], + ['redchannellist',['RedChannelList',['../reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66',1,'reddav.php']]], + ['redcollectiondata',['RedCollectionData',['../reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266',1,'reddav.php']]], + ['redfiledata',['RedFileData',['../reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088',1,'reddav.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 acaf952fd..e11c5787e 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -46,7 +46,7 @@ var searchData= ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]], ['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']]], + ['setname',['setName',['../classRedInode.html#a3d76322f25d847b123b3df37a26dd04e',1,'RedInode\setName()'],['../classRedFile.html#a38a82bfc1b30028ea6ac75923e90fa25',1,'RedFile\setName()']]], ['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']]], diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 3bf81aaa0..926aa0a82 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -10,7 +10,7 @@ var searchData= ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]], ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]], ['_24attach',['$attach',['../classRedInode.html#a7b317eb1230930154107ed51e54193f5',1,'RedInode']]], - ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory']]], + ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory\$auth()'],['../classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2',1,'RedFile\$auth()']]], ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]], ['_24banner_5fcolour',['$banner_colour',['../redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0',1,'style.php']]], ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], @@ -22,7 +22,9 @@ var searchData= ['_24called_5fapi',['$called_api',['../include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d',1,'api.php']]], ['_24category',['$category',['../classApp.html#a5cfc098c061b7d765add58fd2ca97445',1,'App']]], ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], - ['_24channel_5fid',['$channel_id',['../classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d',1,'RedDirectory']]], + ['_24channel_5fhash',['$channel_hash',['../classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef',1,'RedBasicAuth']]], + ['_24channel_5fid',['$channel_id',['../classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354',1,'RedBasicAuth']]], + ['_24channel_5fname',['$channel_name',['../classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac',1,'RedBasicAuth']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cipher',['$cipher',['../classConversation.html#aa95c1a62af38bdfba7add9549bec083b',1,'Conversation']]], @@ -45,11 +47,11 @@ var searchData= ['_24db',['$db',['../classApp.html#a330410a288f3393d53772f5e98f857ea',1,'App\$db()'],['../classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6',1,'dba_driver\$db()']]], ['_24debug',['$debug',['../classdba__driver.html#af48e2afeded5285766bf92e22123ed03',1,'dba_driver\$debug()'],['../classTemplate.html#afc4afb6f89bebcd5480022312a56cb4a',1,'Template\$debug()']]], ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]], - ['_24dir_5fkey',['$dir_key',['../classRedDirectory.html#a8d5df814b2f825dd14c628a51b5829b5',1,'RedDirectory']]], ['_24dirs',['$dirs',['../typo_8php.html#a1b709c1d79631ebc8320b41bda028b54',1,'typo.php']]], ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]], ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]], ['_24error',['$error',['../classApp.html#ac1a8b2cd40609b231a560201a08852ba',1,'App\$error()'],['../classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c',1,'dba_driver\$error()']]], + ['_24ext_5fpath',['$ext_path',['../classRedDirectory.html#a0f113244cd85c17848df991001d024f4',1,'RedDirectory']]], ['_24filelist',['$filelist',['../docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b',1,'docblox_errorchecker.php']]], ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]], ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]], @@ -83,14 +85,14 @@ var searchData= ['_24mode',['$mode',['../classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a',1,'Conversation']]], ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]], ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]], - ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], + ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba',1,'RedFile\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]], ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]], ['_24nav_5fmin_5fopacity',['$nav_min_opacity',['../redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1',1,'style.php']]], ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]], ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]], ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]], ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]], - ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()']]], + ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1',1,'RedBasicAuth\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()']]], ['_24out',['$out',['../php2po_8php.html#a48cb304902320d173a4eaa41543327b9',1,'php2po.php']]], ['_24owner_5fname',['$owner_name',['../classItem.html#a9594df6014b0b6f45364ea7a34510130',1,'Item']]], ['_24owner_5fphoto',['$owner_photo',['../classItem.html#a078f95b4134ce3a1df344cf8d386f986',1,'Item']]], @@ -123,6 +125,7 @@ var searchData= ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24reply_5fphoto',['$reply_photo',['../redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4',1,'style.php']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], + ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 00bbb448c..954ffdeff 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -399,7 +399,7 @@ Functions

      Profile owner - everything is visible

      Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.

      -

      Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), and z_readdir().

      +

      Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedFileData(), and z_readdir().

      diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index 90d2f9892..f5a0c9243 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -138,8 +138,10 @@ Functions    obj_verbs ()   - obj_verb_selector () -  + obj_verb_selector ($current= '') +  + get_things ($profile_hash, $uid) + 

      Function Documentation

      @@ -298,14 +300,43 @@ Functions - + +
      +
      + + + + + + + + + + + + + + + + + + +
      get_things ( $profile_hash,
       $uid 
      )
      +
      + +

      Referenced by advanced_profile().

      + +
      +
      +
      - + +
      obj_verb_selector () $current = '')
      @@ -329,7 +360,7 @@ Functions

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

      -

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

      +

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

      diff --git a/doc/html/taxonomy_8php.js b/doc/html/taxonomy_8php.js index d2025fb8a..24b5fb426 100644 --- a/doc/html/taxonomy_8php.js +++ b/doc/html/taxonomy_8php.js @@ -7,7 +7,8 @@ var taxonomy_8php = [ "file_tag_file_query", "taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1", null ], [ "format_term_for_display", "taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1", null ], [ "get_terms_oftype", "taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1", null ], - [ "obj_verb_selector", "taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2", null ], + [ "get_things", "taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de", null ], + [ "obj_verb_selector", "taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7", null ], [ "obj_verbs", "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce", null ], [ "store_item_tag", "taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd", null ], [ "tagadelic", "taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a", null ], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 4b44bef8e..496aa6f7b 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1289,7 +1289,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(), dirprofile_init(), 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_post(), mail_store(), menu_edit(), 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().

      +

      Referenced by RedDirectory\__construct(), RedFile\__construct(), 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(), RedDirectory\childExists(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedFile\getETag(), RedFile\getLastModified(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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().

      @@ -1523,7 +1523,7 @@ Variables
      -

      Referenced by import_channel_photo(), import_profile_photo(), and photo_upload().

      +

      Referenced by import_channel_photo(), import_profile_photo(), and photo_upload().

      @@ -1709,7 +1709,7 @@ Variables
      -

      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

      +

      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedDirectory\createFile(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

      @@ -2006,7 +2006,7 @@ Variables
      -

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

      +

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

      diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 6b679743b..63812f661 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(), achievements_content(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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(), 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().

      +

      Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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(), 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().

      -- cgit v1.2.3 From 475b24ca9e758b257bde6f81c727178ae8b64bec Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 3 Jan 2014 01:44:25 -0800 Subject: more dav work --- include/reddav.php | 79 +++++++++++++++++++++--- index.php | 2 - mod/cloud.php | 2 +- util/messages.po | 172 ++++++++++++++++++++++++++++++----------------------- version.inc | 2 +- 5 files changed, 170 insertions(+), 87 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index 97903edb2..79c68a000 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -3,6 +3,8 @@ use Sabre\DAV; require_once('vendor/autoload.php'); +require_once('include/attach.php'); + class RedInode implements DAV\INode { private $attach; @@ -149,15 +151,56 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { function createFile($name,$data = null) { + logger('RedDirectory::createFile : ' . $name); + logger('RedDirectory::createFile : ' . print_r($this,true)); + + logger('createFile():' . stream_get_contents($data)); + + if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'write_storage')) { + logger('createFile: permission denied'); throw new DAV\Exception\Forbidden('Permission denied.'); return; } + $mimetype = z_mime_content_type($name); + + + $c = q("select * from channel where channel_id = %d limit 1", + intval($this->auth->channel_id) + ); + + + $filesize = 0; + $hash = random_string(); +dbg(1); + + $r = q("INSERT INTO attach ( aid, uid, hash, filename, filetype, filesize, revision, data, created, edited ) + VALUES ( %d, %d, '%s', '%s', '%s', %d, %d, '%s', '%s', '%s' ) ", + intval($c[0]['channel_account_id']), + intval($c[0]['channel_id']), + dbesc($hash), + dbesc($name), + dbesc($mimetype), + intval($filesize), + intval(0), + dbesc(stream_get_contents($data)), + dbesc(datetime_convert()), + dbesc(datetime_convert()) + ); + + $r = q("update attach set filesize = length(data) where hash = '%s' and uid = %d limit 1", + dbesc($hash), + intval($c[0]['channel_id']) + ); + +dbg(0); + } + function createDirectory($name) { if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'write_storage')) { throw new DAV\Exception\Forbidden('Permission denied.'); @@ -166,6 +209,12 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { + + + + + + } @@ -174,10 +223,11 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { logger('RedDirectory::childExists : ' . print_r($this->auth,true)); if($this->red_path === '/' && $name === 'cloud') { + logger('RedDirectory::childExists /cloud: true'); return true; } - $x = RedFileData($this->ext_path . '/' . $name, $this->auth); + $x = RedFileData($this->ext_path . '/' . $name, $this->auth,true); logger('RedFileData returns: ' . print_r($x,true)); if($x) return true; @@ -232,11 +282,20 @@ class RedFile extends DAV\Node implements DAV\IFile { function put($data) { logger('RedFile::put: ' . basename($this->name)); + logger('put():' . stream_get_contents($data)); + +dbg(1); $r = q("update attach set data = '%s' where hash = '%s' and uid = %d limit 1", - dbesc($data), + dbesc(stream_get_contents($data)), dbesc($this->data['hash']), intval($this->data['uid']) ); + $r = q("update attach set filesize = length(data) where hash = '%s' and uid = %d limit 1", + dbesc($this->data['hash']), + intval($this->data['uid']) + ); +dbg(0); + } @@ -376,7 +435,7 @@ logger('dbg2: ' . print_r($r,true)); } -function RedFileData($file, &$auth) { +function RedFileData($file, &$auth,$test = false) { logger('RedFileData:' . $file); @@ -463,15 +522,19 @@ dbg(0); } if($errors) { + if($test) + return false; throw new DAV\Exception\Forbidden('Permission denied.'); return; } - if($r[0]['flags'] & ATTACH_FLAG_DIR) - return new RedDirectory('/cloud' . $path . '/' . $r[0]['filename'],$auth); - else - return new RedFile('/cloud' . $path . '/' . $r[0]['filename'],$r[0],$auth); - + if($r) { + if($r[0]['flags'] & ATTACH_FLAG_DIR) + return new RedDirectory('/cloud' . $path . '/' . $r[0]['filename'],$auth); + else + return new RedFile('/cloud' . $path . '/' . $r[0]['filename'],$r[0],$auth); + } + return false; } diff --git a/index.php b/index.php index adfa6534f..640a2b6a1 100755 --- a/index.php +++ b/index.php @@ -62,8 +62,6 @@ else { } - - /** * * Important stuff we always need to do. diff --git a/mod/cloud.php b/mod/cloud.php index 3880c1fd5..106379785 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -81,7 +81,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic { logger('(DAV) RedBasicAuth: password verified for ' . $username); $this->channel_name = $r[0]['channel_address']; $this->channel_id = $r[0]['channel_id']; - $this->channel_hash = $r[0]['channel_hash']; + $this->channel_hash = $this->observer = $r[0]['channel_hash']; return true; } } diff --git a/util/messages.po b/util/messages.po index a309e9e82..d603ef3c4 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-12-27.539\n" +"Project-Id-Version: 2014-01-03.546\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-27 00:04-0800\n" +"POT-Creation-Date: 2014-01-03 00:02-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -803,7 +803,7 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 +#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51 #: ../../mod/photos.php:91 ../../mod/photos.php:767 ../../mod/photos.php:789 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 #: ../../mod/profile_photo.php:336 @@ -1111,9 +1111,9 @@ msgid "Select" msgstr "" #: ../../include/conversation.php:632 ../../include/ItemObject.php:107 -#: ../../mod/connedit.php:356 ../../mod/admin.php:693 ../../mod/group.php:176 -#: ../../mod/photos.php:1132 ../../mod/filestorage.php:82 -#: ../../mod/settings.php:570 +#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:693 +#: ../../mod/group.php:176 ../../mod/photos.php:1132 +#: ../../mod/filestorage.php:82 ../../mod/settings.php:570 msgid "Delete" msgstr "" @@ -1516,7 +1516,8 @@ msgstr "" #: ../../include/attach.php:251 ../../include/attach.php:272 #: ../../include/attach.php:464 ../../include/attach.php:539 #: ../../include/items.php:3437 ../../mod/common.php:35 -#: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:104 +#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257 +#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104 #: ../../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/viewconnections.php:22 @@ -1534,10 +1535,10 @@ msgstr "" #: ../../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:26 ../../mod/message.php:16 ../../mod/register.php:68 -#: ../../mod/regmod.php:18 ../../mod/authtest.php:13 ../../mod/mood.php:114 -#: ../../index.php:178 ../../index.php:346 +#: ../../mod/editblock.php:48 ../../mod/suggest.php:26 +#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/authtest.php:13 ../../mod/item.php:181 ../../mod/item.php:189 +#: ../../mod/mood.php:114 ../../index.php:176 ../../index.php:344 msgid "Permission denied." msgstr "" @@ -2240,10 +2241,11 @@ msgid "New Page" msgstr "" #: ../../include/page_widgets.php:8 ../../include/ItemObject.php:95 -#: ../../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 +#: ../../mod/thing.php:229 ../../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 "" @@ -2679,7 +2681,7 @@ msgstr "" msgid "Default" msgstr "" -#: ../../include/identity.php:29 ../../mod/item.php:1152 +#: ../../include/identity.php:29 ../../mod/item.php:1162 msgid "Unable to obtain identity information from database" msgstr "" @@ -2727,7 +2729,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:639 ../../mod/profiles.php:613 +#: ../../include/identity.php:639 ../../mod/profiles.php:615 msgid "Change profile photo" msgstr "" @@ -2739,7 +2741,7 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:646 ../../mod/profiles.php:614 +#: ../../include/identity.php:646 ../../mod/profiles.php:616 msgid "Create New Profile" msgstr "" @@ -2747,15 +2749,15 @@ msgstr "" msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:660 ../../mod/profiles.php:625 +#: ../../include/identity.php:660 ../../mod/profiles.php:627 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:663 ../../mod/profiles.php:628 +#: ../../include/identity.php:663 ../../mod/profiles.php:630 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:664 ../../mod/profiles.php:629 +#: ../../include/identity.php:664 ../../mod/profiles.php:631 msgid "Edit visibility" msgstr "" @@ -2808,7 +2810,7 @@ msgstr "" msgid "Events this week:" msgstr "" -#: ../../include/identity.php:893 ../../include/identity.php:1004 +#: ../../include/identity.php:893 ../../include/identity.php:975 #: ../../mod/profperm.php:103 msgid "Profile" msgstr "" @@ -2989,12 +2991,12 @@ msgid "This is you" msgstr "" #: ../../include/ItemObject.php:531 ../../mod/events.php:470 -#: ../../mod/thing.php:190 ../../mod/invite.php:156 ../../mod/connedit.php:434 -#: ../../mod/setup.php:302 ../../mod/setup.php:345 ../../mod/connect.php:92 -#: ../../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:81 ../../mod/photos.php:677 -#: ../../mod/photos.php:782 ../../mod/photos.php:1042 +#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156 +#: ../../mod/connedit.php:434 ../../mod/setup.php:302 ../../mod/setup.php:345 +#: ../../mod/connect.php:92 ../../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:81 +#: ../../mod/photos.php:677 ../../mod/photos.php:782 ../../mod/photos.php:1042 #: ../../mod/photos.php:1082 ../../mod/photos.php:1169 #: ../../mod/profiles.php:518 ../../mod/import.php:387 #: ../../mod/settings.php:507 ../../mod/settings.php:619 @@ -3060,11 +3062,11 @@ msgid "" msgstr "" #: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:68 -#: ../../mod/profperm.php:19 ../../index.php:345 +#: ../../mod/profperm.php:19 ../../index.php:343 msgid "Permission denied" msgstr "" -#: ../../include/items.php:3375 ../../mod/admin.php:150 +#: ../../include/items.php:3375 ../../mod/thing.php:74 ../../mod/admin.php:150 #: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18 #: ../../mod/home.php:63 ../../mod/display.php:32 msgid "Item not found." @@ -3173,45 +3175,57 @@ msgstr "" msgid "Share this event" msgstr "" -#: ../../mod/thing.php:109 +#: ../../mod/thing.php:94 +msgid "Thing updated" +msgstr "" + +#: ../../mod/thing.php:153 msgid "Object store: failed" msgstr "" -#: ../../mod/thing.php:113 -msgid "thing/stuff added" +#: ../../mod/thing.php:157 +msgid "Thing added" msgstr "" -#: ../../mod/thing.php:129 +#: ../../mod/thing.php:175 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../mod/thing.php:175 -msgid "not yet implemented." +#: ../../mod/thing.php:228 +msgid "Show Thing" msgstr "" -#: ../../mod/thing.php:181 -msgid "Add Stuff to your Profile" +#: ../../mod/thing.php:235 +msgid "item not found." msgstr "" -#: ../../mod/thing.php:183 +#: ../../mod/thing.php:263 +msgid "Edit Thing" +msgstr "" + +#: ../../mod/thing.php:265 ../../mod/thing.php:311 msgid "Select a profile" msgstr "" -#: ../../mod/thing.php:185 +#: ../../mod/thing.php:267 ../../mod/thing.php:313 msgid "Select a category of stuff. e.g. I ______ something" msgstr "" -#: ../../mod/thing.php:187 -msgid "Name of thing or stuff e.g. something" +#: ../../mod/thing.php:270 ../../mod/thing.php:315 +msgid "Name of thing e.g. something" +msgstr "" + +#: ../../mod/thing.php:272 ../../mod/thing.php:316 +msgid "URL of thing (optional)" msgstr "" -#: ../../mod/thing.php:188 -msgid "URL of thing or stuff (optional)" +#: ../../mod/thing.php:274 ../../mod/thing.php:317 +msgid "URL for photo of thing (optional)" msgstr "" -#: ../../mod/thing.php:189 -msgid "URL for photo of thing or stuff (optional)" +#: ../../mod/thing.php:309 +msgid "Add Thing to your Profile" msgstr "" #: ../../mod/invite.php:25 @@ -3666,7 +3680,7 @@ msgid "Channel not found." msgstr "" #: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100 -#: ../../index.php:229 +#: ../../index.php:227 msgid "Page not found." msgstr "" @@ -5239,7 +5253,7 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:68 ../../index.php:226 +#: ../../mod/help.php:68 ../../index.php:224 msgid "Not Found" msgstr "" @@ -5550,6 +5564,14 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" +#: ../../mod/profiles.php:613 +msgid "Add profile things" +msgstr "" + +#: ../../mod/profiles.php:614 +msgid "Include desirable objects in your profile" +msgstr "" + #: ../../mod/new_channel.php:107 msgid "Add a Channel" msgstr "" @@ -6418,7 +6440,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1078 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1088 msgid "Wall Photos" msgstr "" @@ -6491,32 +6513,6 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/item.php:144 -msgid "Unable to locate original post." -msgstr "" - -#: ../../mod/item.php:342 -msgid "Empty post discarded." -msgstr "" - -#: ../../mod/item.php:384 -msgid "Executable content type not permitted to this channel." -msgstr "" - -#: ../../mod/item.php:794 -msgid "System error. Post not saved." -msgstr "" - -#: ../../mod/item.php:1157 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." -msgstr "" - -#: ../../mod/item.php:1163 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." -msgstr "" - #: ../../mod/siteinfo.php:57 #, php-format msgid "Version %s" @@ -6709,6 +6705,32 @@ msgstr "" msgid "Remove My Account" msgstr "" +#: ../../mod/item.php:144 +msgid "Unable to locate original post." +msgstr "" + +#: ../../mod/item.php:342 +msgid "Empty post discarded." +msgstr "" + +#: ../../mod/item.php:384 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:806 +msgid "System error. Post not saved." +msgstr "" + +#: ../../mod/item.php:1167 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../mod/item.php:1173 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "" + #: ../../mod/mood.php:133 msgid "Mood" msgstr "" diff --git a/version.inc b/version.inc index 1ccd4beb1..7312c7541 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-02.545 +2014-01-03.546 -- cgit v1.2.3 From 87ff49544376f71cf0f10aef5123886a99b36239 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Fri, 3 Jan 2014 21:25:18 +0100 Subject: Revert "Fix page not found error after editing a webpage" This reverts commit 575f2b3280049eba2bbead023d8fe7fc345af0b1. --- mod/page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/page.php b/mod/page.php index 125c0141f..df17dbf52 100644 --- a/mod/page.php +++ b/mod/page.php @@ -58,7 +58,7 @@ function page_content(&$a) { $r = q("select item.* from item left join item_id on item.id = item_id.iid where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and - (item_restrict & %d) $sql_options $revision limit 1", + item_restrict = %d $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), intval(ITEM_WEBPAGE) -- cgit v1.2.3 From f2ba6ed9982ee4b3b80331a195534f74e510d508 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 3 Jan 2014 14:18:06 -0800 Subject: fix mimetype detection fallback --- include/attach.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/include/attach.php b/include/attach.php index 0c748cba6..3eb7a9366 100644 --- a/include/attach.php +++ b/include/attach.php @@ -79,17 +79,12 @@ function z_mime_content_type($filename) { if (array_key_exists($ext, $mime_types)) { return $mime_types[$ext]; } + + } -// can't use this because we're just passing a name, e.g. not a file that can be opened -// elseif (function_exists('finfo_open')) { -// $finfo = @finfo_open(FILEINFO_MIME); -// $mimetype = @finfo_file($finfo, $filename); -// @finfo_close($finfo); -// return $mimetype; -// } - else { - return 'application/octet-stream'; - } + + return 'application/octet-stream'; + } -- cgit v1.2.3 From 0c85c9748096d625ae9baa29fb9aad48bab3a208 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 4 Jan 2014 03:58:21 -0800 Subject: move js files from core --- include/zot.php | 5 +- js/acl.js | 270 --------- js/ajaxupload.js | 720 ----------------------- js/crypto.js | 291 ---------- js/fk.autocomplete.js | 200 ------- js/icon_translate.js | 53 -- js/jquery-compat.js | 71 --- js/jquery-migrate-1.1.1.js | 511 ----------------- js/jquery.htmlstream.js | 157 ----- js/jquery.js | 5 - js/jquery.spin.js | 80 --- js/jquery.textinputs.js | 20 - js/main.js | 1211 --------------------------------------- js/spin.js | 349 ----------- js/webtoolkit.base64.js | 142 ----- version.inc | 2 +- view/js/acl.js | 270 +++++++++ view/js/ajaxupload.js | 720 +++++++++++++++++++++++ view/js/crypto.js | 291 ++++++++++ view/js/fk.autocomplete.js | 200 +++++++ view/js/icon_translate.js | 53 ++ view/js/jquery-compat.js | 71 +++ view/js/jquery-migrate-1.1.1.js | 511 +++++++++++++++++ view/js/jquery.htmlstream.js | 157 +++++ view/js/jquery.js | 5 + view/js/jquery.spin.js | 80 +++ view/js/jquery.textinputs.js | 20 + view/js/main.js | 1211 +++++++++++++++++++++++++++++++++++++++ view/js/spin.js | 349 +++++++++++ view/js/webtoolkit.base64.js | 142 +++++ view/php/theme_init.php | 22 +- 31 files changed, 4095 insertions(+), 4094 deletions(-) delete mode 100644 js/acl.js delete mode 100644 js/ajaxupload.js delete mode 100644 js/crypto.js delete mode 100644 js/fk.autocomplete.js delete mode 100644 js/icon_translate.js delete mode 100644 js/jquery-compat.js delete mode 100644 js/jquery-migrate-1.1.1.js delete mode 100644 js/jquery.htmlstream.js delete mode 100644 js/jquery.js delete mode 100644 js/jquery.spin.js delete mode 100644 js/jquery.textinputs.js delete mode 100644 js/main.js delete mode 100644 js/spin.js delete mode 100644 js/webtoolkit.base64.js create mode 100644 view/js/acl.js create mode 100644 view/js/ajaxupload.js create mode 100644 view/js/crypto.js create mode 100644 view/js/fk.autocomplete.js create mode 100644 view/js/icon_translate.js create mode 100644 view/js/jquery-compat.js create mode 100644 view/js/jquery-migrate-1.1.1.js create mode 100644 view/js/jquery.htmlstream.js create mode 100644 view/js/jquery.js create mode 100644 view/js/jquery.spin.js create mode 100644 view/js/jquery.textinputs.js create mode 100644 view/js/main.js create mode 100644 view/js/spin.js create mode 100644 view/js/webtoolkit.base64.js diff --git a/include/zot.php b/include/zot.php index 9d6f462fe..97c9c4a36 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1368,7 +1368,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) { remove_community_tag($sender,$arr,$channel['channel_id']); $item_id = delete_imported_item($sender,$arr,$channel['channel_id']); - $result[] = array($d['hash'],'deleted',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); + $result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); if($relay && $item_id) { logger('process_delivery: invoking relay'); @@ -1524,10 +1524,11 @@ function delete_imported_item($sender,$item,$uid) { logger('delete_imported_item invoked',LOGGER_DEBUG); - $r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' ) + $r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) and mid = '%s' and uid = %d limit 1", dbesc($sender['hash']), dbesc($sender['hash']), + dbesc($sender['hash']), dbesc($item['mid']), intval($uid) ); diff --git a/js/acl.js b/js/acl.js deleted file mode 100644 index 906b28354..000000000 --- a/js/acl.js +++ /dev/null @@ -1,270 +0,0 @@ -function ACL(backend_url, preset){ - that = this; - - that.url = backend_url; - - that.kp_timer = null; - - if (preset==undefined) preset = []; - that.allow_cid = (preset[0] || []); - that.allow_gid = (preset[1] || []); - that.deny_cid = (preset[2] || []); - that.deny_gid = (preset[3] || []); - that.group_uids = []; - that.nw = 4; //items per row. should be calulated from #acl-list.width - - that.list_content = $("#acl-list-content"); - that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html()); - that.showall = $("#acl-showall"); - - if (preset.length==0) that.showall.addClass("selected"); - - /*events*/ - that.showall.click(that.on_showall); - $(document).on('click','.acl-button-show',that.on_button_show); - $(document).on('click','.acl-button-hide',that.on_button_hide); - $("#acl-search").keypress(that.on_search); - $("#acl-wrapper").parents("form").submit(that.on_submit); - - /* startup! */ - that.get(0,100); -} - -ACL.prototype.on_submit = function(){ - aclfileds = $("#acl-fields").html(""); - $(that.allow_gid).each(function(i,v){ - aclfileds.append(""); - }); - $(that.allow_cid).each(function(i,v){ - aclfileds.append(""); - }); - $(that.deny_gid).each(function(i,v){ - aclfileds.append(""); - }); - $(that.deny_cid).each(function(i,v){ - aclfileds.append(""); - }); -} - -ACL.prototype.search = function(){ - var srcstr = $("#acl-search").val(); - that.list_content.html(""); - that.get(0,100, srcstr); -} - -ACL.prototype.on_search = function(event){ - if (that.kp_timer) clearTimeout(that.kp_timer); - that.kp_timer = setTimeout( that.search, 1000); -} - -ACL.prototype.on_showall = function(event){ - event.preventDefault() - event.stopPropagation(); - - if (that.showall.hasClass("selected")){ - return false; - } - that.showall.addClass("selected"); - - that.allow_cid = []; - that.allow_gid = []; - that.deny_cid = []; - that.deny_gid = []; - - that.update_view(); - - return false; -} - -ACL.prototype.on_button_show = function(event){ - event.preventDefault() - event.stopImmediatePropagation() - event.stopPropagation(); - - /*that.showall.removeClass("selected"); - $(this).siblings(".acl-button-hide").removeClass("selected"); - $(this).toggleClass("selected");*/ - - that.set_allow($(this).parent().attr('id')); - - return false; -} -ACL.prototype.on_button_hide = function(event){ - event.preventDefault() - event.stopImmediatePropagation() - event.stopPropagation(); - - /*that.showall.removeClass("selected"); - $(this).siblings(".acl-button-show").removeClass("selected"); - $(this).toggleClass("selected");*/ - - that.set_deny($(this).parent().attr('id')); - - return false; -} - -ACL.prototype.set_allow = function(itemid){ - type = itemid[0]; - id = itemid.substr(1); - switch(type){ - case "g": - if (that.allow_gid.indexOf(id)<0){ - that.allow_gid.push(id) - }else { - that.allow_gid.remove(id); - } - if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id); - break; - case "c": - if (that.allow_cid.indexOf(id)<0){ - that.allow_cid.push(id) - } else { - that.allow_cid.remove(id); - } - if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); - break; - } - that.update_view(); -} - -ACL.prototype.set_deny = function(itemid){ - type = itemid[0]; - id = itemid.substr(1); - switch(type){ - case "g": - if (that.deny_gid.indexOf(id)<0){ - that.deny_gid.push(id) - } else { - that.deny_gid.remove(id); - } - if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id); - break; - case "c": - if (that.deny_cid.indexOf(id)<0){ - that.deny_cid.push(id) - } else { - that.deny_cid.remove(id); - } - if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id); - break; - } - that.update_view(); -} - -ACL.prototype.update_view = function(){ - var jotpermslock; - var jotpermsunlock; - if (document.jotpermslock == null) { - jotpermslock = 'lock'; - } else { - jotpermslock = document.jotpermslock; - } - if (document.jotpermsunlock == null) { - jotpermsunlock = 'unlock'; - } else { - jotpermsunlock = document.jotpermsunlock; - } - if (that.allow_gid.length==0 && that.allow_cid.length==0 && - that.deny_gid.length==0 && that.deny_cid.length==0){ - that.showall.addClass("selected"); - /* jot acl */ - $('#jot-perms-icon').removeClass(jotpermslock).addClass(jotpermsunlock); - $('#jot-public').show(); - $('.profile-jot-net input').attr('disabled', false); - if(typeof editor != 'undefined' && editor != false) { - $('#profile-jot-desc').html(ispublic); - } - - } else { - that.showall.removeClass("selected"); - /* jot acl */ - $('#jot-perms-icon').removeClass(jotpermsunlock).addClass(jotpermslock); - $('#jot-public').hide(); - $('.profile-jot-net input').attr('disabled', 'disabled'); - $('#profile-jot-desc').html(' '); - } - $("#acl-list-content .acl-list-item").each(function(){ - $(this).removeClass("groupshow grouphide"); - }); - - $("#acl-list-content .acl-list-item").each(function(){ - itemid = $(this).attr('id'); - type = itemid[0]; - id = itemid.substr(1); - - btshow = $(this).children(".acl-button-show").removeClass("selected"); - bthide = $(this).children(".acl-button-hide").removeClass("selected"); - - switch(type){ - case "g": - var uclass = ""; - if (that.allow_gid.indexOf(id)>=0){ - btshow.addClass("selected"); - bthide.removeClass("selected"); - uclass="groupshow"; - } - if (that.deny_gid.indexOf(id)>=0){ - btshow.removeClass("selected"); - bthide.addClass("selected"); - uclass="grouphide"; - } - - $(that.group_uids[id]).each(function(i,v) { - if(uclass == "grouphide") - $("#c"+v).removeClass("groupshow"); - if(uclass != "") { - var cls = $("#c"+v).attr('class'); - if( cls == undefined) - return true; - var hiding = cls.indexOf('grouphide'); - if(hiding == -1) - $("#c"+v).addClass(uclass); - } - }); - - break; - case "c": - if (that.allow_cid.indexOf(id)>=0){ - btshow.addClass("selected"); - bthide.removeClass("selected"); - } - if (that.deny_cid.indexOf(id)>=0){ - btshow.removeClass("selected"); - bthide.addClass("selected"); - } - } - - }); - -} - - -ACL.prototype.get = function(start,count, search){ - var postdata = { - start:start, - count:count, - search:search, - } - - $.ajax({ - type:'POST', - url: that.url, - data: postdata, - dataType: 'json', - success:that.populate - }); -} - -ACL.prototype.populate = function(data){ - var height = Math.ceil(data.tot / that.nw) * 42; - that.list_content.height(height); - $(data.items).each(function(){ - html = "
      "+that.item_tpl+"
      "; - html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link, this.taggable ); - if (this.uids!=undefined) that.group_uids[this.id] = this.uids; - //console.log(html); - that.list_content.append(html); - }); - that.update_view(); -} - diff --git a/js/ajaxupload.js b/js/ajaxupload.js deleted file mode 100644 index 5719f30e0..000000000 --- a/js/ajaxupload.js +++ /dev/null @@ -1,720 +0,0 @@ -/** - * AJAX Upload ( http://valums.com/ajax-upload/ ) - * Copyright (c) Andris Valums - * Licensed under the MIT license ( http://valums.com/mit-license/ ) - * Thanks to Gary Haran, David Mark, Corey Burns and others for contributions. - */ - -(function () { - /* global window */ - /* jslint browser: true, devel: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true */ - - /** - * Wrapper for FireBug's console.log - */ - function log(){ - if (typeof(console) != 'undefined' && typeof(console.log) == 'function'){ - Array.prototype.unshift.call(arguments, '[Ajax Upload]'); - console.log( Array.prototype.join.call(arguments, ' ')); - } - } - - /** - * Attaches event to a dom element. - * @param {Element} el - * @param type event name - * @param fn callback This refers to the passed element - */ - function addEvent(el, type, fn){ - if (el.addEventListener) { - el.addEventListener(type, fn, false); - } else if (el.attachEvent) { - el.attachEvent('on' + type, function(){ - fn.call(el); - }); - } else { - throw new Error('not supported or DOM not loaded'); - } - } - - /** - * Attaches resize event to a window, limiting - * number of event fired. Fires only when encounteres - * delay of 100 after series of events. - * - * Some browsers fire event multiple times when resizing - * http://www.quirksmode.org/dom/events/resize.html - * - * @param fn callback This refers to the passed element - */ - function addResizeEvent(fn){ - var timeout; - - addEvent(window, 'resize', function(){ - if (timeout){ - clearTimeout(timeout); - } - timeout = setTimeout(fn, 100); - }); - } - - // Get offset adding all offsets, slow fall-back method - var getOffsetSlow = function(el){ - var top = 0, left = 0; - do { - top += el.offsetTop || 0; - left += el.offsetLeft || 0; - el = el.offsetParent; - } while (el); - - return { - left: left, - top: top - }; - }; - - - - - - // Needs more testing, will be rewriten for next version - // getOffset function copied from jQuery lib (http://jquery.com/) - if (document.documentElement.getBoundingClientRect){ - // Get Offset using getBoundingClientRect - // http://ejohn.org/blog/getboundingclientrect-is-awesome/ - var getOffset = function(el){ - var box = el.getBoundingClientRect(); - var doc = el.ownerDocument; - var body = doc.body; - var docElem = doc.documentElement; // for ie - var clientTop = docElem.clientTop || body.clientTop || 0; - var clientLeft = docElem.clientLeft || body.clientLeft || 0; - - // In Internet Explorer 7 getBoundingClientRect property is treated as physical, - // while others are logical. Make all logical, like in IE8. - var zoom = 1; - if (body.getBoundingClientRect) { - var bound = body.getBoundingClientRect(); - zoom = (bound.right - bound.left) / body.clientWidth; - } - - // some CSS layouts gives 0 width and/or bounding boxes - // in this case we fall back to the slow method - if (zoom == 0 || body.clientWidth == 0) - return getOffsetSlow(el); - - if (zoom > 1) { - clientTop = 0; - clientLeft = 0; - } - - var top = box.top / zoom + (window.pageYOffset || docElem && docElem.scrollTop / zoom || body.scrollTop / zoom) - clientTop, left = box.left / zoom + (window.pageXOffset || docElem && docElem.scrollLeft / zoom || body.scrollLeft / zoom) - clientLeft; - - return { - top: top, - left: left - }; - }; - } else { -// // Get offset adding all offsets - // var getOffset = function(el){ - // var top = 0, left = 0; - // do { - // top += el.offsetTop || 0; - // left += el.offsetLeft || 0; - // el = el.offsetParent; - // } while (el); - - // return { - // left: left, - // top: top - // }; - // }; - var getOffset = getOffsetSlowl - } - - /** - * Returns left, top, right and bottom properties describing the border-box, - * in pixels, with the top-left relative to the body - * @param {Element} el - * @return {Object} Contains left, top, right,bottom - */ - function getBox(el){ - var left, right, top, bottom; - var offset = getOffset(el); - left = offset.left; - top = offset.top; - - right = left + el.offsetWidth; - bottom = top + el.offsetHeight; - - return { - left: left, - right: right, - top: top, - bottom: bottom - }; - } - - /** - * Helper that takes object literal - * and add all properties to element.style - * @param {Element} el - * @param {Object} styles - */ - function addStyles(el, styles){ - for (var name in styles) { - if (styles.hasOwnProperty(name)) { - el.style[name] = styles[name]; - } - } - } - - /** - * Function places an absolutely positioned - * element on top of the specified element - * copying position and dimentions. - * @param {Element} from - * @param {Element} to - */ - function copyLayout(from, to){ - var box = getBox(from); - - addStyles(to, { - position: 'absolute', - left : box.left + 'px', - top : box.top + 'px', - width : from.offsetWidth + 'px', - height : from.offsetHeight + 'px' - }); - to.title = from.title; - - } - - /** - * Creates and returns element from html chunk - * Uses innerHTML to create an element - */ - var toElement = (function(){ - var div = document.createElement('div'); - return function(html){ - div.innerHTML = html; - var el = div.firstChild; - return div.removeChild(el); - }; - })(); - - /** - * Function generates unique id - * @return unique id - */ - var getUID = (function(){ - var id = 0; - return function(){ - return 'ValumsAjaxUpload' + id++; - }; - })(); - - /** - * Get file name from path - * @param {String} file path to file - * @return filename - */ - function fileFromPath(file){ - return file.replace(/.*(\/|\\)/, ""); - } - - /** - * Get file extension lowercase - * @param {String} file name - * @return file extenstion - */ - function getExt(file){ - return (-1 !== file.indexOf('.')) ? file.replace(/.*[.]/, '') : ''; - } - - function hasClass(el, name){ - var re = new RegExp('\\b' + name + '\\b'); - return re.test(el.className); - } - function addClass(el, name){ - if ( ! hasClass(el, name)){ - el.className += ' ' + name; - } - } - function removeClass(el, name){ - var re = new RegExp('\\b' + name + '\\b'); - el.className = el.className.replace(re, ''); - } - - function removeNode(el){ - el.parentNode.removeChild(el); - } - - /** - * Easy styling and uploading - * @constructor - * @param button An element you want convert to - * upload button. Tested dimentions up to 500x500px - * @param {Object} options See defaults below. - */ - window.AjaxUpload = function(button, options){ - this._settings = { - // Location of the server-side upload script - action: 'upload.php', - // File upload name - name: 'userfile', - // Additional data to send - data: {}, - // Submit file as soon as it's selected - autoSubmit: true, - // The type of data that you're expecting back from the server. - // html and xml are detected automatically. - // Only useful when you are using json data as a response. - // Set to "json" in that case. - responseType: false, - // Class applied to button when mouse is hovered - hoverClass: 'hover', - // Class applied to button when button is focused - focusClass: 'focus', - // Class applied to button when AU is disabled - disabledClass: 'disabled', - // When user selects a file, useful with autoSubmit disabled - // You can return false to cancel upload - onChange: function(file, extension){ - }, - // Callback to fire before file is uploaded - // You can return false to cancel upload - onSubmit: function(file, extension){ - }, - // Fired when file upload is completed - // WARNING! DO NOT USE "FALSE" STRING AS A RESPONSE! - onComplete: function(file, response){ - } - }; - - // Merge the users options with our defaults - for (var i in options) { - if (options.hasOwnProperty(i)){ - this._settings[i] = options[i]; - } - } - - // button isn't necessary a dom element - if (button.jquery){ - // jQuery object was passed - button = button[0]; - } else if (typeof button == "string") { - if (/^#.*/.test(button)){ - // If jQuery user passes #elementId don't break it - button = button.slice(1); - } - - button = document.getElementById(button); - } - - if ( ! button || button.nodeType !== 1){ - throw new Error("Please make sure that you're passing a valid element"); - } - - if ( button.nodeName.toUpperCase() == 'A'){ - // disable link - addEvent(button, 'click', function(e){ - if (e && e.preventDefault){ - e.preventDefault(); - } else if (window.event){ - window.event.returnValue = false; - } - }); - } - - // DOM element - this._button = button; - // DOM element - this._input = null; - // If disabled clicking on button won't do anything - this._disabled = false; - - // if the button was disabled before refresh if will remain - // disabled in FireFox, let's fix it - this.enable(); - - this._rerouteClicks(); - }; - - // assigning methods to our class - AjaxUpload.prototype = { - setData: function(data){ - this._settings.data = data; - }, - disable: function(){ - addClass(this._button, this._settings.disabledClass); - this._disabled = true; - - var nodeName = this._button.nodeName.toUpperCase(); - if (nodeName == 'INPUT' || nodeName == 'BUTTON'){ - this._button.setAttribute('disabled', 'disabled'); - } - - // hide input - if (this._input){ - // We use visibility instead of display to fix problem with Safari 4 - // The problem is that the value of input doesn't change if it - // has display none when user selects a file - this._input.parentNode.style.visibility = 'hidden'; - } - }, - enable: function(){ - removeClass(this._button, this._settings.disabledClass); - this._button.removeAttribute('disabled'); - this._disabled = false; - - }, - /** - * Creates invisible file input - * that will hover above the button - *
      - */ - _createInput: function(){ - var self = this; - - var input = document.createElement("input"); - input.setAttribute('type', 'file'); - input.setAttribute('name', this._settings.name); - - addStyles(input, { - 'position' : 'absolute', - // in Opera only 'browse' button - // is clickable and it is located at - // the right side of the input - 'right' : 0, - 'margin' : 0, - 'padding' : 0, - 'fontSize' : '480px', - // in Firefox if font-family is set to - // 'inherit' the input doesn't work - 'fontFamily' : 'sans-serif', - 'cursor' : 'pointer' - }); - - var div = document.createElement("div"); - addStyles(div, { - 'display' : 'block', - 'position' : 'absolute', - 'overflow' : 'hidden', - 'margin' : 0, - 'padding' : 0, - 'opacity' : 0, - // Make sure browse button is in the right side - // in Internet Explorer - 'direction' : 'ltr', - //Max zIndex supported by Opera 9.0-9.2 - 'zIndex': 2147483583, - 'cursor' : 'pointer' - - }); - - // Make sure that element opacity exists. - // Otherwise use IE filter - if ( div.style.opacity !== "0") { - if (typeof(div.filters) == 'undefined'){ - throw new Error('Opacity not supported by the browser'); - } - div.style.filter = "alpha(opacity=0)"; - } - - addEvent(input, 'change', function(){ - - if ( ! input || input.value === ''){ - return; - } - - // Get filename from input, required - // as some browsers have path instead of it - var file = fileFromPath(input.value); - - if (false === self._settings.onChange.call(self, file, getExt(file))){ - self._clearInput(); - return; - } - - // Submit form when value is changed - if (self._settings.autoSubmit) { - self.submit(); - } - }); - - addEvent(input, 'mouseover', function(){ - addClass(self._button, self._settings.hoverClass); - }); - - addEvent(input, 'mouseout', function(){ - removeClass(self._button, self._settings.hoverClass); - removeClass(self._button, self._settings.focusClass); - - // We use visibility instead of display to fix problem with Safari 4 - // The problem is that the value of input doesn't change if it - // has display none when user selects a file - input.parentNode.style.visibility = 'hidden'; - - }); - - addEvent(input, 'focus', function(){ - addClass(self._button, self._settings.focusClass); - }); - - addEvent(input, 'blur', function(){ - removeClass(self._button, self._settings.focusClass); - }); - - div.appendChild(input); - document.body.appendChild(div); - - this._input = input; - }, - _clearInput : function(){ - if (!this._input){ - return; - } - - // this._input.value = ''; Doesn't work in IE6 - removeNode(this._input.parentNode); - this._input = null; - this._createInput(); - - removeClass(this._button, this._settings.hoverClass); - removeClass(this._button, this._settings.focusClass); - }, - /** - * Function makes sure that when user clicks upload button, - * the this._input is clicked instead - */ - _rerouteClicks: function(){ - var self = this; - - // IE will later display 'access denied' error - // if you use using self._input.click() - // other browsers just ignore click() - - addEvent(self._button, 'mouseover', function(){ - if (self._disabled){ - return; - } - - if ( ! self._input){ - self._createInput(); - } - - var div = self._input.parentNode; - copyLayout(self._button, div); - div.style.visibility = 'visible'; - - }); - - - // commented because we now hide input on mouseleave - /** - * When the window is resized the elements - * can be misaligned if button position depends - * on window size - */ - //addResizeEvent(function(){ - // if (self._input){ - // copyLayout(self._button, self._input.parentNode); - // } - //}); - - }, - /** - * Creates iframe with unique name - * @return {Element} iframe - */ - _createIframe: function(){ - // We can't use getTime, because it sometimes return - // same value in safari :( - var id = getUID(); - - // We can't use following code as the name attribute - // won't be properly registered in IE6, and new window - // on form submit will open - // var iframe = document.createElement('iframe'); - // iframe.setAttribute('name', id); - - var iframe = toElement(' + + +
      +
      +
      RedBrowser Member List
      +
      +
      + +

      This is the complete list of members for RedBrowser, including all inherited members.

      + + + + + + +
      $authRedBrowserprivate
      __construct(&$auth)RedBrowser
      generateDirectoryIndex($path)RedBrowser
      htmlActionsPanel(DAV\INode $node, &$output)RedBrowser
      set_writeable()RedBrowser
      + + diff --git a/doc/html/classRedBrowser.html b/doc/html/classRedBrowser.html new file mode 100644 index 000000000..19a02f9e4 --- /dev/null +++ b/doc/html/classRedBrowser.html @@ -0,0 +1,244 @@ + + + + + + +The Red Matrix: RedBrowser Class Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Public Member Functions | +Private Attributes | +List of all members
      +
      +
      RedBrowser Class Reference
      +
      +
      +
      +Inheritance diagram for RedBrowser:
      +
      +
      + + + +
      + + + + + + + + + + +

      +Public Member Functions

       __construct (&$auth)
       
       set_writeable ()
       
       generateDirectoryIndex ($path)
       
       htmlActionsPanel (DAV\INode $node, &$output)
       
      + + + +

      +Private Attributes

       $auth
       
      +

      Constructor & Destructor Documentation

      + +
      +
      + + + + + + + + +
      RedBrowser::__construct (& $auth)
      +
      + +
      +
      +

      Member Function Documentation

      + +
      +
      + + + + + + + + +
      RedBrowser::generateDirectoryIndex ( $path)
      +
      + +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + +
      RedBrowser::htmlActionsPanel (DAV\INode $node,
      & $output 
      )
      +
      + +
      +
      + +
      +
      + + + + + + + +
      RedBrowser::set_writeable ()
      +
      + +
      +
      +

      Member Data Documentation

      + +
      +
      + + + + + +
      + + + + +
      RedBrowser::$auth
      +       		+private
      +
      + +

      Referenced by __construct().

      + +
      +
      +
      The documentation for this class was generated from the following file: +
      +
      + diff --git a/doc/html/classRedBrowser.js b/doc/html/classRedBrowser.js new file mode 100644 index 000000000..c0222b8f9 --- /dev/null +++ b/doc/html/classRedBrowser.js @@ -0,0 +1,8 @@ +var classRedBrowser = +[ + [ "__construct", "classRedBrowser.html#a4b76be9ccef0262cf78fffb4129eda93", null ], + [ "generateDirectoryIndex", "classRedBrowser.html#a1f7daf50bb9bfcde7345b3b1908dbd7e", null ], + [ "htmlActionsPanel", "classRedBrowser.html#a7f6bf0bda07833f4c647557bd172e349", null ], + [ "set_writeable", "classRedBrowser.html#a40fdbb9d9fe6c1243bbf135dd5b0a06f", null ], + [ "$auth", "classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35", null ] +]; \ No newline at end of file diff --git a/doc/html/classRedBrowser.png b/doc/html/classRedBrowser.png new file mode 100644 index 000000000..df14b3aa8 Binary files /dev/null and b/doc/html/classRedBrowser.png differ -- cgit v1.2.3 From 0fef87cb43376289c39ddb0e30ee7a35fa97086d Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 00:58:53 -0800 Subject: security fix for channel?mid= per zottel --- mod/channel.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 20f6fec18..dac4ba2bf 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -135,9 +135,11 @@ function channel_content(&$a, $update = 0, $load = false) { if(($update) && (! $load)) { if ($mid) { - $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $sql_extra limit 1", + $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0 + AND (item_flags & %d) $sql_extra limit 1", dbesc($mid), - intval($a->profile['profile_uid']) + intval($a->profile['profile_uid']), + intval(ITEM_WALL) ); } else { $r = q("SELECT distinct parent AS `item_id` from item -- cgit v1.2.3 From ea511c67c7b4d67cb98a92d6e86c634e6b37dc64 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 10 Jan 2014 13:38:38 +0100 Subject: add security fix to load case, too --- mod/channel.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index dac4ba2bf..a936650f3 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -141,6 +141,9 @@ function channel_content(&$a, $update = 0, $load = false) { intval($a->profile['profile_uid']), intval(ITEM_WALL) ); + if (! $r) { + notice( t('Permission denied.') . EOL); + } } else { $r = q("SELECT distinct parent AS `item_id` from item left join abook on item.author_xchan = abook.abook_xchan @@ -177,11 +180,14 @@ function channel_content(&$a, $update = 0, $load = false) { if($load || ($_COOKIE['jsAvailable'] != 1)) { if ($mid) { - $r = q("SELECT parent AS item_id from item where mid = '%s' limit 1", - dbesc($mid) + $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0 + AND (item_flags & %d) $sql_extra limit 1", + dbesc($mid), + intval($a->profile['profile_uid']), + intval(ITEM_WALL) ); if (! $r) { - notice( t('Item not found.') . EOL); + notice( t('Permission denied.') . EOL); } } else { -- cgit v1.2.3 From 1c315caa28eb991469e122fb7f8650f411152b13 Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 10 Jan 2014 13:41:25 +0100 Subject: and don't send duplicate notices --- mod/channel.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index a936650f3..6e82eb1e7 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -141,9 +141,6 @@ function channel_content(&$a, $update = 0, $load = false) { intval($a->profile['profile_uid']), intval(ITEM_WALL) ); - if (! $r) { - notice( t('Permission denied.') . EOL); - } } else { $r = q("SELECT distinct parent AS `item_id` from item left join abook on item.author_xchan = abook.abook_xchan -- cgit v1.2.3 From c4705724f1e011b8f8d8f3fef419bc27f31b93fe Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 10 Jan 2014 16:54:16 +0100 Subject: make goaway link work --- mod/filestorage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/filestorage.php b/mod/filestorage.php index 3e87dccb8..18760dd45 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -84,12 +84,12 @@ function filestorage_content(&$a) { ); if(! $r) { notice( t('File not found.') . EOL); - goaway(z_root() . '/filestorage' . $which); + goaway(z_root() . '/filestorage/' . $which); } attach_delete($owner,$r[0]['hash']); - goaway(z_root() . '/filestorage' . $which); + goaway(z_root() . '/filestorage/' . $which); } -- cgit v1.2.3 From 865f7aef1c31d245ee8814bb44358d2e8b1a1890 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 10 Jan 2014 20:37:25 +0000 Subject: Prevent whitespace breaking copy-paste of reset passwords. --- view/tpl/pwdreset.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl index 3993dec64..a9106343f 100755 --- a/view/tpl/pwdreset.tpl +++ b/view/tpl/pwdreset.tpl @@ -6,9 +6,7 @@

      {{$lbl3}}

      -

      -{{$newpass}} -

      +

      {{$newpass}}

      {{$lbl4}} {{$lbl5}}

      -- cgit v1.2.3 From c9879edb3e1c7058dca083b11a13840cf7cbe609 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 12:37:48 -0800 Subject: break delivery loop if an item is deleted twice --- include/reddav.php | 2 +- include/zot.php | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index b2683885d..69fcf8bec 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -886,7 +886,7 @@ class RedBrowser extends DAV\Browser\Plugin { {$displayName} {$type} {$size} - " . datetime_convert('UTC', date_default_timezone_get(),$lastmodified) . " + " . (($lastmodified) ? datetime_convert('UTC', date_default_timezone_get(),$lastmodified) : '') . " "; } diff --git a/include/zot.php b/include/zot.php index 168ccaaa5..7c2cfe019 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1367,6 +1367,8 @@ function process_delivery($sender,$arr,$deliveries,$relay) { // remove_community_tag is a no-op if this isn't a community tag activity remove_community_tag($sender,$arr,$channel['channel_id']); + + $item_id = delete_imported_item($sender,$arr,$channel['channel_id']); $result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); @@ -1524,7 +1526,7 @@ function delete_imported_item($sender,$item,$uid) { logger('delete_imported_item invoked',LOGGER_DEBUG); - $r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) + $r = q("select id, item_restrict from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) and mid = '%s' and uid = %d limit 1", dbesc($sender['hash']), dbesc($sender['hash']), @@ -1537,6 +1539,11 @@ function delete_imported_item($sender,$item,$uid) { logger('delete_imported_item: failed: ownership issue'); return false; } + + if($r[0]['item_restrict'] & ITEM_DELETED) { + logger('delete_imported_item: item was already deleted'); + return false; + } require_once('include/items.php'); drop_item($r[0]['id'],false); -- cgit v1.2.3 From ffa86dfea8aef25af8bff9a5ff6342f5b6e7a7c3 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 13:10:50 -0800 Subject: this may fix filesize 0 issues --- include/reddav.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index 69fcf8bec..a962d1bcc 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -321,15 +321,15 @@ class RedFile extends DAV\Node implements DAV\IFile { function put($data) { logger('RedFile::put: ' . basename($this->name), LOGGER_DEBUG); - $r = q("select flags, data from attach where hash = '%s' and uid = %d limit 1", dbesc($hash), intval($c[0]['channel_id']) ); if($r) { if($r[0]['flags'] & ATTACH_FLAG_OS) { - @file_put_contents($r[0]['data'], $data); - $size = @filesize($r[0]['data']); + $f = 'store/' . $this->auth->owner_nick . '/' . (($r[0]['data']) ? $r[0]['data'] . '/' : ''); + @file_put_contents($f, $data); + $size = @filesize($f); } else { $r = q("update attach set data = '%s' where hash = '%s' and uid = %d limit 1", -- cgit v1.2.3 From 0ce3e7235af16f13ab3101a09ae39006aa64cb7e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 13:47:56 -0800 Subject: other reddav issues, but probably won't fix the empty file --- include/reddav.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index a962d1bcc..a6c550e2d 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -322,7 +322,7 @@ class RedFile extends DAV\Node implements DAV\IFile { logger('RedFile::put: ' . basename($this->name), LOGGER_DEBUG); $r = q("select flags, data from attach where hash = '%s' and uid = %d limit 1", - dbesc($hash), + dbesc($this->data['hash']), intval($c[0]['channel_id']) ); if($r) { @@ -330,6 +330,7 @@ class RedFile extends DAV\Node implements DAV\IFile { $f = 'store/' . $this->auth->owner_nick . '/' . (($r[0]['data']) ? $r[0]['data'] . '/' : ''); @file_put_contents($f, $data); $size = @filesize($f); + logger('reddav: put() filename: ' . $f . ' size: ' . $size, LOGGER_DEBUG); } else { $r = q("update attach set data = '%s' where hash = '%s' and uid = %d limit 1", @@ -348,7 +349,7 @@ class RedFile extends DAV\Node implements DAV\IFile { $r = q("update attach set filesize = '%s' where hash = '%s' and uid = %d limit 1", dbesc($size), - dbesc($hash), + dbesc($this->data['hash']), intval($c[0]['channel_id']) ); @@ -356,7 +357,7 @@ class RedFile extends DAV\Node implements DAV\IFile { $maxfilesize = get_config('system','maxfilesize'); if(($maxfilesize) && ($size > $maxfilesize)) { - attach_delete($c[0]['channel_id'],$hash); + attach_delete($c[0]['channel_id'],$this->data['hash']); return; } @@ -366,7 +367,7 @@ class RedFile extends DAV\Node implements DAV\IFile { intval($c[0]['channel_account_id']) ); if(($x) && ($x[0]['total'] + $size > $limit)) { - attach_delete($c[0]['channel_id'],$hash); + attach_delete($c[0]['channel_id'],$this->data['hash']); return; } } -- cgit v1.2.3 From 74e099b135666970ea102843a01e6950a7534acf Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 18:33:46 -0800 Subject: fix cloud path in filestorage edit page --- include/attach.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/attach.php b/include/attach.php index d339ce6f9..a621d2fc4 100644 --- a/include/attach.php +++ b/include/attach.php @@ -735,7 +735,7 @@ function attach_delete($channel_id,$resource) { function get_cloudpath($arr) { - $basepath = 'store/'; + $basepath = 'cloud/'; if($arr['uid']) { $r = q("select channel_address from channel where channel_id = %d limit 1", intval($arr['uid']) -- cgit v1.2.3 From ed9a72ecbe95dcb9077ddd49393b5424cfe92910 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 19:01:24 -0800 Subject: preserve mid on edits --- mod/item.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mod/item.php b/mod/item.php index 915bed706..23fce2fd7 100644 --- a/mod/item.php +++ b/mod/item.php @@ -276,6 +276,9 @@ function item_post(&$a) { $item_restrict = $orig_post['item_restrict']; $postopts = $orig_post['postopts']; $created = $orig_post['created']; + $mid = $orig_post['mid']; + $parent_mid = $orig_post['parent_mid']; + $plink = $orig_post['plink']; } else { @@ -592,9 +595,13 @@ function item_post(&$a) { $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); - $mid = (($message_id) ? $message_id : item_message_id()); + if(! $mid) { + $mid = (($message_id) ? $message_id : item_message_id()); + } + if(! $parent_mid) { + $parent_mid = $mid; + } - $parent_mid = $mid; if($parent_item) $parent_mid = $parent_item['mid']; -- cgit v1.2.3 From f125be846c4e0b68bf687eecf12e64512dd40df0 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Jan 2014 19:18:30 -0800 Subject: DAV put() issues --- include/reddav.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/reddav.php b/include/reddav.php index a6c550e2d..d80bcedde 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -321,13 +321,18 @@ class RedFile extends DAV\Node implements DAV\IFile { function put($data) { logger('RedFile::put: ' . basename($this->name), LOGGER_DEBUG); + + $c = q("select * from channel where channel_id = %d limit 1", + intval($this->auth->owner_id) + ); + $r = q("select flags, data from attach where hash = '%s' and uid = %d limit 1", dbesc($this->data['hash']), intval($c[0]['channel_id']) ); if($r) { if($r[0]['flags'] & ATTACH_FLAG_OS) { - $f = 'store/' . $this->auth->owner_nick . '/' . (($r[0]['data']) ? $r[0]['data'] . '/' : ''); + $f = 'store/' . $this->auth->owner_nick . '/' . (($r[0]['data']) ? $r[0]['data'] : ''); @file_put_contents($f, $data); $size = @filesize($f); logger('reddav: put() filename: ' . $f . ' size: ' . $size, LOGGER_DEBUG); -- cgit v1.2.3 From cff7056f8ff809251448de269bbc5e13780f35de Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Jan 2014 12:58:00 -0800 Subject: mod_attach: output stream wasn't working --- include/attach.php | 3 ++- include/reddav.php | 2 ++ include/security.php | 3 +++ mod/attach.php | 10 ++++++---- version.inc | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/attach.php b/include/attach.php index a621d2fc4..dbc489a2d 100644 --- a/include/attach.php +++ b/include/attach.php @@ -329,6 +329,7 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { } $limit = service_class_fetch($channel_id,'attach_upload_limit'); + if($limit !== false) { $r = q("select sum(filesize) as total from attach where aid = %d ", intval($channel['channel_account_id']) @@ -623,7 +624,7 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { ); if($r) { - if(mkdir($path,STORAGE_DEFAULT_PERMISSIONS)) { + if(mkdir($path,STORAGE_DEFAULT_PERMISSIONS,true)) { $ret['success'] = true; $ret['data'] = $arr; } diff --git a/include/reddav.php b/include/reddav.php index d80bcedde..d00980011 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -163,6 +163,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { intval($c[0]['channel_account_id']) ); if(($x) && ($x[0]['total'] + $size > $limit)) { + logger('reddav: service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . $limit); attach_delete($c[0]['channel_id'],$hash); return; } @@ -372,6 +373,7 @@ class RedFile extends DAV\Node implements DAV\IFile { intval($c[0]['channel_account_id']) ); if(($x) && ($x[0]['total'] + $size > $limit)) { + logger('reddav: service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . $limit); attach_delete($c[0]['channel_id'],$this->data['hash']); return; } diff --git a/include/security.php b/include/security.php index 138efe3ab..a87442d42 100644 --- a/include/security.php +++ b/include/security.php @@ -163,6 +163,9 @@ function change_channel($change_channel) { get_app()->set_observer($x[0]); get_app()->set_perms(get_all_perms(local_user(),$hash)); } + if(! is_dir('store/' . $r[0]['channel_address'])) + @mkdir('store/' . $r[0]['channel_address'], STORAGE_DEFAULT_PERMISSIONS,true); + } return $ret; diff --git a/mod/attach.php b/mod/attach.php index 7371f0367..c52966ce0 100644 --- a/mod/attach.php +++ b/mod/attach.php @@ -27,10 +27,12 @@ function attach_init(&$a) { header('Content-type: ' . $r['data']['filetype']); header('Content-disposition: attachment; filename=' . $r['data']['filename']); if($r['data']['flags'] & ATTACH_FLAG_OS ) { - $stream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb'); - if($stream) { - pipe_stream($stream,STDOUT); - fclose($stream); + $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb'); + $ostream = fopen('php://output','wb'); + if($istream && $ostream) { + pipe_streams($istream,$ostream); + fclose($istream); + fclose($ostream); } } else diff --git a/version.inc b/version.inc index bc73672b3..6f37c44ab 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-10.553 +2014-01-11.554 -- cgit v1.2.3 From 5fd3ca36f8e7b34845e96c779279d64e98be84ed Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 12 Jan 2014 00:49:23 +0100 Subject: Fix page layout selector --- include/text.php | 3 +++ mod/editwebpage.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index f5c440e4a..587514fb5 100755 --- a/include/text.php +++ b/include/text.php @@ -1422,7 +1422,10 @@ function layout_select($channel_id, $current = '') { $o .= ''; else - $layoutselect = layout_select($itm[0]['uid']); - + $layoutselect = layout_select($itm[0]['uid'],$itm[0]['layout_mid']); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Webpage') -- cgit v1.2.3 From 6403875f26c95738fbeeaf9661ac91bbc5f62b3a Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 12 Jan 2014 00:53:28 +0100 Subject: remove debug loggers --- include/text.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/text.php b/include/text.php index 587514fb5..f5c440e4a 100755 --- a/include/text.php +++ b/include/text.php @@ -1422,10 +1422,7 @@ function layout_select($channel_id, $current = '') { $o .= ' + + + + + + + +
      + +
      +
      + +
      +
      + 0/[MESSAGE_TEXT_MAX_LENGTH/] + +
      +
      +
      + + + + + + + + +
      + +
      + + + + + +
      +
      +

      [LANG]onlineUsers[/LANG]

      +
      +
      + + + + + +
      + + + \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/loggedOut.html b/library/ajaxchat/chat/lib/template/loggedOut.html new file mode 100644 index 000000000..ba8a8a4a9 --- /dev/null +++ b/library/ajaxchat/chat/lib/template/loggedOut.html @@ -0,0 +1,78 @@ + + + + + + + [LANG]title[/LANG] + + [STYLE_SHEETS/] + + + + + + + + +
      +
      +

      [LANG]title[/LANG]

      +
      +
      +
      + + +

      +
      +

      +
      +

      +
      +

      +
      +
      +
      * [LANG]registeredUsers[/LANG]
      +
      +
      +
      [ERROR_MESSAGES/]
      + + +
      + + + \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/logs.html b/library/ajaxchat/chat/lib/template/logs.html new file mode 100644 index 000000000..d0b9162a9 --- /dev/null +++ b/library/ajaxchat/chat/lib/template/logs.html @@ -0,0 +1,276 @@ + + + + + + + [LANG]logsTitle[/LANG] + + [STYLE_SHEETS/] + + + + + + + + + + +
      +
      +

      [LANG]logsTitle[/LANG]

      +
      +
      + + + + + + + + + + + + + +
      + +
      +
      + +
      +
      + +
      +
      + + + +
      + + + +
      +
      + + + \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/shoutbox.html b/library/ajaxchat/chat/lib/template/shoutbox.html new file mode 100644 index 000000000..5f2de9981 --- /dev/null +++ b/library/ajaxchat/chat/lib/template/shoutbox.html @@ -0,0 +1,60 @@ +
      + + + + + + +
      +
      + +
      + + + +
      +
      diff --git a/library/ajaxchat/chat/license.txt b/library/ajaxchat/chat/license.txt new file mode 100644 index 000000000..618f9a318 --- /dev/null +++ b/library/ajaxchat/chat/license.txt @@ -0,0 +1,28 @@ +Modified MIT License (MIT) + +Copyright (c) 2013 blueimp.net + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +The above license does not apply to files included in the AJAX Chat project +which fall under other licenses. Such files are provided with their own +license text included beside or within the files themselves. +The presence of this modified MIT license in AJAX Chat does NOT supersede +the licenses applying to those files. You many NOT redistribute this project +or included files in a way that conflicts with their respective licenses. \ No newline at end of file diff --git a/library/ajaxchat/chat/readme.html b/library/ajaxchat/chat/readme.html new file mode 100644 index 000000000..145e188d3 --- /dev/null +++ b/library/ajaxchat/chat/readme.html @@ -0,0 +1,436 @@ + + + + + AJAX Chat Readme + + + + + +
      + +

      AJAX Chat + + v 0.8.7 standalone ( blueimp.net/ajax/ ) + +

      + + + +

      This is the standalone version of blueimp's AJAX Chat designed to run on its own, without another web application.
      +If you want to integrate AJAX Chat with one of the forums we support, go back and choose the right version.
      +This version is good for customizing your own integration, or using on its own.

      + +

      + AJAX stands for "Asynchronous JavaScript and XML".
      + The AJAX Chat client (your browser) uses JavaScript to query the web server for updates.
      + Instead of delivering a complete HTML page only updated data is sent in XML format.
      + By using JavaScript the chat page can be updated without having to reload the whole page.
      + PHP is used to communicate with the database and authenticate users. +

      + +

      Requirements

      +
      + + + + + + + + + +
      Server-SideClient-Side
      + PHP >= 5
      + MySQL >= 4
      + Ruby >= 1.8 (optional) +       		+ Enabled JavaScript
      + Enabled Cookies
      + Flash Plugin >= 9 (optional) +
      +
      + +

      Installation

      +
      +

      Download your preferred version of AJAX Chat and unzip the file on your computer.

      +

      Before You Begin

      +
      +

      + In order to edit PHP files you will need a good text editor. You should not use Windows notepad, wordpad, or Microsoft Word to edit PHP files. These programs will add something called a byte-order-mark (BOM) to the files and this may prevent chat from functioning properly. + We recommend using Notepad ++ ( http://notepad-plus-plus.org ) for editing all files. It also has the benefit of color-coding your files so you can edit them more easily.
      + If you get an error message like "Cannot modify header information - headers already sent" it is likely because you have used one of the above programs to edit files. +

      +
      + +

      Configure Database Settings

      +
      +

      + The first and most important thing you need to do is tell AJAX Chat how to connect to your database. This, and all core settings must be located inside the file lib/config.php.
      + You need to create this file.
      + An example config.php file can be found in lib/config.php.example that shipped with chat.
      + Duplicate this file and save it as config.php (or just delete .example from the end of the file name) and then fill out at least the following four fields in the file:

      +

      + $config['dbConnection']['host'] = 'your_database_hostname';
      + $config['dbConnection']['user'] = 'your_database_username';
      + $config['dbConnection']['pass'] = 'your_database_password';
      + $config['dbConnection']['name'] = 'your_database_name';       +

      +

      Sufficed to say you need this information. Talk to your hosting provider if you don't know.

      +

      In most cases, chat will function with only these fields filled out and you can proceed to the next step.
      +

      +

      If your host does not use mysqli you will need to change the connection type field:
      + $config['dbConnection']['type'] = null;
      + If this is set to "null" it defaults to "mysqli" if existing, else to "mysql". In most cases this field can be left as null.
      +
      + You can reference an existing database connection link or object by changing:
      + $config['dbConnection']['link'] = null;
      + If this is set to null, a new database connection is created.

      +
      + +

      Choose Your Channel Settings

      +
      +

      Edit the file lib/data/channels.php.
      + We have provided you with two sample channels, named public and private. You can add your own, or leave it as-is.
      + Channels follow the following format: +
      + $channels[channel id] = 'channel name'; + Each channel must have a unique channel id number and a unique name.
      + Whitespace in the channel names will be converted to the underscore "_".

      +
      + +

      Add Your Users

      +
      +

      Edit users in lib/data/users.php.
      + Users follow the following format: +

      +

      $users[user id] = array();
      + $users[user id]['userRole'] = AJAX_CHAT_ROLE;
      + $users[user id]['userName'] = 'user name';
      + $users[user id]['password'] = 'user password';
      + $users[user id]['channels'] = array(allowed channel ids);
      + Each user must have a unique user id number and a unique name.
      + The first user in the list (user id 0) is used for the guest user settings. All guest users will have access to the channels set for this user and the user role AJAX_CHAT_GUEST.
      + Registered users can have the user roles AJAX_CHAT_USER, AJAX_CHAT_MODERATOR or AJAX_CHAT_ADMIN. (this is case sensitive, type it exactly)
      + The list of channels a user has access to can be set for each user individually. Channel id's are separated by commas. eg: array(0,1,23); allows channels 0, 1 and 23.
      + Whitespace in the user names will be converted to the underscore "_".

      +
      + +

      Upload to Your Server

      +
      +

      Upload the chat folder to your server somewhere under your document root:
      + e.g. http://example.org/path/to/chat/

      +
      +

      Create the Database Tables

      +
      +

      There are two options available to you to create the database. The first, and usually the easiest option, is to run the installation script included with AJAX Chat. Alternatively, you may use a database tool like PHPMyAdmin to manually create the tables.

      +
        +
      1. To use the installation script, visit the following URL in your browser:
        + http://example.org/path/to/chat/install.php
        + Where + "http://example.org/path/to/chat/" is the real URL to your chat directory.
        2. +
      2. To install it manually using PHPMyAdmin or a similar tool, copy the contents of the chat.sql file and run it as a query.
        3. +
      +

      Either of these methods will create the tables your database needs to store chat messages and other information.

      +
      + +

      Delete the Installation Script

      +
      +

      Delete the file install.php from the chat directory on your server. You may also delete the file chat.sql.

      +
      + +

      Congradulation! You Are Winner!

      +
      +

      Yay! You're done! To test your chat, navigate to your chat URL in a browser: http://example.org/path/to/chat/index.php
      +       You are now free to customize chat to further suit your needs.

      +
      +
      + +

      Configuring and Customizing

      +
      +

      Configuration Files

      +
      +

      AJAX Chat is fully customizable and contains two configuration files:

      +
        +
      1. lib/config.php: This file contains the core configuration options for chat. Essential options for configuring the database, security, available languages, etc, are found here.
        2. +
      2. js/config.js: This file contains client side settings that change your users' default options in chat. Many of these settings can be changed by users in their options but some (like the refresh rate) cannot.
        3. +
      +

      Both of these files are well commented with information on what the settings mean.

      +
      + +

      Customizing the Layout

      +
      +

      The layout of AJAX Chat is fully customizable by using CSS (Cascaded Style Sheets).
      + AJAX Chat comes with a predefined set of styles. To add your own style, do the following:

      +
        +
      1. Add a new CSS file (e.g. mystyle.css) by copying one of the existing styles from the CSS directory.
        2. +
      2. Edit your file (css/mystyle.css) and adjust the CSS settings to your liking.
        3. +
      3. Add the name of your style without file extension to the available styles in lib/config.php:
        + // Available styles:
        + $config['styleAvailable'] = array('mystyle','beige','black','grey');
        + // Default style:
        + $config['styleDefault'] = 'mystyle';
        4. +
      +

      To further customize the layout you can adjust the template files in lib/template/.

      +

      Make sure you are creating valid XHTML, else you will produce errors in modern browsers.
      + This is due to the page content-type served as "application/xhtml+xml".
      + Using this content-type improves performance when manipulating the Document Object Model (DOM).

      +

      If for some reason you cannot create valid XHTML you can force a HTML content-type.
      + Just edit lib/config.php and set the following option:

      +

      $config['contentType'] = 'text/html';

      +
      + +

      Adjusting the Language Settings

      +
      +

      AJAX Chat comes with two language file directories:

      +
        +
      1. js/lang/: This directory contains the language files used for the chat messages localization. These are JavaScript files with the extension ".js".
        2. +
      2. lib/lang/: This directory contains the language files used for the template output. These are PHP files with the extension ".php".
        3. +
      +

      Many languages are already included with the download and you can customize them by editing these files.
      + For each language, you need a file in both of these directories, with the language code as file name (such as en.js and en.php)..
      + The language code is used following the ISO 639 standards.

      +

      The files for the english (language code "en") localization are js/lang/en.js and lib/lang/en.php.

      +

      If you create your own localization, you must put the files in the correct folders and then make two changes to config.php:

      +
        +
      1. Add the language code (this must match the filename you chose for the language. Remember to use commas correctly to separate multiple language codes):
        + $config['langAvailable'] = array('en');
        2. +
      2. Add the language name (this is what users see in the dropdown menu to choose the language):
        + $config['langNames'] = array('en'=>'English');
        3. +
      +

      To avoid errors, you should follow these rules:

      +
        +
      1. Make sure you encode your localization files in UTF-8 (without Byte-order mark).
        2. +
      2. Don't use HTML entities in your localization files.
        3. +
      3. Don't remove any "%s" inside the JavaScript language files - these are filled with dynamic data.
        4. +
      +
      + +

      Adding Features

      +
      +

      AJAX Chat is designed with numerous hooks and overrides available to improve core functionality without requiring you to edit the core files. + With an intermediate understading of PHP and javascript you can modify your chat to suit your needs.

      +

      Have a look through a few examples available on the wiki: + https://github.com/Frug/AJAX-Chat/wiki/General-modifications +

      +
      + +
      + +

      Logs

      +
      +

      Accessing the Logs

      +
      +

      By default, AJAX Chat stores all chat messages in the database.
      + To access the logs you have to add the GET parameter view=logs to your chat url (add ?view=logs to the end of the url):

      +

      e.g. http://example.org/path/to/chat/?view=logs

      +

      If you are not already logged in, you have to login as administrator to access the logs.

      +

      The log view enables you to monitor the latest chat messages on all channels.
      + It is also possible to view the logs of private rooms and private messages.
      + You have the option to filter the logs by date, time and search strings.

      +

      The search filter accepts MySQL style regular expressions as described here: http://dev.mysql.com/doc/refman/5.1/en/regexp.html
      + You can search for IPs, using the following syntax: ip=127.0.0.1

      +
      +
      + +

      Shoutbox

      +
      +

      AJAX Chat is also usable as shoutbox - this is a short guide on how to set it up:

      + +

      Shoutbox Stylesheet

      +
      +

      Add the following line to the stylesheet (CSS) of all pages displaying the shoutbox:

      +

      @import url("http://example.org/path/to/chat/css/shoutbox.css");

      +

      Replace http://example.org/path/to/chat/ with the URL to the chat.
      + Modify css/shoutbox.css to your liking.

      +
      + +

      Shoutbox Function

      +
      +

      Add the following function to your PHP code:

      + +
      +<?php
+function getShoutBoxContent() {
+// URL to the chat directory:
+if(!defined('AJAX_CHAT_URL')) {
+	define('AJAX_CHAT_URL', './chat/');
+}
+
+// Path to the chat directory:
+if(!defined('AJAX_CHAT_PATH')) {
+	define('AJAX_CHAT_PATH', realpath(dirname($_SERVER['SCRIPT_FILENAME']).'/chat').'/');
+}
+
+// Validate the path to the chat:
+if(@is_file(AJAX_CHAT_PATH.'lib/classes.php')) {
+	
+	// Include Class libraries:
+	require_once(AJAX_CHAT_PATH.'lib/classes.php');
+	
+	// Initialize the shoutbox:
+	$ajaxChat = new CustomAJAXChatShoutBox();
+	
+	// Parse and return the shoutbox template content:
+	return $ajaxChat->getShoutBoxContent();
+}
+
+return null;
+}
+?>
+
       + +

      Make sure AJAX_CHAT_URL and AJAX_CHAT_PATH point to the chat directory.

      +
      + +

      Shoutbox Output

      +
      +

      Display the shoutbox content using the shoutbox function:

      +

      <div style="width:200px;"><?php echo getShoutBoxContent(); ?></div>

      +
      +
      + +

      Socket Server

      +
      +

      Using the AJAX technology alone the chat clients have to permanently pull updates from the server.
      + This is due to AJAX being a web technology and HTTP being a stateless protocol.
      + Events pushed from server-side need a permanent or long-lasting socket connection between clients and server.
      + This requires either a custom HTTP server (called "comet") or another custom socket server.

      +

      AJAX Chat uses a JavaScript-to-Flash bridge to establish a permanent socket connection from client side.
      + The JavaScript-to-Flash bridge requires a Flash plugin >= 9 installed on the user browser.
      + Clients without this requirement will fall back to pull the server for updates.

      +

      This part of the setup is OPTIONAL and meant for experienced users only.

      +

      Installation

      +
      +

      The socket server coming with AJAX Chat is implemented in Ruby.
      + You need to be able to run a Ruby script as a service to run the socket server.
      + To be able to start the service, the script files in the socket/ directory have to be executable:

      +

      $ chmod +x server
      + $ chmod +x server.rb

      +

      "server" is a simple bash script to start and stop a service.
      + "server.rb" is the ruby socket server script.
      + "server.conf" is a configuration file - each setting is explained with a comment.

      +

      To start the service, execute the "server" script with the parameter "start":

      +

      $ ./server start

      +

      This will create two additional files:

      +

      "server.pid" contains the process id of the service.
      + "server.log" is filled with the socket server log.

      +

      To monitor the socket server logs, you can use the "tail" command included in most GNU/Linux distributions:

      +

      $ tail -f server.log

      +

      By default only errors and start/stop of the server are logged.
      + To get more detailed logs configure the log level by editing the configuration file.

      +

      To stop the service, execute the "server" script with the parameter "stop":

      +

      $ ./server stop

      +

      If the socket server is running, you have to enable the following option in lib/config.php:

      +

      $config['socketServerEnabled'] = true;
      +
      + This tells the server-side chat script to broadcast chat messages via the socket server.
      + Chat clients will establish a permanent connection to the socket server to listen for chat messages.

      +

      By default only local clients (127.0.0.1,::1) may broadcast messages.
      + Clients allowed to broadcast messages may also handle the channel authentication.
      + If your socket server is running on another host you should set the broadcast_clients option to the chat server IP.

      +

      Using the socket server increases response time while improving server performance at the same time.

      +
      + +

      Flash Permissions

      +
      +

      + Since Flash 9.0.115.0 and all Flash 10 versions, permissions for creating sockets using Flash have changed.
      + Now an explicit permission (using xml-syntax) is required for creating socket connections.
      + In the current state, socket server won't work with the newest Flash versions.
      + You will get a "Flash security error" in the browser. +

      +

      + A solution is to use a policy-files server which will listen to connections in port 843 in the server.
      + Each time a client tries to connect to the chat, the Flash client will request the policy authorization to the server.
      + The policy-files server is downloadable from http://ammonlauritzen.com/FlashPolicyService-09b.zip
      + It works with FF3 and IE7 (not yet tested in other browsers). +

      +

      A more detailed explanation can be found here:

      +

      * http://ammonlauritzen.com/blog/2007/12/13/new-flash-security-policies/
      + * http://ammonlauritzen.com/blog/2008/04/22/flash-policy-service-daemon/
      +

      +

      Official Adobe documentation:

      +

      * http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security.html
      + * http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security_04.html

      +
      +

       

      +
      + +

      Support

      +
      +

      + Please do not email the devs with support questions.
      + For further documentation and some examples, check out our github wiki.
      + For general support questions use our google group.
      + For specific bug reports and a list of pending issues view our github project.
      +

      +
      + + +
      +

      + Your donations contribute to the growth and development of this project and are always appreciated.
      +

      + + + + +
      + I'm on gittip at https://www.gittip.com/Frug +

      +
      + +

      License

      +
      +

      Bluimp's AJAX Chat is released under a Modified MIT License.

      +

      You should also find this license included with your download of this project.

      +
      + +

      back to top

      + +
      + + diff --git a/library/ajaxchat/chat/socket/.htaccess b/library/ajaxchat/chat/socket/.htaccess new file mode 100644 index 000000000..91e386dc9 --- /dev/null +++ b/library/ajaxchat/chat/socket/.htaccess @@ -0,0 +1,4 @@ +AuthType Basic +AuthName "Forbidden" +AuthUserFile /dev/null +require user nobody \ No newline at end of file diff --git a/library/ajaxchat/chat/socket/server b/library/ajaxchat/chat/socket/server new file mode 100644 index 000000000..806b5ef74 --- /dev/null +++ b/library/ajaxchat/chat/socket/server @@ -0,0 +1,71 @@ +#!/bin/bash + +# Simple bash script to start and stop a service +# Works without access to /var/run/ or ps and pidof commands +# +# Date:: Wed, 09 Jan 2008 +# Author:: Sebastian Tschan, https://blueimp.net +# License:: GNU Affero General Public License + + +SERVICE_TITLE=Service +SERVICE_BASENAME=${0##*/} +SERVICE_DIR=${0%/$SERVICE_BASENAME} +SERVICE_COMMAND=$SERVICE_DIR/$SERVICE_BASENAME.rb +SERVICE_CONFIG=$SERVICE_DIR/$SERVICE_BASENAME.conf +SERVICE_LOG=$SERVICE_DIR/$SERVICE_BASENAME.log +SERVICE_PIDFILE=$SERVICE_DIR/$SERVICE_BASENAME.pid + + +function start +{ + if [ -f $SERVICE_PIDFILE ] + then + echo "PID file $SERVICE_PIDFILE found - $SERVICE_TITLE already running?" + else + $SERVICE_COMMAND $SERVICE_CONFIG >> $SERVICE_LOG & echo "Started $SERVICE_TITLE..." + PID=$! + echo $PID > $SERVICE_PIDFILE + fi + exit 0 +} + +function stop +{ + if [ -f $SERVICE_PIDFILE ] + then + PID=`cat $SERVICE_PIDFILE` + kill -TERM $PID + rm -f $SERVICE_PIDFILE + echo "Stopped $SERVICE_TITLE." + else + echo "PID file $SERVICE_PIDFILE not found - $SERVICE_TITLE not running?" + fi + exit 0 +} + +function main +{ + for arg in $@ + do + if [ $arg == "start" ] + then + start + elif [ $arg == "stop" ] + then + stop + else + echo "Unknown argument:" $arg + echo "Usage: $0 [start|stop]" + exit 0 + fi + done + + echo "Missing argument." + echo "Usage: $0 [start|stop]" + exit 0 +} + + +# Script execution: +main $@ \ No newline at end of file diff --git a/library/ajaxchat/chat/socket/server.conf b/library/ajaxchat/chat/socket/server.conf new file mode 100644 index 000000000..47c6849da --- /dev/null +++ b/library/ajaxchat/chat/socket/server.conf @@ -0,0 +1,22 @@ + +# Server address (leave empty to bind to all available interfaces): +server_address= + +# Server port: +server_port=1935 + +# Comma-separated list of clients allowed to broadcast (allows all if empty): +broadcast_clients=127.0.0.1,::1 + +# Maximum number of clients (0 allows an unlimited number of clients): +max_clients=0 + +# Comma-separated list of domains from which downloaded Flash clients are allowed to connect (* allows all domains): +allow_access_from=* + +# Log level: +# 0 = log only errors and server start/stop +# 1 = log client connections +# 2 = log all messages but no broadcast content +# 3 = log everything +log_level=0 diff --git a/library/ajaxchat/chat/socket/server.rb b/library/ajaxchat/chat/socket/server.rb new file mode 100644 index 000000000..c2f532c84 --- /dev/null +++ b/library/ajaxchat/chat/socket/server.rb @@ -0,0 +1,400 @@ +#!/usr/bin/env ruby + +# Simple Ruby XML Socket Server +# +# This is a a simple socket server implementation in ruby +# to communicate with flash clients via Flash XML Sockets. +# +# The socket code is based on the tutorial +# "Sockets programming in Ruby" +# by M. Tim Jones (mtj@mtjones.com). +# +# Date:: Tue, 05 Mar 2008 +# Author:: Sebastian Tschan, https://blueimp.net +# License:: GNU Affero General Public License + +# Include socket library: +require 'socket' +# Include XML libraries: +require 'rexml/document' +require 'rexml/streamlistener' + +# XML Stream Handler class used to parse chat messages: +class XMLStreamHandler + attr_reader :type,:chat_id,:user_id,:reg_id,:channel_id,:channel_ids + # Called when an opening tag (including attributes) is parsed: + def tag_start name, attrs + case name + when 'root' + # root messages are broadcast messages: + @type = :message + @chat_id = attrs['chatID'] + @channel_id = attrs['channelID'] + throw :break + when 'register' + # register messages are sent by chat clients: + @type = :register + @chat_id = attrs['chatID'] + @user_id = attrs['userID'] + @reg_id = attrs['regID'] + throw :break + when 'authenticate' + # authenticate messages are sent by the chat server client: + @type = :authenticate + @chat_id = attrs['chatID'] + @user_id = attrs['userID'] + @reg_id = attrs['regID'] + @channel_ids = Array::new + when 'channel' + # authenticate messages contain channel tags: + if @channel_ids + @channel_ids.push(attrs['id']) + else + throw :break + end + when 'policy-file-request' + # policy-file-requests are sent by flash clients for cross-domain authentication: + @type = :policy_file_request + throw :break + else + throw :break + end + end + # Called when a closing tag is parsed: + def tag_end name + if name == 'authenticate' + throw :break + end + end + def text text + # Called on text between tags + end + # Called when cdata is parsed: + alias cdata text +end + +# Socket Server class: +class SocketServer + + def initialize(config_file) + # List of configuration settings: + @config = Hash::new + # Initialize default settings: + initialize_default_properties + if config_file + # Load settings from configuration file: + load_properties_from_file(config_file) + end + # Sockets list: + @sockets = Array::new + # Clients list: + @clients = Hash::new + # Chats list, used to distinguish between different chat installations (contains channels list): + @chats = Hash::new + # Initialize server socket: + initialize_server_socket + if @server_socket + # Log server start (STDOUT.flush prevents output buffering): + puts "#{Time.now}\tServer started on Port #{@config[:server_port].to_s} ..."; STDOUT.flush + begin + # Start the server: + run + rescue SignalException + # Controlled stop: + ensure + for socket in @sockets + if socket != @server_socket + # Disconnect all clients: + handle_client_disconnection(socket, false) + end + end + @sockets = nil + @clients = nil + # Log server stop: + puts "#{Time.now}\tServer stopped."; STDOUT.flush + end + end + end + + def run + # Endless loop: + while 1 + # Blocking select call. The first three parameters are arrays of IO objects or nil. + # The last parameter is to set a timeout in seconds to force select to return + # if no event has occurred on any of the given IO object arrays. + res = select(@sockets, nil, nil, nil) + if res != nil then + # Iterate through the tagged read descriptors: + for socket in res[0] + # Received a connect to the server socket: + if socket == @server_socket then + accept_new_connection + else + # Received something on a client socket: + if socket.eof? then + # Handle client disconnection: + handle_client_disconnection(socket) + else + # Handle client input data: + handle_client_input(socket, socket.gets(@config[:eol])) + end + end + end + end + end + end + + private + + def initialize_default_properties + # Server address (empty = bind to all available interfaces): + @config[:server_address] = '' + # Server port: + @config[:server_port] = 1935 + # Comma-separated list of clients allowed to broadcast (allows all if empty): + @config[:broadcast_clients] = '' + # Defines if broadcast is sent to broadcasting client: + @config[:broadcast_self] = false + # Maximum number of clients (0 allows an unlimited number of clients): + @config[:max_clients] = 0 + # Comma-separated list of domains from which downloaded Flash clients are allowed to connect (* allows all domains): + @config[:allow_access_from] = '*' + # Defines the cross-domain-policy string sent to Flash clients as response to a policy-file-request: + @config[:cross_domain_policy] = '' + # EOL (End Of Line) character used by Flash XML Socket communication (a null-byte): + @config[:eol] = "\0" + # Log level (0 logs only errors and server start/stop, 1 logs client connections, 2 logs all messages but no broadcast content, 3 logs everything): + @config[:log_level] = 0 + end + + def load_properties_from_file(config_file) + # Open the config file and go through each line: + File.open(config_file, 'r') do |file| + file.read.each_line do |line| + # Remove trailing whitespace from the line: + line.strip! + # Get the position of the first "=": + i = line.index('=') + # Check if line is not a comment and a valid property: + if (!line.empty? && line[0] != ?# && i > 0) + # Add the configuration option to the config hash: + key = line[0..i - 1].strip + value = line[i + 1..-1].strip + # Parse boolean values: + if value.eql?('false') + @config[key.to_sym] = false + elsif value.eql?('true') + @config[key.to_sym] = true + # Parse integer numbers: + elsif value.to_i.to_s.eql?(value) + @config[key.to_sym] = value.to_i + # Parse floating point numbers: + elsif value.to_f.to_s.eql?(value) + @config[key.to_sym] = value.to_f + # Parse string values: + else + @config[key.to_sym] = value + end + end + end + end + if @config[:eol].empty? + # Use default EOL if configuration option is empty: + @config[:eol] = $/ + end + end + + def initialize_server_socket + begin + # The server socket, allowing connections from any interface and bound to the given port number: + @server_socket = TCPServer.new(@config[:server_address], @config[:server_port].to_i) + # Enable reuse of the server address (e.g. for rapid restarts of the server): + @server_socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1) + # Add the server socket to the sockets list: + @sockets.push(@server_socket) + rescue Exception => error + # Log initialization failure: + puts "#{Time.now}\tFailed to initialize Server on Port #{@config[:server_port].to_s}: #{error}."; STDOUT.flush + end + end + + def accept_new_connection + begin + # Accept the client connection (non-blocking): + socket = @server_socket.accept_nonblock + # Retrieve IP and Port: + ip = socket.peeraddr[3] + port = socket.peeraddr[1] + # Check if we have reached the maximum number of connected clients (always accept the broadcast clients): + if @config[:max_clients].to_i == 0 || @clients.size < @config[:max_clients].to_i || !@config[:broadcast_clients].empty? && @config[:broadcast_clients].include?(ip) + # Add the accepted socket connection to the socket list: + @sockets.push(socket) + # Create a new Hash to store the client data: + client = Hash::new + client[:id] = "[#{ip}]:#{port}" + # Check if the client is allowed to broadcast: + if @config[:broadcast_clients].empty? || @config[:broadcast_clients].include?(ip) + client[:allowed_to_broadcast] = true + else + client[:allowed_to_broadcast] = false + end + # Add the client to the clients list: + @clients[socket] = client + if @config[:log_level].to_i > 0 + # Log client connection and the number of connected clients: + puts "#{Time.now}\t#{client[:id]} Connects\t(#{@clients.size} connected)"; STDOUT.flush + end + else + # Close the socket connection: + socket.close + end + rescue + # Client disconnected before the address information (IP, Port) could be retrieved. + end + end + + def handle_client_disconnection(client_socket, delete_socket=true) + # Retrieve the client ID for the current socket: + client_id = @clients[client_socket][:id] + begin + # Close the socket connection: + client_socket.close + rescue + # Rescue if closing the socket fails + end + if delete_socket + # Remove the socket from the sockets list: + @sockets.delete(client_socket) + end + # Remove the client ID from the clients list: + @clients.delete(client_socket) + if @config[:log_level].to_i > 0 + # Log client disconnection and the number of connected clients: + puts "#{Time.now}\t#{client_id} Disconnects\t(#{@clients.size} connected)"; STDOUT.flush + end + end + + def handle_client_input(client_socket, str) + # Create a new XML stream handler: + handler = XMLStreamHandler.new + begin + # As soon as the parser has found the relevant information it throws a :break symbol: + catch :break do + # Parse the given input string for XML messages: + REXML::Document.parse_stream(str, handler) + end + # The handler stores a type property to define the parsed XML message: + case handler.type + when :message + handle_broadcast_message(client_socket, handler.chat_id, handler.channel_id, str) + when :register + handle_client_registration(client_socket, handler.chat_id, handler.user_id, handler.reg_id) + when :authenticate + handle_client_authentication(client_socket, handler.chat_id, handler.user_id, handler.reg_id, handler.channel_ids) + when :policy_file_request + handle_policy_file_request(client_socket) + end + rescue Exception => error + # Rescue if parsing the client input fails and log the error message: + puts "#{Time.now}\t#{@clients[client_socket][:id]} Client Input Error:#{error.to_s.dump}"; STDOUT.flush + end + end + + def handle_broadcast_message(client_socket, chat_id, channel_id, str) + # Check if the_client is allowed to broadcast: + if @clients[client_socket][:allowed_to_broadcast] + # Check if the chat and channel have been registered: + if @chats[chat_id] && (@chats[chat_id][channel_id] || @chats[chat_id]['ALL']) + # Go through the sockets list: + @sockets.each do |socket| + # Skip the server socket and skip the the client socket if broadcast is not to be sent to self: + if socket != @server_socket && (@config[:broadcast_self] || socket != client_socket) + # Only write to clients registered to the given channel or to the "ALL" channel: + if @chats[chat_id]['ALL'] + reg_id = @chats[chat_id]['ALL'][@clients[socket][:user_id]] + end + if !reg_id && @chats[chat_id][channel_id] + reg_id = @chats[chat_id][channel_id][@clients[socket][:user_id]] + end + # Check if the reg_id stored for the given channel and user_id matches the clients reg_id: + if reg_id && reg_id.eql?(@clients[socket][:reg_id]) + begin + # Write the broadcast message on the socket connection: + socket.write(str) + rescue + # Rescue if writing to the socket fails + end + end + end + end + end + if @config[:log_level].to_i > 2 + # Log the message sent by the broadcast client: + puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} Channel:#{channel_id.to_s.dump} Message:#{str.to_s.dump}"; STDOUT.flush + elsif @config[:log_level].to_i > 1 + # Log the message sent by the broadcast client: + puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} Channel:#{channel_id.to_s.dump} Message"; STDOUT.flush + end + end + end + + def handle_client_registration(client_socket, chat_id, user_id, reg_id) + # Save the chat_id, use_id and reg_id as client properties: + @clients[client_socket][:chat_id] = chat_id + @clients[client_socket][:user_id] = user_id + @clients[client_socket][:reg_id] = reg_id + if @config[:log_level].to_i > 1 + # Log the client registration: + puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} User:#{user_id.to_s.dump} Reg:#{reg_id.to_s.dump}"; STDOUT.flush + end + end + + def handle_client_authentication(client_socket, chat_id, user_id, reg_id, channel_ids) + # Only the broadcast clients may send authentication messages: + if @clients[client_socket][:allowed_to_broadcast] + # Create a new chat item if not found for the given chat_id: + if !@chats[chat_id] + @chats[chat_id] = Hash.new + end + # Go through the list of channels for the given chat: + @chats[chat_id].each_key do |key| + # Delete all items for the given user on all channels of the given chat: + @chats[chat_id][key].delete(user_id) + # If the chat channel is empty, delete the channel item: + if @chats[chat_id][key].size == 0 + @chats[chat_id].delete(key) + end + end + # Go through the list of authenticated channel_ids: + channel_ids.each do |channel_id| + # Create a new channel item if not found for the current channel_id (and the given chat_id): + if !@chats[chat_id][channel_id] + @chats[chat_id][channel_id] = Hash.new + end + # Add a user item of the given user_id with the given reg_id to the current channel: + @chats[chat_id][channel_id][user_id] = reg_id + end + if @config[:log_level].to_i > 1 + # Log the client authentication: + puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} User:#{user_id.to_s.dump} Auth:#{reg_id.to_s.dump} Channels:#{channel_ids.join(',').dump}"; STDOUT.flush + end + end + end + + def handle_policy_file_request(client_socket) + begin + # Write the cross-domain-policy to the Flash client: + client_socket.write(@config[:cross_domain_policy]+@config[:eol]) + rescue + # Rescue if writing to the socket fails + end + if @config[:log_level].to_i > 1 + # Log the policy-file-request: + puts "#{Time.now}\t#{@clients[client_socket][:id]} Policy-File-Request"; STDOUT.flush + end + end + +end + +# Start the socket server with the first command line argument as configuration file: +SocketServer.new($*[0]) \ No newline at end of file diff --git a/library/ajaxchat/chat/sounds/index.html b/library/ajaxchat/chat/sounds/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/library/ajaxchat/chat/sounds/license.txt b/library/ajaxchat/chat/sounds/license.txt new file mode 100644 index 000000000..d4a756fe8 --- /dev/null +++ b/library/ajaxchat/chat/sounds/license.txt @@ -0,0 +1,28 @@ +The sounds used for this project have been created by + +==================================== +Stuart Duffield (Soundsnap.com user) +==================================== + +http://soundsnap.com/user/21 + + +The sounds are licensed under the + +================= +Soundsnap Licence +================= + +http://soundsnap.com/licence + +You are Free: + +* To remix or transform the sounds in any way +* To copy, distribute and transmit the sounds +* To use the sounds in any music, film, video game, website etc. +whether commercial or not, without paying royalties or other fees + +You Cannot: + +* Make commercial distribution of these sounds 'as they are'. +For example, you cannot download and sell them as part of a CD library \ No newline at end of file diff --git a/library/ajaxchat/chat/sounds/sound_1.mp3 b/library/ajaxchat/chat/sounds/sound_1.mp3 new file mode 100644 index 000000000..f9526e1ca Binary files /dev/null and b/library/ajaxchat/chat/sounds/sound_1.mp3 differ diff --git a/library/ajaxchat/chat/sounds/sound_2.mp3 b/library/ajaxchat/chat/sounds/sound_2.mp3 new file mode 100644 index 000000000..73bdcd2b1 Binary files /dev/null and b/library/ajaxchat/chat/sounds/sound_2.mp3 differ diff --git a/library/ajaxchat/chat/sounds/sound_3.mp3 b/library/ajaxchat/chat/sounds/sound_3.mp3 new file mode 100644 index 000000000..1c765773a Binary files /dev/null and b/library/ajaxchat/chat/sounds/sound_3.mp3 differ diff --git a/library/ajaxchat/chat/sounds/sound_4.mp3 b/library/ajaxchat/chat/sounds/sound_4.mp3 new file mode 100644 index 000000000..d2f66baff Binary files /dev/null and b/library/ajaxchat/chat/sounds/sound_4.mp3 differ diff --git a/library/ajaxchat/chat/sounds/sound_5.mp3 b/library/ajaxchat/chat/sounds/sound_5.mp3 new file mode 100644 index 000000000..0d5a5f299 Binary files /dev/null and b/library/ajaxchat/chat/sounds/sound_5.mp3 differ diff --git a/library/ajaxchat/chat/sounds/sound_6.mp3 b/library/ajaxchat/chat/sounds/sound_6.mp3 new file mode 100644 index 000000000..df6007948 Binary files /dev/null and b/library/ajaxchat/chat/sounds/sound_6.mp3 differ diff --git a/library/ajaxchat/chat/src/EmptySwf.as b/library/ajaxchat/chat/src/EmptySwf.as new file mode 100644 index 000000000..373c5e375 --- /dev/null +++ b/library/ajaxchat/chat/src/EmptySwf.as @@ -0,0 +1,32 @@ +/* +Copyright 2006 Adobe Systems Incorporated + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +package { + import flash.display.MovieClip; + import bridge.FABridge; + + public class EmptySwf extends MovieClip { + + private var externalBridge:FABridge; + + public function EmptySwf() { + super(); + externalBridge = new FABridge(); + externalBridge.rootObject = this; + } + } +} diff --git a/library/ajaxchat/chat/src/FABridge.as b/library/ajaxchat/chat/src/FABridge.as new file mode 100644 index 000000000..d03dba01a --- /dev/null +++ b/library/ajaxchat/chat/src/FABridge.as @@ -0,0 +1,943 @@ +/* +Copyright � 2006 Adobe Systems Incorporated + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + + +/* + * The Bridge class, responsible for navigating JS instances + */ +package bridge +{ + +/* + * imports + */ +import flash.external.ExternalInterface; +import flash.utils.Timer; +import flash.events.*; +import flash.display.DisplayObject; +import flash.system.ApplicationDomain; +import flash.utils.Dictionary; +import flash.utils.setTimeout; + +import mx.collections.errors.ItemPendingError; +import mx.core.IMXMLObject; + +import flash.utils.getQualifiedClassName; +import flash.utils.describeType; +import flash.events.TimerEvent; + +/** + * The FABridge class, responsible for proxying AS objects into javascript + */ +public class FABridge extends EventDispatcher implements IMXMLObject +{ + + //holds a list of stuff to call later, to break the recurrence of the js <> as calls + //you must use the full class name, as returned by the getQualifiedClassName() function + public static const MethodsToCallLater:Object = new Object(); + MethodsToCallLater["mx.collections::ArrayCollection"]="refresh,removeItemAt"; + + public static const EventsToCallLater:Object = new Object(); + EventsToCallLater["mx.data.events::UnresolvedConflictsEvent"]="true"; + EventsToCallLater["mx.events::PropertyChangeEvent"]="true"; + + public static const INITIALIZED:String = "bridgeInitialized"; + + // constructor + public function FABridge() + { + super(); + initializeCallbacks(); + } + + // private vars + + /** + * stores a cache of descriptions of AS types suitable for sending to JS + */ + private var localTypeMap:Dictionary = new Dictionary(); + + /** + * stores an id-referenced dictionary of objects exported to JS + */ + private var localInstanceMap:Dictionary = new Dictionary(); + + /** + * stores an id-referenced dictionary of functions exported to JS + */ + private var localFunctionMap:Dictionary = new Dictionary(); + + /** + * stores an id-referenced dictionary of proxy functions imported from JS + */ + private var remoteFunctionCache:Dictionary = new Dictionary(); + + /** + * stores a list of custom serialization functions + */ + private var customSerializersMap:Dictionary = new Dictionary(); + + /** + * stores a map of object ID's and their reference count + */ + private var refMap:Dictionary = new Dictionary(); + /** + * a local counter for generating unique IDs + */ + private var nextID:Number = 0; + + private var lastRef:int; + + /* values that can't be serialized natively across the bridge are packed and identified by type. + These constants represent different serialization types */ + public static const TYPE_ASINSTANCE:uint = 1; + public static const TYPE_ASFUNCTION:uint = 2; + public static const TYPE_JSFUNCTION:uint = 3; + public static const TYPE_ANONYMOUS:uint = 4; + + private var _initChecked:Boolean = false; + + // properties + + //getters and setters for the main component in the swf - the root + public function get rootObject():DisplayObject {return _rootObject;} + public function set rootObject(value:DisplayObject):void + { + _rootObject = value; + checkInitialized(); + } + + /** + * the bridge name + */ + public var bridgeName:String; + private var _registerComplete:Boolean = false; + + /** + * increment the reference count for an object being passed over the bridge + */ + public function incRef(objId:int):void + { + if(refMap[objId] == null) { + //the object is being created; we now add it to the map and set its refCount = 1 + refMap[objId] = 1; + } else { + refMap[objId] = refMap[objId] +1; + } + } + + /** + * when an object has been completely passed to JS its reference count is decreased with 1 + */ + public function releaseRef(objId:int):void + { + if(refMap[objId] != null) + { + var newRefVal:int = refMap[objId] - 1; + // if the object exists in the referenceMap and its count equals or has dropped under 0 we clean it up + if(refMap[objId] != null && newRefVal <= 0) + { + delete refMap[objId]; + delete localInstanceMap[objId]; + } + else + { + refMap[objId] = newRefVal; + } + } + } + + /** + * attaches the callbacks to external interface + */ + public function initializeCallbacks():void + { + if (ExternalInterface.available == false) + { + return; + } + + ExternalInterface.addCallback("getRoot", js_getRoot); + ExternalInterface.addCallback("getPropFromAS", js_getPropFromAS); + ExternalInterface.addCallback("setPropInAS", js_setPropertyInAS); + ExternalInterface.addCallback("invokeASMethod", js_invokeMethod); + ExternalInterface.addCallback("invokeASFunction", js_invokeFunction); + ExternalInterface.addCallback("releaseASObjects", js_releaseASObjects); + ExternalInterface.addCallback("create", js_create); + ExternalInterface.addCallback("releaseNamedASObject",js_releaseNamedASObject); + ExternalInterface.addCallback("incRef", incRef); + ExternalInterface.addCallback("releaseRef", releaseRef); + } + + private var _rootObject:DisplayObject; + + private var _document:DisplayObject; + + /** + * called to check whether the bridge has been initialized for the specified document/id pairs + */ + public function initialized(document:Object, id:String):void + { + _document = (document as DisplayObject); + + if (_document != null) + { + checkInitialized(); + } + } + + private function get baseObject():DisplayObject + { + return (rootObject == null)? _document:rootObject; + } + + + private function checkInitialized():void + { + if(_initChecked== true) + { + return; + } + _initChecked = true; + + // oops! timing error. Player team is working on it. + var t:Timer = new Timer(200,1); + t.addEventListener(TimerEvent.TIMER,auxCheckInitialized); + t.start(); + } + + /** + * auxiliary initialization check that is called after the timing has occurred + */ + private function auxCheckInitialized(e:Event):void + { + + var bCanGetParams:Boolean = true; + + try + { + var params:Object = baseObject.root.loaderInfo.parameters; + } + catch (e:Error) + { + bCanGetParams = false; + } + + if (bCanGetParams == false) + { + var t:Timer = new Timer(100); + var timerFunc:Function = function(e:TimerEvent):void + { + if(baseObject.root != null) + { + try + { + bCanGetParams = true; + var params:Object = baseObject.root.loaderInfo.parameters; + } + catch (err:Error) + { + bCanGetParams = false; + } + if (bCanGetParams) + { + t.removeEventListener(TimerEvent.TIMER, timerFunc); + t.stop(); + dispatchInit(); + } + } + } + t.addEventListener(TimerEvent.TIMER, timerFunc); + t.start(); + } + else + { + dispatchInit(); + } + } + + /** + * call into JS to annunce that the bridge is ready to be used + */ + private function dispatchInit(e:Event = null):void + { + if(_registerComplete == true) + { + return; + } + + if (ExternalInterface.available == false) + { + return; + } + + if (bridgeName == null) + { + bridgeName = baseObject.root.loaderInfo.parameters["bridgeName"]; + + if(bridgeName == null) + { + bridgeName = "flash"; + } + } + + _registerComplete = ExternalInterface.call("FABridge__bridgeInitialized", [bridgeName]); + dispatchEvent(new Event(FABridge.INITIALIZED)); + } + + // serialization/deserialization + + /** serializes a value for transfer across the bridge. primitive types are left as is. Arrays are left as arrays, but individual + * values in the array are serialized according to their type. Functions and class instances are inserted into a hash table and sent + * across as keys into the table. + * + * For class instances, if the instance has been sent before, only its id is passed. If This is the first time the instance has been sent, + * a ref descriptor is sent associating the id with a type string. If this is the first time any instance of that type has been sent + * across, a descriptor indicating methods, properties, and variables of the type is also sent across + */ + public function serialize(value:*, keep_refs:Boolean=false):* + { + var result:* = {}; + result.newTypes = []; + result.newRefs = {}; + + if (value is Number || value is Boolean || value is String || value == null || value == undefined || value is int || value is uint) + { + result = value; + } + else if (value is Array) + { + result = []; + for(var i:int = 0; i < value.length; i++) + { + result[i] = serialize(value[i], keep_refs); + } + } + else if (value is Function) + { + // serialize a class + result.type = TYPE_ASFUNCTION; + result.value = getFunctionID(value, true); + } + else if (getQualifiedClassName(value) == "Object") + { + result.type = TYPE_ANONYMOUS; + result.value = value; + } + else + { + // serialize a class + result.type = TYPE_ASINSTANCE; + // make sure the type info is available + var className:String = getQualifiedClassName(value); + + var serializer:Function = customSerializersMap[className]; + + // try looking up the serializer under an alternate name + if (serializer == null) + { + if (className.indexOf('$') > 0) + { + var split:int = className.lastIndexOf(':'); + if (split > 0) + { + var alternate:String = className.substring(split+1); + serializer = customSerializersMap[alternate]; + } + } + } + + if (serializer != null) + { + return serializer.apply(null, [value, keep_refs]); + } + else + { + if (retrieveCachedTypeDescription(className, false) == null) + { + try + { + result.newTypes.push(retrieveCachedTypeDescription(className, true)); + } + catch(err:Error) + { + var interfaceInfo:XMLList = describeType(value).implementsInterface; + for each (var interf:XML in interfaceInfo) + { + className = interf.@type.toString(); + if (retrieveCachedTypeDescription(className, false) == null){ + result.newTypes.push(retrieveCachedTypeDescription(className, true)); + } //end if push new data type + + } //end for going through interfaces + var baseClass:String = describeType(value).@base.toString(); + if (retrieveCachedTypeDescription(baseClass, false) == null){ + result.newTypes.push(retrieveCachedTypeDescription(baseClass, true)); + } //end if push new data type + } + } + + // make sure the reference is known + var objRef:Number = getRef(value, false); + var should_keep_ref:Boolean = false; + if (isNaN(objRef)) + { + //create the reference if necessary + objRef = getRef(value, true); + should_keep_ref = true; + } + + result.newRefs[objRef] = className; + //trace("serializing new reference: " + className + " with value" + value); + + //the result is a getProperty / invokeMethod call. How can we know how much you will need the object ? + if (keep_refs && should_keep_ref) { + incRef(objRef); + } + result.value = objRef; + } + } + return result; + } + + /** + * deserializes a value passed in from javascript. See serialize for details on how values are packed and + * unpacked for transfer across the bridge. + */ + public function deserialize(valuePackage:*):* + { + var result:*; + if (valuePackage is Number || valuePackage is Boolean || valuePackage is String || valuePackage === null || valuePackage === undefined || valuePackage is int || valuePackage is uint) + { + result = valuePackage; + } + else if(valuePackage is Array) + { + result = []; + for (var i:int = 0; i < valuePackage.length; i++) + { + result[i] = deserialize(valuePackage[i]); + } + } + else if (valuePackage.type == FABridge.TYPE_JSFUNCTION) + { + result = getRemoteFunctionProxy(valuePackage.value, true); + } + else if (valuePackage.type == FABridge.TYPE_ASFUNCTION) + { + throw new Error("as functions can't be passed back to as yet"); + } + else if (valuePackage.type == FABridge.TYPE_ASINSTANCE) + { + result = resolveRef(valuePackage.value); + } + else if (valuePackage.type == FABridge.TYPE_ANONYMOUS) + { + result = valuePackage.value; + } + return result; + } + + public function addCustomSerialization(className:String, serializationFunction:Function):void + { + customSerializersMap[className] = serializationFunction; + } + + + // type management + + /** + * retrieves a type description for the type indicated by className, building one and caching it if necessary + */ + public function retrieveCachedTypeDescription(className:String, createifNecessary:Boolean):Object + { + if(localTypeMap[className] == null && createifNecessary == true) + { + localTypeMap[className] = buildTypeDescription(className); + } + return localTypeMap[className]; + } + + public function addCachedTypeDescription(className:String, desc:Object):Object + { + if (localTypeMap[className] == null) + { + localTypeMap[className] = desc; + } + return localTypeMap[className]; + } + + /** + * builds a type description for the type indiciated by className + */ + public function buildTypeDescription(className:String):Object + { + var desc:Object = {}; + + className = className.replace(/::/,"."); + + var objClass:Class = Class(ApplicationDomain.currentDomain.getDefinition(className)); + + var xData:XML = describeType(objClass); + + desc.name = xData.@name.toString(); + + var methods:Array = []; + var xMethods:XMLList = xData.factory.method; + for (var i:int = 0; i < xMethods.length(); i++) + { + methods.push(xMethods[i].@name.toString()); + } + desc.methods = methods; + + var accessors:Array = []; + var xAcc:XMLList = xData.factory.accessor; + for (i = 0; i < xAcc.length(); i++) + { + accessors.push(xAcc[i].@name.toString()); + } + xAcc = xData.factory.variable; + for (i = 0; i < xAcc.length(); i++) + { + accessors.push(xAcc[i].@name.toString()); + } + desc.accessors = accessors; + + return desc; + } + +// instance mgmt + + /** + * resolves an instance id passed from JS to an instance previously cached for representing in JS + */ + private function resolveRef(objRef:Number):Object + { + try + { + return (objRef == -1)? baseObject : localInstanceMap[objRef]; + } + catch(e:Error) + { + return serialize("__FLASHERROR__"+"||"+e.message); + } + + return (objRef == -1)? baseObject : localInstanceMap[objRef]; + } + + /** + * returns an id associated with the object provided for passing across the bridge to JS + */ + public function getRef(obj:Object, createIfNecessary:Boolean):Number + { + try + { + var ref:Number; + + if (createIfNecessary) + { + var newRef:Number = nextID++; + localInstanceMap[newRef] = obj; + ref = newRef; + } + else + { + for (var key:* in localInstanceMap) + { + if (localInstanceMap[key] === obj) + { + ref = key; + break; + } + } + } + } + catch(e:Error) + { + return serialize("__FLASHERROR__"+"||"+e.message) + } + + return ref; + } + + + // function management + + /** + * resolves a function ID passed from JS to a local function previously cached for representation in JS + */ + private function resolveFunctionID(funcID:Number):Function + { + return localFunctionMap[funcID]; + } + + /** + * associates a unique ID with a local function suitable for passing across the bridge to proxy in Javascript + */ + public function getFunctionID(f:Function, createIfNecessary:Boolean):Number + { + var ref:Number; + + if (createIfNecessary) + { + var newID:Number = nextID++; + localFunctionMap[newID] = f; + ref = newID; + } + else + { + for (var key:* in localFunctionMap) + { + if (localFunctionMap[key] === f) { + ref = key; + } + break; + } + } + + return ref; + } + + /** + * returns a proxy function that represents a function defined in javascript. This function can be called syncrhonously, and will + * return any values returned by the JS function + */ + public function getRemoteFunctionProxy(functionID:Number, createIfNecessary:Boolean):Function + { + try + { + if (remoteFunctionCache[functionID] == null) + { + remoteFunctionCache[functionID] = function(...args):* + { + var externalArgs:Array = args.concat(); + externalArgs.unshift(functionID); + var serializedArgs:* = serialize(externalArgs, true); + + if(checkToThrowLater(serializedArgs[1])) + { + setTimeout(function a():* { + try { + var retVal:* = ExternalInterface.call("FABridge__invokeJSFunction", serializedArgs); + for(var i:int = 0; i= 5 | Enabled JavaScript | +| MySQL >= 4 | Enabled Cookies | +| Ruby >= 1.8 (optional) | Flash Plugin >= 9 (optional) | + + +Features +-------- +- Easy installation +- Usable as shoutbox +- Multiple channels +- Private messaging +- Private channels +- Invitation system +- Kick/Ban or Ignore offending Users +- Online users list with user menu +- Emoticons/Smilies +- Easy way to add custom emoticons +- BBCode support +- Optional Flash based sound support +- Optional visual update information (changing window title) +- Clickable Hyperlinks +- Splitting of long words to preserve chat layout +- Flood control +- Possibility to delete messages inside the chat +- IRC style commands +- Easy interface to add custom commands +- Possibility to define opening hours for the chat +- Possibility to enable/disable guest users +- Persistent client-side settings +- Multiple languages (auto-detection of ACCEPT_LANGUAGE browser setting) +- Multiple styles with easy layout customization through stylesheets (CSS) and templates +- Automatic adjustment of displayed time to local client timezone +- Standards compliance (XHTML 1.0 strict) +- Accepts any text input, including code and special characters +- Multiline input field with the possibility to enter line breaks +- Message length counter +- Realtime monitoring and logs viewer +- Support for unicode (UTF-8) and non-unicode content types +- Bandwidth saving update calls (only updated data is sent) +- Optional support to push updates over a Flash based socket connection (increased performance and responsiveness) +- Survives connection timeouts +- Easy integration into existing authentication systems +- Sample phpBB3, MyBB, PunBB, SMF and vBulletin integrations available +- Separation of layout and code +- Well commented Source Code +- Developed with Security as integral part - built to prevent Code injections, SQL injections, Cross-site scripting (XSS), Session stealing and other attacks +- Tested successfully with Microsoft Internet Explorer, Mozilla Firefox, Opera and Safari - built to work with all modern browsers :) + + + +Help +---- +Essential documentation is contained in the attached readme files + +For more documentation consult the github wiki: https://github.com/Frug/AJAX-Chat/wiki + +For support questions use google groups: https://groups.google.com/forum/#!forum/ajax-chat + +To report bugs use github issues: https://github.com/Frug/AJAX-Chat -- cgit v1.2.3 From f3a7bf913f3bb03c1601b105271daf77df4e3bbb Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Jan 2014 14:08:21 -0800 Subject: add the jquery file uploader. Have been suggesting this as a replacement for the valum uploaders for quite some time - as there is client resize ability and no license incompatibilities. It still requires integration. --- library/jqupload/.gitignore | 3 + library/jqupload/.jshintrc | 81 ++ library/jqupload/CONTRIBUTING.md | 42 + library/jqupload/Gruntfile.js | 37 + library/jqupload/README.md | 123 ++ library/jqupload/angularjs.html | 211 +++ library/jqupload/basic-plus.html | 226 ++++ library/jqupload/basic.html | 136 ++ library/jqupload/blueimp-file-upload.jquery.json | 50 + library/jqupload/bower.json | 85 ++ library/jqupload/cors/postmessage.html | 75 ++ library/jqupload/cors/result.html | 24 + library/jqupload/css/demo-ie8.css | 21 + library/jqupload/css/demo.css | 67 + .../jqupload/css/jquery.fileupload-noscript.css | 22 + .../jqupload/css/jquery.fileupload-ui-noscript.css | 17 + library/jqupload/css/jquery.fileupload-ui.css | 57 + library/jqupload/css/jquery.fileupload.css | 36 + library/jqupload/css/style.css | 15 + library/jqupload/img/loading.gif | Bin 0 -> 3897 bytes library/jqupload/img/progressbar.gif | Bin 0 -> 3323 bytes library/jqupload/index.html | 255 ++++ library/jqupload/jquery-ui.html | 250 ++++ library/jqupload/js/app.js | 101 ++ .../js/cors/jquery.postmessage-transport.js | 117 ++ library/jqupload/js/cors/jquery.xdr-transport.js | 86 ++ library/jqupload/js/jquery.fileupload-angular.js | 428 ++++++ library/jqupload/js/jquery.fileupload-audio.js | 106 ++ library/jqupload/js/jquery.fileupload-image.js | 309 +++++ library/jqupload/js/jquery.fileupload-jquery-ui.js | 144 ++ library/jqupload/js/jquery.fileupload-process.js | 172 +++ library/jqupload/js/jquery.fileupload-ui.js | 701 ++++++++++ library/jqupload/js/jquery.fileupload-validate.js | 119 ++ library/jqupload/js/jquery.fileupload-video.js | 106 ++ library/jqupload/js/jquery.fileupload.js | 1420 ++++++++++++++++++++ library/jqupload/js/jquery.iframe-transport.js | 214 +++ library/jqupload/js/main.js | 75 ++ library/jqupload/js/vendor/jquery.ui.widget.js | 530 ++++++++ library/jqupload/package.json | 54 + library/jqupload/server/gae-go/app.yaml | 12 + library/jqupload/server/gae-go/app/main.go | 296 ++++ library/jqupload/server/gae-go/static/robots.txt | 2 + library/jqupload/server/gae-python/app.yaml | 16 + library/jqupload/server/gae-python/main.py | 170 +++ .../jqupload/server/gae-python/static/robots.txt | 2 + library/jqupload/server/node/.gitignore | 2 + library/jqupload/server/node/package.json | 41 + .../jqupload/server/node/public/files/.gitignore | 2 + library/jqupload/server/node/server.js | 292 ++++ library/jqupload/server/node/tmp/.gitignore | 0 library/jqupload/server/php/UploadHandler.php | 1329 ++++++++++++++++++ library/jqupload/server/php/files/.gitignore | 3 + library/jqupload/server/php/files/.htaccess | 18 + library/jqupload/server/php/index.php | 15 + library/jqupload/test/index.html | 166 +++ library/jqupload/test/test.js | 1288 ++++++++++++++++++ version.inc | 2 +- 57 files changed, 10170 insertions(+), 1 deletion(-) create mode 100644 library/jqupload/.gitignore create mode 100644 library/jqupload/.jshintrc create mode 100644 library/jqupload/CONTRIBUTING.md create mode 100644 library/jqupload/Gruntfile.js create mode 100644 library/jqupload/README.md create mode 100644 library/jqupload/angularjs.html create mode 100644 library/jqupload/basic-plus.html create mode 100644 library/jqupload/basic.html create mode 100644 library/jqupload/blueimp-file-upload.jquery.json create mode 100644 library/jqupload/bower.json create mode 100644 library/jqupload/cors/postmessage.html create mode 100644 library/jqupload/cors/result.html create mode 100644 library/jqupload/css/demo-ie8.css create mode 100644 library/jqupload/css/demo.css create mode 100644 library/jqupload/css/jquery.fileupload-noscript.css create mode 100644 library/jqupload/css/jquery.fileupload-ui-noscript.css create mode 100644 library/jqupload/css/jquery.fileupload-ui.css create mode 100644 library/jqupload/css/jquery.fileupload.css create mode 100644 library/jqupload/css/style.css create mode 100644 library/jqupload/img/loading.gif create mode 100644 library/jqupload/img/progressbar.gif create mode 100644 library/jqupload/index.html create mode 100644 library/jqupload/jquery-ui.html create mode 100644 library/jqupload/js/app.js create mode 100644 library/jqupload/js/cors/jquery.postmessage-transport.js create mode 100644 library/jqupload/js/cors/jquery.xdr-transport.js create mode 100644 library/jqupload/js/jquery.fileupload-angular.js create mode 100644 library/jqupload/js/jquery.fileupload-audio.js create mode 100644 library/jqupload/js/jquery.fileupload-image.js create mode 100755 library/jqupload/js/jquery.fileupload-jquery-ui.js create mode 100644 library/jqupload/js/jquery.fileupload-process.js create mode 100644 library/jqupload/js/jquery.fileupload-ui.js create mode 100644 library/jqupload/js/jquery.fileupload-validate.js create mode 100644 library/jqupload/js/jquery.fileupload-video.js create mode 100644 library/jqupload/js/jquery.fileupload.js create mode 100644 library/jqupload/js/jquery.iframe-transport.js create mode 100644 library/jqupload/js/main.js create mode 100644 library/jqupload/js/vendor/jquery.ui.widget.js create mode 100644 library/jqupload/package.json create mode 100644 library/jqupload/server/gae-go/app.yaml create mode 100644 library/jqupload/server/gae-go/app/main.go create mode 100644 library/jqupload/server/gae-go/static/robots.txt create mode 100644 library/jqupload/server/gae-python/app.yaml create mode 100644 library/jqupload/server/gae-python/main.py create mode 100644 library/jqupload/server/gae-python/static/robots.txt create mode 100644 library/jqupload/server/node/.gitignore create mode 100644 library/jqupload/server/node/package.json create mode 100644 library/jqupload/server/node/public/files/.gitignore create mode 100755 library/jqupload/server/node/server.js create mode 100644 library/jqupload/server/node/tmp/.gitignore create mode 100644 library/jqupload/server/php/UploadHandler.php create mode 100644 library/jqupload/server/php/files/.gitignore create mode 100644 library/jqupload/server/php/files/.htaccess create mode 100644 library/jqupload/server/php/index.php create mode 100644 library/jqupload/test/index.html create mode 100644 library/jqupload/test/test.js diff --git a/library/jqupload/.gitignore b/library/jqupload/.gitignore new file mode 100644 index 000000000..29a41a8c4 --- /dev/null +++ b/library/jqupload/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +*.pyc +node_modules diff --git a/library/jqupload/.jshintrc b/library/jqupload/.jshintrc new file mode 100644 index 000000000..4ad82e664 --- /dev/null +++ b/library/jqupload/.jshintrc @@ -0,0 +1,81 @@ +{ + "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.) + "camelcase" : true, // true: Identifiers must be in camelCase + "curly" : true, // true: Require {} for every new block or scope + "eqeqeq" : true, // true: Require triple equals (===) for comparison + "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() + "immed" : true, // true: Require immediate invocations to be wrapped in parens + // e.g. `(function () { } ());` + "indent" : 4, // {int} Number of spaces to use for indentation + "latedef" : true, // true: Require variables/functions to be defined before being used + "newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()` + "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee` + "noempty" : true, // true: Prohibit use of empty blocks + "nonew" : true, // true: Prohibit use of constructors for side-effects (without assignment) + "plusplus" : false, // true: Prohibit use of `++` & `--` + "quotmark" : "single", // Quotation mark consistency: + // false : do nothing (default) + // true : ensure whatever is used is consistent + // "single" : require single quotes + // "double" : require double quotes + "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) + "unused" : true, // true: Require all defined variables be used + "strict" : true, // true: Requires all functions run in ES5 Strict Mode + "trailing" : true, // true: Prohibit trailing whitespaces + "maxparams" : false, // {int} Max number of formal params allowed per function + "maxdepth" : false, // {int} Max depth of nested blocks (within functions) + "maxstatements" : false, // {int} Max number statements per function + "maxcomplexity" : false, // {int} Max cyclomatic complexity per function + "maxlen" : false, // {int} Max number of characters per line + + // Relaxing + "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons) + "boss" : false, // true: Tolerate assignments where comparisons would be expected + "debug" : false, // true: Allow debugger statements e.g. browser breakpoints. + "eqnull" : false, // true: Tolerate use of `== null` + "es5" : false, // true: Allow ES5 syntax (ex: getters and setters) + "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`) + "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features) + // (ex: `for each`, multiple try/catch, function expression…) + "evil" : false, // true: Tolerate use of `eval` and `new Function()` + "expr" : false, // true: Tolerate `ExpressionStatement` as Programs + "funcscope" : false, // true: Tolerate defining variables inside control statements" + "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict') + "iterator" : false, // true: Tolerate using the `__iterator__` property + "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block + "laxbreak" : false, // true: Tolerate possibly unsafe line breakings + "laxcomma" : false, // true: Tolerate comma-first style coding + "loopfunc" : false, // true: Tolerate functions being defined in loops + "multistr" : false, // true: Tolerate multi-line strings + "proto" : false, // true: Tolerate using the `__proto__` property + "scripturl" : false, // true: Tolerate script-targeted URLs + "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment + "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;` + "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation + "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;` + "validthis" : false, // true: Tolerate using this in a non-constructor function + + // Environments + "browser" : false, // Web Browser (window, document, etc) + "couch" : false, // CouchDB + "devel" : false, // Development/debugging (alert, confirm, etc) + "dojo" : false, // Dojo Toolkit + "jquery" : false, // jQuery + "mootools" : false, // MooTools + "node" : false, // Node.js + "nonstandard" : false, // Widely adopted globals (escape, unescape, etc) + "prototypejs" : false, // Prototype and Scriptaculous + "rhino" : false, // Rhino + "worker" : false, // Web Workers + "wsh" : false, // Windows Scripting Host + "yui" : false, // Yahoo User Interface + + // Legacy + "nomen" : true, // true: Prohibit dangling `_` in variables + "onevar" : true, // true: Allow only one `var` statement per function + "passfail" : false, // true: Stop on first error + "white" : true, // true: Check against strict whitespace and indentation rules + + // Custom Globals + "globals" : {} // additional predefined global variables +} diff --git a/library/jqupload/CONTRIBUTING.md b/library/jqupload/CONTRIBUTING.md new file mode 100644 index 000000000..2326ad031 --- /dev/null +++ b/library/jqupload/CONTRIBUTING.md @@ -0,0 +1,42 @@ +# Issue Guidelines + +The issues tracker should only be used for **bugs** or **feature requests**. + +Please post **support requests** and **general discussions** about this project to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). + +## Bugs + +Please follow these guidelines before reporting a bug: + +1. **Update to the latest version** — Check if you can reproduce the issue with the latest version from the `master` branch. + +2. **Use the GitHub issue search** — check if the issue has already been reported. If it has been, please comment on the existing issue. + +3. **Isolate the demonstrable problem** — Try to reproduce the problem with the [Demo](http://blueimp.github.io/jQuery-File-Upload/) or with a reduced test case that includes the least amount of code necessary to reproduce the problem. + +4. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. server information, browser and operating system versions, steps to reproduce the problem. If possible, provide a link to your reduced test case, e.g. via [JSFiddle](http://jsfiddle.net/). + + +## Feature requests + +Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for exising issues before posting a new request. + +Generally, feature requests might be accepted if the implementation would benefit a broader use case or the project could be considered incomplete without that feature. + +If you need help integrating this project into another framework, please post your request to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). + +## Pull requests + +[Pull requests](https://help.github.com/articles/using-pull-requests) are welcome and the preferred way of accepting code contributions. + +However, if you add a server-side upload handler implementation for another framework, please continue to maintain this version in your own fork without sending a pull request. You are welcome to add a link and possibly documentation about your implementation to the [Wiki](https://github.com/blueimp/jQuery-File-Upload/wiki). + +Please follow these guidelines before sending a pull request: + +1. Update your fork to the latest upstream version. + +2. Follow the coding conventions of the original repository. Changes to one of the JavaScript source files are required to pass the [JSLint](http://jslint.com/) validation tool. + +3. Keep your commits as atomar as possible, i.e. create a new commit for every single bug fix or feature added. + +4. Always add meaningfull commit messages. diff --git a/library/jqupload/Gruntfile.js b/library/jqupload/Gruntfile.js new file mode 100644 index 000000000..dcdb5d57a --- /dev/null +++ b/library/jqupload/Gruntfile.js @@ -0,0 +1,37 @@ +/* + * jQuery File Upload Gruntfile + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*global module */ + +module.exports = function (grunt) { + 'use strict'; + + grunt.initConfig({ + jshint: { + options: { + jshintrc: '.jshintrc' + }, + all: [ + 'Gruntfile.js', + 'js/cors/*.js', + 'js/*.js', + 'server/node/server.js', + 'test/test.js' + ] + } + }); + + grunt.loadNpmTasks('grunt-contrib-jshint'); + grunt.loadNpmTasks('grunt-bump-build-git'); + grunt.registerTask('test', ['jshint']); + grunt.registerTask('default', ['test']); + +}; diff --git a/library/jqupload/README.md b/library/jqupload/README.md new file mode 100644 index 000000000..726e6b342 --- /dev/null +++ b/library/jqupload/README.md @@ -0,0 +1,123 @@ +# jQuery File Upload Plugin + +## Demo +[Demo File Upload](http://blueimp.github.io/jQuery-File-Upload/) + +## Description +File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery. +Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads. + +## Setup +* [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup) +* [How to use only the basic plugin (minimal setup guide).](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin) + +## Support + +* **[Support Forum](https://groups.google.com/d/forum/jquery-fileupload)** +**Support requests** and **general discussions** about the File Upload plugin can be posted to the official +[Support Forum](https://groups.google.com/d/forum/jquery-fileupload). +If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload). + +* Bugs and Feature requests +**Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues). +Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting. + +## Features +* **Multiple file upload:** + Allows to select multiple files at once and upload them simultaneously. +* **Drag & Drop support:** + Allows to upload files by dragging them from your desktop or filemanager and dropping them on your browser window. +* **Upload progress bar:** + Shows a progress bar indicating the upload progress for individual files and for all uploads combined. +* **Cancelable uploads:** + Individual file uploads can be canceled to stop the upload progress. +* **Resumable uploads:** + Aborted uploads can be resumed with browsers supporting the Blob API. +* **Chunked uploads:** + Large files can be uploaded in smaller chunks with browsers supporting the Blob API. +* **Client-side image resizing:** + Images can be automatically resized on client-side with browsers supporting the required JS APIs. +* **Preview images, audio and video:** + A preview of image, audio and video files can be displayed before uploading with browsers supporting the required APIs. +* **No browser plugins (e.g. Adobe Flash) required:** + The implementation is based on open standards like HTML5 and JavaScript and requires no additional browser plugins. +* **Graceful fallback for legacy browsers:** + Uploads files via XMLHttpRequests if supported and uses iframes as fallback for legacy browsers. +* **HTML file upload form fallback:** + Allows progressive enhancement by using a standard HTML file upload form as widget element. +* **Cross-site file uploads:** + Supports uploading files to a different domain with cross-site XMLHttpRequests or iframe redirects. +* **Multiple plugin instances:** + Allows to use multiple plugin instances on the same webpage. +* **Customizable and extensible:** + Provides an API to set individual options and define callBack methods for various upload events. +* **Multipart and file contents stream uploads:** + Files can be uploaded as standard "multipart/form-data" or file contents stream (HTTP PUT file upload). +* **Compatible with any server-side application platform:** + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads. + +## Requirements + +### Mandatory requirements +* [jQuery](http://jquery.com/) v. 1.6+ +* [jQuery UI widget factory](http://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included) +* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) (included) + +The jQuery UI widget factory is a requirement for the basic File Upload plugin, but very lightweight without any other dependencies from the jQuery UI suite. + +The jQuery Iframe Transport is required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support). + +### Optional requirements +* [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.5.3+ +* [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image) v. 1.11.0+ +* [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.1.0+ +* [blueimp Gallery](https://github.com/blueimp/Gallery) v. 2.12.0+ +* [Bootstrap CSS framework](http://getbootstrap.com/) v. 3.0.0+ +* [Glyphicons](http://glyphicons.com/) + +The JavaScript Templates engine is used to render the selected and uploaded files for the Basic Plus UI and jQuery UI versions. + +The JavaScript Load Image library and JavaScript Canvas to Blob polyfill are required for the image previews and resizing functionality. + +The blueimp Gallery is used to display the uploaded images in a lightbox. + +The user interface of all versions except the jQuery UI version is built with Twitter's [Bootstrap](http://getbootstrap.com/) framework and icons from [Glyphicons](http://glyphicons.com/). + +### Cross-domain requirements +[Cross-domain File Uploads](https://github.com/blueimp/jQuery-File-Upload/wiki/Cross-domain-uploads) using the [Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) require a redirect back to the origin server to retrieve the upload results. The [example implementation](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/main.js) makes use of [result.html](https://github.com/blueimp/jQuery-File-Upload/blob/master/cors/result.html) as a static redirect page for the origin server. + +The repository also includes the [jQuery XDomainRequest Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/cors/jquery.xdr-transport.js), which enables limited cross-domain AJAX requests in Microsoft Internet Explorer 8 and 9 (IE 10 supports cross-domain XHR requests). +The XDomainRequest object allows GET and POST requests only and doesn't support file uploads. It is used on the [Demo](http://blueimp.github.io/jQuery-File-Upload/) to delete uploaded files from the cross-domain demo file upload service. + +## Browsers + +### Desktop browsers +The File Upload plugin is regularly tested with the latest browser versions and supports the following minimal versions: + +* Google Chrome +* Apple Safari 4.0+ +* Mozilla Firefox 3.0+ +* Opera 11.0+ +* Microsoft Internet Explorer 6.0+ + +### Mobile browsers +The File Upload plugin has been tested with and supports the following mobile browsers: + +* Apple Safari on iOS 6.0+ +* Google Chrome on iOS 6.0+ +* Google Chrome on Android 4.0+ +* Default Browser on Android 2.3+ +* Opera Mobile 12.0+ + +### Supported features +For a detailed overview of the features supported by each browser version please have a look at the [Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support). + +## License +Released under the [MIT license](http://www.opensource.org/licenses/MIT). + +## Donations +jQuery File Upload is free software, but you can donate to support the developer, Sebastian Tschan: + +Flattr: [![Flattr](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/286433/jQuery-File-Upload-Plugin) + +PayPal: [![PayPal](https://www.paypalobjects.com/WEBSCR-640-20110429-1/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PYWYSYP77KL54) diff --git a/library/jqupload/angularjs.html b/library/jqupload/angularjs.html new file mode 100644 index 000000000..d578cfa57 --- /dev/null +++ b/library/jqupload/angularjs.html @@ -0,0 +1,211 @@ + + + + + + + +jQuery File Upload Demo - AngularJS version + + + + + + + + + + + + + + + + + +
      +
      +
      + + jQuery File Upload +
      +
      + +
      +
      +
      +
      +

      jQuery File Upload Demo

      +

      AngularJS version

      + +
      +
      +

      File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for AngularJS.
      + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
      + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

      +
      +
      + +
      + + + +
      +
      + + + + Add files... + + + + + + +
      + +
      + +
      + +
       
      +
      +
      + + + + + + + + +
      +
      + +
      +
      +       		+

      + + {{file.name}} + {{file.name}} + + {{file.name}} +

      + {{file.error}} +       		+

      {{file.size | formatFileSize}}

      +
      +       		+ + + +
      +
      +
      +
      +
      +

      Demo Notes

      +
      +
      +
        +
      • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
        • +
      • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
        • +
      • Uploaded files will be deleted automatically after 5 minutes (demo setting).
        • +
      • You can drag & drop files from your desktop on this webpage (see Browser support).
        • +
      • Please refer to the project website and documentation for more information.
        • +
      • Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.
        • +
      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/jqupload/basic-plus.html b/library/jqupload/basic-plus.html new file mode 100644 index 000000000..dc90bd768 --- /dev/null +++ b/library/jqupload/basic-plus.html @@ -0,0 +1,226 @@ + + + + + + + +jQuery File Upload Demo - Basic Plus version + + + + + + + + + + +
      +
      +
      + + jQuery File Upload +
      +
      + +
      +
      +
      +
      +

      jQuery File Upload Demo

      +

      Basic Plus version

      + +
      +
      +

      File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery.
      + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
      + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

      +
      +
      + + + + Add files... + + + +
      +
      + +
      +
      +
      + +
      +
      +
      +
      +

      Demo Notes

      +
      +
      +
        +
      • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
        • +
      • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
        • +
      • Uploaded files will be deleted automatically after 5 minutes (demo setting).
        • +
      • You can drag & drop files from your desktop on this webpage (see Browser support).
        • +
      • Please refer to the project website and documentation for more information.
        • +
      • Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.
        • +
      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/jqupload/basic.html b/library/jqupload/basic.html new file mode 100644 index 000000000..ea5d0e66f --- /dev/null +++ b/library/jqupload/basic.html @@ -0,0 +1,136 @@ + + + + + + + +jQuery File Upload Demo - Basic version + + + + + + + + + + +
      +
      +
      + + jQuery File Upload +
      +
      + +
      +
      +
      +
      +

      jQuery File Upload Demo

      +

      Basic version

      + +
      +
      +

      File Upload widget with multiple file selection, drag&drop support and progress bar for jQuery.
      + Supports cross-domain, chunked and resumable file uploads.
      + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

      +
      +
      + + + + Select files... + + + +
      +
      + +
      +
      +
      + +
      +
      +
      +
      +

      Demo Notes

      +
      +
      +
        +
      • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
        • +
      • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
        • +
      • Uploaded files will be deleted automatically after 5 minutes (demo setting).
        • +
      • You can drag & drop files from your desktop on this webpage (see Browser support).
        • +
      • Please refer to the project website and documentation for more information.
        • +
      • Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.
        • +
      +
      +
      +
      + + + + + + + + + + + + diff --git a/library/jqupload/blueimp-file-upload.jquery.json b/library/jqupload/blueimp-file-upload.jquery.json new file mode 100644 index 000000000..8382fb4b9 --- /dev/null +++ b/library/jqupload/blueimp-file-upload.jquery.json @@ -0,0 +1,50 @@ +{ + "name": "blueimp-file-upload", + "version": "9.5.2", + "title": "jQuery File Upload", + "author": { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + }, + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } + ], + "dependencies": { + "jquery": ">=1.6" + }, + "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", + "keywords": [ + "jquery", + "file", + "upload", + "widget", + "multiple", + "selection", + "drag", + "drop", + "progress", + "preview", + "cross-domain", + "cross-site", + "chunk", + "resume", + "gae", + "go", + "python", + "php", + "bootstrap" + ], + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "docs": "https://github.com/blueimp/jQuery-File-Upload/wiki", + "demo": "http://blueimp.github.io/jQuery-File-Upload/", + "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", + "maintainers": [ + { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + } + ] +} diff --git a/library/jqupload/bower.json b/library/jqupload/bower.json new file mode 100644 index 000000000..54ba68f82 --- /dev/null +++ b/library/jqupload/bower.json @@ -0,0 +1,85 @@ +{ + "name": "blueimp-file-upload", + "version": "9.5.2", + "title": "jQuery File Upload", + "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", + "keywords": [ + "jquery", + "file", + "upload", + "widget", + "multiple", + "selection", + "drag", + "drop", + "progress", + "preview", + "cross-domain", + "cross-site", + "chunk", + "resume", + "gae", + "go", + "python", + "php", + "bootstrap" + ], + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "author": { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + }, + "maintainers": [ + { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + } + ], + "repository": { + "type": "git", + "url": "git://github.com/blueimp/jQuery-File-Upload.git" + }, + "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } + ], + "dependencies": { + "jquery": ">=1.6", + "blueimp-tmpl": ">=2.5.3", + "blueimp-load-image": ">=1.11.0", + "blueimp-canvas-to-blob": ">=2.1.0" + }, + "main": [ + "css/jquery.fileupload.css", + "css/jquery.fileupload-ui.css", + "css/jquery.fileupload-noscript.css", + "css/jquery.fileupload-ui-noscript.css", + "js/cors/jquery.postmessage-transport.js", + "js/cors/jquery.xdr-transport.js", + "js/vendor/jquery.ui.widget.js", + "js/jquery.fileupload.js", + "js/jquery.fileupload-process.js", + "js/jquery.fileupload-validate.js", + "js/jquery.fileupload-image.js", + "js/jquery.fileupload-audio.js", + "js/jquery.fileupload-video.js", + "js/jquery.fileupload-ui.js", + "js/jquery.fileupload-jquery-ui.js", + "js/jquery.fileupload-angular.js", + "js/jquery.iframe-transport.js" + ], + "ignore": [ + "/*.*", + "/cors", + "css/demo-ie8.css", + "css/demo.css", + "css/style.css", + "js/app.js", + "js/main.js", + "server", + "test" + ] +} diff --git a/library/jqupload/cors/postmessage.html b/library/jqupload/cors/postmessage.html new file mode 100644 index 000000000..3d1448f08 --- /dev/null +++ b/library/jqupload/cors/postmessage.html @@ -0,0 +1,75 @@ + + + + + +jQuery File Upload Plugin postMessage API + + + + + + \ No newline at end of file diff --git a/library/jqupload/cors/result.html b/library/jqupload/cors/result.html new file mode 100644 index 000000000..225131495 --- /dev/null +++ b/library/jqupload/cors/result.html @@ -0,0 +1,24 @@ + + + + + +jQuery Iframe Transport Plugin Redirect Page + + + + + diff --git a/library/jqupload/css/demo-ie8.css b/library/jqupload/css/demo-ie8.css new file mode 100644 index 000000000..262493d08 --- /dev/null +++ b/library/jqupload/css/demo-ie8.css @@ -0,0 +1,21 @@ +@charset "UTF-8"; +/* + * jQuery File Upload Demo CSS Fixes for IE<9 1.0.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.navigation { + list-style: none; + padding: 0; + margin: 1em 0; +} +.navigation li { + display: inline; + margin-right: 10px; +} diff --git a/library/jqupload/css/demo.css b/library/jqupload/css/demo.css new file mode 100644 index 000000000..2b4d43934 --- /dev/null +++ b/library/jqupload/css/demo.css @@ -0,0 +1,67 @@ +@charset "UTF-8"; +/* + * jQuery File Upload Demo CSS 1.1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +body { + max-width: 750px; + margin: 0 auto; + padding: 1em; + font-family: "Lucida Grande", "Lucida Sans Unicode", Arial, sans-serif; + font-size: 1em; + line-height: 1.4em; + background: #222; + color: #fff; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +a { + color: orange; + text-decoration: none; +} +img { + border: 0; + vertical-align: middle; +} +h1 { + line-height: 1em; +} +blockquote { + padding: 0 0 0 15px; + margin: 0 0 20px; + border-left: 5px solid #eee; +} +table { + width: 100%; + margin: 10px 0; +} + +.fileupload-progress { + margin: 10px 0; +} +.fileupload-progress .progress-extended { + margin-top: 5px; +} +.error { + color: red; +} + +@media (min-width: 481px) { + .navigation { + list-style: none; + padding: 0; + } + .navigation li { + display: inline-block; + } + .navigation li:not(:first-child):before { + content: "| "; + } +} diff --git a/library/jqupload/css/jquery.fileupload-noscript.css b/library/jqupload/css/jquery.fileupload-noscript.css new file mode 100644 index 000000000..64d728fc3 --- /dev/null +++ b/library/jqupload/css/jquery.fileupload-noscript.css @@ -0,0 +1,22 @@ +@charset "UTF-8"; +/* + * jQuery File Upload Plugin NoScript CSS 1.2.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileinput-button input { + position: static; + opacity: 1; + filter: none; + font-size: inherit; + direction: inherit; +} +.fileinput-button span { + display: none; +} diff --git a/library/jqupload/css/jquery.fileupload-ui-noscript.css b/library/jqupload/css/jquery.fileupload-ui-noscript.css new file mode 100644 index 000000000..87f110cdb --- /dev/null +++ b/library/jqupload/css/jquery.fileupload-ui-noscript.css @@ -0,0 +1,17 @@ +@charset "UTF-8"; +/* + * jQuery File Upload UI Plugin NoScript CSS 8.8.5 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileinput-button i, +.fileupload-buttonbar .delete, +.fileupload-buttonbar .toggle { + display: none; +} diff --git a/library/jqupload/css/jquery.fileupload-ui.css b/library/jqupload/css/jquery.fileupload-ui.css new file mode 100644 index 000000000..76fb376de --- /dev/null +++ b/library/jqupload/css/jquery.fileupload-ui.css @@ -0,0 +1,57 @@ +@charset "UTF-8"; +/* + * jQuery File Upload UI Plugin CSS 9.0.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileupload-buttonbar .btn, +.fileupload-buttonbar .toggle { + margin-bottom: 5px; +} +.progress-animated .progress-bar, +.progress-animated .bar { + background: url("../img/progressbar.gif") !important; + filter: none; +} +.fileupload-process { + float: right; + display: none; +} +.fileupload-processing .fileupload-process, +.files .processing .preview { + display: block; + width: 32px; + height: 32px; + background: url("../img/loading.gif") center no-repeat; + background-size: contain; +} +.files audio, +.files video { + max-width: 300px; +} + +@media (max-width: 767px) { + .fileupload-buttonbar .toggle, + .files .toggle, + .files .btn span { + display: none; + } + .files .name { + width: 80px; + word-wrap: break-word; + } + .files audio, + .files video { + max-width: 80px; + } + .files img, + .files canvas { + max-width: 100%; + } +} diff --git a/library/jqupload/css/jquery.fileupload.css b/library/jqupload/css/jquery.fileupload.css new file mode 100644 index 000000000..fb6044d34 --- /dev/null +++ b/library/jqupload/css/jquery.fileupload.css @@ -0,0 +1,36 @@ +@charset "UTF-8"; +/* + * jQuery File Upload Plugin CSS 1.3.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileinput-button { + position: relative; + overflow: hidden; +} +.fileinput-button input { + position: absolute; + top: 0; + right: 0; + margin: 0; + opacity: 0; + -ms-filter: 'alpha(opacity=0)'; + font-size: 200px; + direction: ltr; + cursor: pointer; +} + +/* Fixes for IE < 8 */ +@media screen\9 { + .fileinput-button input { + filter: alpha(opacity=0); + font-size: 100%; + height: 100%; + } +} diff --git a/library/jqupload/css/style.css b/library/jqupload/css/style.css new file mode 100644 index 000000000..b2c60a6f1 --- /dev/null +++ b/library/jqupload/css/style.css @@ -0,0 +1,15 @@ +@charset "UTF-8"; +/* + * jQuery File Upload Plugin CSS Example 8.8.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +body { + padding-top: 60px; +} diff --git a/library/jqupload/img/loading.gif b/library/jqupload/img/loading.gif new file mode 100644 index 000000000..90f28cbdb Binary files /dev/null and b/library/jqupload/img/loading.gif differ diff --git a/library/jqupload/img/progressbar.gif b/library/jqupload/img/progressbar.gif new file mode 100644 index 000000000..fbcce6bc9 Binary files /dev/null and b/library/jqupload/img/progressbar.gif differ diff --git a/library/jqupload/index.html b/library/jqupload/index.html new file mode 100644 index 000000000..a3a06aa9b --- /dev/null +++ b/library/jqupload/index.html @@ -0,0 +1,255 @@ + + + + + + + +jQuery File Upload Demo + + + + + + + + + + + + + + + + +
      +
      +
      + + jQuery File Upload +
      +
      + +
      +
      +
      +
      +

      jQuery File Upload Demo

      +

      Basic Plus UI version

      + +
      +
      +

      File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery.
      + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
      + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

      +
      +
      + +
      + + + +
      +
      + + + + Add files... + + + + + + + + +
      + +
      + +
      +
      +
      + +
       
      +
      +
      + + +
      +
      +
      +
      +

      Demo Notes

      +
      +
      +
        +
      • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
        • +
      • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
        • +
      • Uploaded files will be deleted automatically after 5 minutes (demo setting).
        • +
      • You can drag & drop files from your desktop on this webpage (see Browser support).
        • +
      • Please refer to the project website and documentation for more information.
        • +
      • Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.
        • +
      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/jqupload/jquery-ui.html b/library/jqupload/jquery-ui.html new file mode 100644 index 000000000..993a4c815 --- /dev/null +++ b/library/jqupload/jquery-ui.html @@ -0,0 +1,250 @@ + + + + + + + +jQuery File Upload Demo - jQuery UI version + + + + + + + + + + + + + + + + + + + +

      jQuery File Upload Demo

      +

      jQuery UI version

      +
      + + +
      + +
      +

      File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery UI.
      + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
      + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

      +
      + +
      + + + +
      +
      + + + Add files... + + + + + + + + +
      + + +
      + +
      +
      +
      +

      Demo Notes

      +
        +
      • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
        • +
      • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
        • +
      • Uploaded files will be deleted automatically after 5 minutes (demo setting).
        • +
      • You can drag & drop files from your desktop on this webpage (see Browser support).
        • +
      • Please refer to the project website and documentation for more information.
        • +
      • Built with jQuery UI.
        • +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/jqupload/js/app.js b/library/jqupload/js/app.js new file mode 100644 index 000000000..47b4f923b --- /dev/null +++ b/library/jqupload/js/app.js @@ -0,0 +1,101 @@ +/* + * jQuery File Upload Plugin Angular JS Example 1.2.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global window, angular */ + +(function () { + 'use strict'; + + var isOnGitHub = window.location.hostname === 'blueimp.github.io', + url = isOnGitHub ? '//jquery-file-upload.appspot.com/' : 'server/php/'; + + angular.module('demo', [ + 'blueimp.fileupload' + ]) + .config([ + '$httpProvider', 'fileUploadProvider', + function ($httpProvider, fileUploadProvider) { + delete $httpProvider.defaults.headers.common['X-Requested-With']; + fileUploadProvider.defaults.redirect = window.location.href.replace( + /\/[^\/]*$/, + '/cors/result.html?%s' + ); + if (isOnGitHub) { + // Demo settings: + angular.extend(fileUploadProvider.defaults, { + // Enable image resizing, except for Android and Opera, + // which actually support image resizing, but fail to + // send Blob objects via XHR requests: + disableImageResize: /Android(?!.*Chrome)|Opera/ + .test(window.navigator.userAgent), + maxFileSize: 5000000, + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i + }); + } + } + ]) + + .controller('DemoFileUploadController', [ + '$scope', '$http', '$filter', '$window', + function ($scope, $http) { + $scope.options = { + url: url + }; + if (!isOnGitHub) { + $scope.loadingFiles = true; + $http.get(url) + .then( + function (response) { + $scope.loadingFiles = false; + $scope.queue = response.data.files || []; + }, + function () { + $scope.loadingFiles = false; + } + ); + } + } + ]) + + .controller('FileDestroyController', [ + '$scope', '$http', + function ($scope, $http) { + var file = $scope.file, + state; + if (file.url) { + file.$state = function () { + return state; + }; + file.$destroy = function () { + state = 'pending'; + return $http({ + url: file.deleteUrl, + method: file.deleteType + }).then( + function () { + state = 'resolved'; + $scope.clear(file); + }, + function () { + state = 'rejected'; + } + ); + }; + } else if (!file.$cancel && !file._index) { + file.$cancel = function () { + $scope.clear(file); + }; + } + } + ]); + +}()); diff --git a/library/jqupload/js/cors/jquery.postmessage-transport.js b/library/jqupload/js/cors/jquery.postmessage-transport.js new file mode 100644 index 000000000..2b4851e67 --- /dev/null +++ b/library/jqupload/js/cors/jquery.postmessage-transport.js @@ -0,0 +1,117 @@ +/* + * jQuery postMessage Transport Plugin 1.1.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + var counter = 0, + names = [ + 'accepts', + 'cache', + 'contents', + 'contentType', + 'crossDomain', + 'data', + 'dataType', + 'headers', + 'ifModified', + 'mimeType', + 'password', + 'processData', + 'timeout', + 'traditional', + 'type', + 'url', + 'username' + ], + convert = function (p) { + return p; + }; + + $.ajaxSetup({ + converters: { + 'postmessage text': convert, + 'postmessage json': convert, + 'postmessage html': convert + } + }); + + $.ajaxTransport('postmessage', function (options) { + if (options.postMessage && window.postMessage) { + var iframe, + loc = $('').prop('href', options.postMessage)[0], + target = loc.protocol + '//' + loc.host, + xhrUpload = options.xhr().upload; + return { + send: function (_, completeCallback) { + counter += 1; + var message = { + id: 'postmessage-transport-' + counter + }, + eventName = 'message.' + message.id; + iframe = $( + '' + ).bind('load', function () { + $.each(names, function (i, name) { + message[name] = options[name]; + }); + message.dataType = message.dataType.replace('postmessage ', ''); + $(window).bind(eventName, function (e) { + e = e.originalEvent; + var data = e.data, + ev; + if (e.origin === target && data.id === message.id) { + if (data.type === 'progress') { + ev = document.createEvent('Event'); + ev.initEvent(data.type, false, true); + $.extend(ev, data); + xhrUpload.dispatchEvent(ev); + } else { + completeCallback( + data.status, + data.statusText, + {postmessage: data.result}, + data.headers + ); + iframe.remove(); + $(window).unbind(eventName); + } + } + }); + iframe[0].contentWindow.postMessage( + message, + target + ); + }).appendTo(document.body); + }, + abort: function () { + if (iframe) { + iframe.remove(); + } + } + }; + } + }); + +})); diff --git a/library/jqupload/js/cors/jquery.xdr-transport.js b/library/jqupload/js/cors/jquery.xdr-transport.js new file mode 100644 index 000000000..0044cc2d5 --- /dev/null +++ b/library/jqupload/js/cors/jquery.xdr-transport.js @@ -0,0 +1,86 @@ +/* + * jQuery XDomainRequest Transport Plugin 1.1.3 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + * + * Based on Julian Aubourg's ajaxHooks xdr.js: + * https://github.com/jaubourg/ajaxHooks/ + */ + +/* global define, window, XDomainRequest */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + if (window.XDomainRequest && !$.support.cors) { + $.ajaxTransport(function (s) { + if (s.crossDomain && s.async) { + if (s.timeout) { + s.xdrTimeout = s.timeout; + delete s.timeout; + } + var xdr; + return { + send: function (headers, completeCallback) { + var addParamChar = /\?/.test(s.url) ? '&' : '?'; + function callback(status, statusText, responses, responseHeaders) { + xdr.onload = xdr.onerror = xdr.ontimeout = $.noop; + xdr = null; + completeCallback(status, statusText, responses, responseHeaders); + } + xdr = new XDomainRequest(); + // XDomainRequest only supports GET and POST: + if (s.type === 'DELETE') { + s.url = s.url + addParamChar + '_method=DELETE'; + s.type = 'POST'; + } else if (s.type === 'PUT') { + s.url = s.url + addParamChar + '_method=PUT'; + s.type = 'POST'; + } else if (s.type === 'PATCH') { + s.url = s.url + addParamChar + '_method=PATCH'; + s.type = 'POST'; + } + xdr.open(s.type, s.url); + xdr.onload = function () { + callback( + 200, + 'OK', + {text: xdr.responseText}, + 'Content-Type: ' + xdr.contentType + ); + }; + xdr.onerror = function () { + callback(404, 'Not Found'); + }; + if (s.xdrTimeout) { + xdr.ontimeout = function () { + callback(0, 'timeout'); + }; + xdr.timeout = s.xdrTimeout; + } + xdr.send((s.hasContent && s.data) || null); + }, + abort: function () { + if (xdr) { + xdr.onerror = $.noop(); + xdr.abort(); + } + } + }; + } + }); + } +})); diff --git a/library/jqupload/js/jquery.fileupload-angular.js b/library/jqupload/js/jquery.fileupload-angular.js new file mode 100644 index 000000000..666f51429 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-angular.js @@ -0,0 +1,428 @@ +/* + * jQuery File Upload AngularJS Plugin 2.1.3 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, angular */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'angular', + './jquery.fileupload-image', + './jquery.fileupload-audio', + './jquery.fileupload-video', + './jquery.fileupload-validate' + ], factory); + } else { + factory(); + } +}(function () { + 'use strict'; + + angular.module('blueimp.fileupload', []) + + // The fileUpload service provides configuration options + // for the fileUpload directive and default handlers for + // File Upload events: + .provider('fileUpload', function () { + var scopeEvalAsync = function (expression) { + var scope = angular.element(this) + .fileupload('option', 'scope')(); + // Schedule a new $digest cycle if not already inside of one + // and evaluate the given expression: + scope.$evalAsync(expression); + }, + addFileMethods = function (scope, data) { + var files = data.files, + file = files[0]; + angular.forEach(files, function (file, index) { + file._index = index; + file.$state = function () { + return data.state(); + }; + file.$processing = function () { + return data.processing(); + }; + file.$progress = function () { + return data.progress(); + }; + file.$response = function () { + return data.response(); + }; + }); + file.$submit = function () { + if (!file.error) { + return data.submit(); + } + }; + file.$cancel = function () { + return data.abort(); + }; + }, + $config; + $config = this.defaults = { + handleResponse: function (e, data) { + var files = data.result && data.result.files; + if (files) { + data.scope().replace(data.files, files); + } else if (data.errorThrown || + data.textStatus === 'error') { + data.files[0].error = data.errorThrown || + data.textStatus; + } + }, + add: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var scope = data.scope(), + filesCopy = []; + angular.forEach(data.files, function (file) { + filesCopy.push(file); + }); + scope.$apply(function () { + addFileMethods(scope, data); + var method = scope.option('prependFiles') ? + 'unshift' : 'push'; + Array.prototype[method].apply(scope.queue, data.files); + }); + data.process(function () { + return scope.process(data); + }).always(function () { + scope.$apply(function () { + addFileMethods(scope, data); + scope.replace(filesCopy, data.files); + }); + }).then(function () { + if ((scope.option('autoUpload') || + data.autoUpload) && + data.autoUpload !== false) { + data.submit(); + } + }); + }, + progress: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + data.scope().$apply(); + }, + done: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var that = this; + data.scope().$apply(function () { + data.handleResponse.call(that, e, data); + }); + }, + fail: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var that = this, + scope = data.scope(); + if (data.errorThrown === 'abort') { + scope.clear(data.files); + return; + } + scope.$apply(function () { + data.handleResponse.call(that, e, data); + }); + }, + stop: scopeEvalAsync, + processstart: scopeEvalAsync, + processstop: scopeEvalAsync, + getNumberOfFiles: function () { + var scope = this.scope(); + return scope.queue.length - scope.processing(); + }, + dataType: 'json', + autoUpload: false + }; + this.$get = [ + function () { + return { + defaults: $config + }; + } + ]; + }) + + // Format byte numbers to readable presentations: + .provider('formatFileSizeFilter', function () { + var $config = { + // Byte units following the IEC format + // http://en.wikipedia.org/wiki/Kilobyte + units: [ + {size: 1000000000, suffix: ' GB'}, + {size: 1000000, suffix: ' MB'}, + {size: 1000, suffix: ' KB'} + ] + }; + this.defaults = $config; + this.$get = function () { + return function (bytes) { + if (!angular.isNumber(bytes)) { + return ''; + } + var unit = true, + i = 0, + prefix, + suffix; + while (unit) { + unit = $config.units[i]; + prefix = unit.prefix || ''; + suffix = unit.suffix || ''; + if (i === $config.units.length - 1 || bytes >= unit.size) { + return prefix + (bytes / unit.size).toFixed(2) + suffix; + } + i += 1; + } + }; + }; + }) + + // The FileUploadController initializes the fileupload widget and + // provides scope methods to control the File Upload functionality: + .controller('FileUploadController', [ + '$scope', '$element', '$attrs', '$window', 'fileUpload', + function ($scope, $element, $attrs, $window, fileUpload) { + var uploadMethods = { + progress: function () { + return $element.fileupload('progress'); + }, + active: function () { + return $element.fileupload('active'); + }, + option: function (option, data) { + return $element.fileupload('option', option, data); + }, + add: function (data) { + return $element.fileupload('add', data); + }, + send: function (data) { + return $element.fileupload('send', data); + }, + process: function (data) { + return $element.fileupload('process', data); + }, + processing: function (data) { + return $element.fileupload('processing', data); + } + }; + $scope.disabled = !$window.jQuery.support.fileInput; + $scope.queue = $scope.queue || []; + $scope.clear = function (files) { + var queue = this.queue, + i = queue.length, + file = files, + length = 1; + if (angular.isArray(files)) { + file = files[0]; + length = files.length; + } + while (i) { + i -= 1; + if (queue[i] === file) { + return queue.splice(i, length); + } + } + }; + $scope.replace = function (oldFiles, newFiles) { + var queue = this.queue, + file = oldFiles[0], + i, + j; + for (i = 0; i < queue.length; i += 1) { + if (queue[i] === file) { + for (j = 0; j < newFiles.length; j += 1) { + queue[i + j] = newFiles[j]; + } + return; + } + } + }; + $scope.applyOnQueue = function (method) { + var list = this.queue.slice(0), + i, + file; + for (i = 0; i < list.length; i += 1) { + file = list[i]; + if (file[method]) { + file[method](); + } + } + }; + $scope.submit = function () { + this.applyOnQueue('$submit'); + }; + $scope.cancel = function () { + this.applyOnQueue('$cancel'); + }; + // Add upload methods to the scope: + angular.extend($scope, uploadMethods); + // The fileupload widget will initialize with + // the options provided via "data-"-parameters, + // as well as those given via options object: + $element.fileupload(angular.extend( + {scope: function () { + return $scope; + }}, + fileUpload.defaults + )).on('fileuploadadd', function (e, data) { + data.scope = $scope.option('scope'); + }).on('fileuploadfail', function (e, data) { + if (data.errorThrown === 'abort') { + return; + } + if (data.dataType && + data.dataType.indexOf('json') === data.dataType.length - 4) { + try { + data.result = angular.fromJson(data.jqXHR.responseText); + } catch (ignore) {} + } + }).on([ + 'fileuploadadd', + 'fileuploadsubmit', + 'fileuploadsend', + 'fileuploaddone', + 'fileuploadfail', + 'fileuploadalways', + 'fileuploadprogress', + 'fileuploadprogressall', + 'fileuploadstart', + 'fileuploadstop', + 'fileuploadchange', + 'fileuploadpaste', + 'fileuploaddrop', + 'fileuploaddragover', + 'fileuploadchunksend', + 'fileuploadchunkdone', + 'fileuploadchunkfail', + 'fileuploadchunkalways', + 'fileuploadprocessstart', + 'fileuploadprocess', + 'fileuploadprocessdone', + 'fileuploadprocessfail', + 'fileuploadprocessalways', + 'fileuploadprocessstop' + ].join(' '), function (e, data) { + if ($scope.$emit(e.type, data).defaultPrevented) { + e.preventDefault(); + } + }).on('remove', function () { + // Remove upload methods from the scope, + // when the widget is removed: + var method; + for (method in uploadMethods) { + if (uploadMethods.hasOwnProperty(method)) { + delete $scope[method]; + } + } + }); + // Observe option changes: + $scope.$watch( + $attrs.fileUpload, + function (newOptions) { + if (newOptions) { + $element.fileupload('option', newOptions); + } + } + ); + } + ]) + + // Provide File Upload progress feedback: + .controller('FileUploadProgressController', [ + '$scope', '$attrs', '$parse', + function ($scope, $attrs, $parse) { + var fn = $parse($attrs.fileUploadProgress), + update = function () { + var progress = fn($scope); + if (!progress || !progress.total) { + return; + } + $scope.num = Math.floor( + progress.loaded / progress.total * 100 + ); + }; + update(); + $scope.$watch( + $attrs.fileUploadProgress + '.loaded', + function (newValue, oldValue) { + if (newValue !== oldValue) { + update(); + } + } + ); + } + ]) + + // Display File Upload previews: + .controller('FileUploadPreviewController', [ + '$scope', '$element', '$attrs', + function ($scope, $element, $attrs) { + $scope.$watch( + $attrs.fileUploadPreview + '.preview', + function (preview) { + $element.empty(); + if (preview) { + $element.append(preview); + } + } + ); + } + ]) + + .directive('fileUpload', function () { + return { + controller: 'FileUploadController', + scope: true + }; + }) + + .directive('fileUploadProgress', function () { + return { + controller: 'FileUploadProgressController', + scope: true + }; + }) + + .directive('fileUploadPreview', function () { + return { + controller: 'FileUploadPreviewController' + }; + }) + + // Enhance the HTML5 download attribute to + // allow drag&drop of files to the desktop: + .directive('download', function () { + return function (scope, elm) { + elm.on('dragstart', function (e) { + try { + e.originalEvent.dataTransfer.setData( + 'DownloadURL', + [ + 'application/octet-stream', + elm.prop('download'), + elm.prop('href') + ].join(':') + ); + } catch (ignore) {} + }); + }; + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-audio.js b/library/jqupload/js/jquery.fileupload-audio.js new file mode 100644 index 000000000..575800e82 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-audio.js @@ -0,0 +1,106 @@ +/* + * jQuery File Upload Audio Preview Plugin 1.0.3 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'load-image', + './jquery.fileupload-process' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.loadImage + ); + } +}(function ($, loadImage) { + 'use strict'; + + // Prepend to the default processQueue: + $.blueimp.fileupload.prototype.options.processQueue.unshift( + { + action: 'loadAudio', + // Use the action as prefix for the "@" options: + prefix: true, + fileTypes: '@', + maxFileSize: '@', + disabled: '@disableAudioPreview' + }, + { + action: 'setAudio', + name: '@audioPreviewName', + disabled: '@disableAudioPreview' + } + ); + + // The File Upload Audio Preview plugin extends the fileupload widget + // with audio preview functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // The regular expression for the types of audio files to load, + // matched against the file type: + loadAudioFileTypes: /^audio\/.*$/ + }, + + _audioElement: document.createElement('audio'), + + processActions: { + + // Loads the audio file given via data.files and data.index + // as audio element if the browser supports playing it. + // Accepts the options fileTypes (regular expression) + // and maxFileSize (integer) to limit the files to load: + loadAudio: function (data, options) { + if (options.disabled) { + return data; + } + var file = data.files[data.index], + url, + audio; + if (this._audioElement.canPlayType && + this._audioElement.canPlayType(file.type) && + ($.type(options.maxFileSize) !== 'number' || + file.size <= options.maxFileSize) && + (!options.fileTypes || + options.fileTypes.test(file.type))) { + url = loadImage.createObjectURL(file); + if (url) { + audio = this._audioElement.cloneNode(false); + audio.src = url; + audio.controls = true; + data.audio = audio; + return data; + } + } + return data; + }, + + // Sets the audio element as a property of the file object: + setAudio: function (data, options) { + if (data.audio && !options.disabled) { + data.files[data.index][options.name || 'preview'] = data.audio; + } + return data; + } + + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-image.js b/library/jqupload/js/jquery.fileupload-image.js new file mode 100644 index 000000000..8fbf7d42c --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-image.js @@ -0,0 +1,309 @@ +/* + * jQuery File Upload Image Preview & Resize Plugin 1.7.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window, Blob */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'load-image', + 'load-image-meta', + 'load-image-exif', + 'load-image-ios', + 'canvas-to-blob', + './jquery.fileupload-process' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.loadImage + ); + } +}(function ($, loadImage) { + 'use strict'; + + // Prepend to the default processQueue: + $.blueimp.fileupload.prototype.options.processQueue.unshift( + { + action: 'loadImageMetaData', + disableImageHead: '@', + disableExif: '@', + disableExifThumbnail: '@', + disableExifSub: '@', + disableExifGps: '@', + disabled: '@disableImageMetaDataLoad' + }, + { + action: 'loadImage', + // Use the action as prefix for the "@" options: + prefix: true, + fileTypes: '@', + maxFileSize: '@', + noRevoke: '@', + disabled: '@disableImageLoad' + }, + { + action: 'resizeImage', + // Use "image" as prefix for the "@" options: + prefix: 'image', + maxWidth: '@', + maxHeight: '@', + minWidth: '@', + minHeight: '@', + crop: '@', + orientation: '@', + forceResize: '@', + disabled: '@disableImageResize' + }, + { + action: 'saveImage', + quality: '@imageQuality', + type: '@imageType', + disabled: '@disableImageResize' + }, + { + action: 'saveImageMetaData', + disabled: '@disableImageMetaDataSave' + }, + { + action: 'resizeImage', + // Use "preview" as prefix for the "@" options: + prefix: 'preview', + maxWidth: '@', + maxHeight: '@', + minWidth: '@', + minHeight: '@', + crop: '@', + orientation: '@', + thumbnail: '@', + canvas: '@', + disabled: '@disableImagePreview' + }, + { + action: 'setImage', + name: '@imagePreviewName', + disabled: '@disableImagePreview' + }, + { + action: 'deleteImageReferences', + disabled: '@disableImageReferencesDeletion' + } + ); + + // The File Upload Resize plugin extends the fileupload widget + // with image resize functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // The regular expression for the types of images to load: + // matched against the file type: + loadImageFileTypes: /^image\/(gif|jpeg|png)$/, + // The maximum file size of images to load: + loadImageMaxFileSize: 10000000, // 10MB + // The maximum width of resized images: + imageMaxWidth: 1920, + // The maximum height of resized images: + imageMaxHeight: 1080, + // Defines the image orientation (1-8) or takes the orientation + // value from Exif data if set to true: + imageOrientation: false, + // Define if resized images should be cropped or only scaled: + imageCrop: false, + // Disable the resize image functionality by default: + disableImageResize: true, + // The maximum width of the preview images: + previewMaxWidth: 80, + // The maximum height of the preview images: + previewMaxHeight: 80, + // Defines the preview orientation (1-8) or takes the orientation + // value from Exif data if set to true: + previewOrientation: true, + // Create the preview using the Exif data thumbnail: + previewThumbnail: true, + // Define if preview images should be cropped or only scaled: + previewCrop: false, + // Define if preview images should be resized as canvas elements: + previewCanvas: true + }, + + processActions: { + + // Loads the image given via data.files and data.index + // as img element, if the browser supports the File API. + // Accepts the options fileTypes (regular expression) + // and maxFileSize (integer) to limit the files to load: + loadImage: function (data, options) { + if (options.disabled) { + return data; + } + var that = this, + file = data.files[data.index], + dfd = $.Deferred(); + if (($.type(options.maxFileSize) === 'number' && + file.size > options.maxFileSize) || + (options.fileTypes && + !options.fileTypes.test(file.type)) || + !loadImage( + file, + function (img) { + if (img.src) { + data.img = img; + } + dfd.resolveWith(that, [data]); + }, + options + )) { + return data; + } + return dfd.promise(); + }, + + // Resizes the image given as data.canvas or data.img + // and updates data.canvas or data.img with the resized image. + // Also stores the resized image as preview property. + // Accepts the options maxWidth, maxHeight, minWidth, + // minHeight, canvas and crop: + resizeImage: function (data, options) { + if (options.disabled || !(data.canvas || data.img)) { + return data; + } + options = $.extend({canvas: true}, options); + var that = this, + dfd = $.Deferred(), + img = (options.canvas && data.canvas) || data.img, + resolve = function (newImg) { + if (newImg && (newImg.width !== img.width || + newImg.height !== img.height || + options.forceResize)) { + data[newImg.getContext ? 'canvas' : 'img'] = newImg; + } + data.preview = newImg; + dfd.resolveWith(that, [data]); + }, + thumbnail; + if (data.exif) { + if (options.orientation === true) { + options.orientation = data.exif.get('Orientation'); + } + if (options.thumbnail) { + thumbnail = data.exif.get('Thumbnail'); + if (thumbnail) { + loadImage(thumbnail, resolve, options); + return dfd.promise(); + } + } + } + if (img) { + resolve(loadImage.scale(img, options)); + return dfd.promise(); + } + return data; + }, + + // Saves the processed image given as data.canvas + // inplace at data.index of data.files: + saveImage: function (data, options) { + if (!data.canvas || options.disabled) { + return data; + } + var that = this, + file = data.files[data.index], + dfd = $.Deferred(); + if (data.canvas.toBlob) { + data.canvas.toBlob( + function (blob) { + if (!blob.name) { + if (file.type === blob.type) { + blob.name = file.name; + } else if (file.name) { + blob.name = file.name.replace( + /\..+$/, + '.' + blob.type.substr(6) + ); + } + } + // Don't restore invalid meta data: + if (file.type !== blob.type) { + delete data.imageHead; + } + // Store the created blob at the position + // of the original file in the files list: + data.files[data.index] = blob; + dfd.resolveWith(that, [data]); + }, + options.type || file.type, + options.quality + ); + } else { + return data; + } + return dfd.promise(); + }, + + loadImageMetaData: function (data, options) { + if (options.disabled) { + return data; + } + var that = this, + dfd = $.Deferred(); + loadImage.parseMetaData(data.files[data.index], function (result) { + $.extend(data, result); + dfd.resolveWith(that, [data]); + }, options); + return dfd.promise(); + }, + + saveImageMetaData: function (data, options) { + if (!(data.imageHead && data.canvas && + data.canvas.toBlob && !options.disabled)) { + return data; + } + var file = data.files[data.index], + blob = new Blob([ + data.imageHead, + // Resized images always have a head size of 20 bytes, + // including the JPEG marker and a minimal JFIF header: + this._blobSlice.call(file, 20) + ], {type: file.type}); + blob.name = file.name; + data.files[data.index] = blob; + return data; + }, + + // Sets the resized version of the image as a property of the + // file object, must be called after "saveImage": + setImage: function (data, options) { + if (data.preview && !options.disabled) { + data.files[data.index][options.name || 'preview'] = data.preview; + } + return data; + }, + + deleteImageReferences: function (data, options) { + if (!options.disabled) { + delete data.img; + delete data.canvas; + delete data.preview; + delete data.imageHead; + } + return data; + } + + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-jquery-ui.js b/library/jqupload/js/jquery.fileupload-jquery-ui.js new file mode 100755 index 000000000..7b4ffdf05 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-jquery-ui.js @@ -0,0 +1,144 @@ +/* + * jQuery File Upload jQuery UI Plugin 8.7.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery', './jquery.fileupload-ui'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + progress: function (e, data) { + if (data.context) { + data.context.find('.progress').progressbar( + 'option', + 'value', + parseInt(data.loaded / data.total * 100, 10) + ); + } + }, + progressall: function (e, data) { + var $this = $(this); + $this.find('.fileupload-progress') + .find('.progress').progressbar( + 'option', + 'value', + parseInt(data.loaded / data.total * 100, 10) + ).end() + .find('.progress-extended').each(function () { + $(this).html( + ($this.data('blueimp-fileupload') || + $this.data('fileupload')) + ._renderExtendedProgress(data) + ); + }); + } + }, + + _renderUpload: function (func, files) { + var node = this._super(func, files), + showIconText = $(window).width() > 480; + node.find('.progress').empty().progressbar(); + node.find('.start').button({ + icons: {primary: 'ui-icon-circle-arrow-e'}, + text: showIconText + }); + node.find('.cancel').button({ + icons: {primary: 'ui-icon-cancel'}, + text: showIconText + }); + if (node.hasClass('fade')) { + node.hide(); + } + return node; + }, + + _renderDownload: function (func, files) { + var node = this._super(func, files), + showIconText = $(window).width() > 480; + node.find('.delete').button({ + icons: {primary: 'ui-icon-trash'}, + text: showIconText + }); + if (node.hasClass('fade')) { + node.hide(); + } + return node; + }, + + _transition: function (node) { + var deferred = $.Deferred(); + if (node.hasClass('fade')) { + node.fadeToggle( + this.options.transitionDuration, + this.options.transitionEasing, + function () { + deferred.resolveWith(node); + } + ); + } else { + deferred.resolveWith(node); + } + return deferred; + }, + + _create: function () { + this._super(); + this.element + .find('.fileupload-buttonbar') + .find('.fileinput-button').each(function () { + var input = $(this).find('input:file').detach(); + $(this) + .button({icons: {primary: 'ui-icon-plusthick'}}) + .append(input); + }) + .end().find('.start') + .button({icons: {primary: 'ui-icon-circle-arrow-e'}}) + .end().find('.cancel') + .button({icons: {primary: 'ui-icon-cancel'}}) + .end().find('.delete') + .button({icons: {primary: 'ui-icon-trash'}}) + .end().find('.progress').progressbar(); + }, + + _destroy: function () { + this.element + .find('.fileupload-buttonbar') + .find('.fileinput-button').each(function () { + var input = $(this).find('input:file').detach(); + $(this) + .button('destroy') + .append(input); + }) + .end().find('.start') + .button('destroy') + .end().find('.cancel') + .button('destroy') + .end().find('.delete') + .button('destroy') + .end().find('.progress').progressbar('destroy'); + this._super(); + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-process.js b/library/jqupload/js/jquery.fileupload-process.js new file mode 100644 index 000000000..8a6b929a6 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-process.js @@ -0,0 +1,172 @@ +/* + * jQuery File Upload Processing Plugin 1.3.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + './jquery.fileupload' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery + ); + } +}(function ($) { + 'use strict'; + + var originalAdd = $.blueimp.fileupload.prototype.options.add; + + // The File Upload Processing plugin extends the fileupload widget + // with file processing functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // The list of processing actions: + processQueue: [ + /* + { + action: 'log', + type: 'debug' + } + */ + ], + add: function (e, data) { + var $this = $(this); + data.process(function () { + return $this.fileupload('process', data); + }); + originalAdd.call(this, e, data); + } + }, + + processActions: { + /* + log: function (data, options) { + console[options.type]( + 'Processing "' + data.files[data.index].name + '"' + ); + } + */ + }, + + _processFile: function (data, originalData) { + var that = this, + dfd = $.Deferred().resolveWith(that, [data]), + chain = dfd.promise(); + this._trigger('process', null, data); + $.each(data.processQueue, function (i, settings) { + var func = function (data) { + if (originalData.errorThrown) { + return $.Deferred() + .rejectWith(that, [originalData]).promise(); + } + return that.processActions[settings.action].call( + that, + data, + settings + ); + }; + chain = chain.pipe(func, settings.always && func); + }); + chain + .done(function () { + that._trigger('processdone', null, data); + that._trigger('processalways', null, data); + }) + .fail(function () { + that._trigger('processfail', null, data); + that._trigger('processalways', null, data); + }); + return chain; + }, + + // Replaces the settings of each processQueue item that + // are strings starting with an "@", using the remaining + // substring as key for the option map, + // e.g. "@autoUpload" is replaced with options.autoUpload: + _transformProcessQueue: function (options) { + var processQueue = []; + $.each(options.processQueue, function () { + var settings = {}, + action = this.action, + prefix = this.prefix === true ? action : this.prefix; + $.each(this, function (key, value) { + if ($.type(value) === 'string' && + value.charAt(0) === '@') { + settings[key] = options[ + value.slice(1) || (prefix ? prefix + + key.charAt(0).toUpperCase() + key.slice(1) : key) + ]; + } else { + settings[key] = value; + } + + }); + processQueue.push(settings); + }); + options.processQueue = processQueue; + }, + + // Returns the number of files currently in the processsing queue: + processing: function () { + return this._processing; + }, + + // Processes the files given as files property of the data parameter, + // returns a Promise object that allows to bind callbacks: + process: function (data) { + var that = this, + options = $.extend({}, this.options, data); + if (options.processQueue && options.processQueue.length) { + this._transformProcessQueue(options); + if (this._processing === 0) { + this._trigger('processstart'); + } + $.each(data.files, function (index) { + var opts = index ? $.extend({}, options) : options, + func = function () { + if (data.errorThrown) { + return $.Deferred() + .rejectWith(that, [data]).promise(); + } + return that._processFile(opts, data); + }; + opts.index = index; + that._processing += 1; + that._processingQueue = that._processingQueue.pipe(func, func) + .always(function () { + that._processing -= 1; + if (that._processing === 0) { + that._trigger('processstop'); + } + }); + }); + } + return this._processingQueue; + }, + + _create: function () { + this._super(); + this._processing = 0; + this._processingQueue = $.Deferred().resolveWith(this) + .promise(); + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-ui.js b/library/jqupload/js/jquery.fileupload-ui.js new file mode 100644 index 000000000..417edb73f --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-ui.js @@ -0,0 +1,701 @@ +/* + * jQuery File Upload User Interface Plugin 9.5.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'tmpl', + './jquery.fileupload-image', + './jquery.fileupload-audio', + './jquery.fileupload-video', + './jquery.fileupload-validate' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.tmpl + ); + } +}(function ($, tmpl) { + 'use strict'; + + $.blueimp.fileupload.prototype._specialOptions.push( + 'filesContainer', + 'uploadTemplateId', + 'downloadTemplateId' + ); + + // The UI version extends the file upload widget + // and adds complete user interface interaction: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // By default, files added to the widget are uploaded as soon + // as the user clicks on the start buttons. To enable automatic + // uploads, set the following option to true: + autoUpload: false, + // The ID of the upload template: + uploadTemplateId: 'template-upload', + // The ID of the download template: + downloadTemplateId: 'template-download', + // The container for the list of files. If undefined, it is set to + // an element with class "files" inside of the widget element: + filesContainer: undefined, + // By default, files are appended to the files container. + // Set the following option to true, to prepend files instead: + prependFiles: false, + // The expected data type of the upload response, sets the dataType + // option of the $.ajax upload requests: + dataType: 'json', + + // Function returning the current number of files, + // used by the maxNumberOfFiles validation: + getNumberOfFiles: function () { + return this.filesContainer.children() + .not('.processing').length; + }, + + // Callback to retrieve the list of files from the server response: + getFilesFromResponse: function (data) { + if (data.result && $.isArray(data.result.files)) { + return data.result.files; + } + return []; + }, + + // The add callback is invoked as soon as files are added to the fileupload + // widget (via file input selection, drag & drop or add API call). + // See the basic file upload widget for more information: + add: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var $this = $(this), + that = $this.data('blueimp-fileupload') || + $this.data('fileupload'), + options = that.options; + data.context = that._renderUpload(data.files) + .data('data', data) + .addClass('processing'); + options.filesContainer[ + options.prependFiles ? 'prepend' : 'append' + ](data.context); + that._forceReflow(data.context); + $.when( + that._transition(data.context), + data.process(function () { + return $this.fileupload('process', data); + }) + ).always(function () { + data.context.each(function (index) { + $(this).find('.size').text( + that._formatFileSize(data.files[index].size) + ); + }).removeClass('processing'); + that._renderPreviews(data); + }).done(function () { + data.context.find('.start').prop('disabled', false); + if ((that._trigger('added', e, data) !== false) && + (options.autoUpload || data.autoUpload) && + data.autoUpload !== false) { + data.submit(); + } + }).fail(function () { + if (data.files.error) { + data.context.each(function (index) { + var error = data.files[index].error; + if (error) { + $(this).find('.error').text(error); + } + }); + } + }); + }, + // Callback for the start of each file upload request: + send: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var that = $(this).data('blueimp-fileupload') || + $(this).data('fileupload'); + if (data.context && data.dataType && + data.dataType.substr(0, 6) === 'iframe') { + // Iframe Transport does not support progress events. + // In lack of an indeterminate progress bar, we set + // the progress to 100%, showing the full animated bar: + data.context + .find('.progress').addClass( + !$.support.transition && 'progress-animated' + ) + .attr('aria-valuenow', 100) + .children().first().css( + 'width', + '100%' + ); + } + return that._trigger('sent', e, data); + }, + // Callback for successful uploads: + done: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var that = $(this).data('blueimp-fileupload') || + $(this).data('fileupload'), + getFilesFromResponse = data.getFilesFromResponse || + that.options.getFilesFromResponse, + files = getFilesFromResponse(data), + template, + deferred; + if (data.context) { + data.context.each(function (index) { + var file = files[index] || + {error: 'Empty file upload result'}; + deferred = that._addFinishedDeferreds(); + that._transition($(this)).done( + function () { + var node = $(this); + template = that._renderDownload([file]) + .replaceAll(node); + that._forceReflow(template); + that._transition(template).done( + function () { + data.context = $(this); + that._trigger('completed', e, data); + that._trigger('finished', e, data); + deferred.resolve(); + } + ); + } + ); + }); + } else { + template = that._renderDownload(files)[ + that.options.prependFiles ? 'prependTo' : 'appendTo' + ](that.options.filesContainer); + that._forceReflow(template); + deferred = that._addFinishedDeferreds(); + that._transition(template).done( + function () { + data.context = $(this); + that._trigger('completed', e, data); + that._trigger('finished', e, data); + deferred.resolve(); + } + ); + } + }, + // Callback for failed (abort or error) uploads: + fail: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var that = $(this).data('blueimp-fileupload') || + $(this).data('fileupload'), + template, + deferred; + if (data.context) { + data.context.each(function (index) { + if (data.errorThrown !== 'abort') { + var file = data.files[index]; + file.error = file.error || data.errorThrown || + true; + deferred = that._addFinishedDeferreds(); + that._transition($(this)).done( + function () { + var node = $(this); + template = that._renderDownload([file]) + .replaceAll(node); + that._forceReflow(template); + that._transition(template).done( + function () { + data.context = $(this); + that._trigger('failed', e, data); + that._trigger('finished', e, data); + deferred.resolve(); + } + ); + } + ); + } else { + deferred = that._addFinishedDeferreds(); + that._transition($(this)).done( + function () { + $(this).remove(); + that._trigger('failed', e, data); + that._trigger('finished', e, data); + deferred.resolve(); + } + ); + } + }); + } else if (data.errorThrown !== 'abort') { + data.context = that._renderUpload(data.files)[ + that.options.prependFiles ? 'prependTo' : 'appendTo' + ](that.options.filesContainer) + .data('data', data); + that._forceReflow(data.context); + deferred = that._addFinishedDeferreds(); + that._transition(data.context).done( + function () { + data.context = $(this); + that._trigger('failed', e, data); + that._trigger('finished', e, data); + deferred.resolve(); + } + ); + } else { + that._trigger('failed', e, data); + that._trigger('finished', e, data); + that._addFinishedDeferreds().resolve(); + } + }, + // Callback for upload progress events: + progress: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var progress = Math.floor(data.loaded / data.total * 100); + if (data.context) { + data.context.each(function () { + $(this).find('.progress') + .attr('aria-valuenow', progress) + .children().first().css( + 'width', + progress + '%' + ); + }); + } + }, + // Callback for global upload progress events: + progressall: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var $this = $(this), + progress = Math.floor(data.loaded / data.total * 100), + globalProgressNode = $this.find('.fileupload-progress'), + extendedProgressNode = globalProgressNode + .find('.progress-extended'); + if (extendedProgressNode.length) { + extendedProgressNode.html( + ($this.data('blueimp-fileupload') || $this.data('fileupload')) + ._renderExtendedProgress(data) + ); + } + globalProgressNode + .find('.progress') + .attr('aria-valuenow', progress) + .children().first().css( + 'width', + progress + '%' + ); + }, + // Callback for uploads start, equivalent to the global ajaxStart event: + start: function (e) { + if (e.isDefaultPrevented()) { + return false; + } + var that = $(this).data('blueimp-fileupload') || + $(this).data('fileupload'); + that._resetFinishedDeferreds(); + that._transition($(this).find('.fileupload-progress')).done( + function () { + that._trigger('started', e); + } + ); + }, + // Callback for uploads stop, equivalent to the global ajaxStop event: + stop: function (e) { + if (e.isDefaultPrevented()) { + return false; + } + var that = $(this).data('blueimp-fileupload') || + $(this).data('fileupload'), + deferred = that._addFinishedDeferreds(); + $.when.apply($, that._getFinishedDeferreds()) + .done(function () { + that._trigger('stopped', e); + }); + that._transition($(this).find('.fileupload-progress')).done( + function () { + $(this).find('.progress') + .attr('aria-valuenow', '0') + .children().first().css('width', '0%'); + $(this).find('.progress-extended').html(' '); + deferred.resolve(); + } + ); + }, + processstart: function (e) { + if (e.isDefaultPrevented()) { + return false; + } + $(this).addClass('fileupload-processing'); + }, + processstop: function (e) { + if (e.isDefaultPrevented()) { + return false; + } + $(this).removeClass('fileupload-processing'); + }, + // Callback for file deletion: + destroy: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + var that = $(this).data('blueimp-fileupload') || + $(this).data('fileupload'), + removeNode = function () { + that._transition(data.context).done( + function () { + $(this).remove(); + that._trigger('destroyed', e, data); + } + ); + }; + if (data.url) { + data.dataType = data.dataType || that.options.dataType; + $.ajax(data).done(removeNode).fail(function () { + that._trigger('destroyfailed', e, data); + }); + } else { + removeNode(); + } + } + }, + + _resetFinishedDeferreds: function () { + this._finishedUploads = []; + }, + + _addFinishedDeferreds: function (deferred) { + if (!deferred) { + deferred = $.Deferred(); + } + this._finishedUploads.push(deferred); + return deferred; + }, + + _getFinishedDeferreds: function () { + return this._finishedUploads; + }, + + // Link handler, that allows to download files + // by drag & drop of the links to the desktop: + _enableDragToDesktop: function () { + var link = $(this), + url = link.prop('href'), + name = link.prop('download'), + type = 'application/octet-stream'; + link.bind('dragstart', function (e) { + try { + e.originalEvent.dataTransfer.setData( + 'DownloadURL', + [type, name, url].join(':') + ); + } catch (ignore) {} + }); + }, + + _formatFileSize: function (bytes) { + if (typeof bytes !== 'number') { + return ''; + } + if (bytes >= 1000000000) { + return (bytes / 1000000000).toFixed(2) + ' GB'; + } + if (bytes >= 1000000) { + return (bytes / 1000000).toFixed(2) + ' MB'; + } + return (bytes / 1000).toFixed(2) + ' KB'; + }, + + _formatBitrate: function (bits) { + if (typeof bits !== 'number') { + return ''; + } + if (bits >= 1000000000) { + return (bits / 1000000000).toFixed(2) + ' Gbit/s'; + } + if (bits >= 1000000) { + return (bits / 1000000).toFixed(2) + ' Mbit/s'; + } + if (bits >= 1000) { + return (bits / 1000).toFixed(2) + ' kbit/s'; + } + return bits.toFixed(2) + ' bit/s'; + }, + + _formatTime: function (seconds) { + var date = new Date(seconds * 1000), + days = Math.floor(seconds / 86400); + days = days ? days + 'd ' : ''; + return days + + ('0' + date.getUTCHours()).slice(-2) + ':' + + ('0' + date.getUTCMinutes()).slice(-2) + ':' + + ('0' + date.getUTCSeconds()).slice(-2); + }, + + _formatPercentage: function (floatValue) { + return (floatValue * 100).toFixed(2) + ' %'; + }, + + _renderExtendedProgress: function (data) { + return this._formatBitrate(data.bitrate) + ' | ' + + this._formatTime( + (data.total - data.loaded) * 8 / data.bitrate + ) + ' | ' + + this._formatPercentage( + data.loaded / data.total + ) + ' | ' + + this._formatFileSize(data.loaded) + ' / ' + + this._formatFileSize(data.total); + }, + + _renderTemplate: function (func, files) { + if (!func) { + return $(); + } + var result = func({ + files: files, + formatFileSize: this._formatFileSize, + options: this.options + }); + if (result instanceof $) { + return result; + } + return $(this.options.templatesContainer).html(result).children(); + }, + + _renderPreviews: function (data) { + data.context.find('.preview').each(function (index, elm) { + $(elm).append(data.files[index].preview); + }); + }, + + _renderUpload: function (files) { + return this._renderTemplate( + this.options.uploadTemplate, + files + ); + }, + + _renderDownload: function (files) { + return this._renderTemplate( + this.options.downloadTemplate, + files + ).find('a[download]').each(this._enableDragToDesktop).end(); + }, + + _startHandler: function (e) { + e.preventDefault(); + var button = $(e.currentTarget), + template = button.closest('.template-upload'), + data = template.data('data'); + button.prop('disabled', true); + if (data && data.submit) { + data.submit(); + } + }, + + _cancelHandler: function (e) { + e.preventDefault(); + var template = $(e.currentTarget) + .closest('.template-upload,.template-download'), + data = template.data('data') || {}; + data.context = data.context || template; + if (data.abort) { + data.abort(); + } else { + data.errorThrown = 'abort'; + this._trigger('fail', e, data); + } + }, + + _deleteHandler: function (e) { + e.preventDefault(); + var button = $(e.currentTarget); + this._trigger('destroy', e, $.extend({ + context: button.closest('.template-download'), + type: 'DELETE' + }, button.data())); + }, + + _forceReflow: function (node) { + return $.support.transition && node.length && + node[0].offsetWidth; + }, + + _transition: function (node) { + var dfd = $.Deferred(); + if ($.support.transition && node.hasClass('fade') && node.is(':visible')) { + node.bind( + $.support.transition.end, + function (e) { + // Make sure we don't respond to other transitions events + // in the container element, e.g. from button elements: + if (e.target === node[0]) { + node.unbind($.support.transition.end); + dfd.resolveWith(node); + } + } + ).toggleClass('in'); + } else { + node.toggleClass('in'); + dfd.resolveWith(node); + } + return dfd; + }, + + _initButtonBarEventHandlers: function () { + var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'), + filesList = this.options.filesContainer; + this._on(fileUploadButtonBar.find('.start'), { + click: function (e) { + e.preventDefault(); + filesList.find('.start').click(); + } + }); + this._on(fileUploadButtonBar.find('.cancel'), { + click: function (e) { + e.preventDefault(); + filesList.find('.cancel').click(); + } + }); + this._on(fileUploadButtonBar.find('.delete'), { + click: function (e) { + e.preventDefault(); + filesList.find('.toggle:checked') + .closest('.template-download') + .find('.delete').click(); + fileUploadButtonBar.find('.toggle') + .prop('checked', false); + } + }); + this._on(fileUploadButtonBar.find('.toggle'), { + change: function (e) { + filesList.find('.toggle').prop( + 'checked', + $(e.currentTarget).is(':checked') + ); + } + }); + }, + + _destroyButtonBarEventHandlers: function () { + this._off( + this.element.find('.fileupload-buttonbar') + .find('.start, .cancel, .delete'), + 'click' + ); + this._off( + this.element.find('.fileupload-buttonbar .toggle'), + 'change.' + ); + }, + + _initEventHandlers: function () { + this._super(); + this._on(this.options.filesContainer, { + 'click .start': this._startHandler, + 'click .cancel': this._cancelHandler, + 'click .delete': this._deleteHandler + }); + this._initButtonBarEventHandlers(); + }, + + _destroyEventHandlers: function () { + this._destroyButtonBarEventHandlers(); + this._off(this.options.filesContainer, 'click'); + this._super(); + }, + + _enableFileInputButton: function () { + this.element.find('.fileinput-button input') + .prop('disabled', false) + .parent().removeClass('disabled'); + }, + + _disableFileInputButton: function () { + this.element.find('.fileinput-button input') + .prop('disabled', true) + .parent().addClass('disabled'); + }, + + _initTemplates: function () { + var options = this.options; + options.templatesContainer = this.document[0].createElement( + options.filesContainer.prop('nodeName') + ); + if (tmpl) { + if (options.uploadTemplateId) { + options.uploadTemplate = tmpl(options.uploadTemplateId); + } + if (options.downloadTemplateId) { + options.downloadTemplate = tmpl(options.downloadTemplateId); + } + } + }, + + _initFilesContainer: function () { + var options = this.options; + if (options.filesContainer === undefined) { + options.filesContainer = this.element.find('.files'); + } else if (!(options.filesContainer instanceof $)) { + options.filesContainer = $(options.filesContainer); + } + }, + + _initSpecialOptions: function () { + this._super(); + this._initFilesContainer(); + this._initTemplates(); + }, + + _create: function () { + this._super(); + this._resetFinishedDeferreds(); + if (!$.support.fileInput) { + this._disableFileInputButton(); + } + }, + + enable: function () { + var wasDisabled = false; + if (this.options.disabled) { + wasDisabled = true; + } + this._super(); + if (wasDisabled) { + this.element.find('input, button').prop('disabled', false); + this._enableFileInputButton(); + } + }, + + disable: function () { + if (!this.options.disabled) { + this.element.find('input, button').prop('disabled', true); + this._disableFileInputButton(); + } + this._super(); + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-validate.js b/library/jqupload/js/jquery.fileupload-validate.js new file mode 100644 index 000000000..f93a18fa2 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-validate.js @@ -0,0 +1,119 @@ +/* + * jQuery File Upload Validation Plugin 1.1.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* global define, window */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + './jquery.fileupload-process' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery + ); + } +}(function ($) { + 'use strict'; + + // Append to the default processQueue: + $.blueimp.fileupload.prototype.options.processQueue.push( + { + action: 'validate', + // Always trigger this action, + // even if the previous action was rejected: + always: true, + // Options taken from the global options map: + acceptFileTypes: '@', + maxFileSize: '@', + minFileSize: '@', + maxNumberOfFiles: '@', + disabled: '@disableValidation' + } + ); + + // The File Upload Validation plugin extends the fileupload widget + // with file validation functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + /* + // The regular expression for allowed file types, matches + // against either file type or file name: + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, + // The maximum allowed file size in bytes: + maxFileSize: 10000000, // 10 MB + // The minimum allowed file size in bytes: + minFileSize: undefined, // No minimal file size + // The limit of files to be uploaded: + maxNumberOfFiles: 10, + */ + + // Function returning the current number of files, + // has to be overriden for maxNumberOfFiles validation: + getNumberOfFiles: $.noop, + + // Error and info messages: + messages: { + maxNumberOfFiles: 'Maximum number of files exceeded', + acceptFileTypes: 'File type not allowed', + maxFileSize: 'File is too large', + minFileSize: 'File is too small' + } + }, + + processActions: { + + validate: function (data, options) { + if (options.disabled) { + return data; + } + var dfd = $.Deferred(), + settings = this.options, + file = data.files[data.index], + fileSize; + if (options.minFileSize || options.maxFileSize) { + fileSize = file.size; + } + if ($.type(options.maxNumberOfFiles) === 'number' && + (settings.getNumberOfFiles() || 0) + data.files.length > + options.maxNumberOfFiles) { + file.error = settings.i18n('maxNumberOfFiles'); + } else if (options.acceptFileTypes && + !(options.acceptFileTypes.test(file.type) || + options.acceptFileTypes.test(file.name))) { + file.error = settings.i18n('acceptFileTypes'); + } else if (fileSize > options.maxFileSize) { + file.error = settings.i18n('maxFileSize'); + } else if ($.type(fileSize) === 'number' && + fileSize < options.minFileSize) { + file.error = settings.i18n('minFileSize'); + } else { + delete file.error; + } + if (file.error || data.files.error) { + data.files.error = true; + dfd.rejectWith(this, [data]); + } else { + dfd.resolveWith(this, [data]); + } + return dfd.promise(); + } + + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload-video.js b/library/jqupload/js/jquery.fileupload-video.js new file mode 100644 index 000000000..3764b27a2 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload-video.js @@ -0,0 +1,106 @@ +/* + * jQuery File Upload Video Preview Plugin 1.0.3 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'load-image', + './jquery.fileupload-process' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.loadImage + ); + } +}(function ($, loadImage) { + 'use strict'; + + // Prepend to the default processQueue: + $.blueimp.fileupload.prototype.options.processQueue.unshift( + { + action: 'loadVideo', + // Use the action as prefix for the "@" options: + prefix: true, + fileTypes: '@', + maxFileSize: '@', + disabled: '@disableVideoPreview' + }, + { + action: 'setVideo', + name: '@videoPreviewName', + disabled: '@disableVideoPreview' + } + ); + + // The File Upload Video Preview plugin extends the fileupload widget + // with video preview functionality: + $.widget('blueimp.fileupload', $.blueimp.fileupload, { + + options: { + // The regular expression for the types of video files to load, + // matched against the file type: + loadVideoFileTypes: /^video\/.*$/ + }, + + _videoElement: document.createElement('video'), + + processActions: { + + // Loads the video file given via data.files and data.index + // as video element if the browser supports playing it. + // Accepts the options fileTypes (regular expression) + // and maxFileSize (integer) to limit the files to load: + loadVideo: function (data, options) { + if (options.disabled) { + return data; + } + var file = data.files[data.index], + url, + video; + if (this._videoElement.canPlayType && + this._videoElement.canPlayType(file.type) && + ($.type(options.maxFileSize) !== 'number' || + file.size <= options.maxFileSize) && + (!options.fileTypes || + options.fileTypes.test(file.type))) { + url = loadImage.createObjectURL(file); + if (url) { + video = this._videoElement.cloneNode(false); + video.src = url; + video.controls = true; + data.video = video; + return data; + } + } + return data; + }, + + // Sets the video element as a property of the file object: + setVideo: function (data, options) { + if (data.video && !options.disabled) { + data.files[data.index][options.name || 'preview'] = data.video; + } + return data; + } + + } + + }); + +})); diff --git a/library/jqupload/js/jquery.fileupload.js b/library/jqupload/js/jquery.fileupload.js new file mode 100644 index 000000000..b52af0654 --- /dev/null +++ b/library/jqupload/js/jquery.fileupload.js @@ -0,0 +1,1420 @@ +/* + * jQuery File Upload Plugin 5.40.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global define, window, document, location, Blob, FormData */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'jquery.ui.widget' + ], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + // Detect file input support, based on + // http://viljamis.com/blog/2012/file-upload-support-on-mobile/ + $.support.fileInput = !(new RegExp( + // Handle devices which give false positives for the feature detection: + '(Android (1\\.[0156]|2\\.[01]))' + + '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' + + '|(w(eb)?OSBrowser)|(webOS)' + + '|(Kindle/(1\\.0|2\\.[05]|3\\.0))' + ).test(window.navigator.userAgent) || + // Feature detection for all other devices: + $('').prop('disabled')); + + // The FileReader API is not actually used, but works as feature detection, + // as some Safari versions (5?) support XHR file uploads via the FormData API, + // but not non-multipart XHR file uploads. + // window.XMLHttpRequestUpload is not available on IE10, so we check for + // window.ProgressEvent instead to detect XHR2 file upload capability: + $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader); + $.support.xhrFormDataFileUpload = !!window.FormData; + + // Detect support for Blob slicing (required for chunked uploads): + $.support.blobSlice = window.Blob && (Blob.prototype.slice || + Blob.prototype.webkitSlice || Blob.prototype.mozSlice); + + // The fileupload widget listens for change events on file input fields defined + // via fileInput setting and paste or drop events of the given dropZone. + // In addition to the default jQuery Widget methods, the fileupload widget + // exposes the "add" and "send" methods, to add or directly send files using + // the fileupload API. + // By default, files added via file input selection, paste, drag & drop or + // "add" method are uploaded immediately, but it is possible to override + // the "add" callback option to queue file uploads. + $.widget('blueimp.fileupload', { + + options: { + // The drop target element(s), by the default the complete document. + // Set to null to disable drag & drop support: + dropZone: $(document), + // The paste target element(s), by the default the complete document. + // Set to null to disable paste support: + pasteZone: $(document), + // The file input field(s), that are listened to for change events. + // If undefined, it is set to the file input fields inside + // of the widget element on plugin initialization. + // Set to null to disable the change listener. + fileInput: undefined, + // By default, the file input field is replaced with a clone after + // each input field change event. This is required for iframe transport + // queues and allows change events to be fired for the same file + // selection, but can be disabled by setting the following option to false: + replaceFileInput: true, + // The parameter name for the file form data (the request argument name). + // If undefined or empty, the name property of the file input field is + // used, or "files[]" if the file input name property is also empty, + // can be a string or an array of strings: + paramName: undefined, + // By default, each file of a selection is uploaded using an individual + // request for XHR type uploads. Set to false to upload file + // selections in one request each: + singleFileUploads: true, + // To limit the number of files uploaded with one XHR request, + // set the following option to an integer greater than 0: + limitMultiFileUploads: undefined, + // The following option limits the number of files uploaded with one + // XHR request to keep the request size under or equal to the defined + // limit in bytes: + limitMultiFileUploadSize: undefined, + // Multipart file uploads add a number of bytes to each uploaded file, + // therefore the following option adds an overhead for each file used + // in the limitMultiFileUploadSize configuration: + limitMultiFileUploadSizeOverhead: 512, + // Set the following option to true to issue all file upload requests + // in a sequential order: + sequentialUploads: false, + // To limit the number of concurrent uploads, + // set the following option to an integer greater than 0: + limitConcurrentUploads: undefined, + // Set the following option to true to force iframe transport uploads: + forceIframeTransport: false, + // Set the following option to the location of a redirect url on the + // origin server, for cross-domain iframe transport uploads: + redirect: undefined, + // The parameter name for the redirect url, sent as part of the form + // data and set to 'redirect' if this option is empty: + redirectParamName: undefined, + // Set the following option to the location of a postMessage window, + // to enable postMessage transport uploads: + postMessage: undefined, + // By default, XHR file uploads are sent as multipart/form-data. + // The iframe transport is always using multipart/form-data. + // Set to false to enable non-multipart XHR uploads: + multipart: true, + // To upload large files in smaller chunks, set the following option + // to a preferred maximum chunk size. If set to 0, null or undefined, + // or the browser does not support the required Blob API, files will + // be uploaded as a whole. + maxChunkSize: undefined, + // When a non-multipart upload or a chunked multipart upload has been + // aborted, this option can be used to resume the upload by setting + // it to the size of the already uploaded bytes. This option is most + // useful when modifying the options object inside of the "add" or + // "send" callbacks, as the options are cloned for each file upload. + uploadedBytes: undefined, + // By default, failed (abort or error) file uploads are removed from the + // global progress calculation. Set the following option to false to + // prevent recalculating the global progress data: + recalculateProgress: true, + // Interval in milliseconds to calculate and trigger progress events: + progressInterval: 100, + // Interval in milliseconds to calculate progress bitrate: + bitrateInterval: 500, + // By default, uploads are started automatically when adding files: + autoUpload: true, + + // Error and info messages: + messages: { + uploadedBytes: 'Uploaded bytes exceed file size' + }, + + // Translation function, gets the message key to be translated + // and an object with context specific data as arguments: + i18n: function (message, context) { + message = this.messages[message] || message.toString(); + if (context) { + $.each(context, function (key, value) { + message = message.replace('{' + key + '}', value); + }); + } + return message; + }, + + // Additional form data to be sent along with the file uploads can be set + // using this option, which accepts an array of objects with name and + // value properties, a function returning such an array, a FormData + // object (for XHR file uploads), or a simple object. + // The form of the first fileInput is given as parameter to the function: + formData: function (form) { + return form.serializeArray(); + }, + + // The add callback is invoked as soon as files are added to the fileupload + // widget (via file input selection, drag & drop, paste or add API call). + // If the singleFileUploads option is enabled, this callback will be + // called once for each file in the selection for XHR file uploads, else + // once for each file selection. + // + // The upload starts when the submit method is invoked on the data parameter. + // The data object contains a files property holding the added files + // and allows you to override plugin options as well as define ajax settings. + // + // Listeners for this callback can also be bound the following way: + // .bind('fileuploadadd', func); + // + // data.submit() returns a Promise object and allows to attach additional + // handlers using jQuery's Deferred callbacks: + // data.submit().done(func).fail(func).always(func); + add: function (e, data) { + if (e.isDefaultPrevented()) { + return false; + } + if (data.autoUpload || (data.autoUpload !== false && + $(this).fileupload('option', 'autoUpload'))) { + data.process().done(function () { + data.submit(); + }); + } + }, + + // Other callbacks: + + // Callback for the submit event of each file upload: + // submit: function (e, data) {}, // .bind('fileuploadsubmit', func); + + // Callback for the start of each file upload request: + // send: function (e, data) {}, // .bind('fileuploadsend', func); + + // Callback for successful uploads: + // done: function (e, data) {}, // .bind('fileuploaddone', func); + + // Callback for failed (abort or error) uploads: + // fail: function (e, data) {}, // .bind('fileuploadfail', func); + + // Callback for completed (success, abort or error) requests: + // always: function (e, data) {}, // .bind('fileuploadalways', func); + + // Callback for upload progress events: + // progress: function (e, data) {}, // .bind('fileuploadprogress', func); + + // Callback for global upload progress events: + // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func); + + // Callback for uploads start, equivalent to the global ajaxStart event: + // start: function (e) {}, // .bind('fileuploadstart', func); + + // Callback for uploads stop, equivalent to the global ajaxStop event: + // stop: function (e) {}, // .bind('fileuploadstop', func); + + // Callback for change events of the fileInput(s): + // change: function (e, data) {}, // .bind('fileuploadchange', func); + + // Callback for paste events to the pasteZone(s): + // paste: function (e, data) {}, // .bind('fileuploadpaste', func); + + // Callback for drop events of the dropZone(s): + // drop: function (e, data) {}, // .bind('fileuploaddrop', func); + + // Callback for dragover events of the dropZone(s): + // dragover: function (e) {}, // .bind('fileuploaddragover', func); + + // Callback for the start of each chunk upload request: + // chunksend: function (e, data) {}, // .bind('fileuploadchunksend', func); + + // Callback for successful chunk uploads: + // chunkdone: function (e, data) {}, // .bind('fileuploadchunkdone', func); + + // Callback for failed (abort or error) chunk uploads: + // chunkfail: function (e, data) {}, // .bind('fileuploadchunkfail', func); + + // Callback for completed (success, abort or error) chunk upload requests: + // chunkalways: function (e, data) {}, // .bind('fileuploadchunkalways', func); + + // The plugin options are used as settings object for the ajax calls. + // The following are jQuery ajax settings required for the file uploads: + processData: false, + contentType: false, + cache: false + }, + + // A list of options that require reinitializing event listeners and/or + // special initialization code: + _specialOptions: [ + 'fileInput', + 'dropZone', + 'pasteZone', + 'multipart', + 'forceIframeTransport' + ], + + _blobSlice: $.support.blobSlice && function () { + var slice = this.slice || this.webkitSlice || this.mozSlice; + return slice.apply(this, arguments); + }, + + _BitrateTimer: function () { + this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime()); + this.loaded = 0; + this.bitrate = 0; + this.getBitrate = function (now, loaded, interval) { + var timeDiff = now - this.timestamp; + if (!this.bitrate || !interval || timeDiff > interval) { + this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8; + this.loaded = loaded; + this.timestamp = now; + } + return this.bitrate; + }; + }, + + _isXHRUpload: function (options) { + return !options.forceIframeTransport && + ((!options.multipart && $.support.xhrFileUpload) || + $.support.xhrFormDataFileUpload); + }, + + _getFormData: function (options) { + var formData; + if ($.type(options.formData) === 'function') { + return options.formData(options.form); + } + if ($.isArray(options.formData)) { + return options.formData; + } + if ($.type(options.formData) === 'object') { + formData = []; + $.each(options.formData, function (name, value) { + formData.push({name: name, value: value}); + }); + return formData; + } + return []; + }, + + _getTotal: function (files) { + var total = 0; + $.each(files, function (index, file) { + total += file.size || 1; + }); + return total; + }, + + _initProgressObject: function (obj) { + var progress = { + loaded: 0, + total: 0, + bitrate: 0 + }; + if (obj._progress) { + $.extend(obj._progress, progress); + } else { + obj._progress = progress; + } + }, + + _initResponseObject: function (obj) { + var prop; + if (obj._response) { + for (prop in obj._response) { + if (obj._response.hasOwnProperty(prop)) { + delete obj._response[prop]; + } + } + } else { + obj._response = {}; + } + }, + + _onProgress: function (e, data) { + if (e.lengthComputable) { + var now = ((Date.now) ? Date.now() : (new Date()).getTime()), + loaded; + if (data._time && data.progressInterval && + (now - data._time < data.progressInterval) && + e.loaded !== e.total) { + return; + } + data._time = now; + loaded = Math.floor( + e.loaded / e.total * (data.chunkSize || data._progress.total) + ) + (data.uploadedBytes || 0); + // Add the difference from the previously loaded state + // to the global loaded counter: + this._progress.loaded += (loaded - data._progress.loaded); + this._progress.bitrate = this._bitrateTimer.getBitrate( + now, + this._progress.loaded, + data.bitrateInterval + ); + data._progress.loaded = data.loaded = loaded; + data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate( + now, + loaded, + data.bitrateInterval + ); + // Trigger a custom progress event with a total data property set + // to the file size(s) of the current upload and a loaded data + // property calculated accordingly: + this._trigger( + 'progress', + $.Event('progress', {delegatedEvent: e}), + data + ); + // Trigger a global progress event for all current file uploads, + // including ajax calls queued for sequential file uploads: + this._trigger( + 'progressall', + $.Event('progressall', {delegatedEvent: e}), + this._progress + ); + } + }, + + _initProgressListener: function (options) { + var that = this, + xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr(); + // Accesss to the native XHR object is required to add event listeners + // for the upload progress event: + if (xhr.upload) { + $(xhr.upload).bind('progress', function (e) { + var oe = e.originalEvent; + // Make sure the progress event properties get copied over: + e.lengthComputable = oe.lengthComputable; + e.loaded = oe.loaded; + e.total = oe.total; + that._onProgress(e, options); + }); + options.xhr = function () { + return xhr; + }; + } + }, + + _isInstanceOf: function (type, obj) { + // Cross-frame instanceof check + return Object.prototype.toString.call(obj) === '[object ' + type + ']'; + }, + + _initXHRData: function (options) { + var that = this, + formData, + file = options.files[0], + // Ignore non-multipart setting if not supported: + multipart = options.multipart || !$.support.xhrFileUpload, + paramName = $.type(options.paramName) === 'array' ? + options.paramName[0] : options.paramName; + options.headers = $.extend({}, options.headers); + if (options.contentRange) { + options.headers['Content-Range'] = options.contentRange; + } + if (!multipart || options.blob || !this._isInstanceOf('File', file)) { + options.headers['Content-Disposition'] = 'attachment; filename="' + + encodeURI(file.name) + '"'; + } + if (!multipart) { + options.contentType = file.type || 'application/octet-stream'; + options.data = options.blob || file; + } else if ($.support.xhrFormDataFileUpload) { + if (options.postMessage) { + // window.postMessage does not allow sending FormData + // objects, so we just add the File/Blob objects to + // the formData array and let the postMessage window + // create the FormData object out of this array: + formData = this._getFormData(options); + if (options.blob) { + formData.push({ + name: paramName, + value: options.blob + }); + } else { + $.each(options.files, function (index, file) { + formData.push({ + name: ($.type(options.paramName) === 'array' && + options.paramName[index]) || paramName, + value: file + }); + }); + } + } else { + if (that._isInstanceOf('FormData', options.formData)) { + formData = options.formData; + } else { + formData = new FormData(); + $.each(this._getFormData(options), function (index, field) { + formData.append(field.name, field.value); + }); + } + if (options.blob) { + formData.append(paramName, options.blob, file.name); + } else { + $.each(options.files, function (index, file) { + // This check allows the tests to run with + // dummy objects: + if (that._isInstanceOf('File', file) || + that._isInstanceOf('Blob', file)) { + formData.append( + ($.type(options.paramName) === 'array' && + options.paramName[index]) || paramName, + file, + file.uploadName || file.name + ); + } + }); + } + } + options.data = formData; + } + // Blob reference is not needed anymore, free memory: + options.blob = null; + }, + + _initIframeSettings: function (options) { + var targetHost = $('').prop('href', options.url).prop('host'); + // Setting the dataType to iframe enables the iframe transport: + options.dataType = 'iframe ' + (options.dataType || ''); + // The iframe transport accepts a serialized array as form data: + options.formData = this._getFormData(options); + // Add redirect url to form data on cross-domain uploads: + if (options.redirect && targetHost && targetHost !== location.host) { + options.formData.push({ + name: options.redirectParamName || 'redirect', + value: options.redirect + }); + } + }, + + _initDataSettings: function (options) { + if (this._isXHRUpload(options)) { + if (!this._chunkedUpload(options, true)) { + if (!options.data) { + this._initXHRData(options); + } + this._initProgressListener(options); + } + if (options.postMessage) { + // Setting the dataType to postmessage enables the + // postMessage transport: + options.dataType = 'postmessage ' + (options.dataType || ''); + } + } else { + this._initIframeSettings(options); + } + }, + + _getParamName: function (options) { + var fileInput = $(options.fileInput), + paramName = options.paramName; + if (!paramName) { + paramName = []; + fileInput.each(function () { + var input = $(this), + name = input.prop('name') || 'files[]', + i = (input.prop('files') || [1]).length; + while (i) { + paramName.push(name); + i -= 1; + } + }); + if (!paramName.length) { + paramName = [fileInput.prop('name') || 'files[]']; + } + } else if (!$.isArray(paramName)) { + paramName = [paramName]; + } + return paramName; + }, + + _initFormSettings: function (options) { + // Retrieve missing options from the input field and the + // associated form, if available: + if (!options.form || !options.form.length) { + options.form = $(options.fileInput.prop('form')); + // If the given file input doesn't have an associated form, + // use the default widget file input's form: + if (!options.form.length) { + options.form = $(this.options.fileInput.prop('form')); + } + } + options.paramName = this._getParamName(options); + if (!options.url) { + options.url = options.form.prop('action') || location.href; + } + // The HTTP request method must be "POST" or "PUT": + options.type = (options.type || + ($.type(options.form.prop('method')) === 'string' && + options.form.prop('method')) || '' + ).toUpperCase(); + if (options.type !== 'POST' && options.type !== 'PUT' && + options.type !== 'PATCH') { + options.type = 'POST'; + } + if (!options.formAcceptCharset) { + options.formAcceptCharset = options.form.attr('accept-charset'); + } + }, + + _getAJAXSettings: function (data) { + var options = $.extend({}, this.options, data); + this._initFormSettings(options); + this._initDataSettings(options); + return options; + }, + + // jQuery 1.6 doesn't provide .state(), + // while jQuery 1.8+ removed .isRejected() and .isResolved(): + _getDeferredState: function (deferred) { + if (deferred.state) { + return deferred.state(); + } + if (deferred.isResolved()) { + return 'resolved'; + } + if (deferred.isRejected()) { + return 'rejected'; + } + return 'pending'; + }, + + // Maps jqXHR callbacks to the equivalent + // methods of the given Promise object: + _enhancePromise: function (promise) { + promise.success = promise.done; + promise.error = promise.fail; + promise.complete = promise.always; + return promise; + }, + + // Creates and returns a Promise object enhanced with + // the jqXHR methods abort, success, error and complete: + _getXHRPromise: function (resolveOrReject, context, args) { + var dfd = $.Deferred(), + promise = dfd.promise(); + context = context || this.options.context || promise; + if (resolveOrReject === true) { + dfd.resolveWith(context, args); + } else if (resolveOrReject === false) { + dfd.rejectWith(context, args); + } + promise.abort = dfd.promise; + return this._enhancePromise(promise); + }, + + // Adds convenience methods to the data callback argument: + _addConvenienceMethods: function (e, data) { + var that = this, + getPromise = function (args) { + return $.Deferred().resolveWith(that, args).promise(); + }; + data.process = function (resolveFunc, rejectFunc) { + if (resolveFunc || rejectFunc) { + data._processQueue = this._processQueue = + (this._processQueue || getPromise([this])).pipe( + function () { + if (data.errorThrown) { + return $.Deferred() + .rejectWith(that, [data]).promise(); + } + return getPromise(arguments); + } + ).pipe(resolveFunc, rejectFunc); + } + return this._processQueue || getPromise([this]); + }; + data.submit = function () { + if (this.state() !== 'pending') { + data.jqXHR = this.jqXHR = + (that._trigger( + 'submit', + $.Event('submit', {delegatedEvent: e}), + this + ) !== false) && that._onSend(e, this); + } + return this.jqXHR || that._getXHRPromise(); + }; + data.abort = function () { + if (this.jqXHR) { + return this.jqXHR.abort(); + } + this.errorThrown = 'abort'; + that._trigger('fail', null, this); + return that._getXHRPromise(false); + }; + data.state = function () { + if (this.jqXHR) { + return that._getDeferredState(this.jqXHR); + } + if (this._processQueue) { + return that._getDeferredState(this._processQueue); + } + }; + data.processing = function () { + return !this.jqXHR && this._processQueue && that + ._getDeferredState(this._processQueue) === 'pending'; + }; + data.progress = function () { + return this._progress; + }; + data.response = function () { + return this._response; + }; + }, + + // Parses the Range header from the server response + // and returns the uploaded bytes: + _getUploadedBytes: function (jqXHR) { + var range = jqXHR.getResponseHeader('Range'), + parts = range && range.split('-'), + upperBytesPos = parts && parts.length > 1 && + parseInt(parts[1], 10); + return upperBytesPos && upperBytesPos + 1; + }, + + // Uploads a file in multiple, sequential requests + // by splitting the file up in multiple blob chunks. + // If the second parameter is true, only tests if the file + // should be uploaded in chunks, but does not invoke any + // upload requests: + _chunkedUpload: function (options, testOnly) { + options.uploadedBytes = options.uploadedBytes || 0; + var that = this, + file = options.files[0], + fs = file.size, + ub = options.uploadedBytes, + mcs = options.maxChunkSize || fs, + slice = this._blobSlice, + dfd = $.Deferred(), + promise = dfd.promise(), + jqXHR, + upload; + if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) || + options.data) { + return false; + } + if (testOnly) { + return true; + } + if (ub >= fs) { + file.error = options.i18n('uploadedBytes'); + return this._getXHRPromise( + false, + options.context, + [null, 'error', file.error] + ); + } + // The chunk upload method: + upload = function () { + // Clone the options object for each chunk upload: + var o = $.extend({}, options), + currentLoaded = o._progress.loaded; + o.blob = slice.call( + file, + ub, + ub + mcs, + file.type + ); + // Store the current chunk size, as the blob itself + // will be dereferenced after data processing: + o.chunkSize = o.blob.size; + // Expose the chunk bytes position range: + o.contentRange = 'bytes ' + ub + '-' + + (ub + o.chunkSize - 1) + '/' + fs; + // Process the upload data (the blob and potential form data): + that._initXHRData(o); + // Add progress listeners for this chunk upload: + that._initProgressListener(o); + jqXHR = ((that._trigger('chunksend', null, o) !== false && $.ajax(o)) || + that._getXHRPromise(false, o.context)) + .done(function (result, textStatus, jqXHR) { + ub = that._getUploadedBytes(jqXHR) || + (ub + o.chunkSize); + // Create a progress event if no final progress event + // with loaded equaling total has been triggered + // for this chunk: + if (currentLoaded + o.chunkSize - o._progress.loaded) { + that._onProgress($.Event('progress', { + lengthComputable: true, + loaded: ub - o.uploadedBytes, + total: ub - o.uploadedBytes + }), o); + } + options.uploadedBytes = o.uploadedBytes = ub; + o.result = result; + o.textStatus = textStatus; + o.jqXHR = jqXHR; + that._trigger('chunkdone', null, o); + that._trigger('chunkalways', null, o); + if (ub < fs) { + // File upload not yet complete, + // continue with the next chunk: + upload(); + } else { + dfd.resolveWith( + o.context, + [result, textStatus, jqXHR] + ); + } + }) + .fail(function (jqXHR, textStatus, errorThrown) { + o.jqXHR = jqXHR; + o.textStatus = textStatus; + o.errorThrown = errorThrown; + that._trigger('chunkfail', null, o); + that._trigger('chunkalways', null, o); + dfd.rejectWith( + o.context, + [jqXHR, textStatus, errorThrown] + ); + }); + }; + this._enhancePromise(promise); + promise.abort = function () { + return jqXHR.abort(); + }; + upload(); + return promise; + }, + + _beforeSend: function (e, data) { + if (this._active === 0) { + // the start callback is triggered when an upload starts + // and no other uploads are currently running, + // equivalent to the global ajaxStart event: + this._trigger('start'); + // Set timer for global bitrate progress calculation: + this._bitrateTimer = new this._BitrateTimer(); + // Reset the global progress values: + this._progress.loaded = this._progress.total = 0; + this._progress.bitrate = 0; + } + // Make sure the container objects for the .response() and + // .progress() methods on the data object are available + // and reset to their initial state: + this._initResponseObject(data); + this._initProgressObject(data); + data._progress.loaded = data.loaded = data.uploadedBytes || 0; + data._progress.total = data.total = this._getTotal(data.files) || 1; + data._progress.bitrate = data.bitrate = 0; + this._active += 1; + // Initialize the global progress values: + this._progress.loaded += data.loaded; + this._progress.total += data.total; + }, + + _onDone: function (result, textStatus, jqXHR, options) { + var total = options._progress.total, + response = options._response; + if (options._progress.loaded < total) { + // Create a progress event if no final progress event + // with loaded equaling total has been triggered: + this._onProgress($.Event('progress', { + lengthComputable: true, + loaded: total, + total: total + }), options); + } + response.result = options.result = result; + response.textStatus = options.textStatus = textStatus; + response.jqXHR = options.jqXHR = jqXHR; + this._trigger('done', null, options); + }, + + _onFail: function (jqXHR, textStatus, errorThrown, options) { + var response = options._response; + if (options.recalculateProgress) { + // Remove the failed (error or abort) file upload from + // the global progress calculation: + this._progress.loaded -= options._progress.loaded; + this._progress.total -= options._progress.total; + } + response.jqXHR = options.jqXHR = jqXHR; + response.textStatus = options.textStatus = textStatus; + response.errorThrown = options.errorThrown = errorThrown; + this._trigger('fail', null, options); + }, + + _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) { + // jqXHRorResult, textStatus and jqXHRorError are added to the + // options object via done and fail callbacks + this._trigger('always', null, options); + }, + + _onSend: function (e, data) { + if (!data.submit) { + this._addConvenienceMethods(e, data); + } + var that = this, + jqXHR, + aborted, + slot, + pipe, + options = that._getAJAXSettings(data), + send = function () { + that._sending += 1; + // Set timer for bitrate progress calculation: + options._bitrateTimer = new that._BitrateTimer(); + jqXHR = jqXHR || ( + ((aborted || that._trigger( + 'send', + $.Event('send', {delegatedEvent: e}), + options + ) === false) && + that._getXHRPromise(false, options.context, aborted)) || + that._chunkedUpload(options) || $.ajax(options) + ).done(function (result, textStatus, jqXHR) { + that._onDone(result, textStatus, jqXHR, options); + }).fail(function (jqXHR, textStatus, errorThrown) { + that._onFail(jqXHR, textStatus, errorThrown, options); + }).always(function (jqXHRorResult, textStatus, jqXHRorError) { + that._onAlways( + jqXHRorResult, + textStatus, + jqXHRorError, + options + ); + that._sending -= 1; + that._active -= 1; + if (options.limitConcurrentUploads && + options.limitConcurrentUploads > that._sending) { + // Start the next queued upload, + // that has not been aborted: + var nextSlot = that._slots.shift(); + while (nextSlot) { + if (that._getDeferredState(nextSlot) === 'pending') { + nextSlot.resolve(); + break; + } + nextSlot = that._slots.shift(); + } + } + if (that._active === 0) { + // The stop callback is triggered when all uploads have + // been completed, equivalent to the global ajaxStop event: + that._trigger('stop'); + } + }); + return jqXHR; + }; + this._beforeSend(e, options); + if (this.options.sequentialUploads || + (this.options.limitConcurrentUploads && + this.options.limitConcurrentUploads <= this._sending)) { + if (this.options.limitConcurrentUploads > 1) { + slot = $.Deferred(); + this._slots.push(slot); + pipe = slot.pipe(send); + } else { + this._sequence = this._sequence.pipe(send, send); + pipe = this._sequence; + } + // Return the piped Promise object, enhanced with an abort method, + // which is delegated to the jqXHR object of the current upload, + // and jqXHR callbacks mapped to the equivalent Promise methods: + pipe.abort = function () { + aborted = [undefined, 'abort', 'abort']; + if (!jqXHR) { + if (slot) { + slot.rejectWith(options.context, aborted); + } + return send(); + } + return jqXHR.abort(); + }; + return this._enhancePromise(pipe); + } + return send(); + }, + + _onAdd: function (e, data) { + var that = this, + result = true, + options = $.extend({}, this.options, data), + files = data.files, + filesLength = files.length, + limit = options.limitMultiFileUploads, + limitSize = options.limitMultiFileUploadSize, + overhead = options.limitMultiFileUploadSizeOverhead, + batchSize = 0, + paramName = this._getParamName(options), + paramNameSet, + paramNameSlice, + fileSet, + i, + j = 0; + if (limitSize && (!filesLength || files[0].size === undefined)) { + limitSize = undefined; + } + if (!(options.singleFileUploads || limit || limitSize) || + !this._isXHRUpload(options)) { + fileSet = [files]; + paramNameSet = [paramName]; + } else if (!(options.singleFileUploads || limitSize) && limit) { + fileSet = []; + paramNameSet = []; + for (i = 0; i < filesLength; i += limit) { + fileSet.push(files.slice(i, i + limit)); + paramNameSlice = paramName.slice(i, i + limit); + if (!paramNameSlice.length) { + paramNameSlice = paramName; + } + paramNameSet.push(paramNameSlice); + } + } else if (!options.singleFileUploads && limitSize) { + fileSet = []; + paramNameSet = []; + for (i = 0; i < filesLength; i = i + 1) { + batchSize += files[i].size + overhead; + if (i + 1 === filesLength || + ((batchSize + files[i + 1].size + overhead) > limitSize) || + (limit && i + 1 - j >= limit)) { + fileSet.push(files.slice(j, i + 1)); + paramNameSlice = paramName.slice(j, i + 1); + if (!paramNameSlice.length) { + paramNameSlice = paramName; + } + paramNameSet.push(paramNameSlice); + j = i + 1; + batchSize = 0; + } + } + } else { + paramNameSet = paramName; + } + data.originalFiles = files; + $.each(fileSet || files, function (index, element) { + var newData = $.extend({}, data); + newData.files = fileSet ? element : [element]; + newData.paramName = paramNameSet[index]; + that._initResponseObject(newData); + that._initProgressObject(newData); + that._addConvenienceMethods(e, newData); + result = that._trigger( + 'add', + $.Event('add', {delegatedEvent: e}), + newData + ); + return result; + }); + return result; + }, + + _replaceFileInput: function (input) { + var inputClone = input.clone(true); + $('
      ').append(inputClone)[0].reset(); + // Detaching allows to insert the fileInput on another form + // without loosing the file input value: + input.after(inputClone).detach(); + // Avoid memory leaks with the detached file input: + $.cleanData(input.unbind('remove')); + // Replace the original file input element in the fileInput + // elements set with the clone, which has been copied including + // event handlers: + this.options.fileInput = this.options.fileInput.map(function (i, el) { + if (el === input[0]) { + return inputClone[0]; + } + return el; + }); + // If the widget has been initialized on the file input itself, + // override this.element with the file input clone: + if (input[0] === this.element[0]) { + this.element = inputClone; + } + }, + + _handleFileTreeEntry: function (entry, path) { + var that = this, + dfd = $.Deferred(), + errorHandler = function (e) { + if (e && !e.entry) { + e.entry = entry; + } + // Since $.when returns immediately if one + // Deferred is rejected, we use resolve instead. + // This allows valid files and invalid items + // to be returned together in one set: + dfd.resolve([e]); + }, + dirReader; + path = path || ''; + if (entry.isFile) { + if (entry._file) { + // Workaround for Chrome bug #149735 + entry._file.relativePath = path; + dfd.resolve(entry._file); + } else { + entry.file(function (file) { + file.relativePath = path; + dfd.resolve(file); + }, errorHandler); + } + } else if (entry.isDirectory) { + dirReader = entry.createReader(); + dirReader.readEntries(function (entries) { + that._handleFileTreeEntries( + entries, + path + entry.name + '/' + ).done(function (files) { + dfd.resolve(files); + }).fail(errorHandler); + }, errorHandler); + } else { + // Return an empy list for file system items + // other than files or directories: + dfd.resolve([]); + } + return dfd.promise(); + }, + + _handleFileTreeEntries: function (entries, path) { + var that = this; + return $.when.apply( + $, + $.map(entries, function (entry) { + return that._handleFileTreeEntry(entry, path); + }) + ).pipe(function () { + return Array.prototype.concat.apply( + [], + arguments + ); + }); + }, + + _getDroppedFiles: function (dataTransfer) { + dataTransfer = dataTransfer || {}; + var items = dataTransfer.items; + if (items && items.length && (items[0].webkitGetAsEntry || + items[0].getAsEntry)) { + return this._handleFileTreeEntries( + $.map(items, function (item) { + var entry; + if (item.webkitGetAsEntry) { + entry = item.webkitGetAsEntry(); + if (entry) { + // Workaround for Chrome bug #149735: + entry._file = item.getAsFile(); + } + return entry; + } + return item.getAsEntry(); + }) + ); + } + return $.Deferred().resolve( + $.makeArray(dataTransfer.files) + ).promise(); + }, + + _getSingleFileInputFiles: function (fileInput) { + fileInput = $(fileInput); + var entries = fileInput.prop('webkitEntries') || + fileInput.prop('entries'), + files, + value; + if (entries && entries.length) { + return this._handleFileTreeEntries(entries); + } + files = $.makeArray(fileInput.prop('files')); + if (!files.length) { + value = fileInput.prop('value'); + if (!value) { + return $.Deferred().resolve([]).promise(); + } + // If the files property is not available, the browser does not + // support the File API and we add a pseudo File object with + // the input value as name with path information removed: + files = [{name: value.replace(/^.*\\/, '')}]; + } else if (files[0].name === undefined && files[0].fileName) { + // File normalization for Safari 4 and Firefox 3: + $.each(files, function (index, file) { + file.name = file.fileName; + file.size = file.fileSize; + }); + } + return $.Deferred().resolve(files).promise(); + }, + + _getFileInputFiles: function (fileInput) { + if (!(fileInput instanceof $) || fileInput.length === 1) { + return this._getSingleFileInputFiles(fileInput); + } + return $.when.apply( + $, + $.map(fileInput, this._getSingleFileInputFiles) + ).pipe(function () { + return Array.prototype.concat.apply( + [], + arguments + ); + }); + }, + + _onChange: function (e) { + var that = this, + data = { + fileInput: $(e.target), + form: $(e.target.form) + }; + this._getFileInputFiles(data.fileInput).always(function (files) { + data.files = files; + if (that.options.replaceFileInput) { + that._replaceFileInput(data.fileInput); + } + if (that._trigger( + 'change', + $.Event('change', {delegatedEvent: e}), + data + ) !== false) { + that._onAdd(e, data); + } + }); + }, + + _onPaste: function (e) { + var items = e.originalEvent && e.originalEvent.clipboardData && + e.originalEvent.clipboardData.items, + data = {files: []}; + if (items && items.length) { + $.each(items, function (index, item) { + var file = item.getAsFile && item.getAsFile(); + if (file) { + data.files.push(file); + } + }); + if (this._trigger( + 'paste', + $.Event('paste', {delegatedEvent: e}), + data + ) !== false) { + this._onAdd(e, data); + } + } + }, + + _onDrop: function (e) { + e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer; + var that = this, + dataTransfer = e.dataTransfer, + data = {}; + if (dataTransfer && dataTransfer.files && dataTransfer.files.length) { + e.preventDefault(); + this._getDroppedFiles(dataTransfer).always(function (files) { + data.files = files; + if (that._trigger( + 'drop', + $.Event('drop', {delegatedEvent: e}), + data + ) !== false) { + that._onAdd(e, data); + } + }); + } + }, + + _onDragOver: function (e) { + e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer; + var dataTransfer = e.dataTransfer; + if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1 && + this._trigger( + 'dragover', + $.Event('dragover', {delegatedEvent: e}) + ) !== false) { + e.preventDefault(); + dataTransfer.dropEffect = 'copy'; + } + }, + + _initEventHandlers: function () { + if (this._isXHRUpload(this.options)) { + this._on(this.options.dropZone, { + dragover: this._onDragOver, + drop: this._onDrop + }); + this._on(this.options.pasteZone, { + paste: this._onPaste + }); + } + if ($.support.fileInput) { + this._on(this.options.fileInput, { + change: this._onChange + }); + } + }, + + _destroyEventHandlers: function () { + this._off(this.options.dropZone, 'dragover drop'); + this._off(this.options.pasteZone, 'paste'); + this._off(this.options.fileInput, 'change'); + }, + + _setOption: function (key, value) { + var reinit = $.inArray(key, this._specialOptions) !== -1; + if (reinit) { + this._destroyEventHandlers(); + } + this._super(key, value); + if (reinit) { + this._initSpecialOptions(); + this._initEventHandlers(); + } + }, + + _initSpecialOptions: function () { + var options = this.options; + if (options.fileInput === undefined) { + options.fileInput = this.element.is('input[type="file"]') ? + this.element : this.element.find('input[type="file"]'); + } else if (!(options.fileInput instanceof $)) { + options.fileInput = $(options.fileInput); + } + if (!(options.dropZone instanceof $)) { + options.dropZone = $(options.dropZone); + } + if (!(options.pasteZone instanceof $)) { + options.pasteZone = $(options.pasteZone); + } + }, + + _getRegExp: function (str) { + var parts = str.split('/'), + modifiers = parts.pop(); + parts.shift(); + return new RegExp(parts.join('/'), modifiers); + }, + + _isRegExpOption: function (key, value) { + return key !== 'url' && $.type(value) === 'string' && + /^\/.*\/[igm]{0,3}$/.test(value); + }, + + _initDataAttributes: function () { + var that = this, + options = this.options; + // Initialize options set via HTML5 data-attributes: + $.each( + $(this.element[0].cloneNode(false)).data(), + function (key, value) { + if (that._isRegExpOption(key, value)) { + value = that._getRegExp(value); + } + options[key] = value; + } + ); + }, + + _create: function () { + this._initDataAttributes(); + this._initSpecialOptions(); + this._slots = []; + this._sequence = this._getXHRPromise(true); + this._sending = this._active = 0; + this._initProgressObject(this); + this._initEventHandlers(); + }, + + // This method is exposed to the widget API and allows to query + // the number of active uploads: + active: function () { + return this._active; + }, + + // This method is exposed to the widget API and allows to query + // the widget upload progress. + // It returns an object with loaded, total and bitrate properties + // for the running uploads: + progress: function () { + return this._progress; + }, + + // This method is exposed to the widget API and allows adding files + // using the fileupload API. The data parameter accepts an object which + // must have a files property and can contain additional options: + // .fileupload('add', {files: filesList}); + add: function (data) { + var that = this; + if (!data || this.options.disabled) { + return; + } + if (data.fileInput && !data.files) { + this._getFileInputFiles(data.fileInput).always(function (files) { + data.files = files; + that._onAdd(null, data); + }); + } else { + data.files = $.makeArray(data.files); + this._onAdd(null, data); + } + }, + + // This method is exposed to the widget API and allows sending files + // using the fileupload API. The data parameter accepts an object which + // must have a files or fileInput property and can contain additional options: + // .fileupload('send', {files: filesList}); + // The method returns a Promise object for the file upload call. + send: function (data) { + if (data && !this.options.disabled) { + if (data.fileInput && !data.files) { + var that = this, + dfd = $.Deferred(), + promise = dfd.promise(), + jqXHR, + aborted; + promise.abort = function () { + aborted = true; + if (jqXHR) { + return jqXHR.abort(); + } + dfd.reject(null, 'abort', 'abort'); + return promise; + }; + this._getFileInputFiles(data.fileInput).always( + function (files) { + if (aborted) { + return; + } + if (!files.length) { + dfd.reject(); + return; + } + data.files = files; + jqXHR = that._onSend(null, data).then( + function (result, textStatus, jqXHR) { + dfd.resolve(result, textStatus, jqXHR); + }, + function (jqXHR, textStatus, errorThrown) { + dfd.reject(jqXHR, textStatus, errorThrown); + } + ); + } + ); + return this._enhancePromise(promise); + } + data.files = $.makeArray(data.files); + if (data.files.length) { + return this._onSend(null, data); + } + } + return this._getXHRPromise(false, data && data.context); + } + + }); + +})); diff --git a/library/jqupload/js/jquery.iframe-transport.js b/library/jqupload/js/jquery.iframe-transport.js new file mode 100644 index 000000000..8d64b591b --- /dev/null +++ b/library/jqupload/js/jquery.iframe-transport.js @@ -0,0 +1,214 @@ +/* + * jQuery Iframe Transport Plugin 1.8.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + // Helper variable to create unique names for the transport iframes: + var counter = 0; + + // The iframe transport accepts four additional options: + // options.fileInput: a jQuery collection of file input fields + // options.paramName: the parameter name for the file form data, + // overrides the name property of the file input field(s), + // can be a string or an array of strings. + // options.formData: an array of objects with name and value properties, + // equivalent to the return data of .serializeArray(), e.g.: + // [{name: 'a', value: 1}, {name: 'b', value: 2}] + // options.initialIframeSrc: the URL of the initial iframe src, + // by default set to "javascript:false;" + $.ajaxTransport('iframe', function (options) { + if (options.async) { + // javascript:false as initial iframe src + // prevents warning popups on HTTPS in IE6: + /*jshint scripturl: true */ + var initialIframeSrc = options.initialIframeSrc || 'javascript:false;', + /*jshint scripturl: false */ + form, + iframe, + addParamChar; + return { + send: function (_, completeCallback) { + form = $('
      '); + form.attr('accept-charset', options.formAcceptCharset); + addParamChar = /\?/.test(options.url) ? '&' : '?'; + // XDomainRequest only supports GET and POST: + if (options.type === 'DELETE') { + options.url = options.url + addParamChar + '_method=DELETE'; + options.type = 'POST'; + } else if (options.type === 'PUT') { + options.url = options.url + addParamChar + '_method=PUT'; + options.type = 'POST'; + } else if (options.type === 'PATCH') { + options.url = options.url + addParamChar + '_method=PATCH'; + options.type = 'POST'; + } + // IE versions below IE8 cannot set the name property of + // elements that have already been added to the DOM, + // so we set the name along with the iframe HTML markup: + counter += 1; + iframe = $( + '' + ).bind('load', function () { + var fileInputClones, + paramNames = $.isArray(options.paramName) ? + options.paramName : [options.paramName]; + iframe + .unbind('load') + .bind('load', function () { + var response; + // Wrap in a try/catch block to catch exceptions thrown + // when trying to access cross-domain iframe contents: + try { + response = iframe.contents(); + // Google Chrome and Firefox do not throw an + // exception when calling iframe.contents() on + // cross-domain requests, so we unify the response: + if (!response.length || !response[0].firstChild) { + throw new Error(); + } + } catch (e) { + response = undefined; + } + // The complete callback returns the + // iframe content document as response object: + completeCallback( + 200, + 'success', + {'iframe': response} + ); + // Fix for IE endless progress bar activity bug + // (happens on form submits to iframe targets): + $('') + .appendTo(form); + window.setTimeout(function () { + // Removing the form in a setTimeout call + // allows Chrome's developer tools to display + // the response result + form.remove(); + }, 0); + }); + form + .prop('target', iframe.prop('name')) + .prop('action', options.url) + .prop('method', options.type); + if (options.formData) { + $.each(options.formData, function (index, field) { + $('') + .prop('name', field.name) + .val(field.value) + .appendTo(form); + }); + } + if (options.fileInput && options.fileInput.length && + options.type === 'POST') { + fileInputClones = options.fileInput.clone(); + // Insert a clone for each file input field: + options.fileInput.after(function (index) { + return fileInputClones[index]; + }); + if (options.paramName) { + options.fileInput.each(function (index) { + $(this).prop( + 'name', + paramNames[index] || options.paramName + ); + }); + } + // Appending the file input fields to the hidden form + // removes them from their original location: + form + .append(options.fileInput) + .prop('enctype', 'multipart/form-data') + // enctype must be set as encoding for IE: + .prop('encoding', 'multipart/form-data'); + // Remove the HTML5 form attribute from the input(s): + options.fileInput.removeAttr('form'); + } + form.submit(); + // Insert the file input fields at their original location + // by replacing the clones with the originals: + if (fileInputClones && fileInputClones.length) { + options.fileInput.each(function (index, input) { + var clone = $(fileInputClones[index]); + // Restore the original name and form properties: + $(input) + .prop('name', clone.prop('name')) + .attr('form', clone.attr('form')); + clone.replaceWith(input); + }); + } + }); + form.append(iframe).appendTo(document.body); + }, + abort: function () { + if (iframe) { + // javascript:false as iframe src aborts the request + // and prevents warning popups on HTTPS in IE6. + // concat is used to avoid the "Script URL" JSLint error: + iframe + .unbind('load') + .prop('src', initialIframeSrc); + } + if (form) { + form.remove(); + } + } + }; + } + }); + + // The iframe transport returns the iframe content document as response. + // The following adds converters from iframe to text, json, html, xml + // and script. + // Please note that the Content-Type for JSON responses has to be text/plain + // or text/html, if the browser doesn't include application/json in the + // Accept header, else IE will show a download dialog. + // The Content-Type for XML responses on the other hand has to be always + // application/xml or text/xml, so IE properly parses the XML response. + // See also + // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation + $.ajaxSetup({ + converters: { + 'iframe text': function (iframe) { + return iframe && $(iframe[0].body).text(); + }, + 'iframe json': function (iframe) { + return iframe && $.parseJSON($(iframe[0].body).text()); + }, + 'iframe html': function (iframe) { + return iframe && $(iframe[0].body).html(); + }, + 'iframe xml': function (iframe) { + var xmlDoc = iframe && iframe[0]; + return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc : + $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) || + $(xmlDoc.body).html()); + }, + 'iframe script': function (iframe) { + return iframe && $.globalEval($(iframe[0].body).text()); + } + } + }); + +})); diff --git a/library/jqupload/js/main.js b/library/jqupload/js/main.js new file mode 100644 index 000000000..8f57967a3 --- /dev/null +++ b/library/jqupload/js/main.js @@ -0,0 +1,75 @@ +/* + * jQuery File Upload Plugin JS Example 8.9.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* global $, window */ + +$(function () { + 'use strict'; + + // Initialize the jQuery File Upload widget: + $('#fileupload').fileupload({ + // Uncomment the following to send cross-domain cookies: + //xhrFields: {withCredentials: true}, + url: 'server/php/' + }); + + // Enable iframe cross-domain access via redirect option: + $('#fileupload').fileupload( + 'option', + 'redirect', + window.location.href.replace( + /\/[^\/]*$/, + '/cors/result.html?%s' + ) + ); + + if (window.location.hostname === 'blueimp.github.io') { + // Demo settings: + $('#fileupload').fileupload('option', { + url: '//jquery-file-upload.appspot.com/', + // Enable image resizing, except for Android and Opera, + // which actually support image resizing, but fail to + // send Blob objects via XHR requests: + disableImageResize: /Android(?!.*Chrome)|Opera/ + .test(window.navigator.userAgent), + maxFileSize: 5000000, + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i + }); + // Upload server status check for browsers with CORS support: + if ($.support.cors) { + $.ajax({ + url: '//jquery-file-upload.appspot.com/', + type: 'HEAD' + }).fail(function () { + $('
      ') + .text('Upload server currently unavailable - ' + + new Date()) + .appendTo('#fileupload'); + }); + } + } else { + // Load existing files: + $('#fileupload').addClass('fileupload-processing'); + $.ajax({ + // Uncomment the following to send cross-domain cookies: + //xhrFields: {withCredentials: true}, + url: $('#fileupload').fileupload('option', 'url'), + dataType: 'json', + context: $('#fileupload')[0] + }).always(function () { + $(this).removeClass('fileupload-processing'); + }).done(function (result) { + $(this).fileupload('option', 'done') + .call(this, $.Event('done'), {result: result}); + }); + } + +}); diff --git a/library/jqupload/js/vendor/jquery.ui.widget.js b/library/jqupload/js/vendor/jquery.ui.widget.js new file mode 100644 index 000000000..2d370893a --- /dev/null +++ b/library/jqupload/js/vendor/jquery.ui.widget.js @@ -0,0 +1,530 @@ +/* + * jQuery UI Widget 1.10.3+amd + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2013 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://api.jqueryui.com/jQuery.widget/ + */ + +(function (factory) { + if (typeof define === "function" && define.amd) { + // Register as an anonymous AMD module: + define(["jquery"], factory); + } else { + // Browser globals: + factory(jQuery); + } +}(function( $, undefined ) { + +var uuid = 0, + slice = Array.prototype.slice, + _cleanData = $.cleanData; +$.cleanData = function( elems ) { + for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { + try { + $( elem ).triggerHandler( "remove" ); + // http://bugs.jquery.com/ticket/8235 + } catch( e ) {} + } + _cleanData( elems ); +}; + +$.widget = function( name, base, prototype ) { + var fullName, existingConstructor, constructor, basePrototype, + // proxiedPrototype allows the provided prototype to remain unmodified + // so that it can be used as a mixin for multiple widgets (#8876) + proxiedPrototype = {}, + namespace = name.split( "." )[ 0 ]; + + name = name.split( "." )[ 1 ]; + fullName = namespace + "-" + name; + + if ( !prototype ) { + prototype = base; + base = $.Widget; + } + + // create selector for plugin + $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) { + return !!$.data( elem, fullName ); + }; + + $[ namespace ] = $[ namespace ] || {}; + existingConstructor = $[ namespace ][ name ]; + constructor = $[ namespace ][ name ] = function( options, element ) { + // allow instantiation without "new" keyword + if ( !this._createWidget ) { + return new constructor( options, element ); + } + + // allow instantiation without initializing for simple inheritance + // must use "new" keyword (the code above always passes args) + if ( arguments.length ) { + this._createWidget( options, element ); + } + }; + // extend with the existing constructor to carry over any static properties + $.extend( constructor, existingConstructor, { + version: prototype.version, + // copy the object used to create the prototype in case we need to + // redefine the widget later + _proto: $.extend( {}, prototype ), + // track widgets that inherit from this widget in case this widget is + // redefined after a widget inherits from it + _childConstructors: [] + }); + + basePrototype = new base(); + // we need to make the options hash a property directly on the new instance + // otherwise we'll modify the options hash on the prototype that we're + // inheriting from + basePrototype.options = $.widget.extend( {}, basePrototype.options ); + $.each( prototype, function( prop, value ) { + if ( !$.isFunction( value ) ) { + proxiedPrototype[ prop ] = value; + return; + } + proxiedPrototype[ prop ] = (function() { + var _super = function() { + return base.prototype[ prop ].apply( this, arguments ); + }, + _superApply = function( args ) { + return base.prototype[ prop ].apply( this, args ); + }; + return function() { + var __super = this._super, + __superApply = this._superApply, + returnValue; + + this._super = _super; + this._superApply = _superApply; + + returnValue = value.apply( this, arguments ); + + this._super = __super; + this._superApply = __superApply; + + return returnValue; + }; + })(); + }); + constructor.prototype = $.widget.extend( basePrototype, { + // TODO: remove support for widgetEventPrefix + // always use the name + a colon as the prefix, e.g., draggable:start + // don't prefix for widgets that aren't DOM-based + widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name + }, proxiedPrototype, { + constructor: constructor, + namespace: namespace, + widgetName: name, + widgetFullName: fullName + }); + + // If this widget is being redefined then we need to find all widgets that + // are inheriting from it and redefine all of them so that they inherit from + // the new version of this widget. We're essentially trying to replace one + // level in the prototype chain. + if ( existingConstructor ) { + $.each( existingConstructor._childConstructors, function( i, child ) { + var childPrototype = child.prototype; + + // redefine the child widget using the same prototype that was + // originally used, but inherit from the new version of the base + $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto ); + }); + // remove the list of existing child constructors from the old constructor + // so the old child constructors can be garbage collected + delete existingConstructor._childConstructors; + } else { + base._childConstructors.push( constructor ); + } + + $.widget.bridge( name, constructor ); +}; + +$.widget.extend = function( target ) { + var input = slice.call( arguments, 1 ), + inputIndex = 0, + inputLength = input.length, + key, + value; + for ( ; inputIndex < inputLength; inputIndex++ ) { + for ( key in input[ inputIndex ] ) { + value = input[ inputIndex ][ key ]; + if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { + // Clone objects + if ( $.isPlainObject( value ) ) { + target[ key ] = $.isPlainObject( target[ key ] ) ? + $.widget.extend( {}, target[ key ], value ) : + // Don't extend strings, arrays, etc. with objects + $.widget.extend( {}, value ); + // Copy everything else by reference + } else { + target[ key ] = value; + } + } + } + } + return target; +}; + +$.widget.bridge = function( name, object ) { + var fullName = object.prototype.widgetFullName || name; + $.fn[ name ] = function( options ) { + var isMethodCall = typeof options === "string", + args = slice.call( arguments, 1 ), + returnValue = this; + + // allow multiple hashes to be passed on init + options = !isMethodCall && args.length ? + $.widget.extend.apply( null, [ options ].concat(args) ) : + options; + + if ( isMethodCall ) { + this.each(function() { + var methodValue, + instance = $.data( this, fullName ); + if ( !instance ) { + return $.error( "cannot call methods on " + name + " prior to initialization; " + + "attempted to call method '" + options + "'" ); + } + if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { + return $.error( "no such method '" + options + "' for " + name + " widget instance" ); + } + methodValue = instance[ options ].apply( instance, args ); + if ( methodValue !== instance && methodValue !== undefined ) { + returnValue = methodValue && methodValue.jquery ? + returnValue.pushStack( methodValue.get() ) : + methodValue; + return false; + } + }); + } else { + this.each(function() { + var instance = $.data( this, fullName ); + if ( instance ) { + instance.option( options || {} )._init(); + } else { + $.data( this, fullName, new object( options, this ) ); + } + }); + } + + return returnValue; + }; +}; + +$.Widget = function( /* options, element */ ) {}; +$.Widget._childConstructors = []; + +$.Widget.prototype = { + widgetName: "widget", + widgetEventPrefix: "", + defaultElement: "
      ", + options: { + disabled: false, + + // callbacks + create: null + }, + _createWidget: function( options, element ) { + element = $( element || this.defaultElement || this )[ 0 ]; + this.element = $( element ); + this.uuid = uuid++; + this.eventNamespace = "." + this.widgetName + this.uuid; + this.options = $.widget.extend( {}, + this.options, + this._getCreateOptions(), + options ); + + this.bindings = $(); + this.hoverable = $(); + this.focusable = $(); + + if ( element !== this ) { + $.data( element, this.widgetFullName, this ); + this._on( true, this.element, { + remove: function( event ) { + if ( event.target === element ) { + this.destroy(); + } + } + }); + this.document = $( element.style ? + // element within the document + element.ownerDocument : + // element is window or document + element.document || element ); + this.window = $( this.document[0].defaultView || this.document[0].parentWindow ); + } + + this._create(); + this._trigger( "create", null, this._getCreateEventData() ); + this._init(); + }, + _getCreateOptions: $.noop, + _getCreateEventData: $.noop, + _create: $.noop, + _init: $.noop, + + destroy: function() { + this._destroy(); + // we can probably remove the unbind calls in 2.0 + // all event bindings should go through this._on() + this.element + .unbind( this.eventNamespace ) + // 1.9 BC for #7810 + // TODO remove dual storage + .removeData( this.widgetName ) + .removeData( this.widgetFullName ) + // support: jquery <1.6.3 + // http://bugs.jquery.com/ticket/9413 + .removeData( $.camelCase( this.widgetFullName ) ); + this.widget() + .unbind( this.eventNamespace ) + .removeAttr( "aria-disabled" ) + .removeClass( + this.widgetFullName + "-disabled " + + "ui-state-disabled" ); + + // clean up events and states + this.bindings.unbind( this.eventNamespace ); + this.hoverable.removeClass( "ui-state-hover" ); + this.focusable.removeClass( "ui-state-focus" ); + }, + _destroy: $.noop, + + widget: function() { + return this.element; + }, + + option: function( key, value ) { + var options = key, + parts, + curOption, + i; + + if ( arguments.length === 0 ) { + // don't return a reference to the internal hash + return $.widget.extend( {}, this.options ); + } + + if ( typeof key === "string" ) { + // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } + options = {}; + parts = key.split( "." ); + key = parts.shift(); + if ( parts.length ) { + curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); + for ( i = 0; i < parts.length - 1; i++ ) { + curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; + curOption = curOption[ parts[ i ] ]; + } + key = parts.pop(); + if ( value === undefined ) { + return curOption[ key ] === undefined ? null : curOption[ key ]; + } + curOption[ key ] = value; + } else { + if ( value === undefined ) { + return this.options[ key ] === undefined ? null : this.options[ key ]; + } + options[ key ] = value; + } + } + + this._setOptions( options ); + + return this; + }, + _setOptions: function( options ) { + var key; + + for ( key in options ) { + this._setOption( key, options[ key ] ); + } + + return this; + }, + _setOption: function( key, value ) { + this.options[ key ] = value; + + if ( key === "disabled" ) { + this.widget() + .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value ) + .attr( "aria-disabled", value ); + this.hoverable.removeClass( "ui-state-hover" ); + this.focusable.removeClass( "ui-state-focus" ); + } + + return this; + }, + + enable: function() { + return this._setOption( "disabled", false ); + }, + disable: function() { + return this._setOption( "disabled", true ); + }, + + _on: function( suppressDisabledCheck, element, handlers ) { + var delegateElement, + instance = this; + + // no suppressDisabledCheck flag, shuffle arguments + if ( typeof suppressDisabledCheck !== "boolean" ) { + handlers = element; + element = suppressDisabledCheck; + suppressDisabledCheck = false; + } + + // no element argument, shuffle and use this.element + if ( !handlers ) { + handlers = element; + element = this.element; + delegateElement = this.widget(); + } else { + // accept selectors, DOM elements + element = delegateElement = $( element ); + this.bindings = this.bindings.add( element ); + } + + $.each( handlers, function( event, handler ) { + function handlerProxy() { + // allow widgets to customize the disabled handling + // - disabled as an array instead of boolean + // - disabled class as method for disabling individual parts + if ( !suppressDisabledCheck && + ( instance.options.disabled === true || + $( this ).hasClass( "ui-state-disabled" ) ) ) { + return; + } + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + + // copy the guid so direct unbinding works + if ( typeof handler !== "string" ) { + handlerProxy.guid = handler.guid = + handler.guid || handlerProxy.guid || $.guid++; + } + + var match = event.match( /^(\w+)\s*(.*)$/ ), + eventName = match[1] + instance.eventNamespace, + selector = match[2]; + if ( selector ) { + delegateElement.delegate( selector, eventName, handlerProxy ); + } else { + element.bind( eventName, handlerProxy ); + } + }); + }, + + _off: function( element, eventName ) { + eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace; + element.unbind( eventName ).undelegate( eventName ); + }, + + _delay: function( handler, delay ) { + function handlerProxy() { + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + var instance = this; + return setTimeout( handlerProxy, delay || 0 ); + }, + + _hoverable: function( element ) { + this.hoverable = this.hoverable.add( element ); + this._on( element, { + mouseenter: function( event ) { + $( event.currentTarget ).addClass( "ui-state-hover" ); + }, + mouseleave: function( event ) { + $( event.currentTarget ).removeClass( "ui-state-hover" ); + } + }); + }, + + _focusable: function( element ) { + this.focusable = this.focusable.add( element ); + this._on( element, { + focusin: function( event ) { + $( event.currentTarget ).addClass( "ui-state-focus" ); + }, + focusout: function( event ) { + $( event.currentTarget ).removeClass( "ui-state-focus" ); + } + }); + }, + + _trigger: function( type, event, data ) { + var prop, orig, + callback = this.options[ type ]; + + data = data || {}; + event = $.Event( event ); + event.type = ( type === this.widgetEventPrefix ? + type : + this.widgetEventPrefix + type ).toLowerCase(); + // the original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[ 0 ]; + + // copy original event properties over to the new event + orig = event.originalEvent; + if ( orig ) { + for ( prop in orig ) { + if ( !( prop in event ) ) { + event[ prop ] = orig[ prop ]; + } + } + } + + this.element.trigger( event, data ); + return !( $.isFunction( callback ) && + callback.apply( this.element[0], [ event ].concat( data ) ) === false || + event.isDefaultPrevented() ); + } +}; + +$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { + $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { + if ( typeof options === "string" ) { + options = { effect: options }; + } + var hasOptions, + effectName = !options ? + method : + options === true || typeof options === "number" ? + defaultEffect : + options.effect || defaultEffect; + options = options || {}; + if ( typeof options === "number" ) { + options = { duration: options }; + } + hasOptions = !$.isEmptyObject( options ); + options.complete = callback; + if ( options.delay ) { + element.delay( options.delay ); + } + if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { + element[ method ]( options ); + } else if ( effectName !== method && element[ effectName ] ) { + element[ effectName ]( options.duration, options.easing, callback ); + } else { + element.queue(function( next ) { + $( this )[ method ](); + if ( callback ) { + callback.call( element[ 0 ] ); + } + next(); + }); + } + }; +}); + +})); diff --git a/library/jqupload/package.json b/library/jqupload/package.json new file mode 100644 index 000000000..85852c35a --- /dev/null +++ b/library/jqupload/package.json @@ -0,0 +1,54 @@ +{ + "name": "blueimp-file-upload", + "version": "9.5.2", + "title": "jQuery File Upload", + "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", + "keywords": [ + "jquery", + "file", + "upload", + "widget", + "multiple", + "selection", + "drag", + "drop", + "progress", + "preview", + "cross-domain", + "cross-site", + "chunk", + "resume", + "gae", + "go", + "python", + "php", + "bootstrap" + ], + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "author": { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + }, + "maintainers": [ + { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + } + ], + "repository": { + "type": "git", + "url": "git://github.com/blueimp/jQuery-File-Upload.git" + }, + "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } + ], + "devDependencies": { + "grunt": "~0.4.2", + "grunt-bump-build-git": "~1.1.1", + "grunt-contrib-jshint": "~0.8.0" + } +} diff --git a/library/jqupload/server/gae-go/app.yaml b/library/jqupload/server/gae-go/app.yaml new file mode 100644 index 000000000..2d09daa56 --- /dev/null +++ b/library/jqupload/server/gae-go/app.yaml @@ -0,0 +1,12 @@ +application: jquery-file-upload +version: 2 +runtime: go +api_version: go1 + +handlers: +- url: /(favicon\.ico|robots\.txt) + static_files: static/\1 + upload: static/(.*) + expiration: '1d' +- url: /.* + script: _go_app diff --git a/library/jqupload/server/gae-go/app/main.go b/library/jqupload/server/gae-go/app/main.go new file mode 100644 index 000000000..f995f73a8 --- /dev/null +++ b/library/jqupload/server/gae-go/app/main.go @@ -0,0 +1,296 @@ +/* + * jQuery File Upload Plugin GAE Go Example 3.1.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +package app + +import ( + "appengine" + "appengine/blobstore" + "appengine/image" + "appengine/taskqueue" + "bytes" + "encoding/json" + "fmt" + "io" + "log" + "mime/multipart" + "net/http" + "net/url" + "regexp" + "strings" + "time" +) + +const ( + WEBSITE = "http://blueimp.github.io/jQuery-File-Upload/" + MIN_FILE_SIZE = 1 // bytes + MAX_FILE_SIZE = 5000000 // bytes + IMAGE_TYPES = "image/(gif|p?jpeg|(x-)?png)" + ACCEPT_FILE_TYPES = IMAGE_TYPES + EXPIRATION_TIME = 300 // seconds + THUMBNAIL_PARAM = "=s80" +) + +var ( + imageTypes = regexp.MustCompile(IMAGE_TYPES) + acceptFileTypes = regexp.MustCompile(ACCEPT_FILE_TYPES) +) + +type FileInfo struct { + Key appengine.BlobKey `json:"-"` + Url string `json:"url,omitempty"` + ThumbnailUrl string `json:"thumbnailUrl,omitempty"` + Name string `json:"name"` + Type string `json:"type"` + Size int64 `json:"size"` + Error string `json:"error,omitempty"` + DeleteUrl string `json:"deleteUrl,omitempty"` + DeleteType string `json:"deleteType,omitempty"` +} + +func (fi *FileInfo) ValidateType() (valid bool) { + if acceptFileTypes.MatchString(fi.Type) { + return true + } + fi.Error = "Filetype not allowed" + return false +} + +func (fi *FileInfo) ValidateSize() (valid bool) { + if fi.Size < MIN_FILE_SIZE { + fi.Error = "File is too small" + } else if fi.Size > MAX_FILE_SIZE { + fi.Error = "File is too big" + } else { + return true + } + return false +} + +func (fi *FileInfo) CreateUrls(r *http.Request, c appengine.Context) { + u := &url.URL{ + Scheme: r.URL.Scheme, + Host: appengine.DefaultVersionHostname(c), + Path: "/", + } + uString := u.String() + fi.Url = uString + escape(string(fi.Key)) + "/" + + escape(string(fi.Name)) + fi.DeleteUrl = fi.Url + "?delete=true" + fi.DeleteType = "DELETE" + if imageTypes.MatchString(fi.Type) { + servingUrl, err := image.ServingURL( + c, + fi.Key, + &image.ServingURLOptions{ + Secure: strings.HasSuffix(u.Scheme, "s"), + Size: 0, + Crop: false, + }, + ) + check(err) + fi.ThumbnailUrl = servingUrl.String() + THUMBNAIL_PARAM + } +} + +func check(err error) { + if err != nil { + panic(err) + } +} + +func escape(s string) string { + return strings.Replace(url.QueryEscape(s), "+", "%20", -1) +} + +func delayedDelete(c appengine.Context, fi *FileInfo) { + if key := string(fi.Key); key != "" { + task := &taskqueue.Task{ + Path: "/" + escape(key) + "/-", + Method: "DELETE", + Delay: time.Duration(EXPIRATION_TIME) * time.Second, + } + taskqueue.Add(c, task, "") + } +} + +func handleUpload(r *http.Request, p *multipart.Part) (fi *FileInfo) { + fi = &FileInfo{ + Name: p.FileName(), + Type: p.Header.Get("Content-Type"), + } + if !fi.ValidateType() { + return + } + defer func() { + if rec := recover(); rec != nil { + log.Println(rec) + fi.Error = rec.(error).Error() + } + }() + lr := &io.LimitedReader{R: p, N: MAX_FILE_SIZE + 1} + context := appengine.NewContext(r) + w, err := blobstore.Create(context, fi.Type) + defer func() { + w.Close() + fi.Size = MAX_FILE_SIZE + 1 - lr.N + fi.Key, err = w.Key() + check(err) + if !fi.ValidateSize() { + err := blobstore.Delete(context, fi.Key) + check(err) + return + } + delayedDelete(context, fi) + fi.CreateUrls(r, context) + }() + check(err) + _, err = io.Copy(w, lr) + return +} + +func getFormValue(p *multipart.Part) string { + var b bytes.Buffer + io.CopyN(&b, p, int64(1<<20)) // Copy max: 1 MiB + return b.String() +} + +func handleUploads(r *http.Request) (fileInfos []*FileInfo) { + fileInfos = make([]*FileInfo, 0) + mr, err := r.MultipartReader() + check(err) + r.Form, err = url.ParseQuery(r.URL.RawQuery) + check(err) + part, err := mr.NextPart() + for err == nil { + if name := part.FormName(); name != "" { + if part.FileName() != "" { + fileInfos = append(fileInfos, handleUpload(r, part)) + } else { + r.Form[name] = append(r.Form[name], getFormValue(part)) + } + } + part, err = mr.NextPart() + } + return +} + +func get(w http.ResponseWriter, r *http.Request) { + if r.URL.Path == "/" { + http.Redirect(w, r, WEBSITE, http.StatusFound) + return + } + parts := strings.Split(r.URL.Path, "/") + if len(parts) == 3 { + if key := parts[1]; key != "" { + blobKey := appengine.BlobKey(key) + bi, err := blobstore.Stat(appengine.NewContext(r), blobKey) + if err == nil { + w.Header().Add("X-Content-Type-Options", "nosniff") + if !imageTypes.MatchString(bi.ContentType) { + w.Header().Add("Content-Type", "application/octet-stream") + w.Header().Add( + "Content-Disposition", + fmt.Sprintf("attachment; filename=\"%s\"", parts[2]), + ) + } + w.Header().Add( + "Cache-Control", + fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME), + ) + blobstore.Send(w, blobKey) + return + } + } + } + http.Error(w, "404 Not Found", http.StatusNotFound) +} + +func post(w http.ResponseWriter, r *http.Request) { + result := make(map[string][]*FileInfo, 1) + result["files"] = handleUploads(r) + b, err := json.Marshal(result) + check(err) + if redirect := r.FormValue("redirect"); redirect != "" { + if strings.Contains(redirect, "%s") { + redirect = fmt.Sprintf( + redirect, + escape(string(b)), + ) + } + http.Redirect(w, r, redirect, http.StatusFound) + return + } + w.Header().Set("Cache-Control", "no-cache") + jsonType := "application/json" + if strings.Index(r.Header.Get("Accept"), jsonType) != -1 { + w.Header().Set("Content-Type", jsonType) + } + fmt.Fprintln(w, string(b)) +} + +func delete(w http.ResponseWriter, r *http.Request) { + parts := strings.Split(r.URL.Path, "/") + if len(parts) != 3 { + return + } + result := make(map[string]bool, 1) + if key := parts[1]; key != "" { + c := appengine.NewContext(r) + blobKey := appengine.BlobKey(key) + err := blobstore.Delete(c, blobKey) + check(err) + err = image.DeleteServingURL(c, blobKey) + check(err) + result[key] = true + } + jsonType := "application/json" + if strings.Index(r.Header.Get("Accept"), jsonType) != -1 { + w.Header().Set("Content-Type", jsonType) + } + b, err := json.Marshal(result) + check(err) + fmt.Fprintln(w, string(b)) +} + +func handle(w http.ResponseWriter, r *http.Request) { + params, err := url.ParseQuery(r.URL.RawQuery) + check(err) + w.Header().Add("Access-Control-Allow-Origin", "*") + w.Header().Add( + "Access-Control-Allow-Methods", + "OPTIONS, HEAD, GET, POST, PUT, DELETE", + ) + w.Header().Add( + "Access-Control-Allow-Headers", + "Content-Type, Content-Range, Content-Disposition", + ) + switch r.Method { + case "OPTIONS": + case "HEAD": + case "GET": + get(w, r) + case "POST": + if len(params["_method"]) > 0 && params["_method"][0] == "DELETE" { + delete(w, r) + } else { + post(w, r) + } + case "DELETE": + delete(w, r) + default: + http.Error(w, "501 Not Implemented", http.StatusNotImplemented) + } +} + +func init() { + http.HandleFunc("/", handle) +} diff --git a/library/jqupload/server/gae-go/static/robots.txt b/library/jqupload/server/gae-go/static/robots.txt new file mode 100644 index 000000000..eb0536286 --- /dev/null +++ b/library/jqupload/server/gae-go/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: diff --git a/library/jqupload/server/gae-python/app.yaml b/library/jqupload/server/gae-python/app.yaml new file mode 100644 index 000000000..5fe123f59 --- /dev/null +++ b/library/jqupload/server/gae-python/app.yaml @@ -0,0 +1,16 @@ +application: jquery-file-upload +version: 1 +runtime: python27 +api_version: 1 +threadsafe: true + +builtins: +- deferred: on + +handlers: +- url: /(favicon\.ico|robots\.txt) + static_files: static/\1 + upload: static/(.*) + expiration: '1d' +- url: /.* + script: main.app diff --git a/library/jqupload/server/gae-python/main.py b/library/jqupload/server/gae-python/main.py new file mode 100644 index 000000000..37aa44e38 --- /dev/null +++ b/library/jqupload/server/gae-python/main.py @@ -0,0 +1,170 @@ +# -*- coding: utf-8 -*- +# +# jQuery File Upload Plugin GAE Python Example 2.1.1 +# https://github.com/blueimp/jQuery-File-Upload +# +# Copyright 2011, Sebastian Tschan +# https://blueimp.net +# +# Licensed under the MIT license: +# http://www.opensource.org/licenses/MIT +# + +from __future__ import with_statement +from google.appengine.api import files, images +from google.appengine.ext import blobstore, deferred +from google.appengine.ext.webapp import blobstore_handlers +import json +import re +import urllib +import webapp2 + +WEBSITE = 'http://blueimp.github.io/jQuery-File-Upload/' +MIN_FILE_SIZE = 1 # bytes +MAX_FILE_SIZE = 5000000 # bytes +IMAGE_TYPES = re.compile('image/(gif|p?jpeg|(x-)?png)') +ACCEPT_FILE_TYPES = IMAGE_TYPES +THUMBNAIL_MODIFICATOR = '=s80' # max width / height +EXPIRATION_TIME = 300 # seconds + + +def cleanup(blob_keys): + blobstore.delete(blob_keys) + + +class UploadHandler(webapp2.RequestHandler): + + def initialize(self, request, response): + super(UploadHandler, self).initialize(request, response) + self.response.headers['Access-Control-Allow-Origin'] = '*' + self.response.headers[ + 'Access-Control-Allow-Methods' + ] = 'OPTIONS, HEAD, GET, POST, PUT, DELETE' + self.response.headers[ + 'Access-Control-Allow-Headers' + ] = 'Content-Type, Content-Range, Content-Disposition' + + def validate(self, file): + if file['size'] < MIN_FILE_SIZE: + file['error'] = 'File is too small' + elif file['size'] > MAX_FILE_SIZE: + file['error'] = 'File is too big' + elif not ACCEPT_FILE_TYPES.match(file['type']): + file['error'] = 'Filetype not allowed' + else: + return True + return False + + def get_file_size(self, file): + file.seek(0, 2) # Seek to the end of the file + size = file.tell() # Get the position of EOF + file.seek(0) # Reset the file position to the beginning + return size + + def write_blob(self, data, info): + blob = files.blobstore.create( + mime_type=info['type'], + _blobinfo_uploaded_filename=info['name'] + ) + with files.open(blob, 'a') as f: + f.write(data) + files.finalize(blob) + return files.blobstore.get_blob_key(blob) + + def handle_upload(self): + results = [] + blob_keys = [] + for name, fieldStorage in self.request.POST.items(): + if type(fieldStorage) is unicode: + continue + result = {} + result['name'] = re.sub( + r'^.*\\', + '', + fieldStorage.filename + ) + result['type'] = fieldStorage.type + result['size'] = self.get_file_size(fieldStorage.file) + if self.validate(result): + blob_key = str( + self.write_blob(fieldStorage.value, result) + ) + blob_keys.append(blob_key) + result['deleteType'] = 'DELETE' + result['deleteUrl'] = self.request.host_url +\ + '/?key=' + urllib.quote(blob_key, '') + if (IMAGE_TYPES.match(result['type'])): + try: + result['url'] = images.get_serving_url( + blob_key, + secure_url=self.request.host_url.startswith( + 'https' + ) + ) + result['thumbnailUrl'] = result['url'] +\ + THUMBNAIL_MODIFICATOR + except: # Could not get an image serving url + pass + if not 'url' in result: + result['url'] = self.request.host_url +\ + '/' + blob_key + '/' + urllib.quote( + result['name'].encode('utf-8'), '') + results.append(result) + deferred.defer( + cleanup, + blob_keys, + _countdown=EXPIRATION_TIME + ) + return results + + def options(self): + pass + + def head(self): + pass + + def get(self): + self.redirect(WEBSITE) + + def post(self): + if (self.request.get('_method') == 'DELETE'): + return self.delete() + result = {'files': self.handle_upload()} + s = json.dumps(result, separators=(',', ':')) + redirect = self.request.get('redirect') + if redirect: + return self.redirect(str( + redirect.replace('%s', urllib.quote(s, ''), 1) + )) + if 'application/json' in self.request.headers.get('Accept'): + self.response.headers['Content-Type'] = 'application/json' + self.response.write(s) + + def delete(self): + key = self.request.get('key') or '' + blobstore.delete(key) + s = json.dumps({key: True}, separators=(',', ':')) + if 'application/json' in self.request.headers.get('Accept'): + self.response.headers['Content-Type'] = 'application/json' + self.response.write(s) + + +class DownloadHandler(blobstore_handlers.BlobstoreDownloadHandler): + def get(self, key, filename): + if not blobstore.get(key): + self.error(404) + else: + # Prevent browsers from MIME-sniffing the content-type: + self.response.headers['X-Content-Type-Options'] = 'nosniff' + # Cache for the expiration time: + self.response.headers['Cache-Control'] = 'public,max-age=%d' % EXPIRATION_TIME + # Send the file forcing a download dialog: + self.send_blob(key, save_as=filename, content_type='application/octet-stream') + +app = webapp2.WSGIApplication( + [ + ('/', UploadHandler), + ('/([^/]+)/([^/]+)', DownloadHandler) + ], + debug=True +) diff --git a/library/jqupload/server/gae-python/static/robots.txt b/library/jqupload/server/gae-python/static/robots.txt new file mode 100644 index 000000000..eb0536286 --- /dev/null +++ b/library/jqupload/server/gae-python/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: diff --git a/library/jqupload/server/node/.gitignore b/library/jqupload/server/node/.gitignore new file mode 100644 index 000000000..9daa8247d --- /dev/null +++ b/library/jqupload/server/node/.gitignore @@ -0,0 +1,2 @@ +.DS_Store +node_modules diff --git a/library/jqupload/server/node/package.json b/library/jqupload/server/node/package.json new file mode 100644 index 000000000..dd38c50ca --- /dev/null +++ b/library/jqupload/server/node/package.json @@ -0,0 +1,41 @@ +{ + "name": "blueimp-file-upload-node", + "version": "2.1.0", + "title": "jQuery File Upload Node.js example", + "description": "Node.js implementation example of a file upload handler for jQuery File Upload.", + "keywords": [ + "file", + "upload", + "cross-domain", + "cross-site", + "node" + ], + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "author": { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + }, + "maintainers": [ + { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + } + ], + "repository": { + "type": "git", + "url": "git://github.com/blueimp/jQuery-File-Upload.git" + }, + "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } + ], + "dependencies": { + "formidable": ">=1.0.11", + "node-static": ">=0.6.5", + "imagemagick": ">=0.1.3" + }, + "main": "server.js" +} diff --git a/library/jqupload/server/node/public/files/.gitignore b/library/jqupload/server/node/public/files/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/library/jqupload/server/node/public/files/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/library/jqupload/server/node/server.js b/library/jqupload/server/node/server.js new file mode 100755 index 000000000..5eb07a6ed --- /dev/null +++ b/library/jqupload/server/node/server.js @@ -0,0 +1,292 @@ +#!/usr/bin/env node +/* + * jQuery File Upload Plugin Node.js Example 2.1.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* jshint nomen:false */ +/* global require, __dirname, unescape, console */ + +(function (port) { + 'use strict'; + var path = require('path'), + fs = require('fs'), + // Since Node 0.8, .existsSync() moved from path to fs: + _existsSync = fs.existsSync || path.existsSync, + formidable = require('formidable'), + nodeStatic = require('node-static'), + imageMagick = require('imagemagick'), + options = { + tmpDir: __dirname + '/tmp', + publicDir: __dirname + '/public', + uploadDir: __dirname + '/public/files', + uploadUrl: '/files/', + maxPostSize: 11000000000, // 11 GB + minFileSize: 1, + maxFileSize: 10000000000, // 10 GB + acceptFileTypes: /.+/i, + // Files not matched by this regular expression force a download dialog, + // to prevent executing any scripts in the context of the service domain: + inlineFileTypes: /\.(gif|jpe?g|png)$/i, + imageTypes: /\.(gif|jpe?g|png)$/i, + imageVersions: { + 'thumbnail': { + width: 80, + height: 80 + } + }, + accessControl: { + allowOrigin: '*', + allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE', + allowHeaders: 'Content-Type, Content-Range, Content-Disposition' + }, + /* Uncomment and edit this section to provide the service via HTTPS: + ssl: { + key: fs.readFileSync('/Applications/XAMPP/etc/ssl.key/server.key'), + cert: fs.readFileSync('/Applications/XAMPP/etc/ssl.crt/server.crt') + }, + */ + nodeStatic: { + cache: 3600 // seconds to cache served files + } + }, + utf8encode = function (str) { + return unescape(encodeURIComponent(str)); + }, + fileServer = new nodeStatic.Server(options.publicDir, options.nodeStatic), + nameCountRegexp = /(?:(?: \(([\d]+)\))?(\.[^.]+))?$/, + nameCountFunc = function (s, index, ext) { + return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || ''); + }, + FileInfo = function (file) { + this.name = file.name; + this.size = file.size; + this.type = file.type; + this.deleteType = 'DELETE'; + }, + UploadHandler = function (req, res, callback) { + this.req = req; + this.res = res; + this.callback = callback; + }, + serve = function (req, res) { + res.setHeader( + 'Access-Control-Allow-Origin', + options.accessControl.allowOrigin + ); + res.setHeader( + 'Access-Control-Allow-Methods', + options.accessControl.allowMethods + ); + res.setHeader( + 'Access-Control-Allow-Headers', + options.accessControl.allowHeaders + ); + var handleResult = function (result, redirect) { + if (redirect) { + res.writeHead(302, { + 'Location': redirect.replace( + /%s/, + encodeURIComponent(JSON.stringify(result)) + ) + }); + res.end(); + } else { + res.writeHead(200, { + 'Content-Type': req.headers.accept + .indexOf('application/json') !== -1 ? + 'application/json' : 'text/plain' + }); + res.end(JSON.stringify(result)); + } + }, + setNoCacheHeaders = function () { + res.setHeader('Pragma', 'no-cache'); + res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate'); + res.setHeader('Content-Disposition', 'inline; filename="files.json"'); + }, + handler = new UploadHandler(req, res, handleResult); + switch (req.method) { + case 'OPTIONS': + res.end(); + break; + case 'HEAD': + case 'GET': + if (req.url === '/') { + setNoCacheHeaders(); + if (req.method === 'GET') { + handler.get(); + } else { + res.end(); + } + } else { + fileServer.serve(req, res); + } + break; + case 'POST': + setNoCacheHeaders(); + handler.post(); + break; + case 'DELETE': + handler.destroy(); + break; + default: + res.statusCode = 405; + res.end(); + } + }; + fileServer.respond = function (pathname, status, _headers, files, stat, req, res, finish) { + // Prevent browsers from MIME-sniffing the content-type: + _headers['X-Content-Type-Options'] = 'nosniff'; + if (!options.inlineFileTypes.test(files[0])) { + // Force a download dialog for unsafe file extensions: + _headers['Content-Type'] = 'application/octet-stream'; + _headers['Content-Disposition'] = 'attachment; filename="' + + utf8encode(path.basename(files[0])) + '"'; + } + nodeStatic.Server.prototype.respond + .call(this, pathname, status, _headers, files, stat, req, res, finish); + }; + FileInfo.prototype.validate = function () { + if (options.minFileSize && options.minFileSize > this.size) { + this.error = 'File is too small'; + } else if (options.maxFileSize && options.maxFileSize < this.size) { + this.error = 'File is too big'; + } else if (!options.acceptFileTypes.test(this.name)) { + this.error = 'Filetype not allowed'; + } + return !this.error; + }; + FileInfo.prototype.safeName = function () { + // Prevent directory traversal and creating hidden system files: + this.name = path.basename(this.name).replace(/^\.+/, ''); + // Prevent overwriting existing files: + while (_existsSync(options.uploadDir + '/' + this.name)) { + this.name = this.name.replace(nameCountRegexp, nameCountFunc); + } + }; + FileInfo.prototype.initUrls = function (req) { + if (!this.error) { + var that = this, + baseUrl = (options.ssl ? 'https:' : 'http:') + + '//' + req.headers.host + options.uploadUrl; + this.url = this.deleteUrl = baseUrl + encodeURIComponent(this.name); + Object.keys(options.imageVersions).forEach(function (version) { + if (_existsSync( + options.uploadDir + '/' + version + '/' + that.name + )) { + that[version + 'Url'] = baseUrl + version + '/' + + encodeURIComponent(that.name); + } + }); + } + }; + UploadHandler.prototype.get = function () { + var handler = this, + files = []; + fs.readdir(options.uploadDir, function (err, list) { + list.forEach(function (name) { + var stats = fs.statSync(options.uploadDir + '/' + name), + fileInfo; + if (stats.isFile() && name[0] !== '.') { + fileInfo = new FileInfo({ + name: name, + size: stats.size + }); + fileInfo.initUrls(handler.req); + files.push(fileInfo); + } + }); + handler.callback({files: files}); + }); + }; + UploadHandler.prototype.post = function () { + var handler = this, + form = new formidable.IncomingForm(), + tmpFiles = [], + files = [], + map = {}, + counter = 1, + redirect, + finish = function () { + counter -= 1; + if (!counter) { + files.forEach(function (fileInfo) { + fileInfo.initUrls(handler.req); + }); + handler.callback({files: files}, redirect); + } + }; + form.uploadDir = options.tmpDir; + form.on('fileBegin', function (name, file) { + tmpFiles.push(file.path); + var fileInfo = new FileInfo(file, handler.req, true); + fileInfo.safeName(); + map[path.basename(file.path)] = fileInfo; + files.push(fileInfo); + }).on('field', function (name, value) { + if (name === 'redirect') { + redirect = value; + } + }).on('file', function (name, file) { + var fileInfo = map[path.basename(file.path)]; + fileInfo.size = file.size; + if (!fileInfo.validate()) { + fs.unlink(file.path); + return; + } + fs.renameSync(file.path, options.uploadDir + '/' + fileInfo.name); + if (options.imageTypes.test(fileInfo.name)) { + Object.keys(options.imageVersions).forEach(function (version) { + counter += 1; + var opts = options.imageVersions[version]; + imageMagick.resize({ + width: opts.width, + height: opts.height, + srcPath: options.uploadDir + '/' + fileInfo.name, + dstPath: options.uploadDir + '/' + version + '/' + + fileInfo.name + }, finish); + }); + } + }).on('aborted', function () { + tmpFiles.forEach(function (file) { + fs.unlink(file); + }); + }).on('error', function (e) { + console.log(e); + }).on('progress', function (bytesReceived) { + if (bytesReceived > options.maxPostSize) { + handler.req.connection.destroy(); + } + }).on('end', finish).parse(handler.req); + }; + UploadHandler.prototype.destroy = function () { + var handler = this, + fileName; + if (handler.req.url.slice(0, options.uploadUrl.length) === options.uploadUrl) { + fileName = path.basename(decodeURIComponent(handler.req.url)); + if (fileName[0] !== '.') { + fs.unlink(options.uploadDir + '/' + fileName, function (ex) { + Object.keys(options.imageVersions).forEach(function (version) { + fs.unlink(options.uploadDir + '/' + version + '/' + fileName); + }); + handler.callback({success: !ex}); + }); + return; + } + } + handler.callback({success: false}); + }; + if (options.ssl) { + require('https').createServer(options.ssl, serve).listen(port); + } else { + require('http').createServer(serve).listen(port); + } +}(8888)); diff --git a/library/jqupload/server/node/tmp/.gitignore b/library/jqupload/server/node/tmp/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/library/jqupload/server/php/UploadHandler.php b/library/jqupload/server/php/UploadHandler.php new file mode 100644 index 000000000..66545b12a --- /dev/null +++ b/library/jqupload/server/php/UploadHandler.php @@ -0,0 +1,1329 @@ + 'The uploaded file exceeds the upload_max_filesize directive in php.ini', + 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', + 3 => 'The uploaded file was only partially uploaded', + 4 => 'No file was uploaded', + 6 => 'Missing a temporary folder', + 7 => 'Failed to write file to disk', + 8 => 'A PHP extension stopped the file upload', + 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', + 'max_file_size' => 'File is too big', + 'min_file_size' => 'File is too small', + 'accept_file_types' => 'Filetype not allowed', + 'max_number_of_files' => 'Maximum number of files exceeded', + 'max_width' => 'Image exceeds maximum width', + 'min_width' => 'Image requires a minimum width', + 'max_height' => 'Image exceeds maximum height', + 'min_height' => 'Image requires a minimum height', + 'abort' => 'File upload aborted', + 'image_resize' => 'Failed to resize image' + ); + + protected $image_objects = array(); + + function __construct($options = null, $initialize = true, $error_messages = null) { + $this->options = array( + 'script_url' => $this->get_full_url().'/', + 'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/files/', + 'upload_url' => $this->get_full_url().'/files/', + 'user_dirs' => false, + 'mkdir_mode' => 0755, + 'param_name' => 'files', + // Set the following option to 'POST', if your server does not support + // DELETE requests. This is a parameter sent to the client: + 'delete_type' => 'DELETE', + 'access_control_allow_origin' => '*', + 'access_control_allow_credentials' => false, + 'access_control_allow_methods' => array( + 'OPTIONS', + 'HEAD', + 'GET', + 'POST', + 'PUT', + 'PATCH', + 'DELETE' + ), + 'access_control_allow_headers' => array( + 'Content-Type', + 'Content-Range', + 'Content-Disposition' + ), + // Enable to provide file downloads via GET requests to the PHP script: + // 1. Set to 1 to download files via readfile method through PHP + // 2. Set to 2 to send a X-Sendfile header for lighttpd/Apache + // 3. Set to 3 to send a X-Accel-Redirect header for nginx + // If set to 2 or 3, adjust the upload_url option to the base path of + // the redirect parameter, e.g. '/files/'. + 'download_via_php' => false, + // Read files in chunks to avoid memory limits when download_via_php + // is enabled, set to 0 to disable chunked reading of files: + 'readfile_chunk_size' => 10 * 1024 * 1024, // 10 MiB + // Defines which files can be displayed inline when downloaded: + 'inline_file_types' => '/\.(gif|jpe?g|png)$/i', + // Defines which files (based on their names) are accepted for upload: + 'accept_file_types' => '/.+$/i', + // The php.ini settings upload_max_filesize and post_max_size + // take precedence over the following max_file_size setting: + 'max_file_size' => null, + 'min_file_size' => 1, + // The maximum number of files for the upload directory: + 'max_number_of_files' => null, + // Defines which files are handled as image files: + 'image_file_types' => '/\.(gif|jpe?g|png)$/i', + // Image resolution restrictions: + 'max_width' => null, + 'max_height' => null, + 'min_width' => 1, + 'min_height' => 1, + // Set the following option to false to enable resumable uploads: + 'discard_aborted_uploads' => true, + // Set to 0 to use the GD library to scale and orient images, + // set to 1 to use imagick (if installed, falls back to GD), + // set to 2 to use the ImageMagick convert binary directly: + 'image_library' => 1, + // Uncomment the following to define an array of resource limits + // for imagick: + /* + 'imagick_resource_limits' => array( + imagick::RESOURCETYPE_MAP => 32, + imagick::RESOURCETYPE_MEMORY => 32 + ), + */ + // Command or path for to the ImageMagick convert binary: + 'convert_bin' => 'convert', + // Uncomment the following to add parameters in front of each + // ImageMagick convert call (the limit constraints seem only + // to have an effect if put in front): + /* + 'convert_params' => '-limit memory 32MiB -limit map 32MiB', + */ + // Command or path for to the ImageMagick identify binary: + 'identify_bin' => 'identify', + 'image_versions' => array( + // The empty image version key defines options for the original image: + '' => array( + // Automatically rotate images based on EXIF meta data: + 'auto_orient' => true + ), + // Uncomment the following to create medium sized images: + /* + 'medium' => array( + 'max_width' => 800, + 'max_height' => 600 + ), + */ + 'thumbnail' => array( + // Uncomment the following to use a defined directory for the thumbnails + // instead of a subdirectory based on the version identifier. + // Make sure that this directory doesn't allow execution of files if you + // don't pose any restrictions on the type of uploaded files, e.g. by + // copying the .htaccess file from the files directory for Apache: + //'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/thumb/', + //'upload_url' => $this->get_full_url().'/thumb/', + // Uncomment the following to force the max + // dimensions and e.g. create square thumbnails: + //'crop' => true, + 'max_width' => 80, + 'max_height' => 80 + ) + ) + ); + if ($options) { + $this->options = $options + $this->options; + } + if ($error_messages) { + $this->error_messages = $error_messages + $this->error_messages; + } + if ($initialize) { + $this->initialize(); + } + } + + protected function initialize() { + switch ($this->get_server_var('REQUEST_METHOD')) { + case 'OPTIONS': + case 'HEAD': + $this->head(); + break; + case 'GET': + $this->get(); + break; + case 'PATCH': + case 'PUT': + case 'POST': + $this->post(); + break; + case 'DELETE': + $this->delete(); + break; + default: + $this->header('HTTP/1.1 405 Method Not Allowed'); + } + } + + protected function get_full_url() { + $https = !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'on') === 0; + return + ($https ? 'https://' : 'http://'). + (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : ''). + (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME']. + ($https && $_SERVER['SERVER_PORT'] === 443 || + $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))). + substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/')); + } + + protected function get_user_id() { + @session_start(); + return session_id(); + } + + protected function get_user_path() { + if ($this->options['user_dirs']) { + return $this->get_user_id().'/'; + } + return ''; + } + + protected function get_upload_path($file_name = null, $version = null) { + $file_name = $file_name ? $file_name : ''; + if (empty($version)) { + $version_path = ''; + } else { + $version_dir = @$this->options['image_versions'][$version]['upload_dir']; + if ($version_dir) { + return $version_dir.$this->get_user_path().$file_name; + } + $version_path = $version.'/'; + } + return $this->options['upload_dir'].$this->get_user_path() + .$version_path.$file_name; + } + + protected function get_query_separator($url) { + return strpos($url, '?') === false ? '?' : '&'; + } + + protected function get_download_url($file_name, $version = null, $direct = false) { + if (!$direct && $this->options['download_via_php']) { + $url = $this->options['script_url'] + .$this->get_query_separator($this->options['script_url']) + .$this->get_singular_param_name() + .'='.rawurlencode($file_name); + if ($version) { + $url .= '&version='.rawurlencode($version); + } + return $url.'&download=1'; + } + if (empty($version)) { + $version_path = ''; + } else { + $version_url = @$this->options['image_versions'][$version]['upload_url']; + if ($version_url) { + return $version_url.$this->get_user_path().rawurlencode($file_name); + } + $version_path = rawurlencode($version).'/'; + } + return $this->options['upload_url'].$this->get_user_path() + .$version_path.rawurlencode($file_name); + } + + protected function set_additional_file_properties($file) { + $file->deleteUrl = $this->options['script_url'] + .$this->get_query_separator($this->options['script_url']) + .$this->get_singular_param_name() + .'='.rawurlencode($file->name); + $file->deleteType = $this->options['delete_type']; + if ($file->deleteType !== 'DELETE') { + $file->deleteUrl .= '&_method=DELETE'; + } + if ($this->options['access_control_allow_credentials']) { + $file->deleteWithCredentials = true; + } + } + + // Fix for overflowing signed 32 bit integers, + // works for sizes up to 2^32-1 bytes (4 GiB - 1): + protected function fix_integer_overflow($size) { + if ($size < 0) { + $size += 2.0 * (PHP_INT_MAX + 1); + } + return $size; + } + + protected function get_file_size($file_path, $clear_stat_cache = false) { + if ($clear_stat_cache) { + if (version_compare(PHP_VERSION, '5.3.0') >= 0) { + clearstatcache(true, $file_path); + } else { + clearstatcache(); + } + } + return $this->fix_integer_overflow(filesize($file_path)); + } + + protected function is_valid_file_object($file_name) { + $file_path = $this->get_upload_path($file_name); + if (is_file($file_path) && $file_name[0] !== '.') { + return true; + } + return false; + } + + protected function get_file_object($file_name) { + if ($this->is_valid_file_object($file_name)) { + $file = new stdClass(); + $file->name = $file_name; + $file->size = $this->get_file_size( + $this->get_upload_path($file_name) + ); + $file->url = $this->get_download_url($file->name); + foreach($this->options['image_versions'] as $version => $options) { + if (!empty($version)) { + if (is_file($this->get_upload_path($file_name, $version))) { + $file->{$version.'Url'} = $this->get_download_url( + $file->name, + $version + ); + } + } + } + $this->set_additional_file_properties($file); + return $file; + } + return null; + } + + protected function get_file_objects($iteration_method = 'get_file_object') { + $upload_dir = $this->get_upload_path(); + if (!is_dir($upload_dir)) { + return array(); + } + return array_values(array_filter(array_map( + array($this, $iteration_method), + scandir($upload_dir) + ))); + } + + protected function count_file_objects() { + return count($this->get_file_objects('is_valid_file_object')); + } + + protected function get_error_message($error) { + return array_key_exists($error, $this->error_messages) ? + $this->error_messages[$error] : $error; + } + + function get_config_bytes($val) { + $val = trim($val); + $last = strtolower($val[strlen($val)-1]); + switch($last) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + } + return $this->fix_integer_overflow($val); + } + + protected function validate($uploaded_file, $file, $error, $index) { + if ($error) { + $file->error = $this->get_error_message($error); + return false; + } + $content_length = $this->fix_integer_overflow(intval( + $this->get_server_var('CONTENT_LENGTH') + )); + $post_max_size = $this->get_config_bytes(ini_get('post_max_size')); + if ($post_max_size && ($content_length > $post_max_size)) { + $file->error = $this->get_error_message('post_max_size'); + return false; + } + if (!preg_match($this->options['accept_file_types'], $file->name)) { + $file->error = $this->get_error_message('accept_file_types'); + return false; + } + if ($uploaded_file && is_uploaded_file($uploaded_file)) { + $file_size = $this->get_file_size($uploaded_file); + } else { + $file_size = $content_length; + } + if ($this->options['max_file_size'] && ( + $file_size > $this->options['max_file_size'] || + $file->size > $this->options['max_file_size']) + ) { + $file->error = $this->get_error_message('max_file_size'); + return false; + } + if ($this->options['min_file_size'] && + $file_size < $this->options['min_file_size']) { + $file->error = $this->get_error_message('min_file_size'); + return false; + } + if (is_int($this->options['max_number_of_files']) && ( + $this->count_file_objects() >= $this->options['max_number_of_files']) + ) { + $file->error = $this->get_error_message('max_number_of_files'); + return false; + } + $max_width = @$this->options['max_width']; + $max_height = @$this->options['max_height']; + $min_width = @$this->options['min_width']; + $min_height = @$this->options['min_height']; + if (($max_width || $max_height || $min_width || $min_height)) { + list($img_width, $img_height) = $this->get_image_size($uploaded_file); + } + if (!empty($img_width)) { + if ($max_width && $img_width > $max_width) { + $file->error = $this->get_error_message('max_width'); + return false; + } + if ($max_height && $img_height > $max_height) { + $file->error = $this->get_error_message('max_height'); + return false; + } + if ($min_width && $img_width < $min_width) { + $file->error = $this->get_error_message('min_width'); + return false; + } + if ($min_height && $img_height < $min_height) { + $file->error = $this->get_error_message('min_height'); + return false; + } + } + return true; + } + + protected function upcount_name_callback($matches) { + $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1; + $ext = isset($matches[2]) ? $matches[2] : ''; + return ' ('.$index.')'.$ext; + } + + protected function upcount_name($name) { + return preg_replace_callback( + '/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/', + array($this, 'upcount_name_callback'), + $name, + 1 + ); + } + + protected function get_unique_filename($file_path, $name, $size, $type, $error, + $index, $content_range) { + while(is_dir($this->get_upload_path($name))) { + $name = $this->upcount_name($name); + } + // Keep an existing filename if this is part of a chunked upload: + $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1])); + while(is_file($this->get_upload_path($name))) { + if ($uploaded_bytes === $this->get_file_size( + $this->get_upload_path($name))) { + break; + } + $name = $this->upcount_name($name); + } + return $name; + } + + protected function trim_file_name($file_path, $name, $size, $type, $error, + $index, $content_range) { + // Remove path information and dots around the filename, to prevent uploading + // into different directories or replacing hidden system files. + // Also remove control characters and spaces (\x00..\x20) around the filename: + $name = trim(basename(stripslashes($name)), ".\x00..\x20"); + // Use a timestamp for empty filenames: + if (!$name) { + $name = str_replace('.', '-', microtime(true)); + } + // Add missing file extension for known image types: + if (strpos($name, '.') === false && + preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) { + $name .= '.'.$matches[1]; + } + if (function_exists('exif_imagetype')) { + switch(@exif_imagetype($file_path)){ + case IMAGETYPE_JPEG: + $extensions = array('jpg', 'jpeg'); + break; + case IMAGETYPE_PNG: + $extensions = array('png'); + break; + case IMAGETYPE_GIF: + $extensions = array('gif'); + break; + } + // Adjust incorrect image file extensions: + if (!empty($extensions)) { + $parts = explode('.', $name); + $extIndex = count($parts) - 1; + $ext = strtolower(@$parts[$extIndex]); + if (!in_array($ext, $extensions)) { + $parts[$extIndex] = $extensions[0]; + $name = implode('.', $parts); + } + } + } + return $name; + } + + protected function get_file_name($file_path, $name, $size, $type, $error, + $index, $content_range) { + return $this->get_unique_filename( + $file_path, + $this->trim_file_name($file_path, $name, $size, $type, $error, + $index, $content_range), + $size, + $type, + $error, + $index, + $content_range + ); + } + + protected function handle_form_data($file, $index) { + // Handle form data, e.g. $_REQUEST['description'][$index] + } + + protected function get_scaled_image_file_paths($file_name, $version) { + $file_path = $this->get_upload_path($file_name); + if (!empty($version)) { + $version_dir = $this->get_upload_path(null, $version); + if (!is_dir($version_dir)) { + mkdir($version_dir, $this->options['mkdir_mode'], true); + } + $new_file_path = $version_dir.'/'.$file_name; + } else { + $new_file_path = $file_path; + } + return array($file_path, $new_file_path); + } + + protected function gd_get_image_object($file_path, $func, $no_cache = false) { + if (empty($this->image_objects[$file_path]) || $no_cache) { + $this->gd_destroy_image_object($file_path); + $this->image_objects[$file_path] = $func($file_path); + } + return $this->image_objects[$file_path]; + } + + protected function gd_set_image_object($file_path, $image) { + $this->gd_destroy_image_object($file_path); + $this->image_objects[$file_path] = $image; + } + + protected function gd_destroy_image_object($file_path) { + $image = @$this->image_objects[$file_path]; + return $image && imagedestroy($image); + } + + protected function gd_imageflip($image, $mode) { + if (function_exists('imageflip')) { + return imageflip($image, $mode); + } + $new_width = $src_width = imagesx($image); + $new_height = $src_height = imagesy($image); + $new_img = imagecreatetruecolor($new_width, $new_height); + $src_x = 0; + $src_y = 0; + switch ($mode) { + case '1': // flip on the horizontal axis + $src_y = $new_height - 1; + $src_height = -$new_height; + break; + case '2': // flip on the vertical axis + $src_x = $new_width - 1; + $src_width = -$new_width; + break; + case '3': // flip on both axes + $src_y = $new_height - 1; + $src_height = -$new_height; + $src_x = $new_width - 1; + $src_width = -$new_width; + break; + default: + return $image; + } + imagecopyresampled( + $new_img, + $image, + 0, + 0, + $src_x, + $src_y, + $new_width, + $new_height, + $src_width, + $src_height + ); + return $new_img; + } + + protected function gd_orient_image($file_path, $src_img) { + if (!function_exists('exif_read_data')) { + return false; + } + $exif = @exif_read_data($file_path); + if ($exif === false) { + return false; + } + $orientation = intval(@$exif['Orientation']); + if ($orientation < 2 || $orientation > 8) { + return false; + } + switch ($orientation) { + case 2: + $new_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 + ); + break; + case 3: + $new_img = imagerotate($src_img, 180, 0); + break; + case 4: + $new_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 + ); + break; + case 5: + $tmp_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 + ); + $new_img = imagerotate($tmp_img, 270, 0); + imagedestroy($tmp_img); + break; + case 6: + $new_img = imagerotate($src_img, 270, 0); + break; + case 7: + $tmp_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 + ); + $new_img = imagerotate($tmp_img, 270, 0); + imagedestroy($tmp_img); + break; + case 8: + $new_img = imagerotate($src_img, 90, 0); + break; + default: + return false; + } + $this->gd_set_image_object($file_path, $new_img); + return true; + } + + protected function gd_create_scaled_image($file_name, $version, $options) { + if (!function_exists('imagecreatetruecolor')) { + error_log('Function not found: imagecreatetruecolor'); + return false; + } + list($file_path, $new_file_path) = + $this->get_scaled_image_file_paths($file_name, $version); + $type = strtolower(substr(strrchr($file_name, '.'), 1)); + switch ($type) { + case 'jpg': + case 'jpeg': + $src_func = 'imagecreatefromjpeg'; + $write_func = 'imagejpeg'; + $image_quality = isset($options['jpeg_quality']) ? + $options['jpeg_quality'] : 75; + break; + case 'gif': + $src_func = 'imagecreatefromgif'; + $write_func = 'imagegif'; + $image_quality = null; + break; + case 'png': + $src_func = 'imagecreatefrompng'; + $write_func = 'imagepng'; + $image_quality = isset($options['png_quality']) ? + $options['png_quality'] : 9; + break; + default: + return false; + } + $src_img = $this->gd_get_image_object( + $file_path, + $src_func, + !empty($options['no_cache']) + ); + $image_oriented = false; + if (!empty($options['auto_orient']) && $this->gd_orient_image( + $file_path, + $src_img + )) { + $image_oriented = true; + $src_img = $this->gd_get_image_object( + $file_path, + $src_func + ); + } + $max_width = $img_width = imagesx($src_img); + $max_height = $img_height = imagesy($src_img); + if (!empty($options['max_width'])) { + $max_width = $options['max_width']; + } + if (!empty($options['max_height'])) { + $max_height = $options['max_height']; + } + $scale = min( + $max_width / $img_width, + $max_height / $img_height + ); + if ($scale >= 1) { + if ($image_oriented) { + return $write_func($src_img, $new_file_path, $image_quality); + } + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + if (empty($options['crop'])) { + $new_width = $img_width * $scale; + $new_height = $img_height * $scale; + $dst_x = 0; + $dst_y = 0; + $new_img = imagecreatetruecolor($new_width, $new_height); + } else { + if (($img_width / $img_height) >= ($max_width / $max_height)) { + $new_width = $img_width / ($img_height / $max_height); + $new_height = $max_height; + } else { + $new_width = $max_width; + $new_height = $img_height / ($img_width / $max_width); + } + $dst_x = 0 - ($new_width - $max_width) / 2; + $dst_y = 0 - ($new_height - $max_height) / 2; + $new_img = imagecreatetruecolor($max_width, $max_height); + } + // Handle transparency in GIF and PNG images: + switch ($type) { + case 'gif': + case 'png': + imagecolortransparent($new_img, imagecolorallocate($new_img, 0, 0, 0)); + case 'png': + imagealphablending($new_img, false); + imagesavealpha($new_img, true); + break; + } + $success = imagecopyresampled( + $new_img, + $src_img, + $dst_x, + $dst_y, + 0, + 0, + $new_width, + $new_height, + $img_width, + $img_height + ) && $write_func($new_img, $new_file_path, $image_quality); + $this->gd_set_image_object($file_path, $new_img); + return $success; + } + + protected function imagick_get_image_object($file_path, $no_cache = false) { + if (empty($this->image_objects[$file_path]) || $no_cache) { + $this->imagick_destroy_image_object($file_path); + $image = new Imagick(); + if (!empty($this->options['imagick_resource_limits'])) { + foreach ($this->options['imagick_resource_limits'] as $type => $limit) { + $image->setResourceLimit($type, $limit); + } + } + $image->readImage($file_path); + $this->image_objects[$file_path] = $image; + } + return $this->image_objects[$file_path]; + } + + protected function imagick_set_image_object($file_path, $image) { + $this->imagick_destroy_image_object($file_path); + $this->image_objects[$file_path] = $image; + } + + protected function imagick_destroy_image_object($file_path) { + $image = @$this->image_objects[$file_path]; + return $image && $image->destroy(); + } + + protected function imagick_orient_image($image) { + $orientation = $image->getImageOrientation(); + $background = new ImagickPixel('none'); + switch ($orientation) { + case imagick::ORIENTATION_TOPRIGHT: // 2 + $image->flopImage(); // horizontal flop around y-axis + break; + case imagick::ORIENTATION_BOTTOMRIGHT: // 3 + $image->rotateImage($background, 180); + break; + case imagick::ORIENTATION_BOTTOMLEFT: // 4 + $image->flipImage(); // vertical flip around x-axis + break; + case imagick::ORIENTATION_LEFTTOP: // 5 + $image->flopImage(); // horizontal flop around y-axis + $image->rotateImage($background, 270); + break; + case imagick::ORIENTATION_RIGHTTOP: // 6 + $image->rotateImage($background, 90); + break; + case imagick::ORIENTATION_RIGHTBOTTOM: // 7 + $image->flipImage(); // vertical flip around x-axis + $image->rotateImage($background, 270); + break; + case imagick::ORIENTATION_LEFTBOTTOM: // 8 + $image->rotateImage($background, 270); + break; + default: + return false; + } + $image->setImageOrientation(imagick::ORIENTATION_TOPLEFT); // 1 + return true; + } + + protected function imagick_create_scaled_image($file_name, $version, $options) { + list($file_path, $new_file_path) = + $this->get_scaled_image_file_paths($file_name, $version); + $image = $this->imagick_get_image_object( + $file_path, + !empty($options['no_cache']) + ); + if ($image->getImageFormat() === 'GIF') { + // Handle animated GIFs: + $images = $image->coalesceImages(); + foreach ($images as $frame) { + $image = $frame; + $this->imagick_set_image_object($file_name, $image); + break; + } + } + $image_oriented = false; + if (!empty($options['auto_orient'])) { + $image_oriented = $this->imagick_orient_image($image); + } + $new_width = $max_width = $img_width = $image->getImageWidth(); + $new_height = $max_height = $img_height = $image->getImageHeight(); + if (!empty($options['max_width'])) { + $new_width = $max_width = $options['max_width']; + } + if (!empty($options['max_height'])) { + $new_height = $max_height = $options['max_height']; + } + if (!($image_oriented || $max_width < $img_width || $max_height < $img_height)) { + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + $crop = !empty($options['crop']); + if ($crop) { + $x = 0; + $y = 0; + if (($img_width / $img_height) >= ($max_width / $max_height)) { + $new_width = 0; // Enables proportional scaling based on max_height + $x = ($img_width / ($img_height / $max_height) - $max_width) / 2; + } else { + $new_height = 0; // Enables proportional scaling based on max_width + $y = ($img_height / ($img_width / $max_width) - $max_height) / 2; + } + } + $success = $image->resizeImage( + $new_width, + $new_height, + isset($options['filter']) ? $options['filter'] : imagick::FILTER_LANCZOS, + isset($options['blur']) ? $options['blur'] : 1, + $new_width && $new_height // fit image into constraints if not to be cropped + ); + if ($success && $crop) { + $success = $image->cropImage( + $max_width, + $max_height, + $x, + $y + ); + if ($success) { + $success = $image->setImagePage($max_width, $max_height, 0, 0); + } + } + $type = strtolower(substr(strrchr($file_name, '.'), 1)); + switch ($type) { + case 'jpg': + case 'jpeg': + if (!empty($options['jpeg_quality'])) { + $image->setImageCompression(Imagick::COMPRESSION_JPEG); + $image->setImageCompressionQuality($options['jpeg_quality']); + } + break; + } + if (!empty($options['strip'])) { + $image->stripImage(); + } + return $success && $image->writeImage($new_file_path); + } + + protected function imagemagick_create_scaled_image($file_name, $version, $options) { + list($file_path, $new_file_path) = + $this->get_scaled_image_file_paths($file_name, $version); + $resize = @$options['max_width'] + .(empty($options['max_height']) ? '' : 'x'.$options['max_height']); + if (!$resize && empty($options['auto_orient'])) { + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + $cmd = $this->options['convert_bin']; + if (!empty($this->options['convert_params'])) { + $cmd .= ' '.$this->options['convert_params']; + } + $cmd .= ' '.escapeshellarg($file_path); + if (!empty($options['auto_orient'])) { + $cmd .= ' -auto-orient'; + } + if ($resize) { + // Handle animated GIFs: + $cmd .= ' -coalesce'; + if (empty($options['crop'])) { + $cmd .= ' -resize '.escapeshellarg($resize.'>'); + } else { + $cmd .= ' -resize '.escapeshellarg($resize.'^'); + $cmd .= ' -gravity center'; + $cmd .= ' -crop '.escapeshellarg($resize.'+0+0'); + } + // Make sure the page dimensions are correct (fixes offsets of animated GIFs): + $cmd .= ' +repage'; + } + if (!empty($options['convert_params'])) { + $cmd .= ' '.$options['convert_params']; + } + $cmd .= ' '.escapeshellarg($new_file_path); + exec($cmd, $output, $error); + if ($error) { + error_log(implode('\n', $output)); + return false; + } + return true; + } + + protected function get_image_size($file_path) { + if ($this->options['image_library']) { + if (extension_loaded('imagick')) { + $image = new Imagick(); + try { + if (@$image->pingImage($file_path)) { + $dimensions = array($image->getImageWidth(), $image->getImageHeight()); + $image->destroy(); + return $dimensions; + } + return false; + } catch (Exception $e) { + error_log($e->getMessage()); + } + } + if ($this->options['image_library'] === 2) { + $cmd = $this->options['identify_bin']; + $cmd .= ' -ping '.escapeshellarg($file_path); + exec($cmd, $output, $error); + if (!$error && !empty($output)) { + // image.jpg JPEG 1920x1080 1920x1080+0+0 8-bit sRGB 465KB 0.000u 0:00.000 + $infos = preg_split('/\s+/', $output[0]); + $dimensions = preg_split('/x/', $infos[2]); + return $dimensions; + } + return false; + } + } + if (!function_exists('getimagesize')) { + error_log('Function not found: getimagesize'); + return false; + } + return @getimagesize($file_path); + } + + protected function create_scaled_image($file_name, $version, $options) { + if ($this->options['image_library'] === 2) { + return $this->imagemagick_create_scaled_image($file_name, $version, $options); + } + if ($this->options['image_library'] && extension_loaded('imagick')) { + return $this->imagick_create_scaled_image($file_name, $version, $options); + } + return $this->gd_create_scaled_image($file_name, $version, $options); + } + + protected function destroy_image_object($file_path) { + if ($this->options['image_library'] && extension_loaded('imagick')) { + return $this->imagick_destroy_image_object($file_path); + } + } + + protected function is_valid_image_file($file_path) { + if (!preg_match($this->options['image_file_types'], $file_path)) { + return false; + } + if (function_exists('exif_imagetype')) { + return @exif_imagetype($file_path); + } + $image_info = $this->get_image_size($file_path); + return $image_info && $image_info[0] && $image_info[1]; + } + + protected function handle_image_file($file_path, $file) { + $failed_versions = array(); + foreach($this->options['image_versions'] as $version => $options) { + if ($this->create_scaled_image($file->name, $version, $options)) { + if (!empty($version)) { + $file->{$version.'Url'} = $this->get_download_url( + $file->name, + $version + ); + } else { + $file->size = $this->get_file_size($file_path, true); + } + } else { + $failed_versions[] = $version ? $version : 'original'; + } + } + if (count($failed_versions)) { + $file->error = $this->get_error_message('image_resize') + .' ('.implode($failed_versions,', ').')'; + } + // Free memory: + $this->destroy_image_object($file_path); + } + + protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, + $index = null, $content_range = null) { + $file = new stdClass(); + $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, + $index, $content_range); + $file->size = $this->fix_integer_overflow(intval($size)); + $file->type = $type; + if ($this->validate($uploaded_file, $file, $error, $index)) { + $this->handle_form_data($file, $index); + $upload_dir = $this->get_upload_path(); + if (!is_dir($upload_dir)) { + mkdir($upload_dir, $this->options['mkdir_mode'], true); + } + $file_path = $this->get_upload_path($file->name); + $append_file = $content_range && is_file($file_path) && + $file->size > $this->get_file_size($file_path); + if ($uploaded_file && is_uploaded_file($uploaded_file)) { + // multipart/formdata uploads (POST method uploads) + if ($append_file) { + file_put_contents( + $file_path, + fopen($uploaded_file, 'r'), + FILE_APPEND + ); + } else { + move_uploaded_file($uploaded_file, $file_path); + } + } else { + // Non-multipart uploads (PUT method support) + file_put_contents( + $file_path, + fopen('php://input', 'r'), + $append_file ? FILE_APPEND : 0 + ); + } + $file_size = $this->get_file_size($file_path, $append_file); + if ($file_size === $file->size) { + $file->url = $this->get_download_url($file->name); + if ($this->is_valid_image_file($file_path)) { + $this->handle_image_file($file_path, $file); + } + } else { + $file->size = $file_size; + if (!$content_range && $this->options['discard_aborted_uploads']) { + unlink($file_path); + $file->error = $this->get_error_message('abort'); + } + } + $this->set_additional_file_properties($file); + } + return $file; + } + + protected function readfile($file_path) { + $file_size = $this->get_file_size($file_path); + $chunk_size = $this->options['readfile_chunk_size']; + if ($chunk_size && $file_size > $chunk_size) { + $handle = fopen($file_path, 'rb'); + while (!feof($handle)) { + echo fread($handle, $chunk_size); + ob_flush(); + flush(); + } + fclose($handle); + return $file_size; + } + return readfile($file_path); + } + + protected function body($str) { + echo $str; + } + + protected function header($str) { + header($str); + } + + protected function get_server_var($id) { + return isset($_SERVER[$id]) ? $_SERVER[$id] : ''; + } + + protected function generate_response($content, $print_response = true) { + if ($print_response) { + $json = json_encode($content); + $redirect = isset($_REQUEST['redirect']) ? + stripslashes($_REQUEST['redirect']) : null; + if ($redirect) { + $this->header('Location: '.sprintf($redirect, rawurlencode($json))); + return; + } + $this->head(); + if ($this->get_server_var('HTTP_CONTENT_RANGE')) { + $files = isset($content[$this->options['param_name']]) ? + $content[$this->options['param_name']] : null; + if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) { + $this->header('Range: 0-'.( + $this->fix_integer_overflow(intval($files[0]->size)) - 1 + )); + } + } + $this->body($json); + } + return $content; + } + + protected function get_version_param() { + return isset($_GET['version']) ? basename(stripslashes($_GET['version'])) : null; + } + + protected function get_singular_param_name() { + return substr($this->options['param_name'], 0, -1); + } + + protected function get_file_name_param() { + $name = $this->get_singular_param_name(); + return isset($_GET[$name]) ? basename(stripslashes($_GET[$name])) : null; + } + + protected function get_file_names_params() { + $params = isset($_GET[$this->options['param_name']]) ? + $_GET[$this->options['param_name']] : array(); + foreach ($params as $key => $value) { + $params[$key] = basename(stripslashes($value)); + } + return $params; + } + + protected function get_file_type($file_path) { + switch (strtolower(pathinfo($file_path, PATHINFO_EXTENSION))) { + case 'jpeg': + case 'jpg': + return 'image/jpeg'; + case 'png': + return 'image/png'; + case 'gif': + return 'image/gif'; + default: + return ''; + } + } + + protected function download() { + switch ($this->options['download_via_php']) { + case 1: + $redirect_header = null; + break; + case 2: + $redirect_header = 'X-Sendfile'; + break; + case 3: + $redirect_header = 'X-Accel-Redirect'; + break; + default: + return $this->header('HTTP/1.1 403 Forbidden'); + } + $file_name = $this->get_file_name_param(); + if (!$this->is_valid_file_object($file_name)) { + return $this->header('HTTP/1.1 404 Not Found'); + } + if ($redirect_header) { + return $this->header( + $redirect_header.': '.$this->get_download_url( + $file_name, + $this->get_version_param(), + true + ) + ); + } + $file_path = $this->get_upload_path($file_name, $this->get_version_param()); + // Prevent browsers from MIME-sniffing the content-type: + $this->header('X-Content-Type-Options: nosniff'); + if (!preg_match($this->options['inline_file_types'], $file_name)) { + $this->header('Content-Type: application/octet-stream'); + $this->header('Content-Disposition: attachment; filename="'.$file_name.'"'); + } else { + $this->header('Content-Type: '.$this->get_file_type($file_path)); + $this->header('Content-Disposition: inline; filename="'.$file_name.'"'); + } + $this->header('Content-Length: '.$this->get_file_size($file_path)); + $this->header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path))); + $this->readfile($file_path); + } + + protected function send_content_type_header() { + $this->header('Vary: Accept'); + if (strpos($this->get_server_var('HTTP_ACCEPT'), 'application/json') !== false) { + $this->header('Content-type: application/json'); + } else { + $this->header('Content-type: text/plain'); + } + } + + protected function send_access_control_headers() { + $this->header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']); + $this->header('Access-Control-Allow-Credentials: ' + .($this->options['access_control_allow_credentials'] ? 'true' : 'false')); + $this->header('Access-Control-Allow-Methods: ' + .implode(', ', $this->options['access_control_allow_methods'])); + $this->header('Access-Control-Allow-Headers: ' + .implode(', ', $this->options['access_control_allow_headers'])); + } + + public function head() { + $this->header('Pragma: no-cache'); + $this->header('Cache-Control: no-store, no-cache, must-revalidate'); + $this->header('Content-Disposition: inline; filename="files.json"'); + // Prevent Internet Explorer from MIME-sniffing the content-type: + $this->header('X-Content-Type-Options: nosniff'); + if ($this->options['access_control_allow_origin']) { + $this->send_access_control_headers(); + } + $this->send_content_type_header(); + } + + public function get($print_response = true) { + if ($print_response && isset($_GET['download'])) { + return $this->download(); + } + $file_name = $this->get_file_name_param(); + if ($file_name) { + $response = array( + $this->get_singular_param_name() => $this->get_file_object($file_name) + ); + } else { + $response = array( + $this->options['param_name'] => $this->get_file_objects() + ); + } + return $this->generate_response($response, $print_response); + } + + public function post($print_response = true) { + if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') { + return $this->delete($print_response); + } + $upload = isset($_FILES[$this->options['param_name']]) ? + $_FILES[$this->options['param_name']] : null; + // Parse the Content-Disposition header, if available: + $file_name = $this->get_server_var('HTTP_CONTENT_DISPOSITION') ? + rawurldecode(preg_replace( + '/(^[^"]+")|("$)/', + '', + $this->get_server_var('HTTP_CONTENT_DISPOSITION') + )) : null; + // Parse the Content-Range header, which has the following form: + // Content-Range: bytes 0-524287/2000000 + $content_range = $this->get_server_var('HTTP_CONTENT_RANGE') ? + preg_split('/[^0-9]+/', $this->get_server_var('HTTP_CONTENT_RANGE')) : null; + $size = $content_range ? $content_range[3] : null; + $files = array(); + if ($upload && is_array($upload['tmp_name'])) { + // param_name is an array identifier like "files[]", + // $_FILES is a multi-dimensional array: + foreach ($upload['tmp_name'] as $index => $value) { + $files[] = $this->handle_file_upload( + $upload['tmp_name'][$index], + $file_name ? $file_name : $upload['name'][$index], + $size ? $size : $upload['size'][$index], + $upload['type'][$index], + $upload['error'][$index], + $index, + $content_range + ); + } + } else { + // param_name is a single object identifier like "file", + // $_FILES is a one-dimensional array: + $files[] = $this->handle_file_upload( + isset($upload['tmp_name']) ? $upload['tmp_name'] : null, + $file_name ? $file_name : (isset($upload['name']) ? + $upload['name'] : null), + $size ? $size : (isset($upload['size']) ? + $upload['size'] : $this->get_server_var('CONTENT_LENGTH')), + isset($upload['type']) ? + $upload['type'] : $this->get_server_var('CONTENT_TYPE'), + isset($upload['error']) ? $upload['error'] : null, + null, + $content_range + ); + } + return $this->generate_response( + array($this->options['param_name'] => $files), + $print_response + ); + } + + public function delete($print_response = true) { + $file_names = $this->get_file_names_params(); + if (empty($file_names)) { + $file_names = array($this->get_file_name_param()); + } + $response = array(); + foreach($file_names as $file_name) { + $file_path = $this->get_upload_path($file_name); + $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path); + if ($success) { + foreach($this->options['image_versions'] as $version => $options) { + if (!empty($version)) { + $file = $this->get_upload_path($file_name, $version); + if (is_file($file)) { + unlink($file); + } + } + } + } + $response[$file_name] = $success; + } + return $this->generate_response($response, $print_response); + } + +} diff --git a/library/jqupload/server/php/files/.gitignore b/library/jqupload/server/php/files/.gitignore new file mode 100644 index 000000000..e24a60fae --- /dev/null +++ b/library/jqupload/server/php/files/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!.htaccess diff --git a/library/jqupload/server/php/files/.htaccess b/library/jqupload/server/php/files/.htaccess new file mode 100644 index 000000000..56689f0bb --- /dev/null +++ b/library/jqupload/server/php/files/.htaccess @@ -0,0 +1,18 @@ +# The following directives force the content-type application/octet-stream +# and force browsers to display a download dialog for non-image files. +# This prevents the execution of script files in the context of the website: +ForceType application/octet-stream +Header set Content-Disposition attachment + + ForceType none + Header unset Content-Disposition + + +# The following directive prevents browsers from MIME-sniffing the content-type. +# This is an important complement to the ForceType directive above: +Header set X-Content-Type-Options nosniff + +# Uncomment the following lines to prevent unauthorized download of files: +#AuthName "Authorization required" +#AuthType Basic +#require valid-user diff --git a/library/jqupload/server/php/index.php b/library/jqupload/server/php/index.php new file mode 100644 index 000000000..3ae1295ef --- /dev/null +++ b/library/jqupload/server/php/index.php @@ -0,0 +1,15 @@ + + + + + + + +jQuery File Upload Plugin Test + + + + +

      jQuery File Upload Plugin Test

      +

      +
      +

      +
        +
        + +
        + +
        +
        + + + + Add files... + + + + + + + + +
        + +
        + +
        +
        +
        + +
         
        +
        +
        + + +
        +
        + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/jqupload/test/test.js b/library/jqupload/test/test.js new file mode 100644 index 000000000..72d08d99e --- /dev/null +++ b/library/jqupload/test/test.js @@ -0,0 +1,1288 @@ +/* + * jQuery File Upload Plugin Test 9.4.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/* global $, QUnit, window, document, expect, module, test, asyncTest, start, ok, strictEqual, notStrictEqual */ + +$(function () { + // jshint nomen:false + 'use strict'; + + QUnit.done = function () { + // Delete all uploaded files: + var url = $('#fileupload').prop('action'); + $.getJSON(url, function (result) { + $.each(result.files, function (index, file) { + $.ajax({ + url: url + '?file=' + encodeURIComponent(file.name), + type: 'DELETE' + }); + }); + }); + }; + + var lifecycle = { + setup: function () { + // Set the .fileupload method to the basic widget method: + $.widget('blueimp.fileupload', window.testBasicWidget, {}); + }, + teardown: function () { + // Remove all remaining event listeners: + $(document).unbind(); + } + }, + lifecycleUI = { + setup: function () { + // Set the .fileupload method to the UI widget method: + $.widget('blueimp.fileupload', window.testUIWidget, {}); + }, + teardown: function () { + // Remove all remaining event listeners: + $(document).unbind(); + } + }; + + module('Initialization', lifecycle); + + test('Widget initialization', function () { + var fu = $('#fileupload').fileupload(); + ok(fu.data('blueimp-fileupload') || fu.data('fileupload')); + }); + + test('Data attribute options', function () { + $('#fileupload').attr('data-url', 'http://example.org'); + $('#fileupload').fileupload(); + strictEqual( + $('#fileupload').fileupload('option', 'url'), + 'http://example.org' + ); + }); + + test('File input initialization', function () { + var fu = $('#fileupload').fileupload(); + ok( + fu.fileupload('option', 'fileInput').length, + 'File input field inside of the widget' + ); + ok( + fu.fileupload('option', 'fileInput').length, + 'Widget element as file input field' + ); + }); + + test('Drop zone initialization', function () { + ok($('#fileupload').fileupload() + .fileupload('option', 'dropZone').length); + }); + + test('Paste zone initialization', function () { + ok($('#fileupload').fileupload() + .fileupload('option', 'pasteZone').length); + }); + + test('Event listeners initialization', function () { + expect( + $.support.xhrFormDataFileUpload ? 4 : 1 + ); + var eo = { + originalEvent: { + dataTransfer: {files: [{}], types: ['Files']}, + clipboardData: {items: [{}]} + } + }, + fu = $('#fileupload').fileupload({ + dragover: function () { + ok(true, 'Triggers dragover callback'); + return false; + }, + drop: function () { + ok(true, 'Triggers drop callback'); + return false; + }, + paste: function () { + ok(true, 'Triggers paste callback'); + return false; + }, + change: function () { + ok(true, 'Triggers change callback'); + return false; + } + }), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'), + pasteZone = fu.fileupload('option', 'pasteZone'); + fileInput.trigger($.Event('change', eo)); + dropZone.trigger($.Event('dragover', eo)); + dropZone.trigger($.Event('drop', eo)); + pasteZone.trigger($.Event('paste', eo)); + }); + + module('API', lifecycle); + + test('destroy', function () { + expect(4); + var eo = { + originalEvent: { + dataTransfer: {files: [{}], types: ['Files']}, + clipboardData: {items: [{}]} + } + }, + options = { + dragover: function () { + ok(true, 'Triggers dragover callback'); + return false; + }, + drop: function () { + ok(true, 'Triggers drop callback'); + return false; + }, + paste: function () { + ok(true, 'Triggers paste callback'); + return false; + }, + change: function () { + ok(true, 'Triggers change callback'); + return false; + } + }, + fu = $('#fileupload').fileupload(options), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'), + pasteZone = fu.fileupload('option', 'pasteZone'); + dropZone.bind('dragover', options.dragover); + dropZone.bind('drop', options.drop); + pasteZone.bind('paste', options.paste); + fileInput.bind('change', options.change); + fu.fileupload('destroy'); + fileInput.trigger($.Event('change', eo)); + dropZone.trigger($.Event('dragover', eo)); + dropZone.trigger($.Event('drop', eo)); + pasteZone.trigger($.Event('paste', eo)); + }); + + test('disable/enable', function () { + expect( + $.support.xhrFormDataFileUpload ? 4 : 1 + ); + var eo = { + originalEvent: { + dataTransfer: {files: [{}], types: ['Files']}, + clipboardData: {items: [{}]} + } + }, + fu = $('#fileupload').fileupload({ + dragover: function () { + ok(true, 'Triggers dragover callback'); + return false; + }, + drop: function () { + ok(true, 'Triggers drop callback'); + return false; + }, + paste: function () { + ok(true, 'Triggers paste callback'); + return false; + }, + change: function () { + ok(true, 'Triggers change callback'); + return false; + } + }), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'), + pasteZone = fu.fileupload('option', 'pasteZone'); + fu.fileupload('disable'); + fileInput.trigger($.Event('change', eo)); + dropZone.trigger($.Event('dragover', eo)); + dropZone.trigger($.Event('drop', eo)); + pasteZone.trigger($.Event('paste', eo)); + fu.fileupload('enable'); + fileInput.trigger($.Event('change', eo)); + dropZone.trigger($.Event('dragover', eo)); + dropZone.trigger($.Event('drop', eo)); + pasteZone.trigger($.Event('paste', eo)); + }); + + test('option', function () { + expect( + $.support.xhrFormDataFileUpload ? 10 : 7 + ); + var eo = { + originalEvent: { + dataTransfer: {files: [{}], types: ['Files']}, + clipboardData: {items: [{}]} + } + }, + fu = $('#fileupload').fileupload({ + dragover: function () { + ok(true, 'Triggers dragover callback'); + return false; + }, + drop: function () { + ok(true, 'Triggers drop callback'); + return false; + }, + paste: function () { + ok(true, 'Triggers paste callback'); + return false; + }, + change: function () { + ok(true, 'Triggers change callback'); + return false; + } + }), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'), + pasteZone = fu.fileupload('option', 'pasteZone'); + fu.fileupload('option', 'fileInput', null); + fu.fileupload('option', 'dropZone', null); + fu.fileupload('option', 'pasteZone', null); + fileInput.trigger($.Event('change', eo)); + dropZone.trigger($.Event('dragover', eo)); + dropZone.trigger($.Event('drop', eo)); + pasteZone.trigger($.Event('paste', eo)); + fu.fileupload('option', 'dropZone', 'body'); + strictEqual( + fu.fileupload('option', 'dropZone')[0], + document.body, + 'Allow a query string as parameter for the dropZone option' + ); + fu.fileupload('option', 'dropZone', document); + strictEqual( + fu.fileupload('option', 'dropZone')[0], + document, + 'Allow a document element as parameter for the dropZone option' + ); + fu.fileupload('option', 'pasteZone', 'body'); + strictEqual( + fu.fileupload('option', 'pasteZone')[0], + document.body, + 'Allow a query string as parameter for the pasteZone option' + ); + fu.fileupload('option', 'pasteZone', document); + strictEqual( + fu.fileupload('option', 'pasteZone')[0], + document, + 'Allow a document element as parameter for the pasteZone option' + ); + fu.fileupload('option', 'fileInput', ':file'); + strictEqual( + fu.fileupload('option', 'fileInput')[0], + $(':file')[0], + 'Allow a query string as parameter for the fileInput option' + ); + fu.fileupload('option', 'fileInput', $(':file')[0]); + strictEqual( + fu.fileupload('option', 'fileInput')[0], + $(':file')[0], + 'Allow a document element as parameter for the fileInput option' + ); + fu.fileupload('option', 'fileInput', fileInput); + fu.fileupload('option', 'dropZone', dropZone); + fu.fileupload('option', 'pasteZone', pasteZone); + fileInput.trigger($.Event('change', eo)); + dropZone.trigger($.Event('dragover', eo)); + dropZone.trigger($.Event('drop', eo)); + pasteZone.trigger($.Event('paste', eo)); + }); + + asyncTest('add', function () { + expect(2); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + add: function (e, data) { + strictEqual( + data.files[0].name, + param.files[0].name, + 'Triggers add callback' + ); + } + }).fileupload('add', param).fileupload( + 'option', + 'add', + function (e, data) { + data.submit().complete(function () { + ok(true, 'data.submit() Returns a jqXHR object'); + start(); + }); + } + ).fileupload('add', param); + }); + + asyncTest('send', function () { + expect(3); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + send: function (e, data) { + strictEqual( + data.files[0].name, + 'test', + 'Triggers send callback' + ); + } + }).fileupload('send', param).fail(function () { + ok(true, 'Allows to abort the request'); + }).complete(function () { + ok(true, 'Returns a jqXHR object'); + start(); + }).abort(); + }); + + module('Callbacks', lifecycle); + + asyncTest('add', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + add: function () { + ok(true, 'Triggers add callback'); + start(); + } + }).fileupload('add', param); + }); + + asyncTest('submit', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + submit: function () { + ok(true, 'Triggers submit callback'); + start(); + return false; + } + }).fileupload('add', param); + }); + + asyncTest('send', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + send: function () { + ok(true, 'Triggers send callback'); + start(); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('done', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + done: function () { + ok(true, 'Triggers done callback'); + start(); + } + }).fileupload('send', param); + }); + + asyncTest('fail', function () { + expect(1); + var param = {files: [{name: 'test'}]}, + fu = $('#fileupload').fileupload({ + url: '404', + fail: function () { + ok(true, 'Triggers fail callback'); + start(); + } + }); + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + fu.fileupload('send', param); + }); + + asyncTest('always', function () { + expect(2); + var param = {files: [{name: 'test'}]}, + counter = 0, + fu = $('#fileupload').fileupload({ + always: function () { + ok(true, 'Triggers always callback'); + if (counter === 1) { + start(); + } else { + counter += 1; + } + } + }); + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + fu.fileupload('add', param).fileupload( + 'option', + 'url', + '404' + ).fileupload('add', param); + }); + + asyncTest('progress', function () { + expect(1); + var param = {files: [{name: 'test'}]}, + counter = 0; + $('#fileupload').fileupload({ + forceIframeTransport: true, + progress: function () { + ok(true, 'Triggers progress callback'); + if (counter === 0) { + start(); + } else { + counter += 1; + } + } + }).fileupload('send', param); + }); + + asyncTest('progressall', function () { + expect(1); + var param = {files: [{name: 'test'}]}, + counter = 0; + $('#fileupload').fileupload({ + forceIframeTransport: true, + progressall: function () { + ok(true, 'Triggers progressall callback'); + if (counter === 0) { + start(); + } else { + counter += 1; + } + } + }).fileupload('send', param); + }); + + asyncTest('start', function () { + expect(1); + var param = {files: [{name: '1'}, {name: '2'}]}, + active = 0; + $('#fileupload').fileupload({ + send: function () { + active += 1; + }, + start: function () { + ok(!active, 'Triggers start callback before uploads'); + start(); + } + }).fileupload('send', param); + }); + + asyncTest('stop', function () { + expect(1); + var param = {files: [{name: '1'}, {name: '2'}]}, + active = 0; + $('#fileupload').fileupload({ + send: function () { + active += 1; + }, + always: function () { + active -= 1; + }, + stop: function () { + ok(!active, 'Triggers stop callback after uploads'); + start(); + } + }).fileupload('send', param); + }); + + test('change', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'), + fileInput = fu.fileupload('option', 'fileInput'); + expect(2); + fu.fileupload({ + change: function (e, data) { + ok(true, 'Triggers change callback'); + strictEqual( + data.files.length, + 0, + 'Returns empty files list' + ); + }, + add: $.noop + }); + fuo._onChange({ + data: {fileupload: fuo}, + target: fileInput[0] + }); + }); + + test('paste', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'); + expect(1); + fu.fileupload({ + paste: function () { + ok(true, 'Triggers paste callback'); + }, + add: $.noop + }); + fuo._onPaste({ + data: {fileupload: fuo}, + originalEvent: { + dataTransfer: {files: [{}]}, + clipboardData: {items: [{}]} + }, + preventDefault: $.noop + }); + }); + + test('drop', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'); + expect(1); + fu.fileupload({ + drop: function () { + ok(true, 'Triggers drop callback'); + }, + add: $.noop + }); + fuo._onDrop({ + data: {fileupload: fuo}, + originalEvent: { + dataTransfer: {files: [{}]}, + clipboardData: {items: [{}]} + }, + preventDefault: $.noop + }); + }); + + test('dragover', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'); + expect(1); + fu.fileupload({ + dragover: function () { + ok(true, 'Triggers dragover callback'); + }, + add: $.noop + }); + fuo._onDragOver({ + data: {fileupload: fuo}, + originalEvent: {dataTransfer: {types: ['Files']}}, + preventDefault: $.noop + }); + }); + + module('Options', lifecycle); + + test('paramName', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + paramName: null, + send: function (e, data) { + strictEqual( + data.paramName[0], + data.fileInput.prop('name'), + 'Takes paramName from file input field if not set' + ); + return false; + } + }).fileupload('send', param); + }); + + test('url', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + url: null, + send: function (e, data) { + strictEqual( + data.url, + $(data.fileInput.prop('form')).prop('action'), + 'Takes url from form action if not set' + ); + return false; + } + }).fileupload('send', param); + }); + + test('type', function () { + expect(2); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + type: null, + send: function (e, data) { + strictEqual( + data.type, + 'POST', + 'Request type is "POST" if not set to "PUT"' + ); + return false; + } + }).fileupload('send', param); + $('#fileupload').fileupload({ + type: 'PUT', + send: function (e, data) { + strictEqual( + data.type, + 'PUT', + 'Request type is "PUT" if set to "PUT"' + ); + return false; + } + }).fileupload('send', param); + }); + + test('replaceFileInput', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'), + fileInput = fu.fileupload('option', 'fileInput'), + fileInputElement = fileInput[0]; + expect(2); + fu.fileupload({ + replaceFileInput: false, + change: function () { + strictEqual( + fu.fileupload('option', 'fileInput')[0], + fileInputElement, + 'Keeps file input with replaceFileInput: false' + ); + }, + add: $.noop + }); + fuo._onChange({ + data: {fileupload: fuo}, + target: fileInput[0] + }); + fu.fileupload({ + replaceFileInput: true, + change: function () { + notStrictEqual( + fu.fileupload('option', 'fileInput')[0], + fileInputElement, + 'Replaces file input with replaceFileInput: true' + ); + }, + add: $.noop + }); + fuo._onChange({ + data: {fileupload: fuo}, + target: fileInput[0] + }); + }); + + asyncTest('forceIframeTransport', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + forceIframeTransport: true, + done: function (e, data) { + strictEqual( + data.dataType.substr(0, 6), + 'iframe', + 'Iframe Transport is used' + ); + start(); + } + }).fileupload('send', param); + }); + + test('singleFileUploads', function () { + expect(3); + var fu = $('#fileupload').fileupload(), + param = {files: [{name: '1'}, {name: '2'}]}, + index = 1; + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + $('#fileupload').fileupload({ + singleFileUploads: true, + add: function () { + ok(true, 'Triggers callback number ' + index.toString()); + index += 1; + } + }).fileupload('add', param).fileupload( + 'option', + 'singleFileUploads', + false + ).fileupload('add', param); + }); + + test('limitMultiFileUploads', function () { + expect(3); + var fu = $('#fileupload').fileupload(), + param = {files: [ + {name: '1'}, + {name: '2'}, + {name: '3'}, + {name: '4'}, + {name: '5'} + ]}, + index = 1; + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + $('#fileupload').fileupload({ + singleFileUploads: false, + limitMultiFileUploads: 2, + add: function () { + ok(true, 'Triggers callback number ' + index.toString()); + index += 1; + } + }).fileupload('add', param); + }); + + test('limitMultiFileUploadSize', function () { + expect(7); + var fu = $('#fileupload').fileupload(), + param = {files: [ + {name: '1-1', size: 100000}, + {name: '1-2', size: 40000}, + {name: '2-1', size: 100000}, + {name: '3-1', size: 50000}, + {name: '3-2', size: 40000}, + {name: '4-1', size: 45000} // New request due to limitMultiFileUploads + ]}, + param2 = {files: [ + {name: '5-1'}, + {name: '5-2'}, + {name: '6-1'}, + {name: '6-2'}, + {name: '7-1'} + ]}, + index = 1; + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + $('#fileupload').fileupload({ + singleFileUploads: false, + limitMultiFileUploads: 2, + limitMultiFileUploadSize: 150000, + limitMultiFileUploadSizeOverhead: 5000, + add: function () { + ok(true, 'Triggers callback number ' + index.toString()); + index += 1; + } + }).fileupload('add', param).fileupload('add', param2); + }); + + asyncTest('sequentialUploads', function () { + expect(6); + var param = {files: [ + {name: '1'}, + {name: '2'}, + {name: '3'}, + {name: '4'}, + {name: '5'}, + {name: '6'} + ]}, + addIndex = 0, + sendIndex = 0, + loadIndex = 0, + fu = $('#fileupload').fileupload({ + sequentialUploads: true, + add: function (e, data) { + addIndex += 1; + if (addIndex === 4) { + data.submit().abort(); + } else { + data.submit(); + } + }, + send: function () { + sendIndex += 1; + }, + done: function () { + loadIndex += 1; + strictEqual(sendIndex, loadIndex, 'upload in order'); + }, + fail: function (e, data) { + strictEqual(data.errorThrown, 'abort', 'upload aborted'); + }, + stop: function () { + start(); + } + }); + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + fu.fileupload('add', param); + }); + + asyncTest('limitConcurrentUploads', function () { + expect(12); + var param = {files: [ + {name: '1'}, + {name: '2'}, + {name: '3'}, + {name: '4'}, + {name: '5'}, + {name: '6'}, + {name: '7'}, + {name: '8'}, + {name: '9'}, + {name: '10'}, + {name: '11'}, + {name: '12'} + ]}, + addIndex = 0, + sendIndex = 0, + loadIndex = 0, + fu = $('#fileupload').fileupload({ + limitConcurrentUploads: 3, + add: function (e, data) { + addIndex += 1; + if (addIndex === 4) { + data.submit().abort(); + } else { + data.submit(); + } + }, + send: function () { + sendIndex += 1; + }, + done: function () { + loadIndex += 1; + ok(sendIndex - loadIndex < 3); + }, + fail: function (e, data) { + strictEqual(data.errorThrown, 'abort', 'upload aborted'); + }, + stop: function () { + start(); + } + }); + (fu.data('blueimp-fileupload') || fu.data('fileupload')) + ._isXHRUpload = function () { + return true; + }; + fu.fileupload('add', param); + }); + + if ($.support.xhrFileUpload) { + asyncTest('multipart', function () { + expect(2); + var param = {files: [{ + name: 'test.png', + size: 123, + type: 'image/png' + }]}, + fu = $('#fileupload').fileupload({ + multipart: false, + always: function (e, data) { + strictEqual( + data.contentType, + param.files[0].type, + 'non-multipart upload sets file type as contentType' + ); + strictEqual( + data.headers['Content-Disposition'], + 'attachment; filename="' + param.files[0].name + '"', + 'non-multipart upload sets Content-Disposition header' + ); + start(); + } + }); + fu.fileupload('send', param); + }); + } + + module('UI Initialization', lifecycleUI); + + test('Widget initialization', function () { + var fu = $('#fileupload').fileupload(); + ok(fu.data('blueimp-fileupload') || fu.data('fileupload')); + ok( + $('#fileupload').fileupload('option', 'uploadTemplate').length, + 'Initialized upload template' + ); + ok( + $('#fileupload').fileupload('option', 'downloadTemplate').length, + 'Initialized download template' + ); + }); + + test('Buttonbar event listeners', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'), + files = [{name: 'test'}]; + expect(4); + $('#fileupload').fileupload({ + send: function () { + ok(true, 'Started file upload via global start button'); + }, + fail: function (e, data) { + ok(true, 'Canceled file upload via global cancel button'); + data.context.remove(); + }, + destroy: function () { + ok(true, 'Delete action called via global delete button'); + } + }); + $('#fileupload').fileupload('add', {files: files}); + buttonbar.find('.cancel').click(); + $('#fileupload').fileupload('add', {files: files}); + buttonbar.find('.start').click(); + buttonbar.find('.cancel').click(); + files[0].deleteUrl = 'http://example.org/banana.jpg'; + ($('#fileupload').data('blueimp-fileupload') || + $('#fileupload').data('fileupload')) + ._renderDownload(files) + .appendTo($('#fileupload .files')).show() + .find('.toggle').click(); + buttonbar.find('.delete').click(); + }); + + module('UI API', lifecycleUI); + + test('destroy', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'), + files = [{name: 'test'}]; + expect(1); + $('#fileupload').fileupload({ + send: function () { + ok(true, 'This test should not run'); + return false; + } + }) + .fileupload('add', {files: files}) + .fileupload('destroy'); + buttonbar.find('.start').click(function () { + ok(true, 'Clicked global start button'); + return false; + }).click(); + }); + + test('disable/enable', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'); + $('#fileupload').fileupload(); + $('#fileupload').fileupload('disable'); + strictEqual( + buttonbar.find('input[type=file], button').not(':disabled').length, + 0, + 'Disables the buttonbar buttons' + ); + $('#fileupload').fileupload('enable'); + strictEqual( + buttonbar.find('input[type=file], button').not(':disabled').length, + 4, + 'Enables the buttonbar buttons' + ); + }); + + module('UI Callbacks', lifecycleUI); + + test('destroy', function () { + expect(3); + $('#fileupload').fileupload({ + destroy: function (e, data) { + ok(true, 'Triggers destroy callback'); + strictEqual( + data.url, + 'test', + 'Passes over deletion url parameter' + ); + strictEqual( + data.type, + 'DELETE', + 'Passes over deletion request type parameter' + ); + } + }); + ($('#fileupload').data('blueimp-fileupload') || + $('#fileupload').data('fileupload')) + ._renderDownload([{ + name: 'test', + deleteUrl: 'test', + deleteType: 'DELETE' + }]) + .appendTo($('#fileupload .files')) + .show() + .find('.toggle').click(); + $('#fileupload .fileupload-buttonbar .delete').click(); + }); + + asyncTest('added', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + added: function (e, data) { + start(); + strictEqual( + data.files[0].name, + param.files[0].name, + 'Triggers added callback' + ); + }, + send: function () { + return false; + } + }).fileupload('add', param); + }); + + asyncTest('started', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + started: function () { + start(); + ok('Triggers started callback'); + return false; + }, + sent: function () { + return false; + } + }).fileupload('send', param); + }); + + asyncTest('sent', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + sent: function (e, data) { + start(); + strictEqual( + data.files[0].name, + param.files[0].name, + 'Triggers sent callback' + ); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('completed', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + completed: function () { + start(); + ok('Triggers completed callback'); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('failed', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + failed: function () { + start(); + ok('Triggers failed callback'); + return false; + } + }).fileupload('send', param).abort(); + }); + + asyncTest('stopped', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + stopped: function () { + start(); + ok('Triggers stopped callback'); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('destroyed', function () { + expect(1); + $('#fileupload').fileupload({ + dataType: 'html', + destroyed: function () { + start(); + ok(true, 'Triggers destroyed callback'); + } + }); + ($('#fileupload').data('blueimp-fileupload') || + $('#fileupload').data('fileupload')) + ._renderDownload([{ + name: 'test', + deleteUrl: '.', + deleteType: 'GET' + }]) + .appendTo($('#fileupload .files')) + .show() + .find('.toggle').click(); + $('#fileupload .fileupload-buttonbar .delete').click(); + }); + + module('UI Options', lifecycleUI); + + test('autoUpload', function () { + expect(1); + $('#fileupload') + .fileupload({ + autoUpload: true, + send: function () { + ok(true, 'Started file upload automatically'); + return false; + } + }) + .fileupload('add', {files: [{name: 'test'}]}) + .fileupload('option', 'autoUpload', false) + .fileupload('add', {files: [{name: 'test'}]}); + }); + + test('maxNumberOfFiles', function () { + expect(3); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + maxNumberOfFiles: 3, + singleFileUploads: false, + send: function () { + strictEqual( + sendIndex += 1, + addIndex + ); + }, + progress: $.noop, + progressall: $.noop, + done: $.noop, + stop: $.noop + }) + .fileupload('add', {files: [{name: (addIndex += 1)}]}) + .fileupload('add', {files: [{name: (addIndex += 1)}]}) + .fileupload('add', {files: [{name: (addIndex += 1)}]}) + .fileupload('add', {files: [{name: 'test'}]}); + }); + + test('maxFileSize', function () { + expect(2); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + maxFileSize: 1000, + send: function () { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{ + name: (addIndex += 1) + }]}) + .fileupload('add', {files: [{ + name: (addIndex += 1), + size: 999 + }]}) + .fileupload('add', {files: [{ + name: 'test', + size: 1001 + }]}) + .fileupload({ + send: function (e, data) { + ok( + !$.blueimp.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }); + }); + + test('minFileSize', function () { + expect(2); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + minFileSize: 1000, + send: function () { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{ + name: (addIndex += 1) + }]}) + .fileupload('add', {files: [{ + name: (addIndex += 1), + size: 1001 + }]}) + .fileupload('add', {files: [{ + name: 'test', + size: 999 + }]}) + .fileupload({ + send: function (e, data) { + ok( + !$.blueimp.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }); + }); + + test('acceptFileTypes', function () { + expect(2); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, + disableImageMetaDataLoad: true, + send: function () { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{ + name: (addIndex += 1) + '.jpg' + }]}) + .fileupload('add', {files: [{ + name: (addIndex += 1), + type: 'image/jpeg' + }]}) + .fileupload('add', {files: [{ + name: 'test.txt', + type: 'text/plain' + }]}) + .fileupload({ + send: function (e, data) { + ok( + !$.blueimp.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }); + }); + + test('acceptFileTypes as HTML5 data attribute', function () { + expect(2); + var regExp = /(\.|\/)(gif|jpe?g|png)$/i; + $('#fileupload') + .attr('data-accept-file-types', regExp.toString()) + .fileupload(); + strictEqual( + $.type($('#fileupload').fileupload('option', 'acceptFileTypes')), + $.type(regExp) + ); + strictEqual( + $('#fileupload').fileupload('option', 'acceptFileTypes').toString(), + regExp.toString() + ); + }); + +}); diff --git a/version.inc b/version.inc index 318508268..4d2657c6c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-18.561 +2014-01-19.562 -- cgit v1.2.3 From 3459c717d4c70b197cce00da49984b1482de8f18 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Jan 2014 14:21:26 -0800 Subject: don't allow the demo upload server to operate - otherwise one could find themselves with a bunch of unwanted uploads --- library/jqupload/server/php/index.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/jqupload/server/php/index.php b/library/jqupload/server/php/index.php index 3ae1295ef..be29bf479 100644 --- a/library/jqupload/server/php/index.php +++ b/library/jqupload/server/php/index.php @@ -10,6 +10,10 @@ * http://www.opensource.org/licenses/MIT */ +// Don't allow files to be stored from the demo server + +exit; + error_reporting(E_ALL | E_STRICT); require('UploadHandler.php'); $upload_handler = new UploadHandler(); -- cgit v1.2.3 From e9ce68559e7f552b6ef738eaf7f9025813eb82ad Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 19 Jan 2014 23:48:26 +0000 Subject: Stop Google DDoSing me by providing block_public_search, which unlike block_public will block *only* searching without an observer. --- mod/search.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mod/search.php b/mod/search.php index d13c613c2..22e521164 100644 --- a/mod/search.php +++ b/mod/search.php @@ -8,11 +8,12 @@ function search_init(&$a) { function search_content(&$a,$update = 0, $load = false) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); + if((get_config('system','block_public')) || (get_config('system','block_public_search'))) { + if ((! local_user()) && (! remote_user())) { + notice( t('Public access denied.') . EOL); return; + } } - nav_set_selected('search'); require_once("include/bbcode.php"); -- cgit v1.2.3 From 9fb36df8d981716a6557068b18ee364e62522180 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 20 Jan 2014 01:54:52 +0000 Subject: Fix dav directory creation. --- include/reddav.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index 838ead7b7..1658e43c4 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -190,8 +190,9 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { } $r = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1", - intval(PAGE_REMOVED), - intval($this->auth->owner_id) + intval($this->auth->owner_id), + intval(PAGE_REMOVED) + ); if($r) { -- cgit v1.2.3 From 82a5eb5d90d99cfd9fc3a319235c2f24cff2de67 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Jan 2014 22:27:54 -0800 Subject: strip zid= from REQUEST_URI as well as QUERY_STRING - sabre uses both --- mod/cloud.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod/cloud.php b/mod/cloud.php index 2db7682ef..616d512cc 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -68,6 +68,9 @@ function cloud_init(&$a) { $_SERVER['QUERY_STRING'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['QUERY_STRING']); $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']); + $_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']); + $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']); + $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); -- cgit v1.2.3 From 26dfcecf054e19616f198872b66c7645270f4430 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 20 Jan 2014 06:28:38 +0000 Subject: Prevent zids messing up dav --- include/reddav.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index 1658e43c4..0d2aac19e 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -50,6 +50,9 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { function getChild($name) { logger('RedDirectory::getChild : ' . $name, LOGGER_DATA); + $name = str_replace(array('?f=','&f='),array('',''),$name); + $name = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$name); + logger('RedDirectory::getChild post strip zid: ' . $name, LOGGER_DATA); if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { @@ -190,9 +193,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { } $r = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1", - intval($this->auth->owner_id), - intval(PAGE_REMOVED) - + intval(PAGE_REMOVED), + intval($this->auth->owner_id) ); if($r) { -- cgit v1.2.3 From 0250223438d38a508b991a581ef08de904ac6368 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Jan 2014 22:34:28 -0800 Subject: revert 26dfcecf054e1 --- include/reddav.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index 0d2aac19e..a937360a8 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -50,10 +50,6 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { function getChild($name) { logger('RedDirectory::getChild : ' . $name, LOGGER_DATA); - $name = str_replace(array('?f=','&f='),array('',''),$name); - $name = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$name); - logger('RedDirectory::getChild post strip zid: ' . $name, LOGGER_DATA); - if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) { throw new DAV\Exception\Forbidden('Permission denied.'); @@ -193,8 +189,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { } $r = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1", - intval(PAGE_REMOVED), - intval($this->auth->owner_id) + intval($this->auth->owner_id), + intval(PAGE_REMOVED) ); if($r) { -- cgit v1.2.3 From d5bf53c54cbe212eac5adeacac57adee5b478279 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Jan 2014 23:37:46 -0800 Subject: bring photo tagging back which hasn't worked since forking from Friendica - this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh. --- mod/item.php | 8 +- mod/photos.php | 229 ++++++++++++--------------------------------------------- 2 files changed, 53 insertions(+), 184 deletions(-) diff --git a/mod/item.php b/mod/item.php index 23fce2fd7..6d421009b 100644 --- a/mod/item.php +++ b/mod/item.php @@ -518,10 +518,10 @@ function item_post(&$a) { 'url' => $success['url'] ); } - if(is_array($success['contact']) && intval($success['contact']['prv'])) { - $private_forum = true; - $private_id = $success['contact']['id']; - } +// if(is_array($success['contact']) && intval($success['contact']['prv'])) { +// $private_forum = true; +// $private_id = $success['contact']['id']; +// } } } diff --git a/mod/photos.php b/mod/photos.php index 8099c71e6..23733e121 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -335,208 +335,77 @@ function photos_post(&$a) { $str_tags = ''; $inform = ''; - // if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag + // if the new tag doesn't have a namespace specifier (@foo or #foo) give it a mention $x = substr($rawtags,0,1); if($x !== '@' && $x !== '#') - $rawtags = '#' . $rawtags; + $rawtags = '@' . $rawtags; $taginfo = array(); $tags = get_tags($rawtags); if(count($tags)) { foreach($tags as $tag) { - if(isset($profile)) - unset($profile); - if(strpos($tag,'@') === 0) { - $name = substr($tag,1); - if((strpos($name,'@')) || (strpos($name,'http://'))) { - $newname = $name; - $links = @lrdd($name); - if(count($links)) { - foreach($links as $link) { - if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') - $profile = $link['@attributes']['href']; - if($link['@attributes']['rel'] === 'salmon') { - $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']); - if(strlen($inform)) - $inform .= ','; - $inform .= $salmon; - } - } - } - $taginfo[] = array($newname,$profile,$salmon); + + // If we already tagged 'Robert Johnson', don't try and tag 'Robert'. + // Robert Johnson should be first in the $tags array + + $fullnametagged = false; + for($x = 0; $x < count($tagged); $x ++) { + if(stristr($tagged[$x],$tag . ' ')) { + $fullnametagged = true; + break; } - else { - $newname = $name; - $alias = ''; - $tagcid = 0; - if(strrpos($newname,'+')) - $tagcid = intval(substr($newname,strrpos($newname,'+') + 1)); - - if($tagcid) { - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($tagcid), - intval($profile_uid) - ); - } - else { - $newname = str_replace('_',' ',$name); - - //select someone from this user's contacts by name - $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", - dbesc($newname), - intval($page_owner_uid) - ); - - if(! $r) { - //select someone by attag or nick and the name passed in - $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", - dbesc($name), - dbesc($name), - intval($page_owner_uid) - ); - } - } -/* elseif(strstr($name,'_') || strstr($name,' ')) { - $newname = str_replace('_',' ',$name); - $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", - dbesc($newname), - intval($page_owner_uid) - ); - } - else { - $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", - dbesc($name), - dbesc($name), - intval($page_owner_uid) - ); - }*/ - if(count($r)) { - $newname = $r[0]['name']; - $profile = $r[0]['url']; - $notify = 'cid:' . $r[0]['id']; - if(strlen($inform)) - $inform .= ','; - $inform .= $notify; - } + } + if($fullnametagged) + continue; + + require_once('mod/item.php'); + $body = $access_tag = ''; + + $success = handle_tag($a, $body, $access_tag, $str_tags, (local_user()) ? local_user() : $a->profile['profile_uid'] , $tag); + logger('handle_tag: ' . print_r($success,tue), LOGGER_DEBUG); + if($access_tag) { + logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DEBUG); + if(strpos($access_tag,'cid:') === 0) { + $str_contact_allow .= '<' . substr($access_tag,4) . '>'; + $access_tag = ''; } - if($profile) { - if(substr($notify,0,4) === 'cid:') - $taginfo[] = array($newname,$profile,$notify,$r[0],'@[zrl=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/zrl]'); - else - $taginfo[] = array($newname,$profile,$notify,null,$str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'); - if(strlen($str_tags)) - $str_tags .= ','; - $profile = str_replace(',','%2c',$profile); - $str_tags .= '@[zrl=' . $profile . ']' . $newname . '[/zrl]'; + elseif(strpos($access_tag,'gid:') === 0) { + $str_group_allow .= '<' . substr($access_tag,4) . '>'; + $access_tag = ''; } } + + if($success['replaced']) { + $tagged[] = $tag; + $post_tags[] = array( + 'uid' => $a->profile['profile_uid'], + 'type' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ); + } } } - - $newtag = $old_tag; - if(strlen($newtag) && strlen($str_tags)) - $newtag .= ','; - $newtag .= $str_tags; - - $newinform = $old_inform; - if(strlen($newinform) && strlen($inform)) - $newinform .= ','; - $newinform .= $inform; -//FIXME - inform is gone -// $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", -// dbesc($newtag), -// dbesc($newinform), -// dbesc(datetime_convert()), -// dbesc(datetime_convert()), -// intval($item_id), -// intval($page_owner_uid) -// ); - - $best = 0; - foreach($p as $scales) { - if(intval($scales['scale']) == 2) { - $best = 2; - break; - } - if(intval($scales['scale']) == 4) { - $best = 4; - break; - } - } - - if(count($taginfo)) { - foreach($taginfo as $tagged) { - $mid = item_message_id(); - - $arr = array(); -//FIXME - $arr['uid'] = $page_owner_uid; - $arr['mid'] = $mid; - $arr['parent_mid'] = $mid; - $arr['type'] = 'activity'; - $arr['wall'] = 1; - $arr['contact-id'] = $owner_record['id']; - $arr['owner-name'] = $owner_record['name']; - $arr['owner-link'] = $owner_record['url']; - $arr['owner-avatar'] = $owner_record['thumb']; - $arr['author-name'] = $owner_record['name']; - $arr['author-link'] = $owner_record['url']; - $arr['author-avatar'] = $owner_record['thumb']; - $arr['title'] = ''; - $arr['allow_cid'] = $p[0]['allow_cid']; - $arr['allow_gid'] = $p[0]['allow_gid']; - $arr['deny_cid'] = $p[0]['deny_cid']; - $arr['deny_gid'] = $p[0]['deny_gid']; - $arr['visible'] = 1; - $arr['verb'] = ACTIVITY_TAG; - $arr['obj_type'] = ACTIVITY_OBJ_PERSON; - $arr['tgt_type'] = ACTIVITY_OBJ_PHOTO; - $arr['tag'] = $tagged[4]; - $arr['inform'] = $tagged[2]; - $arr['origin'] = 1; - $arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[zrl=' . $tagged[1] . ']' . $tagged[0] . '[/zrl]', '[zrl=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/zrl]', '[zrl=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/zrl]') ; - - $arr['body'] .= "\n\n" . '[zrl=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ']' . '[zmg]' . $a->get_baseurl() . "/photo/" . $p[0]['resource_id'] . '-' . $best . '.' . $ext . '[/zmg][/zrl]' . "\n" ; - - $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $tagged[0] . '' . $tagged[1] . '/' . $tagged[0] . ''; - $arr['object'] .= '' . xmlify('' . "\n"); - if($tagged[3]) - $arr['object'] .= xmlify('' . "\n"); - $arr['object'] .= '' . "\n"; - - $arr['target'] = '' . ACTIVITY_OBJ_PHOTO . '' . $p[0]['description'] . '' - . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ''; - $arr['target'] .= '' . xmlify('' . "\n" . '') . ''; - - if ((! $arr['plink']) && ($arr['item_flags'] & ITEM_THREAD_TOP)) { - $arr['plink'] = z_root() . '/channel/' . $owner_record['channel_address'] . '/?f=&mid=' . $arr['mid']; - } - - - - - $post = item_store($arr); - $item_id = $post['item_id']; - - if($item_id) { - q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", - dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id), - intval($page_owner_uid), - intval($item_id) - ); - - proc_run('php',"include/notifier.php","tag","$item_id"); - } - } + $r = q("select * from item where id = %d and uid = %d limit 1", + intval($item_id), + intval($page_owner_uid) + ); + if($r) { + $datarray = $r[0]; + $datarray['term'] = $post_tags; + item_store_update($datarray,$execflag); } } + goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); return; // NOTREACHED + } -- cgit v1.2.3 From fdfea0a8e932bdb8d243c7b81bcdb9acefb28d4d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Jan 2014 01:03:58 -0800 Subject: catch auth exceptions --- mod/cloud.php | 9 +++++++-- version.inc | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mod/cloud.php b/mod/cloud.php index 616d512cc..7413e1824 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -80,9 +80,14 @@ function cloud_init(&$a) { $server->addPlugin($lockPlugin); - if(! $auth->observer) - $auth->Authenticate($server,'Red Matrix'); + if(! $auth->observer) { + try { + $auth->Authenticate($server,'Red Matrix'); + } + catch ( Exception $e) { + } + } // $browser = new DAV\Browser\Plugin(); $browser = new RedBrowser($auth); diff --git a/version.inc b/version.inc index 4d2657c6c..1d3ba2799 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-19.562 +2014-01-20.563 -- cgit v1.2.3 From 1fa8546d467bcd541858967aaec33d8779e4df99 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Jan 2014 01:29:41 -0800 Subject: zidify audio/video links --- include/oembed.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/include/oembed.php b/include/oembed.php index 520b69892..6946ba4b8 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -26,7 +26,20 @@ function oembed_fetch_url($embedurl){ if(is_null($txt)){ $txt = ""; - if (!in_array($ext, $noexts)){ + if (in_array($ext, $noexts)) { + $m = @parse_url($embedurl); + $zrl = false; + if($m['host']) { + $r = q("select hubloc_url from hubloc where hubloc_host = '%s' limit 1", + dbesc($m['host']) + ); + if($r) + $zrl = true; + } + if($zrl) + $embedurl = zid($embedurl); + } + else { // try oembed autodiscovery $redirects = 0; @@ -57,12 +70,6 @@ function oembed_fetch_url($embedurl){ call_hooks('oembed_probe',$x); if(array_key_exists('embed',$x)) $txt = $x['embed']; - - // try oohembed service -// $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth; -// $result = z_fetch_url($ourl); -// if($result['success']) -// $txt = $result['body']; } $txt=trim($txt); -- cgit v1.2.3 From e68748afabee36a0c60fdf071cdc7c458080f13b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Jan 2014 03:11:45 -0800 Subject: transifex didn't like plural-forms and now they don't like it commented out. So we'll try uncommenting the sucker and see if they like it again. --- util/messages.po | 439 +++++++++++++++++++++++++-------------------------- util/run_xgettext.sh | 6 +- 2 files changed, 220 insertions(+), 225 deletions(-) diff --git a/util/messages.po b/util/messages.po index 802e4e463..360dd67b8 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-01-17.560\n" +"Project-Id-Version: 2014-01-20.563\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-17 00:03-0800\n" +"POT-Creation-Date: 2014-01-20 03:10-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../../include/acl_selectors.php:235 msgid "Visible to everybody" @@ -145,7 +145,7 @@ msgid "Addon applications, utilities, games" msgstr "" #: ../../include/nav.php:135 ../../include/text.php:736 -#: ../../include/text.php:750 ../../mod/search.php:28 +#: ../../include/text.php:750 ../../mod/search.php:29 msgid "Search" msgstr "" @@ -295,12 +295,8 @@ msgstr "" msgid "Please wait..." msgstr "" -#: ../../include/reddav.php:984 -msgid "Edit File properties" -msgstr "" - -#: ../../include/Contact.php:104 ../../include/widgets.php:115 -#: ../../include/widgets.php:155 ../../include/identity.php:625 +#: ../../include/Contact.php:104 ../../include/identity.php:625 +#: ../../include/widgets.php:115 ../../include/widgets.php:155 #: ../../mod/directory.php:182 ../../mod/match.php:62 ../../mod/suggest.php:51 #: ../../mod/dirprofile.php:165 msgid "Connect" @@ -314,152 +310,6 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87 -msgid "Categories" -msgstr "" - -#: ../../include/widgets.php:117 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "" - -#: ../../include/widgets.php:123 ../../mod/connections.php:236 -msgid "Suggestions" -msgstr "" - -#: ../../include/widgets.php:124 -msgid "See more..." -msgstr "" - -#: ../../include/widgets.php:146 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/widgets.php:152 -msgid "Add New Connection" -msgstr "" - -#: ../../include/widgets.php:153 -msgid "Enter the channel address" -msgstr "" - -#: ../../include/widgets.php:154 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/widgets.php:171 -msgid "Notes" -msgstr "" - -#: ../../include/widgets.php:173 ../../include/text.php:738 -#: ../../include/text.php:752 ../../mod/filer.php:36 -msgid "Save" -msgstr "" - -#: ../../include/widgets.php:243 -msgid "Remove term" -msgstr "" - -#: ../../include/widgets.php:252 ../../include/features.php:50 -msgid "Saved Searches" -msgstr "" - -#: ../../include/widgets.php:253 ../../include/group.php:290 -msgid "add" -msgstr "" - -#: ../../include/widgets.php:283 ../../include/features.php:64 -#: ../../include/contact_widgets.php:53 -msgid "Saved Folders" -msgstr "" - -#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56 -#: ../../include/contact_widgets.php:90 -msgid "Everything" -msgstr "" - -#: ../../include/widgets.php:318 ../../include/items.php:3568 -msgid "Archives" -msgstr "" - -#: ../../include/widgets.php:370 -msgid "Refresh" -msgstr "" - -#: ../../include/widgets.php:371 ../../mod/connedit.php:386 -msgid "Me" -msgstr "" - -#: ../../include/widgets.php:372 ../../mod/connedit.php:388 -msgid "Best Friends" -msgstr "" - -#: ../../include/widgets.php:373 ../../include/identity.php:310 -#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:389 -msgid "Friends" -msgstr "" - -#: ../../include/widgets.php:374 -msgid "Co-workers" -msgstr "" - -#: ../../include/widgets.php:375 ../../mod/connedit.php:390 -msgid "Former Friends" -msgstr "" - -#: ../../include/widgets.php:376 ../../mod/connedit.php:391 -msgid "Acquaintances" -msgstr "" - -#: ../../include/widgets.php:377 -msgid "Everybody" -msgstr "" - -#: ../../include/widgets.php:409 -msgid "Account settings" -msgstr "" - -#: ../../include/widgets.php:415 -msgid "Channel settings" -msgstr "" - -#: ../../include/widgets.php:421 -msgid "Additional features" -msgstr "" - -#: ../../include/widgets.php:427 -msgid "Feature settings" -msgstr "" - -#: ../../include/widgets.php:433 -msgid "Display settings" -msgstr "" - -#: ../../include/widgets.php:439 -msgid "Connected apps" -msgstr "" - -#: ../../include/widgets.php:445 -msgid "Export channel" -msgstr "" - -#: ../../include/widgets.php:457 -msgid "Automatic Permissions (Advanced)" -msgstr "" - -#: ../../include/widgets.php:467 -msgid "Premium Channel Settings" -msgstr "" - -#: ../../include/widgets.php:476 ../../include/features.php:41 -#: ../../mod/sources.php:81 -msgid "Channel Sources" -msgstr "" - -#: ../../include/widgets.php:504 -msgid "Check Mail" -msgstr "" - #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "" @@ -684,6 +534,11 @@ msgstr[1] "" msgid "View Connections" msgstr "" +#: ../../include/text.php:738 ../../include/text.php:752 +#: ../../include/widgets.php:173 ../../mod/filer.php:36 +msgid "Save" +msgstr "" + #: ../../include/text.php:818 msgid "poke" msgstr "" @@ -1007,12 +862,16 @@ msgstr "" msgid "Channels not in any collection" msgstr "" +#: ../../include/group.php:290 ../../include/widgets.php:253 +msgid "add" +msgstr "" + #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:536 -#: ../../mod/photos.php:1099 ../../mod/photos.php:1186 +#: ../../mod/photos.php:968 ../../mod/photos.php:1055 msgid "Comment" msgstr "" @@ -1135,7 +994,7 @@ msgid "Stored post could not be verified." msgstr "" #: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51 -#: ../../mod/photos.php:91 ../../mod/photos.php:783 ../../mod/photos.php:805 +#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 #: ../../mod/profile_photo.php:336 msgid "Profile Photos" @@ -1178,6 +1037,11 @@ msgstr "" msgid "Default Profile" msgstr "" +#: ../../include/identity.php:310 ../../include/profile_selectors.php:42 +#: ../../include/widgets.php:373 ../../mod/connedit.php:389 +msgid "Friends" +msgstr "" + #: ../../include/identity.php:477 msgid "Requested channel is not available." msgstr "" @@ -1274,7 +1138,7 @@ msgstr "" msgid "Events this week:" msgstr "" -#: ../../include/identity.php:893 ../../include/identity.php:975 +#: ../../include/identity.php:893 ../../include/identity.php:977 #: ../../mod/profperm.php:103 msgid "Profile" msgstr "" @@ -1345,33 +1209,41 @@ msgid "Contact information and Social Networks:" msgstr "" #: ../../include/identity.php:955 -msgid "Musical interests:" +msgid "My other channels:" msgstr "" #: ../../include/identity.php:957 -msgid "Books, literature:" +msgid "Musical interests:" msgstr "" #: ../../include/identity.php:959 -msgid "Television:" +msgid "Books, literature:" msgstr "" #: ../../include/identity.php:961 -msgid "Film/dance/culture/entertainment:" +msgid "Television:" msgstr "" #: ../../include/identity.php:963 -msgid "Love/Romance:" +msgid "Film/dance/culture/entertainment:" msgstr "" #: ../../include/identity.php:965 -msgid "Work/employment:" +msgid "Love/Romance:" msgstr "" #: ../../include/identity.php:967 +msgid "Work/employment:" +msgstr "" + +#: ../../include/identity.php:969 msgid "School/education:" msgstr "" +#: ../../include/reddav.php:984 +msgid "Edit File properties" +msgstr "" + #: ../../include/bbcode.php:94 ../../include/bbcode.php:509 #: ../../include/bbcode.php:512 msgid "Image/photo" @@ -1398,11 +1270,11 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/oembed.php:150 +#: ../../include/oembed.php:157 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:159 +#: ../../include/oembed.php:166 msgid "Embedding disabled" msgstr "" @@ -1490,6 +1362,11 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" +#: ../../include/features.php:41 ../../include/widgets.php:476 +#: ../../mod/sources.php:81 +msgid "Channel Sources" +msgstr "" + #: ../../include/features.php:41 msgid "Automatically import channel content from other channels or feeds" msgstr "" @@ -1523,6 +1400,10 @@ msgstr "" msgid "Enable widget to display Network posts only from selected collections" msgstr "" +#: ../../include/features.php:50 ../../include/widgets.php:252 +msgid "Saved Searches" +msgstr "" + #: ../../include/features.php:50 msgid "Save search terms for re-use" msgstr "" @@ -1587,6 +1468,11 @@ msgstr "" msgid "Add categories to your posts" msgstr "" +#: ../../include/features.php:64 ../../include/widgets.php:283 +#: ../../include/contact_widgets.php:53 +msgid "Saved Folders" +msgstr "" + #: ../../include/features.php:64 msgid "Ability to file posts under folders" msgstr "" @@ -1650,7 +1536,7 @@ msgstr "" #: ../../include/conversation.php:632 ../../include/ItemObject.php:108 #: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:693 -#: ../../mod/group.php:176 ../../mod/photos.php:1150 +#: ../../mod/group.php:176 ../../mod/photos.php:1019 #: ../../mod/filestorage.php:172 ../../mod/settings.php:570 msgid "Delete" msgstr "" @@ -1687,7 +1573,7 @@ msgid "View in context" msgstr "" #: ../../include/conversation.php:706 ../../include/conversation.php:1119 -#: ../../include/ItemObject.php:248 ../../mod/photos.php:1081 +#: ../../include/ItemObject.php:248 ../../mod/photos.php:950 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115 #: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153 #: ../../mod/editblock.php:129 @@ -1818,13 +1704,13 @@ msgid "Expires YYYY-MM-DD HH:MM" msgstr "" #: ../../include/conversation.php:1082 ../../include/ItemObject.php:546 -#: ../../mod/webpages.php:122 ../../mod/photos.php:1101 +#: ../../mod/webpages.php:122 ../../mod/photos.php:970 #: ../../mod/editlayout.php:136 ../../mod/editpost.php:127 #: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151 msgid "Preview" msgstr "" -#: ../../include/conversation.php:1096 ../../mod/photos.php:1080 +#: ../../include/conversation.php:1096 ../../mod/photos.php:949 msgid "Share" msgstr "" @@ -2069,7 +1955,7 @@ msgstr "" #: ../../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:653 ../../mod/viewsrc.php:12 +#: ../../mod/photos.php:68 ../../mod/photos.php:522 ../../mod/viewsrc.php:12 #: ../../mod/menu.php:40 ../../mod/connections.php:167 #: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12 #: ../../mod/profiles.php:152 ../../mod/profiles.php:465 @@ -2109,8 +1995,8 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:301 ../../mod/photos.php:821 -#: ../../mod/photos.php:1296 +#: ../../include/photos.php:301 ../../mod/photos.php:690 +#: ../../mod/photos.php:1165 msgid "Upload New Photos" msgstr "" @@ -2726,6 +2612,124 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" +#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87 +msgid "Categories" +msgstr "" + +#: ../../include/widgets.php:117 ../../mod/suggest.php:53 +msgid "Ignore/Hide" +msgstr "" + +#: ../../include/widgets.php:123 ../../mod/connections.php:236 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:124 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:146 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/widgets.php:152 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:153 +msgid "Enter the channel address" +msgstr "" + +#: ../../include/widgets.php:154 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:171 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:243 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56 +#: ../../include/contact_widgets.php:90 +msgid "Everything" +msgstr "" + +#: ../../include/widgets.php:318 ../../include/items.php:3568 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:370 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:371 ../../mod/connedit.php:386 +msgid "Me" +msgstr "" + +#: ../../include/widgets.php:372 ../../mod/connedit.php:388 +msgid "Best Friends" +msgstr "" + +#: ../../include/widgets.php:374 +msgid "Co-workers" +msgstr "" + +#: ../../include/widgets.php:375 ../../mod/connedit.php:390 +msgid "Former Friends" +msgstr "" + +#: ../../include/widgets.php:376 ../../mod/connedit.php:391 +msgid "Acquaintances" +msgstr "" + +#: ../../include/widgets.php:377 +msgid "Everybody" +msgstr "" + +#: ../../include/widgets.php:409 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:415 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:421 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:427 +msgid "Feature settings" +msgstr "" + +#: ../../include/widgets.php:433 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:439 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:445 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:457 +msgid "Automatic Permissions (Advanced)" +msgstr "" + +#: ../../include/widgets.php:467 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:504 +msgid "Check Mail" +msgstr "" + #: ../../include/contact_widgets.php:14 #, php-format msgid "%d invitation available" @@ -2948,7 +2952,7 @@ msgstr "" msgid "Connection not found." msgstr "" -#: ../../include/ItemObject.php:89 ../../mod/photos.php:972 +#: ../../include/ItemObject.php:89 ../../mod/photos.php:841 msgid "Private Message" msgstr "" @@ -2976,11 +2980,11 @@ msgstr "" msgid "add tag" msgstr "" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1078 +#: ../../include/ItemObject.php:175 ../../mod/photos.php:947 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:176 ../../mod/photos.php:1079 +#: ../../include/ItemObject.php:176 ../../mod/photos.php:948 msgid "I don't like this (toggle)" msgstr "" @@ -3025,8 +3029,8 @@ msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:534 ../../mod/photos.php:1097 -#: ../../mod/photos.php:1184 +#: ../../include/ItemObject.php:534 ../../mod/photos.php:966 +#: ../../mod/photos.php:1053 msgid "This is you" msgstr "" @@ -3036,8 +3040,8 @@ msgstr "" #: ../../mod/connect.php:92 ../../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:81 -#: ../../mod/photos.php:693 ../../mod/photos.php:798 ../../mod/photos.php:1060 -#: ../../mod/photos.php:1100 ../../mod/photos.php:1187 +#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929 +#: ../../mod/photos.php:969 ../../mod/photos.php:1056 #: ../../mod/profiles.php:518 ../../mod/filestorage.php:132 #: ../../mod/import.php:387 ../../mod/settings.php:507 #: ../../mod/settings.php:619 ../../mod/settings.php:647 @@ -4076,8 +4080,8 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/viewconnections.php:17 ../../mod/search.php:12 -#: ../../mod/photos.php:573 ../../mod/directory.php:15 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 ../../mod/search.php:13 +#: ../../mod/photos.php:442 ../../mod/directory.php:15 ../../mod/display.php:9 #: ../../mod/community.php:18 ../../mod/dirprofile.php:9 msgid "Public access denied." msgstr "" @@ -4952,132 +4956,123 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:799 +#: ../../mod/photos.php:119 ../../mod/photos.php:668 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:159 ../../mod/photos.php:1061 +#: ../../mod/photos.php:159 ../../mod/photos.php:930 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:500 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" - -#: ../../mod/photos.php:500 -msgid "a photo" -msgstr "" - -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:452 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:630 +#: ../../mod/photos.php:499 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:573 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:707 +#: ../../mod/photos.php:576 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:726 +#: ../../mod/photos.php:595 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:730 ../../mod/photos.php:794 +#: ../../mod/photos.php:599 ../../mod/photos.php:663 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:731 +#: ../../mod/photos.php:600 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:732 +#: ../../mod/photos.php:601 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:734 ../../mod/photos.php:1056 +#: ../../mod/photos.php:603 ../../mod/photos.php:925 #: ../../mod/filestorage.php:125 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:783 ../../mod/photos.php:805 ../../mod/photos.php:1232 -#: ../../mod/photos.php:1247 +#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1101 +#: ../../mod/photos.php:1116 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:678 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:815 +#: ../../mod/photos.php:684 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:817 +#: ../../mod/photos.php:686 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:860 ../../mod/photos.php:1279 +#: ../../mod/photos.php:729 ../../mod/photos.php:1148 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:906 +#: ../../mod/photos.php:775 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:908 +#: ../../mod/photos.php:777 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:966 +#: ../../mod/photos.php:835 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:990 +#: ../../mod/photos.php:859 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1044 +#: ../../mod/photos.php:913 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1046 +#: ../../mod/photos.php:915 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1047 +#: ../../mod/photos.php:916 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1049 +#: ../../mod/photos.php:918 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:921 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1054 +#: ../../mod/photos.php:923 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1058 +#: ../../mod/photos.php:927 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1154 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1294 +#: ../../mod/photos.php:1163 msgid "Recent Photos" msgstr "" diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 73f28cabb..8b5f54a53 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -48,7 +48,7 @@ KEYWORDS="-k -kt -ktt:1,2" echo "extract strings to $OUTFILE.." -echo "extract strings to $OUTFILE.." + rm "$OUTFILE"; touch "$OUTFILE" for f in $(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f) do @@ -67,7 +67,7 @@ then sed -i "s/PACKAGE VERSION//g" "$OUTFILE" sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" - sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" +# sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" else sed -i "s/SOME DESCRIPTIVE TITLE./Red Communications Project/g" "$OUTFILE" sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Red Matrix Project/g" "$OUTFILE" @@ -75,7 +75,7 @@ else sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" sed -i "s/PACKAGE/Red/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" - sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" +# sed -i "s/^\"Plural-Forms//g" "$OUTFILE" fi echo "done." -- cgit v1.2.3 From a13593590b5e5488554225ba9ff9bced24cffd0c Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Mon, 20 Jan 2014 12:12:40 +0100 Subject: added buttons to perform later hubloc actions --- include/security.php | 2 +- mod/admin.php | 6 ++++-- view/tpl/admin_hubloc.tpl | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/security.php b/include/security.php index a87442d42..9943cf88d 100644 --- a/include/security.php +++ b/include/security.php @@ -339,7 +339,7 @@ function get_form_security_token($typename = '') { $timestamp = time(); $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename); - + return $timestamp . '.' . $sec_hash; } diff --git a/mod/admin.php b/mod/admin.php index 91dd0b56e..984e12777 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -456,7 +456,8 @@ function admin_page_site(&$a) { } function admin_page_hubloc_post(&$a){ - check_form_security_token_redirectOnErr('/admin/hubloc', 'hubloc'); + check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc'); + goaway($a->get_baseurl(true) . '/admin/hubloc' ); return; } @@ -479,7 +480,8 @@ function admin_page_hubloc(&$a) { '$queues' => $queues, //'$accounts' => $accounts, /*$accounts is empty here*/ '$pending' => Array( t('Pending registrations'), $pending), - '$plugins' => Array( t('Active plugins'), $a->plugins ) + '$plugins' => Array( t('Active plugins'), $a->plugins ), + '$form_security_token' => get_form_security_token("admin_hubloc") )); return $o; } diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index a9f250652..e1c8b3647 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -14,6 +14,8 @@ {{foreach $hubloc as $hub}} {{$hub.hubloc_id}}{{$hub.hubloc_addr}}{{$hub.hubloc_host}}{{$hub.hubloc_status}} + + {{/foreach}} -- cgit v1.2.3 From 86e2237555e23a83dcb5286488af677f5d52d610 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Mon, 20 Jan 2014 13:03:24 +0100 Subject: no need to have a doule hublocid --- view/tpl/admin_hubloc.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index e1c8b3647..6e7629094 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -14,8 +14,9 @@ {{foreach $hubloc as $hub}} {{$hub.hubloc_id}}{{$hub.hubloc_addr}}{{$hub.hubloc_host}}{{$hub.hubloc_status}} - - + + + {{/foreach}} -- cgit v1.2.3 From 5b69e3b79535d7d903d1f203f03b0647188eebc8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Jan 2014 14:18:12 -0800 Subject: Add external resource list so this stuff doesn't get lost. Please update it if you know of other related projects. --- doc/External-Resources.md | 22 ++++++++++++++++++++++ doc/Home.md | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 doc/External-Resources.md diff --git a/doc/External-Resources.md b/doc/External-Resources.md new file mode 100644 index 000000000..fd17f63e4 --- /dev/null +++ b/doc/External-Resources.md @@ -0,0 +1,22 @@ +External Resources +================== + + + +**Third-Party Themes** + +* [APW](https://github.com/beardy-unixer/apw) +* [Redstrap](https://github.com/omigeot/redstrap3) +* [Pluto](https://github.com/23n/Pluto) +* [bootstrap](https://bitbucket.org/tobiasd/red-theme-bootstrap/overview) + + +**Third-Party Addons** + + +**Related projects** + +* [Redshare for Firefox](https://addons.mozilla.org/en-US/firefox/addon/redshare/) + +* [Red for Android](https://github.com/cvogeley/red-for-android) + diff --git a/doc/Home.md b/doc/Home.md index bdb169691..de2353470 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -32,10 +32,10 @@ Red Matrix Documentation and Resources **External Resources** +* [External Resource Links](help/External-Resources) * [Main Website](https://github.com/friendica/red) * [Plugin/Addon Website](https://github.com/friendica/red-addons) * [Assets Website](https://github.com/friendica/red-assets) - * [Development Channel](http://zothub.com/channel/one) **About** -- cgit v1.2.3 From 3469e63ef507af9b2c49badf63996950eb84468f Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 20 Jan 2014 23:34:21 +0000 Subject: Add BBCode extensions to doco --- doc/External-Resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/External-Resources.md b/doc/External-Resources.md index fd17f63e4..22454e2a9 100644 --- a/doc/External-Resources.md +++ b/doc/External-Resources.md @@ -13,6 +13,7 @@ External Resources **Third-Party Addons** +* [BBCode Extensions for Webpages/Wikis](https://github.com/beardy-unixer/red-addons-extra) **Related projects** -- cgit v1.2.3 From ea606869a6ece5d13a3d4fd60d1bb6d6e30de439 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Jan 2014 17:45:02 -0800 Subject: when loading a single thread on the channel page, tell JS that there isn't any more content to load. --- mod/channel.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 6e82eb1e7..34a1e2dda 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -136,10 +136,11 @@ function channel_content(&$a, $update = 0, $load = false) { if(($update) && (! $load)) { if ($mid) { $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0 - AND (item_flags & %d) $sql_extra limit 1", + AND (item_flags & %d) AND (item_flags & %d) $sql_extra limit 1", dbesc($mid), intval($a->profile['profile_uid']), - intval(ITEM_WALL) + intval(ITEM_WALL), + intval(ITEM_UNSEEN) ); } else { $r = q("SELECT distinct parent AS `item_id` from item @@ -295,5 +296,8 @@ function channel_content(&$a, $update = 0, $load = false) { if((! $update) || ($_COOKIE['jsAvailable'] != 1)) $o .= alt_pager($a,count($items)); + if($mid) + $o .= '
        '; + return $o; } -- cgit v1.2.3 From 583be04583989cdb81dcbc6465f58272be10dc65 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 21 Jan 2014 05:26:59 +0000 Subject: Debian install script doco --- doc/External-Resources.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/External-Resources.md b/doc/External-Resources.md index 22454e2a9..4048b4b20 100644 --- a/doc/External-Resources.md +++ b/doc/External-Resources.md @@ -21,3 +21,6 @@ External Resources * [Red for Android](https://github.com/cvogeley/red-for-android) +**Utilities** + +* [Debian Install Script](https://github.com/beardy-unixer/lowendscript-ng) -- cgit v1.2.3 From 8c4f7216ed04263b5c55b401109390ff5ee2d92c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 21 Jan 2014 05:51:54 +0000 Subject: Nginx conf update --- doc/install/sample-nginx.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf index 396e39fb8..cd12d8dea 100644 --- a/doc/install/sample-nginx.conf +++ b/doc/install/sample-nginx.conf @@ -124,4 +124,12 @@ server { location ~ /\. { deny all; } + +#deny access to store + + location ~ /store { + deny all; + } + + } -- cgit v1.2.3 From 19b6ed68c164564cb6b20249eb018684d4ce44f6 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 21 Jan 2014 08:51:21 +0100 Subject: lighttpd sample conf update --- doc/install/sample-lighttpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/sample-lighttpd.conf b/doc/install/sample-lighttpd.conf index 213719ac9..721fa25ea 100644 --- a/doc/install/sample-lighttpd.conf +++ b/doc/install/sample-lighttpd.conf @@ -74,7 +74,7 @@ $HTTP["url"] =~ "\.(out|log|htaccess)$" { url.access-deny = ("") } -$HTTP["url"] =~ "(^|/)\.git" { +$HTTP["url"] =~ "(^|/)\.git|(^|/)store" { url.access-deny = ("") } -- cgit v1.2.3 From 46252f94a37b69d02f9a635d6c37e051c24d31af Mon Sep 17 00:00:00 2001 From: zottel Date: Tue, 21 Jan 2014 08:55:14 +0100 Subject: added feed2red.pl --- doc/External-Resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/External-Resources.md b/doc/External-Resources.md index 4048b4b20..d5bed17a2 100644 --- a/doc/External-Resources.md +++ b/doc/External-Resources.md @@ -18,8 +18,8 @@ External Resources **Related projects** * [Redshare for Firefox](https://addons.mozilla.org/en-US/firefox/addon/redshare/) - * [Red for Android](https://github.com/cvogeley/red-for-android) +* [feed2red.pl (posts Atom/RSS feeds to channels)](https://github.com/zzottel/feed2red) **Utilities** -- cgit v1.2.3 From 35733ca013e8a113bfd546d5d47f64a83946bc51 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 00:02:25 -0800 Subject: create store directory if it's missing before initialising DAV --- mod/cloud.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/cloud.php b/mod/cloud.php index 7413e1824..3332cf18c 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -32,6 +32,9 @@ function cloud_init(&$a) { require_once('include/reddav.php'); + if(! is_dir('store')) + mkdir('store',STORAGE_DEFAULT_PERMISSIONS,false); + $which = null; if(argc() > 1) $which = argv(1); @@ -74,7 +77,7 @@ function cloud_init(&$a) { $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); - $lockBackend = new DAV\Locks\Backend\File('store/data/locks'); + $lockBackend = new DAV\Locks\Backend\File('store/[data]/locks'); $lockPlugin = new DAV\Locks\Plugin($lockBackend); $server->addPlugin($lockPlugin); -- cgit v1.2.3 From 8a5c7470104af34f838a889c429e27aa3143d40b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 00:19:53 -0800 Subject: move some store things --- .htaccess | 1 + boot.php | 2 +- install/update.php | 7 ++++++- version.inc | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 2f4fb1381..52eb5d6c0 100644 --- a/.htaccess +++ b/.htaccess @@ -11,6 +11,7 @@ Deny from all RewriteEngine on # Protect repository directory from browsing RewriteRule "(^|/)\.git" - [F] + RewriteRule "(^|/)store" - [F] # Rewrite current-style URLs of the form 'index.php?q=x'. diff --git a/boot.php b/boot.php index 2cedb8bd6..b52ef87eb 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1091 ); +define ( 'DB_UPDATE_VERSION', 1092 ); define ( 'EOL', '
        ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/update.php b/install/update.php index 022d7f0dc..3e5589820 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 21 Jan 2014 00:40:45 -0800 Subject: sql error --- include/photo/photo_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index debe1bc38..ff92e5a0f 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -525,7 +525,7 @@ function import_profile_photo($photo,$xchan,$thing = false) { if($thing) $hash = photo_new_resource(); else { - $r = q("select resource_id from photo where xchan = '%s' and (photo_flags & %d ) scale = 4 limit 1", + $r = q("select resource_id from photo where xchan = '%s' and (photo_flags & %d ) and scale = 4 limit 1", dbesc($xchan), intval(PHOTO_XCHAN) ); -- cgit v1.2.3 From 60416d6f33e94d44bab4e47e616b363b36dbd777 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 14:56:42 -0800 Subject: fix the admin interface to pending registrations --- include/account.php | 4 ++-- mod/admin.php | 2 +- view/tpl/admin_users.tpl | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/account.php b/include/account.php index b3dbb7023..7d1aa598d 100644 --- a/include/account.php +++ b/include/account.php @@ -383,11 +383,11 @@ function user_deny($hash) { if(! count($register)) return false; - $user = q("SELECT account_id FROM account WHERE account_id = %d LIMIT 1", + $account = q("SELECT account_id FROM account WHERE account_id = %d LIMIT 1", intval($register[0]['uid']) ); - if(! $user) + if(! $account) return false; $r = q("DELETE FROM account WHERE account_id = %d LIMIT 1", diff --git a/mod/admin.php b/mod/admin.php index 984e12777..749b94de2 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -688,7 +688,7 @@ function admin_page_users(&$a){ '$submit' => t('Submit'), '$select_all' => t('select all'), '$h_pending' => t('User registrations waiting for confirm'), - '$th_pending' => array( t('Request date'), t('Name'), t('Email') ), + '$th_pending' => array( t('Request date'), t('Email') ), '$no_pending' => t('No registrations.'), '$approve' => t('Approve'), '$deny' => t('Deny'), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 3549dc5c2..65fffd17c 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -29,9 +29,8 @@ {{foreach $pending as $u}} - {{$u.created}} - {{$u.name}} - {{$u.email}} + {{$u.account_created}} + {{$u.account_email}} -- cgit v1.2.3 From 0dbbe007e8fa1cf9e1fd514624c7600e3f87f0f1 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 15:38:02 -0800 Subject: add the quota and volume size code --- include/reddav.php | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/include/reddav.php b/include/reddav.php index a937360a8..daa7fd734 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -5,7 +5,7 @@ require_once('vendor/autoload.php'); require_once('include/attach.php'); -class RedDirectory extends DAV\Node implements DAV\ICollection { +class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota { private $red_path; private $folder_hash; @@ -297,6 +297,34 @@ class RedDirectory extends DAV\Node implements DAV\ICollection { } + public function getQuotaInfo() { + + $limit = disk_total_space('store'); + $free = disk_free_space('store'); + + if($this->auth->owner_id) { + + $c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1", + intval($this->auth->owner_id), + intval(PAGE_REMOVED) + + ); + + $ulimit = service_class_fetch($c[0]['channel_id'],'attach_upload_limit'); + $limit = (($ulimit) ? $ulimit : $limit); + + $x = q("select sum(filesize) as total from attach where aid = %d ", + intval($c[0]['channel_account_id']) + ); + $free = (($x) ? $limit - $x[0]['total'] : 0); + } + + return array( + $limit - $free, + $free + ); + + } } -- cgit v1.2.3 From 55e4a53e019d8637eed4854601bcd22b3cc93f7a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 18:11:44 -0800 Subject: push new messages.po --- util/messages.po | 162 +++++++++++++++++++++++++-------------------------- util/run_xgettext.sh | 8 +-- 2 files changed, 84 insertions(+), 86 deletions(-) diff --git a/util/messages.po b/util/messages.po index 360dd67b8..0c3f38257 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,14 +1,14 @@ -# Red Communications Project +# Red Matrix Project # Copyright (C) 2012-2014 the Red Matrix Project # This file is distributed under the same license as the Red package. -# Mike Macgirvin, 2013 +# Mike Macgirvin, 2012 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-01-20.563\n" +"Project-Id-Version: 2014-01-21.564\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-20 03:10-0800\n" +"POT-Creation-Date: 2014-01-21 16:53-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../../include/acl_selectors.php:235 msgid "Visible to everybody" @@ -263,7 +262,7 @@ msgid "Manage Your Channels" msgstr "" #: ../../include/nav.php:177 ../../include/widgets.php:487 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../mod/admin.php:787 ../../mod/admin.php:992 msgid "Settings" msgstr "" @@ -370,8 +369,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 -#: ../../mod/admin.php:698 ../../boot.php:1423 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:691 +#: ../../mod/admin.php:700 ../../boot.php:1423 msgid "Email" msgstr "" @@ -838,7 +837,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:242 ../../mod/admin.php:698 +#: ../../include/group.php:242 ../../mod/admin.php:700 msgid "All Channels" msgstr "" @@ -1240,7 +1239,7 @@ msgstr "" msgid "School/education:" msgstr "" -#: ../../include/reddav.php:984 +#: ../../include/reddav.php:1012 msgid "Edit File properties" msgstr "" @@ -1535,7 +1534,7 @@ msgid "Select" msgstr "" #: ../../include/conversation.php:632 ../../include/ItemObject.php:108 -#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:693 +#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695 #: ../../mod/group.php:176 ../../mod/photos.php:1019 #: ../../mod/filestorage.php:172 ../../mod/settings.php:570 msgid "Delete" @@ -1969,8 +1968,8 @@ msgstr "" #: ../../mod/notifications.php:66 ../../mod/blocks.php:29 #: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44 #: ../../mod/editwebpage.php:83 ../../mod/poke.php:128 -#: ../../mod/channel.php:88 ../../mod/channel.php:187 -#: ../../mod/channel.php:230 ../../mod/fsuggest.php:78 +#: ../../mod/channel.php:88 ../../mod/channel.php:188 +#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/suggest.php:26 #: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190 @@ -2925,7 +2924,7 @@ msgid "Permission denied" msgstr "" #: ../../include/items.php:3385 ../../mod/thing.php:74 ../../mod/admin.php:150 -#: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18 +#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18 #: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32 msgid "Item not found." msgstr "" @@ -3038,8 +3037,8 @@ msgstr "" #: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156 #: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347 #: ../../mod/connect.php:92 ../../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:81 +#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828 +#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81 #: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929 #: ../../mod/photos.php:969 ../../mod/photos.php:1056 #: ../../mod/profiles.php:518 ../../mod/filestorage.php:132 @@ -3425,12 +3424,12 @@ msgid "View recent posts and comments" msgstr "" #: ../../mod/connedit.php:330 ../../mod/connedit.php:472 -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:697 msgid "Unblock" msgstr "" #: ../../mod/connedit.php:330 ../../mod/connedit.php:472 -#: ../../mod/admin.php:694 +#: ../../mod/admin.php:696 msgid "Block" msgstr "" @@ -4260,19 +4259,19 @@ msgstr "" msgid "Site" msgstr "" -#: ../../mod/admin.php:88 ../../mod/admin.php:685 ../../mod/admin.php:697 +#: ../../mod/admin.php:88 ../../mod/admin.php:687 ../../mod/admin.php:699 msgid "Users" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:783 ../../mod/admin.php:825 +#: ../../mod/admin.php:89 ../../mod/admin.php:785 ../../mod/admin.php:827 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:90 ../../mod/admin.php:988 ../../mod/admin.php:1024 +#: ../../mod/admin.php:90 ../../mod/admin.php:990 ../../mod/admin.php:1026 msgid "Themes" msgstr "" -#: ../../mod/admin.php:91 ../../mod/admin.php:478 +#: ../../mod/admin.php:91 ../../mod/admin.php:479 msgid "Server" msgstr "" @@ -4280,7 +4279,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1111 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1113 msgid "Logs" msgstr "" @@ -4296,9 +4295,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:477 -#: ../../mod/admin.php:684 ../../mod/admin.php:782 ../../mod/admin.php:824 -#: ../../mod/admin.php:987 ../../mod/admin.php:1023 ../../mod/admin.php:1110 +#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:478 +#: ../../mod/admin.php:686 ../../mod/admin.php:784 ../../mod/admin.php:826 +#: ../../mod/admin.php:989 ../../mod/admin.php:1025 ../../mod/admin.php:1112 msgid "Administration" msgstr "" @@ -4310,7 +4309,7 @@ msgstr "" msgid "Registered users" msgstr "" -#: ../../mod/admin.php:198 ../../mod/admin.php:481 +#: ../../mod/admin.php:198 ../../mod/admin.php:482 msgid "Pending registrations" msgstr "" @@ -4318,7 +4317,7 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:201 ../../mod/admin.php:482 +#: ../../mod/admin.php:201 ../../mod/admin.php:483 msgid "Active plugins" msgstr "" @@ -4558,224 +4557,219 @@ msgid "" "default 50." msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:470 msgid "No server found" msgstr "" -#: ../../mod/admin.php:476 ../../mod/admin.php:698 +#: ../../mod/admin.php:477 ../../mod/admin.php:700 msgid "ID" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:477 msgid "for channel" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:477 msgid "on server" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:477 msgid "Status" msgstr "" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:498 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:508 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:511 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:515 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:518 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:531 +#: ../../mod/admin.php:533 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:537 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:537 +#: ../../mod/admin.php:539 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:540 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:564 +#: ../../mod/admin.php:566 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:573 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:602 +#: ../../mod/admin.php:604 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:613 +#: ../../mod/admin.php:615 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:622 +#: ../../mod/admin.php:624 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:622 +#: ../../mod/admin.php:624 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:687 +#: ../../mod/admin.php:689 msgid "select all" msgstr "" -#: ../../mod/admin.php:688 +#: ../../mod/admin.php:690 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:691 msgid "Request date" msgstr "" -#: ../../mod/admin.php:689 ../../mod/settings.php:509 -#: ../../mod/settings.php:535 -msgid "Name" -msgstr "" - -#: ../../mod/admin.php:690 +#: ../../mod/admin.php:692 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:693 msgid "Approve" msgstr "" -#: ../../mod/admin.php:692 +#: ../../mod/admin.php:694 msgid "Deny" msgstr "" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Register date" msgstr "" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Last login" msgstr "" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Expires" msgstr "" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:700 +#: ../../mod/admin.php:702 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:701 +#: ../../mod/admin.php:703 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:742 +#: ../../mod/admin.php:744 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:746 +#: ../../mod/admin.php:748 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:756 ../../mod/admin.php:958 +#: ../../mod/admin.php:758 ../../mod/admin.php:960 msgid "Disable" msgstr "" -#: ../../mod/admin.php:758 ../../mod/admin.php:960 +#: ../../mod/admin.php:760 ../../mod/admin.php:962 msgid "Enable" msgstr "" -#: ../../mod/admin.php:784 ../../mod/admin.php:989 +#: ../../mod/admin.php:786 ../../mod/admin.php:991 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:792 ../../mod/admin.php:999 +#: ../../mod/admin.php:794 ../../mod/admin.php:1001 msgid "Author: " msgstr "" -#: ../../mod/admin.php:793 ../../mod/admin.php:1000 +#: ../../mod/admin.php:795 ../../mod/admin.php:1002 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:922 +#: ../../mod/admin.php:924 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:981 +#: ../../mod/admin.php:983 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1029 +#: ../../mod/admin.php:1031 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1030 +#: ../../mod/admin.php:1032 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1057 +#: ../../mod/admin.php:1059 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1113 +#: ../../mod/admin.php:1115 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1119 +#: ../../mod/admin.php:1121 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1122 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1122 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1121 +#: ../../mod/admin.php:1123 msgid "Log level" msgstr "" @@ -5931,6 +5925,10 @@ msgstr "" msgid "Add application" msgstr "" +#: ../../mod/settings.php:509 ../../mod/settings.php:535 +msgid "Name" +msgstr "" + #: ../../mod/settings.php:509 msgid "Name of application" msgstr "" diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 8b5f54a53..432e0f717 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -67,15 +67,15 @@ then sed -i "s/PACKAGE VERSION//g" "$OUTFILE" sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" -# sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" else - sed -i "s/SOME DESCRIPTIVE TITLE./Red Communications Project/g" "$OUTFILE" + sed -i "s/SOME DESCRIPTIVE TITLE./Red Matrix Project/g" "$OUTFILE" sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Red Matrix Project/g" "$OUTFILE" - sed -i "s/FIRST AUTHOR , YEAR./Mike Macgirvin, 2013/g" "$OUTFILE" + sed -i "s/FIRST AUTHOR , YEAR./Mike Macgirvin, 2012/g" "$OUTFILE" sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" sed -i "s/PACKAGE/Red/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" -# sed -i "s/^\"Plural-Forms//g" "$OUTFILE" fi +grep -v "Plural-Forms:" $OUTFILE > tmpout +mv tmpout $OUTFILE echo "done." -- cgit v1.2.3 From 05951a9877a2e8d0369ae3201a4379016b9b4968 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 18:45:40 -0800 Subject: add primary webbie to directory popup --- mod/directory.php | 1 + mod/dirprofile.php | 1 + view/tpl/direntry_large.tpl | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/mod/directory.php b/mod/directory.php index 53542db60..ff51b55db 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -173,6 +173,7 @@ function directory_content(&$a) { 'name' => $rr['name'], 'details' => $pdesc . $details, 'profile' => $profile, + 'address' => $rr['address'], 'location' => $location, 'gender' => $gender, 'pdesc' => $pdesc, diff --git a/mod/dirprofile.php b/mod/dirprofile.php index 0cd84b910..1593b014a 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -153,6 +153,7 @@ function dirprofile_init(&$a) { '$name' => $rr['name'], '$details' => $pdesc . $details, '$profile' => $profile, + '$address' => $rr['address'], '$location' => $location, '$gender' => $gender, '$pdesc' => $pdesc, diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index befd2a27a..a3fa7e4c3 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -12,10 +12,14 @@
        +
        {{$name}}
        {{if $connect}}
        {{$conn_label}}
        {{/if}} + +
        {{$address}}
        +
        {{$details}}
        {{if $marital}}
        {{$marital}}
        -- cgit v1.2.3 From c41d3b2d5393de6ae810cd4518851d6d633be279 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 19:01:23 -0800 Subject: text - change remove account button to remove channel --- mod/removeme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/removeme.php b/mod/removeme.php index 7af4719bd..f0b4ae3c0 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -50,7 +50,7 @@ function removeme_content(&$a) { '$desc' => t('This will completely remove this channel from the network. Once this has been done it is not recoverable.'), '$passwd' => t('Please enter your password for verification:'), '$global' => array('global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network')), - '$submit' => t('Remove My Account') + '$submit' => t('Remove Channel') )); return $o; -- cgit v1.2.3 From a13393fb230f83cbb93ad36494ce337ef5c48ee0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 20:42:10 -0800 Subject: seems you can't easily have a blank password for DAV guests, so the guest password is now +++ --- include/reddav.php | 6 ++++++ mod/cloud.php | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/reddav.php b/include/reddav.php index daa7fd734..c5ef39097 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -745,6 +745,12 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic { public $timezone; protected function validateUserPass($username, $password) { + + if(trim($password) === '+++') { + logger('reddav: validateUserPass: guest ' . $username); + return true; + } + require_once('include/auth.php'); $record = account_verify_password($email,$pass); if($record && $record['account_default_channel']) { diff --git a/mod/cloud.php b/mod/cloud.php index 3332cf18c..de42249fe 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -85,12 +85,14 @@ function cloud_init(&$a) { if(! $auth->observer) { try { - $auth->Authenticate($server,'Red Matrix'); + $auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++')); } catch ( Exception $e) { - + logger('mod_cloud: auth exception' . $e->getMessage()); + http_status_exit($e->getHTTPCode(),$e->getMessage()); } } + // $browser = new DAV\Browser\Plugin(); $browser = new RedBrowser($auth); -- cgit v1.2.3 From 3b375a3d3f6d0d7fef885edcc75097564a1f7987 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Jan 2014 23:09:33 -0800 Subject: fix location of string file in Translations.md, fix some permissions and owner vagueness (potential bugs) in profile_tabs() --- doc/Translations.md | 6 +++--- include/conversation.php | 39 ++++++++++++++++++++++++--------------- mod/channel.php | 1 + 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/doc/Translations.md b/doc/Translations.md index 1ebdfb67d..724286052 100644 --- a/doc/Translations.md +++ b/doc/Translations.md @@ -32,13 +32,13 @@ The location of the translated files in the source tree is /view/LNG-CODE/ where LNG-CODE is the language code used, e.g. de for German or fr for French. For the email templates (the *.tpl files) just place them into the directory -and you are done. The translated strings come as a "message.po" file from +and you are done. The translated strings come as a "messages.po" file from transifex which needs to be translated into the PHP file Red uses. To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your Red installation. Assuming you want to convert the German localization which is placed in -view/de/message.po you would do the following. +view/de/messages.po you would do the following. 1. Navigate at the command prompt to the base directory of your Red installation @@ -46,7 +46,7 @@ view/de/message.po you would do the following. 2. Execute the po2php script, which will place the translation in the strings.php file that is used by Red. - $> php util/po2php.php view/de/message.po + $> php util/po2php.php view/de/messages.po The output of the script will be placed at view/de/strings.php where froemdoca os expecting it, so you can test your translation mmediately. diff --git a/include/conversation.php b/include/conversation.php index a9bf69a3e..708348ddd 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1431,7 +1431,8 @@ function network_tabs() { function profile_tabs($a, $is_owner=False, $nickname=Null){ //echo "
        "; var_dump($a->user); killme();
-	
+
+		
 	$channel = $a->get_channel();
 
 	if (is_null($nickname))
@@ -1451,33 +1452,38 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 			'title' => t('Status Messages and Posts'),
 			'id'    => 'status-tab',
 		),
-		array(
+	);
+
+	$p = get_all_perms($a->profile['profile_uid'],get_observer_hash());
+
+	if($p['view_profile']) {
+		$tabs[] = array(
 			'label' => t('About'),
 			'url' 	=> $pr,
 			'sel'	=> ((argv(0) == 'profile') ? 'active' : ''),
 			'title' => t('Profile Details'),
 			'id'    => 'profile-tab',
-		),
-		array(
+		);
+	}
+	if($p['view_photos']) {
+		$tabs[] = array(
 			'label' => t('Photos'),
 			'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
 			'sel'	=> ((argv(0) == 'photos') ? 'active' : ''),
 			'title' => t('Photo Albums'),
 			'id'    => 'photo-tab',
-		),
-
-		array(
+		);
+	}
+	if($p['view_storage']) {
+		$tabs[] = array(
 			'label' => t('Files'),
 			'url'	=> $a->get_baseurl() . '/cloud/' . $nickname,
 			'sel'	=> ((argv(0) == 'cloud') ? 'active' : ''),
 			'title' => t('Files and Storage'),
 			'id'    => 'files-tab',
-		),
-
-	);
-
-
-	if ($is_owner){
+		);
+	}
+	if($is_owner) {
 		$tabs[] = array(
 			'label' => t('Events'),
 			'url'	=> $a->get_baseurl() . '/events',
@@ -1485,15 +1491,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 			'title' => t('Events and Calendar'),
 			'id'    => 'events-tab',
 		);
-		if(feature_enabled(local_user(),'webpages')){
+	}
+
+	if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) {
 		$tabs[] = array(
 			'label' => t('Webpages'),
 			'url'	=> $a->get_baseurl() . '/webpages/' . $nickname,
 			'sel' 	=> ((argv(0) == 'webpages') ? 'active' : ''),
 			'title' => t('Manage Webpages'),
 			'id'    => 'webpages-tab',
-		);}
+		);
 	}
+
 	else {
 		// FIXME
 		// we probably need a listing of events that were created by 
diff --git a/mod/channel.php b/mod/channel.php
index 34a1e2dda..7e2b6d7c5 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -28,6 +28,7 @@ function channel_init(&$a) {
 
 	$profile = 0;
 	$channel = $a->get_channel();
+logger('channel: ' . $channel['channel_name']);
 
 	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
 		$which = $channel['channel_address'];
-- 
cgit v1.2.3


From 3f49114a05f51b4d7ad11898e75fe512c9a9e774 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 21 Jan 2014 23:12:03 -0800
Subject: remove debugging

---
 mod/channel.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mod/channel.php b/mod/channel.php
index 7e2b6d7c5..34a1e2dda 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -28,7 +28,6 @@ function channel_init(&$a) {
 
 	$profile = 0;
 	$channel = $a->get_channel();
-logger('channel: ' . $channel['channel_name']);
 
 	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
 		$which = $channel['channel_address'];
-- 
cgit v1.2.3


From f28b21f99d563b08e9d0ddb4a27fb223ad1ce432 Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Wed, 22 Jan 2014 09:16:22 +0100
Subject: start with hubloc ping

---
 mod/admin.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mod/admin.php b/mod/admin.php
index 749b94de2..a373fa772 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -457,6 +457,15 @@ function admin_page_site(&$a) {
 }
 function admin_page_hubloc_post(&$a){
 	check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc');
+
+	//prepare for ping
+	logger('POST input: '.$_POST , LOGGER_DEBUG);
+	//perform ping
+	//handle results and set the hubloc flags in db to make results visible
+
+	//in case of repair store new pub key for tested hubloc (all channel with this hubloc) in db
+	//after repair set hubloc flags to 0
+
 	goaway($a->get_baseurl(true) . '/admin/hubloc' );
 	return;
 }
-- 
cgit v1.2.3


From ffabb4cc867f59d86380eced3253053d368327f2 Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Wed, 22 Jan 2014 11:29:49 +0100
Subject: reorg formula data for hubloc checks

---
 mod/admin.php             | 11 ++++++++++-
 view/tpl/admin_hubloc.tpl |  9 +++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index a373fa772..57e285781 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -459,7 +459,16 @@ function admin_page_hubloc_post(&$a){
 	check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc');
 
 	//prepare for ping
-	logger('POST input: '.$_POST , LOGGER_DEBUG);
+	logger('POST input: '. print_r($_POST,true), LOGGER_DEBUG);
+
+	if ( $_POST['hublocid']) {
+		logger('hublocid is not empty: ' . $_POST['hublocid'], LOGGER_DEBUG);
+	}
+
+	//if ( $_POST'' == "check" ) {
+	//	//todo
+	//}
+
 	//perform ping
 	//handle results and set the hubloc flags in db to make results visible
 
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
index 6e7629094..ea840e1b3 100755
--- a/view/tpl/admin_hubloc.tpl
+++ b/view/tpl/admin_hubloc.tpl
@@ -1,9 +1,6 @@
 
        
 	
        {{$title}} - {{$page}}
        
 
-	
        
-	
-	
 	
@@ -14,9 +11,13 @@
 			
 			{{foreach $hubloc as $hub}}
-			
+			{{/foreach}}
 		
        
 		
 			
        
 			{{$hub.hubloc_id}}{{$hub.hubloc_addr}}{{$hub.hubloc_host}}{{$hub.hubloc_status}}
+			
+			
+			
+			
 			
 			
 			
        
 	
        
-- 
cgit v1.2.3


From 39142002238b416a2d823245cf046ca9eee0bf94 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 22 Jan 2014 03:01:28 -0800
Subject: simplify chanview authentication and make sure it carries through
 multiple generations

---
 mod/chanview.php | 12 ++++--------
 version.inc      |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/mod/chanview.php b/mod/chanview.php
index ae22212b9..ca3410c8f 100644
--- a/mod/chanview.php
+++ b/mod/chanview.php
@@ -78,14 +78,10 @@ function chanview_content(&$a) {
 		return;
 	}
 
-	if(is_foreigner($a->poi['xchan_hash']))
-		$url = $a->poi['xchan_url'];
-	else {
-		$url = (($observer) 
-			? z_root() . '/magic?f=&dest=' . $a->poi['xchan_url'] . '&addr=' . $a->poi['xchan_addr'] 
-			: $a->poi['xchan_url']
-		);
-	}
+
+	$url = $a->poi['xchan_url'];
+	if($observer)
+		$url = zid($url);
 
 	// let somebody over-ride the iframed viewport presentation
 
diff --git a/version.inc b/version.inc
index 02e793fcd..a641cb0f8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-21.564
+2014-01-22.565
-- 
cgit v1.2.3


From eb868f6df8ce31497992bab1e8c4fd39bee8fe15 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 22 Jan 2014 17:18:40 +0100
Subject: make network tabs regard selected group (collection) and vice versa

---
 include/conversation.php | 6 +++---
 include/group.php        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 708348ddd..c0bed2a6b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1374,13 +1374,13 @@ function network_tabs() {
 	$tabs = array(
 		array(
 			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 
 			'sel'=>$all_active,
 			'title'=> t('Sort by Comment Date'),
 		),
 		array(
 			'label' => t('Posted Order'),
-			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 
 			'sel'=>$postord_active,
 			'title' => t('Sort by Post Date'),
 		),
@@ -1393,7 +1393,7 @@ function network_tabs() {
 		),
 		array(
 			'label' => t('New'),
-			'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&new=1',
+			'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
 			'sel' => $new_active,
 			'title' => t('Activity Stream - by date'),
 		),
diff --git a/include/group.php b/include/group.php
index cdd779df2..56a7555bc 100644
--- a/include/group.php
+++ b/include/group.php
@@ -272,7 +272,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 				'cid'		=> $cid,
 				'text' 		=> $rr['name'],
 				'selected' 	=> $selected,
-				'href'		=> (($mode == 0) ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']),
+				'href'		=> (($mode == 0) ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']) . ((x($_GET,'new')) ? '&new=' . $_GET['new'] : '') . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : ''),
 				'edit'		=> $groupedit,
 				'ismember'	=> in_array($rr['id'],$member_of),
 			);
-- 
cgit v1.2.3


From d341358afbf19622575fa36a632f9d40b39ae202 Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Wed, 22 Jan 2014 23:15:42 +0100
Subject: Add $since_id to items_fetch

---
 include/items.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/items.php b/include/items.php
index ea46df9bf..6e4f9f0d6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3718,7 +3718,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 		$uidhash = $channel['channel_hash'];
 		$item_uids = " item.uid = " . intval($uid) . " ";
 	}
-	
+
 	if($arr['star'])
 		$sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ") ";
 
@@ -3726,7 +3726,10 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 		$sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ") ";
 
 	$sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ") $sql_options ) ";
-
+	
+	if($arr['since_id'])
+   		$sql_extra .= " and item.id > " . $since_id . " ";
+   		
     if($arr['gid'] && $uid) {
         $r = q("SELECT * FROM `groups` WHERE id = %d AND uid = %d LIMIT 1",
             intval($arr['group']),
-- 
cgit v1.2.3


From 25f7a7fac975f9858b771f7bb57d4c06c5ab0daf Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Wed, 22 Jan 2014 22:17:12 +0000
Subject: Give pages enough to construct a share button.

---
 include/conversation.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 708348ddd..13f0d8970 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1301,7 +1301,8 @@ function prepare_page($item) {
 	$naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0);
 	$observer = $a->get_observer();
 	$zid = ($observer['xchan_addr']);
-
+	$preview = substr(urlencode($item['body']), 0, 100);
+	$link = z_root() . '/' . $a->cmd;
 	if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) {
 		if($a->layout['webpage']['authored'] === 'none')
 			$naked = 1;
@@ -1313,7 +1314,9 @@ function prepare_page($item) {
 		'$zid' => $zid,
 		'$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')),
 		'$title' => smilies(bbcode($item['title'])),
-		'$body' => prepare_body($item,true)
+		'$body' => prepare_body($item,true),
+		'$preview' => $preview,
+		'$link' => $link
 	));
 }
 
-- 
cgit v1.2.3


From 040d87c999c02df82dd3acad97db498d12f8580a Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 22 Jan 2014 23:24:09 +0100
Subject: update argument ?f=

---
 include/conversation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index c0bed2a6b..ddcb12b07 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1387,13 +1387,13 @@ function network_tabs() {
 
 		array(
 			'label' => t('Personal'),
-			'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
+			'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1',
 			'sel' => $conv_active,
 			'title' => t('Posts that mention or involve you'),
 		),
 		array(
 			'label' => t('New'),
-			'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
+			'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
 			'sel' => $new_active,
 			'title' => t('Activity Stream - by date'),
 		),
-- 
cgit v1.2.3


From b8ae9014e7bdd02a8534f32d4344a6e88b57624d Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Thu, 23 Jan 2014 00:23:49 +0000
Subject: Nobody seems to be using that anymore

---
 library/prettyphoto/README                         |  30 ----
 library/prettyphoto/css/prettyPhoto.css            | 170 ---------------------
 .../images/prettyPhoto/dark_rounded/btnNext.png    | Bin 1411 -> 0 bytes
 .../prettyPhoto/dark_rounded/btnPrevious.png       | Bin 1442 -> 0 bytes
 .../prettyPhoto/dark_rounded/contentPattern.png    | Bin 130 -> 0 bytes
 .../prettyPhoto/dark_rounded/default_thumbnail.gif | Bin 227 -> 0 bytes
 .../images/prettyPhoto/dark_rounded/loader.gif     | Bin 2545 -> 0 bytes
 .../images/prettyPhoto/dark_rounded/sprite.png     | Bin 4076 -> 0 bytes
 .../images/prettyPhoto/dark_square/btnNext.png     | Bin 1411 -> 0 bytes
 .../images/prettyPhoto/dark_square/btnPrevious.png | Bin 1442 -> 0 bytes
 .../prettyPhoto/dark_square/contentPattern.png     | Bin 121 -> 0 bytes
 .../prettyPhoto/dark_square/default_thumbnail.gif  | Bin 227 -> 0 bytes
 .../images/prettyPhoto/dark_square/loader.gif      | Bin 2545 -> 0 bytes
 .../images/prettyPhoto/dark_square/sprite.png      | Bin 3507 -> 0 bytes
 .../images/prettyPhoto/default/default_thumb.png   | Bin 1537 -> 0 bytes
 .../images/prettyPhoto/default/loader.gif          | Bin 6331 -> 0 bytes
 .../images/prettyPhoto/default/sprite.png          | Bin 6682 -> 0 bytes
 .../images/prettyPhoto/default/sprite_next.png     | Bin 1358 -> 0 bytes
 .../images/prettyPhoto/default/sprite_prev.png     | Bin 1376 -> 0 bytes
 .../images/prettyPhoto/default/sprite_x.png        | Bin 1097 -> 0 bytes
 .../images/prettyPhoto/default/sprite_y.png        | Bin 1162 -> 0 bytes
 .../images/prettyPhoto/facebook/btnNext.png        | Bin 845 -> 0 bytes
 .../images/prettyPhoto/facebook/btnPrevious.png    | Bin 828 -> 0 bytes
 .../prettyPhoto/facebook/contentPatternBottom.png  | Bin 142 -> 0 bytes
 .../prettyPhoto/facebook/contentPatternLeft.png    | Bin 137 -> 0 bytes
 .../prettyPhoto/facebook/contentPatternRight.png   | Bin 136 -> 0 bytes
 .../prettyPhoto/facebook/contentPatternTop.png     | Bin 142 -> 0 bytes
 .../prettyPhoto/facebook/default_thumbnail.gif     | Bin 227 -> 0 bytes
 .../images/prettyPhoto/facebook/loader.gif         | Bin 2545 -> 0 bytes
 .../images/prettyPhoto/facebook/sprite.png         | Bin 4227 -> 0 bytes
 .../images/prettyPhoto/light_rounded/btnNext.png   | Bin 1411 -> 0 bytes
 .../prettyPhoto/light_rounded/btnPrevious.png      | Bin 1442 -> 0 bytes
 .../light_rounded/default_thumbnail.gif            | Bin 227 -> 0 bytes
 .../images/prettyPhoto/light_rounded/loader.gif    | Bin 2545 -> 0 bytes
 .../images/prettyPhoto/light_rounded/sprite.png    | Bin 4099 -> 0 bytes
 .../images/prettyPhoto/light_square/btnNext.png    | Bin 1411 -> 0 bytes
 .../prettyPhoto/light_square/btnPrevious.png       | Bin 1442 -> 0 bytes
 .../prettyPhoto/light_square/default_thumbnail.gif | Bin 227 -> 0 bytes
 .../images/prettyPhoto/light_square/loader.gif     | Bin 2545 -> 0 bytes
 .../images/prettyPhoto/light_square/sprite.png     | Bin 3507 -> 0 bytes
 library/prettyphoto/js/jquery-1.3.2.min.js         |  19 ---
 library/prettyphoto/js/jquery-1.4.4.min.js         | 167 --------------------
 library/prettyphoto/js/jquery-1.6.1.min.js         |  18 ---
 library/prettyphoto/js/jquery.prettyPhoto.js       |   7 -
 44 files changed, 411 deletions(-)
 delete mode 100755 library/prettyphoto/README
 delete mode 100644 library/prettyphoto/css/prettyPhoto.css
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_rounded/btnNext.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_rounded/btnPrevious.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_rounded/contentPattern.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_rounded/loader.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_rounded/sprite.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_square/btnNext.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_square/btnPrevious.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_square/contentPattern.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_square/default_thumbnail.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_square/loader.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/dark_square/sprite.png
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/default_thumb.png
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/loader.gif
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/sprite.png
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/sprite_next.png
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/sprite_prev.png
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/sprite_x.png
 delete mode 100644 library/prettyphoto/images/prettyPhoto/default/sprite_y.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/btnNext.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/btnPrevious.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/contentPatternBottom.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/contentPatternLeft.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/contentPatternRight.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/contentPatternTop.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/default_thumbnail.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/loader.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/facebook/sprite.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_rounded/btnNext.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_rounded/btnPrevious.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_rounded/loader.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_rounded/sprite.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_square/btnNext.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_square/btnPrevious.png
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_square/default_thumbnail.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_square/loader.gif
 delete mode 100755 library/prettyphoto/images/prettyPhoto/light_square/sprite.png
 delete mode 100755 library/prettyphoto/js/jquery-1.3.2.min.js
 delete mode 100644 library/prettyphoto/js/jquery-1.4.4.min.js
 delete mode 100644 library/prettyphoto/js/jquery-1.6.1.min.js
 delete mode 100644 library/prettyphoto/js/jquery.prettyPhoto.js

diff --git a/library/prettyphoto/README b/library/prettyphoto/README
deleted file mode 100755
index 1e5684253..000000000
--- a/library/prettyphoto/README
+++ /dev/null
@@ -1,30 +0,0 @@
-prettyPhoto v3.1.4
-© Copyright, Stephane Caron
-http://www.no-margin-for-errors.com
-
-
-============================= Released under =============================
-
-Creative Commons 2.5
-http://creativecommons.org/licenses/by/2.5/
-
-OR
-
-GPLV2 license
-http://www.gnu.org/licenses/gpl-2.0.html
-
-You are free to use prettyPhoto in commercial projects as long as the
-copyright header is left intact.
-
-============================ More information ============================
-http://www.no-margin-for-errors.com/projects/prettyPhoto/
-
-
-============================== Description ===============================
-
-prettyPhoto is a jQuery based lightbox clone. Not only does it support images,
-it also add support for videos, flash, YouTube, iFrame. It's a full blown
-media modal box.
-
-Please refer to http://www.no-margin-for-errors.com/projects/prettyPhoto/
-for all the details on how to use. 
diff --git a/library/prettyphoto/css/prettyPhoto.css b/library/prettyphoto/css/prettyPhoto.css
deleted file mode 100644
index 8a2a2fd14..000000000
--- a/library/prettyphoto/css/prettyPhoto.css
+++ /dev/null
@@ -1,170 +0,0 @@
-div.pp_default .pp_top,div.pp_default .pp_top .pp_middle,div.pp_default .pp_top .pp_left,div.pp_default .pp_top .pp_right,div.pp_default .pp_bottom,div.pp_default .pp_bottom .pp_left,div.pp_default .pp_bottom .pp_middle,div.pp_default .pp_bottom .pp_right{height:13px}
-div.pp_default .pp_top .pp_left{background:url(../images/prettyPhoto/default/sprite.png) -78px -93px no-repeat}
-div.pp_default .pp_top .pp_middle{background:url(../images/prettyPhoto/default/sprite_x.png) top left repeat-x}
-div.pp_default .pp_top .pp_right{background:url(../images/prettyPhoto/default/sprite.png) -112px -93px no-repeat}
-div.pp_default .pp_content .ppt{color:#f8f8f8}
-div.pp_default .pp_content_container .pp_left{background:url(../images/prettyPhoto/default/sprite_y.png) -7px 0 repeat-y;padding-left:13px}
-div.pp_default .pp_content_container .pp_right{background:url(../images/prettyPhoto/default/sprite_y.png) top right repeat-y;padding-right:13px}
-div.pp_default .pp_next:hover{background:url(../images/prettyPhoto/default/sprite_next.png) center right no-repeat;cursor:pointer}
-div.pp_default .pp_previous:hover{background:url(../images/prettyPhoto/default/sprite_prev.png) center left no-repeat;cursor:pointer}
-div.pp_default .pp_expand{background:url(../images/prettyPhoto/default/sprite.png) 0 -29px no-repeat;cursor:pointer;width:28px;height:28px}
-div.pp_default .pp_expand:hover{background:url(../images/prettyPhoto/default/sprite.png) 0 -56px no-repeat;cursor:pointer}
-div.pp_default .pp_contract{background:url(../images/prettyPhoto/default/sprite.png) 0 -84px no-repeat;cursor:pointer;width:28px;height:28px}
-div.pp_default .pp_contract:hover{background:url(../images/prettyPhoto/default/sprite.png) 0 -113px no-repeat;cursor:pointer}
-div.pp_default .pp_close{width:30px;height:30px;background:url(../images/prettyPhoto/default/sprite.png) 2px 1px no-repeat;cursor:pointer}
-div.pp_default .pp_gallery ul li a{background:url(../images/prettyPhoto/default/default_thumb.png) center center #f8f8f8;border:1px solid #aaa}
-div.pp_default .pp_social{margin-top:7px}
-div.pp_default .pp_gallery a.pp_arrow_previous,div.pp_default .pp_gallery a.pp_arrow_next{position:static;left:auto}
-div.pp_default .pp_nav .pp_play,div.pp_default .pp_nav .pp_pause{background:url(../images/prettyPhoto/default/sprite.png) -51px 1px no-repeat;height:30px;width:30px}
-div.pp_default .pp_nav .pp_pause{background-position:-51px -29px}
-div.pp_default a.pp_arrow_previous,div.pp_default a.pp_arrow_next{background:url(../images/prettyPhoto/default/sprite.png) -31px -3px no-repeat;height:20px;width:20px;margin:4px 0 0}
-div.pp_default a.pp_arrow_next{left:52px;background-position:-82px -3px}
-div.pp_default .pp_content_container .pp_details{margin-top:5px}
-div.pp_default .pp_nav{clear:none;height:30px;width:110px;position:relative}
-div.pp_default .pp_nav .currentTextHolder{font-family:Georgia;font-style:italic;color:#999;font-size:11px;left:75px;line-height:25px;position:absolute;top:2px;margin:0;padding:0 0 0 10px}
-div.pp_default .pp_close:hover,div.pp_default .pp_nav .pp_play:hover,div.pp_default .pp_nav .pp_pause:hover,div.pp_default .pp_arrow_next:hover,div.pp_default .pp_arrow_previous:hover{opacity:0.7}
-div.pp_default .pp_description{font-size:11px;font-weight:700;line-height:14px;margin:5px 50px 5px 0}
-div.pp_default .pp_bottom .pp_left{background:url(../images/prettyPhoto/default/sprite.png) -78px -127px no-repeat}
-div.pp_default .pp_bottom .pp_middle{background:url(../images/prettyPhoto/default/sprite_x.png) bottom left repeat-x}
-div.pp_default .pp_bottom .pp_right{background:url(../images/prettyPhoto/default/sprite.png) -112px -127px no-repeat}
-div.pp_default .pp_loaderIcon{background:url(../images/prettyPhoto/default/loader.gif) center center no-repeat}
-div.light_rounded .pp_top .pp_left{background:url(../images/prettyPhoto/light_rounded/sprite.png) -88px -53px no-repeat}
-div.light_rounded .pp_top .pp_right{background:url(../images/prettyPhoto/light_rounded/sprite.png) -110px -53px no-repeat}
-div.light_rounded .pp_next:hover{background:url(../images/prettyPhoto/light_rounded/btnNext.png) center right no-repeat;cursor:pointer}
-div.light_rounded .pp_previous:hover{background:url(../images/prettyPhoto/light_rounded/btnPrevious.png) center left no-repeat;cursor:pointer}
-div.light_rounded .pp_expand{background:url(../images/prettyPhoto/light_rounded/sprite.png) -31px -26px no-repeat;cursor:pointer}
-div.light_rounded .pp_expand:hover{background:url(../images/prettyPhoto/light_rounded/sprite.png) -31px -47px no-repeat;cursor:pointer}
-div.light_rounded .pp_contract{background:url(../images/prettyPhoto/light_rounded/sprite.png) 0 -26px no-repeat;cursor:pointer}
-div.light_rounded .pp_contract:hover{background:url(../images/prettyPhoto/light_rounded/sprite.png) 0 -47px no-repeat;cursor:pointer}
-div.light_rounded .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/light_rounded/sprite.png) -1px -1px no-repeat;cursor:pointer}
-div.light_rounded .pp_nav .pp_play{background:url(../images/prettyPhoto/light_rounded/sprite.png) -1px -100px no-repeat;height:15px;width:14px}
-div.light_rounded .pp_nav .pp_pause{background:url(../images/prettyPhoto/light_rounded/sprite.png) -24px -100px no-repeat;height:15px;width:14px}
-div.light_rounded .pp_arrow_previous{background:url(../images/prettyPhoto/light_rounded/sprite.png) 0 -71px no-repeat}
-div.light_rounded .pp_arrow_next{background:url(../images/prettyPhoto/light_rounded/sprite.png) -22px -71px no-repeat}
-div.light_rounded .pp_bottom .pp_left{background:url(../images/prettyPhoto/light_rounded/sprite.png) -88px -80px no-repeat}
-div.light_rounded .pp_bottom .pp_right{background:url(../images/prettyPhoto/light_rounded/sprite.png) -110px -80px no-repeat}
-div.dark_rounded .pp_top .pp_left{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -88px -53px no-repeat}
-div.dark_rounded .pp_top .pp_right{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -110px -53px no-repeat}
-div.dark_rounded .pp_content_container .pp_left{background:url(../images/prettyPhoto/dark_rounded/contentPattern.png) top left repeat-y}
-div.dark_rounded .pp_content_container .pp_right{background:url(../images/prettyPhoto/dark_rounded/contentPattern.png) top right repeat-y}
-div.dark_rounded .pp_next:hover{background:url(../images/prettyPhoto/dark_rounded/btnNext.png) center right no-repeat;cursor:pointer}
-div.dark_rounded .pp_previous:hover{background:url(../images/prettyPhoto/dark_rounded/btnPrevious.png) center left no-repeat;cursor:pointer}
-div.dark_rounded .pp_expand{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -31px -26px no-repeat;cursor:pointer}
-div.dark_rounded .pp_expand:hover{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -31px -47px no-repeat;cursor:pointer}
-div.dark_rounded .pp_contract{background:url(../images/prettyPhoto/dark_rounded/sprite.png) 0 -26px no-repeat;cursor:pointer}
-div.dark_rounded .pp_contract:hover{background:url(../images/prettyPhoto/dark_rounded/sprite.png) 0 -47px no-repeat;cursor:pointer}
-div.dark_rounded .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/dark_rounded/sprite.png) -1px -1px no-repeat;cursor:pointer}
-div.dark_rounded .pp_description{margin-right:85px;color:#fff}
-div.dark_rounded .pp_nav .pp_play{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -1px -100px no-repeat;height:15px;width:14px}
-div.dark_rounded .pp_nav .pp_pause{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -24px -100px no-repeat;height:15px;width:14px}
-div.dark_rounded .pp_arrow_previous{background:url(../images/prettyPhoto/dark_rounded/sprite.png) 0 -71px no-repeat}
-div.dark_rounded .pp_arrow_next{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -22px -71px no-repeat}
-div.dark_rounded .pp_bottom .pp_left{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -88px -80px no-repeat}
-div.dark_rounded .pp_bottom .pp_right{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -110px -80px no-repeat}
-div.dark_rounded .pp_loaderIcon{background:url(../images/prettyPhoto/dark_rounded/loader.gif) center center no-repeat}
-div.dark_square .pp_left,div.dark_square .pp_middle,div.dark_square .pp_right,div.dark_square .pp_content{background:#000}
-div.dark_square .pp_description{color:#fff;margin:0 85px 0 0}
-div.dark_square .pp_loaderIcon{background:url(../images/prettyPhoto/dark_square/loader.gif) center center no-repeat}
-div.dark_square .pp_expand{background:url(../images/prettyPhoto/dark_square/sprite.png) -31px -26px no-repeat;cursor:pointer}
-div.dark_square .pp_expand:hover{background:url(../images/prettyPhoto/dark_square/sprite.png) -31px -47px no-repeat;cursor:pointer}
-div.dark_square .pp_contract{background:url(../images/prettyPhoto/dark_square/sprite.png) 0 -26px no-repeat;cursor:pointer}
-div.dark_square .pp_contract:hover{background:url(../images/prettyPhoto/dark_square/sprite.png) 0 -47px no-repeat;cursor:pointer}
-div.dark_square .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/dark_square/sprite.png) -1px -1px no-repeat;cursor:pointer}
-div.dark_square .pp_nav{clear:none}
-div.dark_square .pp_nav .pp_play{background:url(../images/prettyPhoto/dark_square/sprite.png) -1px -100px no-repeat;height:15px;width:14px}
-div.dark_square .pp_nav .pp_pause{background:url(../images/prettyPhoto/dark_square/sprite.png) -24px -100px no-repeat;height:15px;width:14px}
-div.dark_square .pp_arrow_previous{background:url(../images/prettyPhoto/dark_square/sprite.png) 0 -71px no-repeat}
-div.dark_square .pp_arrow_next{background:url(../images/prettyPhoto/dark_square/sprite.png) -22px -71px no-repeat}
-div.dark_square .pp_next:hover{background:url(../images/prettyPhoto/dark_square/btnNext.png) center right no-repeat;cursor:pointer}
-div.dark_square .pp_previous:hover{background:url(../images/prettyPhoto/dark_square/btnPrevious.png) center left no-repeat;cursor:pointer}
-div.light_square .pp_expand{background:url(../images/prettyPhoto/light_square/sprite.png) -31px -26px no-repeat;cursor:pointer}
-div.light_square .pp_expand:hover{background:url(../images/prettyPhoto/light_square/sprite.png) -31px -47px no-repeat;cursor:pointer}
-div.light_square .pp_contract{background:url(../images/prettyPhoto/light_square/sprite.png) 0 -26px no-repeat;cursor:pointer}
-div.light_square .pp_contract:hover{background:url(../images/prettyPhoto/light_square/sprite.png) 0 -47px no-repeat;cursor:pointer}
-div.light_square .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/light_square/sprite.png) -1px -1px no-repeat;cursor:pointer}
-div.light_square .pp_nav .pp_play{background:url(../images/prettyPhoto/light_square/sprite.png) -1px -100px no-repeat;height:15px;width:14px}
-div.light_square .pp_nav .pp_pause{background:url(../images/prettyPhoto/light_square/sprite.png) -24px -100px no-repeat;height:15px;width:14px}
-div.light_square .pp_arrow_previous{background:url(../images/prettyPhoto/light_square/sprite.png) 0 -71px no-repeat}
-div.light_square .pp_arrow_next{background:url(../images/prettyPhoto/light_square/sprite.png) -22px -71px no-repeat}
-div.light_square .pp_next:hover{background:url(../images/prettyPhoto/light_square/btnNext.png) center right no-repeat;cursor:pointer}
-div.light_square .pp_previous:hover{background:url(../images/prettyPhoto/light_square/btnPrevious.png) center left no-repeat;cursor:pointer}
-div.facebook .pp_top .pp_left{background:url(../images/prettyPhoto/facebook/sprite.png) -88px -53px no-repeat}
-div.facebook .pp_top .pp_middle{background:url(../images/prettyPhoto/facebook/contentPatternTop.png) top left repeat-x}
-div.facebook .pp_top .pp_right{background:url(../images/prettyPhoto/facebook/sprite.png) -110px -53px no-repeat}
-div.facebook .pp_content_container .pp_left{background:url(../images/prettyPhoto/facebook/contentPatternLeft.png) top left repeat-y}
-div.facebook .pp_content_container .pp_right{background:url(../images/prettyPhoto/facebook/contentPatternRight.png) top right repeat-y}
-div.facebook .pp_expand{background:url(../images/prettyPhoto/facebook/sprite.png) -31px -26px no-repeat;cursor:pointer}
-div.facebook .pp_expand:hover{background:url(../images/prettyPhoto/facebook/sprite.png) -31px -47px no-repeat;cursor:pointer}
-div.facebook .pp_contract{background:url(../images/prettyPhoto/facebook/sprite.png) 0 -26px no-repeat;cursor:pointer}
-div.facebook .pp_contract:hover{background:url(../images/prettyPhoto/facebook/sprite.png) 0 -47px no-repeat;cursor:pointer}
-div.facebook .pp_close{width:22px;height:22px;background:url(../images/prettyPhoto/facebook/sprite.png) -1px -1px no-repeat;cursor:pointer}
-div.facebook .pp_description{margin:0 37px 0 0}
-div.facebook .pp_loaderIcon{background:url(../images/prettyPhoto/facebook/loader.gif) center center no-repeat}
-div.facebook .pp_arrow_previous{background:url(../images/prettyPhoto/facebook/sprite.png) 0 -71px no-repeat;height:22px;margin-top:0;width:22px}
-div.facebook .pp_arrow_previous.disabled{background-position:0 -96px;cursor:default}
-div.facebook .pp_arrow_next{background:url(../images/prettyPhoto/facebook/sprite.png) -32px -71px no-repeat;height:22px;margin-top:0;width:22px}
-div.facebook .pp_arrow_next.disabled{background-position:-32px -96px;cursor:default}
-div.facebook .pp_nav{margin-top:0}
-div.facebook .pp_nav p{font-size:15px;padding:0 3px 0 4px}
-div.facebook .pp_nav .pp_play{background:url(../images/prettyPhoto/facebook/sprite.png) -1px -123px no-repeat;height:22px;width:22px}
-div.facebook .pp_nav .pp_pause{background:url(../images/prettyPhoto/facebook/sprite.png) -32px -123px no-repeat;height:22px;width:22px}
-div.facebook .pp_next:hover{background:url(../images/prettyPhoto/facebook/btnNext.png) center right no-repeat;cursor:pointer}
-div.facebook .pp_previous:hover{background:url(../images/prettyPhoto/facebook/btnPrevious.png) center left no-repeat;cursor:pointer}
-div.facebook .pp_bottom .pp_left{background:url(../images/prettyPhoto/facebook/sprite.png) -88px -80px no-repeat}
-div.facebook .pp_bottom .pp_middle{background:url(../images/prettyPhoto/facebook/contentPatternBottom.png) top left repeat-x}
-div.facebook .pp_bottom .pp_right{background:url(../images/prettyPhoto/facebook/sprite.png) -110px -80px no-repeat}
-div.pp_pic_holder a:focus{outline:none}
-div.pp_overlay{background:#000;display:none;left:0;position:absolute;top:0;width:100%;z-index:9500}
-div.pp_pic_holder{display:none;position:absolute;width:100px;z-index:10000}
-.pp_content{height:40px;min-width:40px}
-* html .pp_content{width:40px}
-.pp_content_container{position:relative;text-align:left;width:100%}
-.pp_content_container .pp_left{padding-left:20px}
-.pp_content_container .pp_right{padding-right:20px}
-.pp_content_container .pp_details{float:left;margin:10px 0 2px}
-.pp_description{display:none;margin:0}
-.pp_social{float:left;margin:0}
-.pp_social .facebook{float:left;margin-left:5px;width:55px;overflow:hidden}
-.pp_social .twitter{float:left}
-.pp_nav{clear:right;float:left;margin:3px 10px 0 0}
-.pp_nav p{float:left;white-space:nowrap;margin:2px 4px}
-.pp_nav .pp_play,.pp_nav .pp_pause{float:left;margin-right:4px;text-indent:-10000px}
-a.pp_arrow_previous,a.pp_arrow_next{display:block;float:left;height:15px;margin-top:3px;overflow:hidden;text-indent:-10000px;width:14px}
-.pp_hoverContainer{position:absolute;top:0;width:100%;z-index:2000}
-.pp_gallery{display:none;left:50%;margin-top:-50px;position:absolute;z-index:10000}
-.pp_gallery div{float:left;overflow:hidden;position:relative}
-.pp_gallery ul{float:left;height:35px;position:relative;white-space:nowrap;margin:0 0 0 5px;padding:0}
-.pp_gallery ul a{border:1px rgba(0,0,0,0.5) solid;display:block;float:left;height:33px;overflow:hidden}
-.pp_gallery ul a img{border:0}
-.pp_gallery li{display:block;float:left;margin:0 5px 0 0;padding:0}
-.pp_gallery li.default a{background:url(../images/prettyPhoto/facebook/default_thumbnail.gif) 0 0 no-repeat;display:block;height:33px;width:50px}
-.pp_gallery .pp_arrow_previous,.pp_gallery .pp_arrow_next{margin-top:7px!important}
-a.pp_next{background:url(../images/prettyPhoto/light_rounded/btnNext.png) 10000px 10000px no-repeat;display:block;float:right;height:100%;text-indent:-10000px;width:49%}
-a.pp_previous{background:url(../images/prettyPhoto/light_rounded/btnNext.png) 10000px 10000px no-repeat;display:block;float:left;height:100%;text-indent:-10000px;width:49%}
-a.pp_expand,a.pp_contract{cursor:pointer;display:none;height:20px;position:absolute;right:30px;text-indent:-10000px;top:10px;width:20px;z-index:20000}
-a.pp_close{position:absolute;right:0;top:0;display:block;line-height:22px;text-indent:-10000px}
-.pp_loaderIcon{display:block;height:24px;left:50%;position:absolute;top:50%;width:24px;margin:-12px 0 0 -12px}
-#pp_full_res{line-height:1!important}
-#pp_full_res .pp_inline{text-align:left}
-#pp_full_res .pp_inline p{margin:0 0 15px}
-div.ppt{color:#fff;display:none;font-size:17px;z-index:9999;margin:0 0 5px 15px}
-div.pp_default .pp_content,div.light_rounded .pp_content{background-color:#fff}
-div.pp_default #pp_full_res .pp_inline,div.light_rounded .pp_content .ppt,div.light_rounded #pp_full_res .pp_inline,div.light_square .pp_content .ppt,div.light_square #pp_full_res .pp_inline,div.facebook .pp_content .ppt,div.facebook #pp_full_res .pp_inline{color:#000}
-div.pp_default .pp_gallery ul li a:hover,div.pp_default .pp_gallery ul li.selected a,.pp_gallery ul a:hover,.pp_gallery li.selected a{border-color:#fff}
-div.pp_default .pp_details,div.light_rounded .pp_details,div.dark_rounded .pp_details,div.dark_square .pp_details,div.light_square .pp_details,div.facebook .pp_details{position:relative}
-div.light_rounded .pp_top .pp_middle,div.light_rounded .pp_content_container .pp_left,div.light_rounded .pp_content_container .pp_right,div.light_rounded .pp_bottom .pp_middle,div.light_square .pp_left,div.light_square .pp_middle,div.light_square .pp_right,div.light_square .pp_content,div.facebook .pp_content{background:#fff}
-div.light_rounded .pp_description,div.light_square .pp_description{margin-right:85px}
-div.light_rounded .pp_gallery a.pp_arrow_previous,div.light_rounded .pp_gallery a.pp_arrow_next,div.dark_rounded .pp_gallery a.pp_arrow_previous,div.dark_rounded .pp_gallery a.pp_arrow_next,div.dark_square .pp_gallery a.pp_arrow_previous,div.dark_square .pp_gallery a.pp_arrow_next,div.light_square .pp_gallery a.pp_arrow_previous,div.light_square .pp_gallery a.pp_arrow_next{margin-top:12px!important}
-div.light_rounded .pp_arrow_previous.disabled,div.dark_rounded .pp_arrow_previous.disabled,div.dark_square .pp_arrow_previous.disabled,div.light_square .pp_arrow_previous.disabled{background-position:0 -87px;cursor:default}
-div.light_rounded .pp_arrow_next.disabled,div.dark_rounded .pp_arrow_next.disabled,div.dark_square .pp_arrow_next.disabled,div.light_square .pp_arrow_next.disabled{background-position:-22px -87px;cursor:default}
-div.light_rounded .pp_loaderIcon,div.light_square .pp_loaderIcon{background:url(../images/prettyPhoto/light_rounded/loader.gif) center center no-repeat}
-div.dark_rounded .pp_top .pp_middle,div.dark_rounded .pp_content,div.dark_rounded .pp_bottom .pp_middle{background:url(../images/prettyPhoto/dark_rounded/contentPattern.png) top left repeat}
-div.dark_rounded .currentTextHolder,div.dark_square .currentTextHolder{color:#c4c4c4}
-div.dark_rounded #pp_full_res .pp_inline,div.dark_square #pp_full_res .pp_inline{color:#fff}
-.pp_top,.pp_bottom{height:20px;position:relative}
-* html .pp_top,* html .pp_bottom{padding:0 20px}
-.pp_top .pp_left,.pp_bottom .pp_left{height:20px;left:0;position:absolute;width:20px}
-.pp_top .pp_middle,.pp_bottom .pp_middle{height:20px;left:20px;position:absolute;right:20px}
-* html .pp_top .pp_middle,* html .pp_bottom .pp_middle{left:0;position:static}
-.pp_top .pp_right,.pp_bottom .pp_right{height:20px;left:auto;position:absolute;right:0;top:0;width:20px}
-.pp_fade,.pp_gallery li.default a img{display:none}
\ No newline at end of file
diff --git a/library/prettyphoto/images/prettyPhoto/dark_rounded/btnNext.png b/library/prettyphoto/images/prettyPhoto/dark_rounded/btnNext.png
deleted file mode 100755
index b28c1ef3d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_rounded/btnNext.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_rounded/btnPrevious.png b/library/prettyphoto/images/prettyPhoto/dark_rounded/btnPrevious.png
deleted file mode 100755
index e0cd9c49a..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_rounded/btnPrevious.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_rounded/contentPattern.png b/library/prettyphoto/images/prettyPhoto/dark_rounded/contentPattern.png
deleted file mode 100755
index e5a047c3a..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_rounded/contentPattern.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/library/prettyphoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
deleted file mode 100755
index 2b1280f32..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_rounded/loader.gif b/library/prettyphoto/images/prettyPhoto/dark_rounded/loader.gif
deleted file mode 100755
index 50820eedd..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_rounded/loader.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_rounded/sprite.png b/library/prettyphoto/images/prettyPhoto/dark_rounded/sprite.png
deleted file mode 100755
index fb8c0f83d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_rounded/sprite.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_square/btnNext.png b/library/prettyphoto/images/prettyPhoto/dark_square/btnNext.png
deleted file mode 100755
index b28c1ef3d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_square/btnNext.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_square/btnPrevious.png b/library/prettyphoto/images/prettyPhoto/dark_square/btnPrevious.png
deleted file mode 100755
index e0cd9c49a..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_square/btnPrevious.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_square/contentPattern.png b/library/prettyphoto/images/prettyPhoto/dark_square/contentPattern.png
deleted file mode 100755
index 7b50aff88..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_square/contentPattern.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_square/default_thumbnail.gif b/library/prettyphoto/images/prettyPhoto/dark_square/default_thumbnail.gif
deleted file mode 100755
index 2b1280f32..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_square/default_thumbnail.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_square/loader.gif b/library/prettyphoto/images/prettyPhoto/dark_square/loader.gif
deleted file mode 100755
index 50820eedd..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_square/loader.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/dark_square/sprite.png b/library/prettyphoto/images/prettyPhoto/dark_square/sprite.png
deleted file mode 100755
index 4fe354752..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/dark_square/sprite.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/default_thumb.png b/library/prettyphoto/images/prettyPhoto/default/default_thumb.png
deleted file mode 100644
index 1a26e4b16..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/default_thumb.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/loader.gif b/library/prettyphoto/images/prettyPhoto/default/loader.gif
deleted file mode 100644
index 35d397c9e..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/loader.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/sprite.png b/library/prettyphoto/images/prettyPhoto/default/sprite.png
deleted file mode 100644
index 5f07ddc56..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/sprite.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/sprite_next.png b/library/prettyphoto/images/prettyPhoto/default/sprite_next.png
deleted file mode 100644
index 379dc0d0d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/sprite_next.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/sprite_prev.png b/library/prettyphoto/images/prettyPhoto/default/sprite_prev.png
deleted file mode 100644
index 1ee486514..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/sprite_prev.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/sprite_x.png b/library/prettyphoto/images/prettyPhoto/default/sprite_x.png
deleted file mode 100644
index d4433ab0d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/sprite_x.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/default/sprite_y.png b/library/prettyphoto/images/prettyPhoto/default/sprite_y.png
deleted file mode 100644
index 7786ab512..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/default/sprite_y.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/btnNext.png b/library/prettyphoto/images/prettyPhoto/facebook/btnNext.png
deleted file mode 100755
index e809c3b64..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/btnNext.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/btnPrevious.png b/library/prettyphoto/images/prettyPhoto/facebook/btnPrevious.png
deleted file mode 100755
index 0812542cc..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/btnPrevious.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternBottom.png b/library/prettyphoto/images/prettyPhoto/facebook/contentPatternBottom.png
deleted file mode 100755
index a9be3b2ca..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternBottom.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternLeft.png b/library/prettyphoto/images/prettyPhoto/facebook/contentPatternLeft.png
deleted file mode 100755
index 277c87a5b..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternLeft.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternRight.png b/library/prettyphoto/images/prettyPhoto/facebook/contentPatternRight.png
deleted file mode 100755
index 76e50d0f5..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternRight.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternTop.png b/library/prettyphoto/images/prettyPhoto/facebook/contentPatternTop.png
deleted file mode 100755
index 8b110bac6..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/contentPatternTop.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/default_thumbnail.gif b/library/prettyphoto/images/prettyPhoto/facebook/default_thumbnail.gif
deleted file mode 100755
index 2b1280f32..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/default_thumbnail.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/loader.gif b/library/prettyphoto/images/prettyPhoto/facebook/loader.gif
deleted file mode 100755
index 7ac990cf0..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/loader.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/facebook/sprite.png b/library/prettyphoto/images/prettyPhoto/facebook/sprite.png
deleted file mode 100755
index 660a254f1..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/facebook/sprite.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_rounded/btnNext.png b/library/prettyphoto/images/prettyPhoto/light_rounded/btnNext.png
deleted file mode 100755
index b28c1ef3d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_rounded/btnNext.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_rounded/btnPrevious.png b/library/prettyphoto/images/prettyPhoto/light_rounded/btnPrevious.png
deleted file mode 100755
index e0cd9c49a..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_rounded/btnPrevious.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_rounded/default_thumbnail.gif b/library/prettyphoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
deleted file mode 100755
index 2b1280f32..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_rounded/default_thumbnail.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_rounded/loader.gif b/library/prettyphoto/images/prettyPhoto/light_rounded/loader.gif
deleted file mode 100755
index 7ac990cf0..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_rounded/loader.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_rounded/sprite.png b/library/prettyphoto/images/prettyPhoto/light_rounded/sprite.png
deleted file mode 100755
index 7f2837981..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_rounded/sprite.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_square/btnNext.png b/library/prettyphoto/images/prettyPhoto/light_square/btnNext.png
deleted file mode 100755
index b28c1ef3d..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_square/btnNext.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_square/btnPrevious.png b/library/prettyphoto/images/prettyPhoto/light_square/btnPrevious.png
deleted file mode 100755
index e0cd9c49a..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_square/btnPrevious.png and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_square/default_thumbnail.gif b/library/prettyphoto/images/prettyPhoto/light_square/default_thumbnail.gif
deleted file mode 100755
index 2b1280f32..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_square/default_thumbnail.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_square/loader.gif b/library/prettyphoto/images/prettyPhoto/light_square/loader.gif
deleted file mode 100755
index 7ac990cf0..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_square/loader.gif and /dev/null differ
diff --git a/library/prettyphoto/images/prettyPhoto/light_square/sprite.png b/library/prettyphoto/images/prettyPhoto/light_square/sprite.png
deleted file mode 100755
index 4fe354752..000000000
Binary files a/library/prettyphoto/images/prettyPhoto/light_square/sprite.png and /dev/null differ
diff --git a/library/prettyphoto/js/jquery-1.3.2.min.js b/library/prettyphoto/js/jquery-1.3.2.min.js
deleted file mode 100755
index b1ae21d8b..000000000
--- a/library/prettyphoto/js/jquery-1.3.2.min.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
        "]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
        ","
        "]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="
        ";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
        ";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
        ").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
        ';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
diff --git a/library/prettyphoto/js/jquery-1.4.4.min.js b/library/prettyphoto/js/jquery-1.4.4.min.js
deleted file mode 100644
index 2bd4cbb8a..000000000
--- a/library/prettyphoto/js/jquery-1.4.4.min.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.4
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Nov 11 19:04:53 2010 -0500
- */
-(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
-h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;kd)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
-"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
-e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
-"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
-a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
-s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
-j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
-toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
--1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
-if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
-b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
-!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
-l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H
        a";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
-k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
-scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
-1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="
        ";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="
        t
        ";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
-"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
-c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
-else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
-if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
-attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
-b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
-c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
-arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
-d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
-c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
-8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
-"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
-d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
-B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
-"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
-0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
-(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
-break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
-q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
-l;g.sort(w);if(h)for(var i=1;i0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
-m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
-true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
-g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return in[3]-0},nth:function(g,i,n){return n[3]-
-0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
-i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
-if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
-g);else if(typeof g.length==="number")for(var p=g.length;n";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
-n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
-function(){var g=k,i=t.createElement("div");i.innerHTML="
        ";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
-p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
-t.createElement("div");g.innerHTML="
        ";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
-function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n0)for(var h=d;h0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
-h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
-c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
-2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
-b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
-e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/\s]+\/)>/g,P={option:[1,
-""],legend:[1,"
        ","
        "],thead:[1,"","
        "],tr:[2,"","
        "],td:[3,"","
        "],col:[2,"","
        "],area:[1,"",""],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div
        ","
        "];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
-else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1>");try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
-prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
-b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]===""&&!x?r.childNodes:[];for(o=k.length-
-1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
-d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
-jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
-zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
-h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
-if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
-d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
-e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/)<[^<]*)*<\/script>/gi,
-ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
-"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("
        ").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
-!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
-getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
-script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
-!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
-false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
-A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
-b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
-c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
-c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
-encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
-[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
-e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
-if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
-3),a,b,d);else{d=0;for(var e=this.length;d=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
-d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
-Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
-var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
-this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
-this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
-c.timers,b=0;b-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
-e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
-c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
-c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
-b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
\ No newline at end of file
diff --git a/library/prettyphoto/js/jquery-1.6.1.min.js b/library/prettyphoto/js/jquery-1.6.1.min.js
deleted file mode 100644
index eb6a59693..000000000
--- a/library/prettyphoto/js/jquery-1.6.1.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu May 12 15:04:36 2011 -0400
- */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g=0===c})}function W(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function O(a,b){return(a&&a!=="*"?a+".":"")+b.replace(A,"`").replace(B,"&")}function N(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function L(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function F(){return!0}function E(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function H(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(H,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=d.userAgent,x,y,z,A=Object.prototype.toString,B=Object.prototype.hasOwnProperty,C=Array.prototype.push,D=Array.prototype.slice,E=String.prototype.trim,F=Array.prototype.indexOf,G={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.1",length:0,size:function(){return this.length},toArray:function(){return D.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?C.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(D.apply(this,arguments),"slice",D.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:C,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;y.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!y){y=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",z,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",z),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&H()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):G[A.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!B.call(a,"constructor")&&!B.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||B.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
        a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};f=c.createElement("select"),g=f.appendChild(c.createElement("option")),h=a.getElementsByTagName("input")[0],j={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},h.checked=!0,j.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,j.optDisabled=!g.disabled;try{delete a.test}catch(s){j.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function b(){j.noCloneEvent=!1,a.detachEvent("onclick",b)}),a.cloneNode(!0).fireEvent("onclick")),h=c.createElement("input"),h.value="t",h.setAttribute("type","radio"),j.radioValue=h.value==="t",h.setAttribute("checked","checked"),a.appendChild(h),k=c.createDocumentFragment(),k.appendChild(a.firstChild),j.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",l=c.createElement("body"),m={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};for(q in m)l.style[q]=m[q];l.appendChild(a),b.insertBefore(l,b.firstChild),j.appendChecked=h.checked,j.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,j.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
        ",j.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
        t
        ",n=a.getElementsByTagName("td"),r=n[0].offsetHeight===0,n[0].style.display="",n[1].style.display="none",j.reliableHiddenOffsets=r&&n[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(i=c.createElement("div"),i.style.width="0",i.style.marginRight="0",a.appendChild(i),j.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(i,null)||{marginRight:0}).marginRight,10)||0)===0),l.innerHTML="",b.removeChild(l);if(a.attachEvent)for(q in{submit:1,change:1,focusin:1})p="on"+q,r=p in a,r||(a.setAttribute(p,"return;"),r=typeof a[p]=="function"),j[q+"Bubbles"]=r;return j}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;return(e.value||"").replace(p,"")}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);c=j&&f.attrFix[c]||c,i=f.attrHooks[c],i||(!t.test(c)||typeof d!="boolean"&&d!==b&&d.toLowerCase()!==c.toLowerCase()?v&&(f.nodeName(a,"form")||u.test(c))&&(i=v):i=w);if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j)return i.get(a,c);h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);c=i&&f.propFix[c]||c,h=f.propHooks[c];return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return a[f.propFix[c]||c]?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=b),a.setAttribute(c,c.toLowerCase()));return c}},f.attrHooks.value={get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return a.value},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=Object.prototype.hasOwnProperty,y=/\.(.*)$/,z=/^(?:textarea|input|select)$/i,A=/\./g,B=/ /g,C=/[^\w\s.|`]/g,D=function(a){return a.replace(C,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=E;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=E);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),D).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem
-)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},K=function(c){var d=c.target,e,g;if(!!z.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=J(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:K,beforedeactivate:K,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&K.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&K.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",J(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in I)f.event.add(this,c+".specialChange",I[c]);return z.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return z.test(this.nodeName)}},I=f.event.special.change.filters,I.focus=I.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="
        ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
        ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=U.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(W(c[0])||W(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=T.call(arguments);P.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!V[a]?f.unique(e):e,(this.length>1||R.test(d))&&Q.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y=/ jQuery\d+="(?:\d+|null)"/g,Z=/^\s+/,$=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,_=/<([\w:]+)/,ba=/",""],legend:[1,"
        ","
        "],thead:[1,"","
        "],tr:[2,"","
        "],td:[3,"","
        "],col:[2,"","
        "],area:[1,"",""],_default:[0,"",""]};bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
        ","
        "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bj(a,d),e=bk(a),g=bk(d);for(h=0;e[h];++h)bj(e[h],g[h])}if(b){bi(a,d);if(c){e=bk(a),g=bk(d);for(h=0;e[h];++h)bi(e[h],g[h])}}return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||
-b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bb.test(k))k=b.createTextNode(k);else{k=k.replace($,"<$1>");var l=(_.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=ba.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Z.test(k)&&o.insertBefore(b.createTextNode(Z.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bp.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bo.test(g)?g.replace(bo,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,c){var d,e,g;c=c.replace(br,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bs.test(d)&&bt.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bE=/%20/g,bF=/\[\]$/,bG=/\r?\n/g,bH=/#.*$/,bI=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bJ=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bK=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bL=/^(?:GET|HEAD)$/,bM=/^\/\//,bN=/\?/,bO=/)<[^<]*)*<\/script>/gi,bP=/^(?:select|textarea)/i,bQ=/\s+/,bR=/([?&])_=[^&]*/,bS=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bT=f.fn.load,bU={},bV={},bW,bX;try{bW=e.href}catch(bY){bW=c.createElement("a"),bW.href="",bW=bW.href}bX=bS.exec(bW.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bT)return bT.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
        ").append(c.replace(bO,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bP.test(this.nodeName)||bJ.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bG,"\r\n")}}):{name:b.name,value:c.replace(bG,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bW,isLocal:bK.test(bX[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bZ(bU),ajaxTransport:bZ(bV),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?ca(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=cb(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bI.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bH,"").replace(bM,bX[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bQ),d.crossDomain==null&&(r=bS.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bX[1]&&r[2]==bX[2]&&(r[3]||(r[1]==="http:"?80:443))==(bX[3]||(bX[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bU,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bL.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bN.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bR,"$1_="+x);d.url=y+(y===d.url?(bN.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bV,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bE,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq,cr=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
        ";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){return this[0]?parseFloat(f.css(this[0],d,"padding")):null},f.fn["outer"+c]=function(a){return this[0]?parseFloat(f.css(this[0],d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/library/prettyphoto/js/jquery.prettyPhoto.js b/library/prettyphoto/js/jquery.prettyPhoto.js
deleted file mode 100644
index a67afddca..000000000
--- a/library/prettyphoto/js/jquery.prettyPhoto.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* ------------------------------------------------------------------------
-	Class: prettyPhoto
-	Use: Lightbox clone for jQuery
-	Author: Stephane Caron (http://www.no-margin-for-errors.com)
-	Version: 3.1.5
-------------------------------------------------------------------------- */
-(function(e){function t(){var e=location.href;hashtag=e.indexOf("#prettyPhoto")!==-1?decodeURI(e.substring(e.indexOf("#prettyPhoto")+1,e.length)):false;return hashtag}function n(){if(typeof theRel=="undefined")return;location.hash=theRel+"/"+rel_index+"/"}function r(){if(location.href.indexOf("#prettyPhoto")!==-1)location.hash="prettyPhoto"}function i(e,t){e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var n="[\\?&]"+e+"=([^&#]*)";var r=new RegExp(n);var i=r.exec(t);return i==null?"":i[1]}e.prettyPhoto={version:"3.1.5"};e.fn.prettyPhoto=function(s){function g(){e(".pp_loaderIcon").hide();projectedTop=scroll_pos["scrollTop"]+(d/2-a["containerHeight"]/2);if(projectedTop<0)projectedTop=0;$ppt.fadeTo(settings.animation_speed,1);$pp_pic_holder.find(".pp_content").animate({height:a["contentHeight"],width:a["contentWidth"]},settings.animation_speed);$pp_pic_holder.animate({top:projectedTop,left:v/2-a["containerWidth"]/2<0?0:v/2-a["containerWidth"]/2,width:a["containerWidth"]},settings.animation_speed,function(){$pp_pic_holder.find(".pp_hoverContainer,#fullResImage").height(a["height"]).width(a["width"]);$pp_pic_holder.find(".pp_fade").fadeIn(settings.animation_speed);if(isSet&&S(pp_images[set_position])=="image"){$pp_pic_holder.find(".pp_hoverContainer").show()}else{$pp_pic_holder.find(".pp_hoverContainer").hide()}if(settings.allow_expand){if(a["resized"]){e("a.pp_expand,a.pp_contract").show()}else{e("a.pp_expand").hide()}}if(settings.autoplay_slideshow&&!m&&!f)e.prettyPhoto.startSlideshow();settings.changepicturecallback();f=true});C();s.ajaxcallback()}function y(t){$pp_pic_holder.find("#pp_full_res object,#pp_full_res embed").css("visibility","hidden");$pp_pic_holder.find(".pp_fade").fadeOut(settings.animation_speed,function(){e(".pp_loaderIcon").show();t()})}function b(t){t>1?e(".pp_nav").show():e(".pp_nav").hide()}function w(e,t){resized=false;E(e,t);imageWidth=e,imageHeight=t;if((p>v||h>d)&&doresize&&settings.allow_resize&&!u){resized=true,fitting=false;while(!fitting){if(p>v){imageWidth=v-200;imageHeight=t/e*imageWidth}else if(h>d){imageHeight=d-200;imageWidth=e/t*imageHeight}else{fitting=true}h=imageHeight,p=imageWidth}if(p>v||h>d){w(p,h)}E(imageWidth,imageHeight)}return{width:Math.floor(imageWidth),height:Math.floor(imageHeight),containerHeight:Math.floor(h),containerWidth:Math.floor(p)+settings.horizontal_padding*2,contentHeight:Math.floor(l),contentWidth:Math.floor(c),resized:resized}}function E(t,n){t=parseFloat(t);n=parseFloat(n);$pp_details=$pp_pic_holder.find(".pp_details");$pp_details.width(t);detailsHeight=parseFloat($pp_details.css("marginTop"))+parseFloat($pp_details.css("marginBottom"));$pp_details=$pp_details.clone().addClass(settings.theme).width(t).appendTo(e("body")).css({position:"absolute",top:-1e4});detailsHeight+=$pp_details.height();detailsHeight=detailsHeight<=34?36:detailsHeight;$pp_details.remove();$pp_title=$pp_pic_holder.find(".ppt");$pp_title.width(t);titleHeight=parseFloat($pp_title.css("marginTop"))+parseFloat($pp_title.css("marginBottom"));$pp_title=$pp_title.clone().appendTo(e("body")).css({position:"absolute",top:-1e4});titleHeight+=$pp_title.height();$pp_title.remove();l=n+detailsHeight;c=t;h=l+titleHeight+$pp_pic_holder.find(".pp_top").height()+$pp_pic_holder.find(".pp_bottom").height();p=t}function S(e){if(e.match(/youtube\.com\/watch/i)||e.match(/youtu\.be/i)){return"youtube"}else if(e.match(/vimeo\.com/i)){return"vimeo"}else if(e.match(/\b.mov\b/i)){return"quicktime"}else if(e.match(/\b.swf\b/i)){return"flash"}else if(e.match(/\biframe=true\b/i)){return"iframe"}else if(e.match(/\bajax=true\b/i)){return"ajax"}else if(e.match(/\bcustom=true\b/i)){return"custom"}else if(e.substr(0,1)=="#"){return"inline"}else{return"image"}}function x(){if(doresize&&typeof $pp_pic_holder!="undefined"){scroll_pos=T();contentHeight=$pp_pic_holder.height(),contentwidth=$pp_pic_holder.width();projectedTop=d/2+scroll_pos["scrollTop"]-contentHeight/2;if(projectedTop<0)projectedTop=0;if(contentHeight>d)return;$pp_pic_holder.css({top:projectedTop,left:v/2+scroll_pos["scrollLeft"]-contentwidth/2})}}function T(){if(self.pageYOffset){return{scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}}else if(document.documentElement&&document.documentElement.scrollTop){return{scrollTop:document.documentElement.scrollTop,scrollLeft:document.documentElement.scrollLeft}}else if(document.body){return{scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}}}function N(){d=e(window).height(),v=e(window).width();if(typeof $pp_overlay!="undefined")$pp_overlay.height(e(document).height()).width(v)}function C(){if(isSet&&settings.overlay_gallery&&S(pp_images[set_position])=="image"){itemWidth=52+5;navWidth=settings.theme=="facebook"||settings.theme=="pp_default"?50:30;itemsPerPage=Math.floor((a["containerWidth"]-100-navWidth)/itemWidth);itemsPerPage=itemsPerPage"}toInject=settings.gallery_markup.replace(/{gallery}/g,toInject);$pp_pic_holder.find("#pp_full_res").after(toInject);$pp_gallery=e(".pp_pic_holder .pp_gallery"),$pp_gallery_li=$pp_gallery.find("li");$pp_gallery.find(".pp_arrow_next").click(function(){e.prettyPhoto.changeGalleryPage("next");e.prettyPhoto.stopSlideshow();return false});$pp_gallery.find(".pp_arrow_previous").click(function(){e.prettyPhoto.changeGalleryPage("previous");e.prettyPhoto.stopSlideshow();return false});$pp_pic_holder.find(".pp_content").hover(function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeIn()},function(){$pp_pic_holder.find(".pp_gallery:not(.disabled)").fadeOut()});itemWidth=52+5;$pp_gallery_li.each(function(t){e(this).find("a").click(function(){e.prettyPhoto.changePage(t);e.prettyPhoto.stopSlideshow();return false})})}if(settings.slideshow){$pp_pic_holder.find(".pp_nav").prepend('Play');$pp_pic_holder.find(".pp_nav .pp_play").click(function(){e.prettyPhoto.startSlideshow();return false})}$pp_pic_holder.attr("class","pp_pic_holder "+settings.theme);$pp_overlay.css({opacity:0,height:e(document).height(),width:e(window).width()}).bind("click",function(){if(!settings.modal)e.prettyPhoto.close()});e("a.pp_close").bind("click",function(){e.prettyPhoto.close();return false});if(settings.allow_expand){e("a.pp_expand").bind("click",function(t){if(e(this).hasClass("pp_expand")){e(this).removeClass("pp_expand").addClass("pp_contract");doresize=false}else{e(this).removeClass("pp_contract").addClass("pp_expand");doresize=true}y(function(){e.prettyPhoto.open()});return false})}$pp_pic_holder.find(".pp_previous, .pp_nav .pp_arrow_previous").bind("click",function(){e.prettyPhoto.changePage("previous");e.prettyPhoto.stopSlideshow();return false});$pp_pic_holder.find(".pp_next, .pp_nav .pp_arrow_next").bind("click",function(){e.prettyPhoto.changePage("next");e.prettyPhoto.stopSlideshow();return false});x()}s=jQuery.extend({hook:"rel",animation_speed:"fast",ajaxcallback:function(){},slideshow:5e3,autoplay_slideshow:false,opacity:.8,show_title:true,allow_resize:true,allow_expand:true,default_width:500,default_height:344,counter_separator_label:"/",theme:"pp_default",horizontal_padding:20,hideflash:false,wmode:"opaque",autoplay:true,modal:false,deeplinking:true,overlay_gallery:true,overlay_gallery_max:30,keyboard_shortcuts:true,changepicturecallback:function(){},callback:function(){},ie6_fallback:true,markup:'
         						
         
         						
         							
         							
         							
         						
         						
         							
         							
         								
         									
         									
         										Expand 										
         											next 											previous 										
         										
         										
         											
         												Previous 												
        0/0
         												Next 											
         											
         											
        {pp_social}
         											Close 										
         									
         								
         							
         							
         						
         						
         							
         							
         							
         						
         					
         					
        ',gallery_markup:'
         								Previous 								
         									
           										{gallery} 									
         								
         								Next 							
        ',image_markup:'',flash_markup:'',quicktime_markup:'',iframe_markup:'',inline_markup:'
        {content}
        '},s);var o=this,u=false,a,f,l,c,h,p,d=e(window).height(),v=e(window).width(),m;doresize=true,scroll_pos=T();e(window).unbind("resize.prettyphoto").bind("resize.prettyphoto",function(){x();N()});if(s.keyboard_shortcuts){e(document).unbind("keydown.prettyphoto").bind("keydown.prettyphoto",function(t){if(typeof $pp_pic_holder!="undefined"){if($pp_pic_holder.is(":visible")){switch(t.keyCode){case 37:e.prettyPhoto.changePage("previous");t.preventDefault();break;case 39:e.prettyPhoto.changePage("next");t.preventDefault();break;case 27:if(!settings.modal)e.prettyPhoto.close();t.preventDefault();break}}}})}e.prettyPhoto.initialize=function(){settings=s;if(settings.theme=="pp_default")settings.horizontal_padding=16;theRel=e(this).attr(settings.hook);galleryRegExp=/\[(?:.*)\]/;isSet=galleryRegExp.exec(theRel)?true:false;pp_images=isSet?jQuery.map(o,function(t,n){if(e(t).attr(settings.hook).indexOf(theRel)!=-1)return e(t).attr("href")}):e.makeArray(e(this).attr("href"));pp_titles=isSet?jQuery.map(o,function(t,n){if(e(t).attr(settings.hook).indexOf(theRel)!=-1)return e(t).find("img").attr("alt")?e(t).find("img").attr("alt"):""}):e.makeArray(e(this).find("img").attr("alt"));pp_descriptions=isSet?jQuery.map(o,function(t,n){if(e(t).attr(settings.hook).indexOf(theRel)!=-1)return e(t).attr("title")?e(t).attr("title"):""}):e.makeArray(e(this).attr("title"));if(pp_images.length>settings.overlay_gallery_max)settings.overlay_gallery=false;set_position=jQuery.inArray(e(this).attr("href"),pp_images);rel_index=isSet?set_position:e("a["+settings.hook+"^='"+theRel+"']").index(e(this));k(this);if(settings.allow_resize)e(window).bind("scroll.prettyphoto",function(){x()});e.prettyPhoto.open();return false};e.prettyPhoto.open=function(t){if(typeof settings=="undefined"){settings=s;pp_images=e.makeArray(arguments[0]);pp_titles=arguments[1]?e.makeArray(arguments[1]):e.makeArray("");pp_descriptions=arguments[2]?e.makeArray(arguments[2]):e.makeArray("");isSet=pp_images.length>1?true:false;set_position=arguments[3]?arguments[3]:0;k(t.target)}if(settings.hideflash)e("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","hidden");b(e(pp_images).size());e(".pp_loaderIcon").show();if(settings.deeplinking)n();if(settings.social_tools){facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href));$pp_pic_holder.find(".pp_social").html(facebook_like_link)}if($ppt.is(":hidden"))$ppt.css("opacity",0).show();$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity);$pp_pic_holder.find(".currentTextHolder").text(set_position+1+settings.counter_separator_label+e(pp_images).size());if(typeof pp_descriptions[set_position]!="undefined"&&pp_descriptions[set_position]!=""){$pp_pic_holder.find(".pp_description").show().html(unescape(pp_descriptions[set_position]))}else{$pp_pic_holder.find(".pp_description").hide()}movie_width=parseFloat(i("width",pp_images[set_position]))?i("width",pp_images[set_position]):settings.default_width.toString();movie_height=parseFloat(i("height",pp_images[set_position]))?i("height",pp_images[set_position]):settings.default_height.toString();u=false;if(movie_height.indexOf("%")!=-1){movie_height=parseFloat(e(window).height()*parseFloat(movie_height)/100-150);u=true}if(movie_width.indexOf("%")!=-1){movie_width=parseFloat(e(window).width()*parseFloat(movie_width)/100-150);u=true}$pp_pic_holder.fadeIn(function(){settings.show_title&&pp_titles[set_position]!=""&&typeof pp_titles[set_position]!="undefined"?$ppt.html(unescape(pp_titles[set_position])):$ppt.html(" ");imgPreloader="";skipInjection=false;switch(S(pp_images[set_position])){case"image":imgPreloader=new Image;nextImage=new Image;if(isSet&&set_position0)movie_id=movie_id.substr(0,movie_id.indexOf("?"));if(movie_id.indexOf("&")>0)movie_id=movie_id.substr(0,movie_id.indexOf("&"))}movie="http://www.youtube.com/embed/"+movie_id;i("rel",pp_images[set_position])?movie+="?rel="+i("rel",pp_images[set_position]):movie+="?rel=1";if(settings.autoplay)movie+="&autoplay=1";toInject=settings.iframe_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie);break;case"vimeo":a=w(movie_width,movie_height);movie_id=pp_images[set_position];var t=/http(s?):\/\/(www\.)?vimeo.com\/(\d+)/;var n=movie_id.match(t);movie="http://player.vimeo.com/video/"+n[3]+"?title=0&byline=0&portrait=0";if(settings.autoplay)movie+="&autoplay=1;";vimeo_width=a["width"]+"/embed/?moog_width="+a["width"];toInject=settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,a["height"]).replace(/{path}/g,movie);break;case"quicktime":a=w(movie_width,movie_height);a["height"]+=15;a["contentHeight"]+=15;a["containerHeight"]+=15;toInject=settings.quicktime_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay);break;case"flash":a=w(movie_width,movie_height);flash_vars=pp_images[set_position];flash_vars=flash_vars.substring(pp_images[set_position].indexOf("flashvars")+10,pp_images[set_position].length);filename=pp_images[set_position];filename=filename.substring(0,filename.indexOf("?"));toInject=settings.flash_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+"?"+flash_vars);break;case"iframe":a=w(movie_width,movie_height);frame_url=pp_images[set_position];frame_url=frame_url.substr(0,frame_url.indexOf("iframe")-1);toInject=settings.iframe_markup.replace(/{width}/g,a["width"]).replace(/{height}/g,a["height"]).replace(/{path}/g,frame_url);break;case"ajax":doresize=false;a=w(movie_width,movie_height);doresize=true;skipInjection=true;e.get(pp_images[set_position],function(e){toInject=settings.inline_markup.replace(/{content}/g,e);$pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject;g()});break;case"custom":a=w(movie_width,movie_height);toInject=settings.custom_markup;break;case"inline":myClone=e(pp_images[set_position]).clone().append('
        ').css({width:settings.default_width}).wrapInner('
        ').appendTo(e("body")).show();doresize=false;a=w(e(myClone).width(),e(myClone).height());doresize=true;e(myClone).remove();toInject=settings.inline_markup.replace(/{content}/g,e(pp_images[set_position]).html());break}if(!imgPreloader&&!skipInjection){$pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject;g()}});return false};e.prettyPhoto.changePage=function(t){currentGalleryPage=0;if(t=="previous"){set_position--;if(set_position<0)set_position=e(pp_images).size()-1}else if(t=="next"){set_position++;if(set_position>e(pp_images).size()-1)set_position=0}else{set_position=t}rel_index=set_position;if(!doresize)doresize=true;if(settings.allow_expand){e(".pp_contract").removeClass("pp_contract").addClass("pp_expand")}y(function(){e.prettyPhoto.open()})};e.prettyPhoto.changeGalleryPage=function(e){if(e=="next"){currentGalleryPage++;if(currentGalleryPage>totalPage)currentGalleryPage=0}else if(e=="previous"){currentGalleryPage--;if(currentGalleryPage<0)currentGalleryPage=totalPage}else{currentGalleryPage=e}slide_speed=e=="next"||e=="previous"?settings.animation_speed:0;slide_to=currentGalleryPage*itemsPerPage*itemWidth;$pp_gallery.find("ul").animate({left:-slide_to},slide_speed)};e.prettyPhoto.startSlideshow=function(){if(typeof m=="undefined"){$pp_pic_holder.find(".pp_play").unbind("click").removeClass("pp_play").addClass("pp_pause").click(function(){e.prettyPhoto.stopSlideshow();return false});m=setInterval(e.prettyPhoto.startSlideshow,settings.slideshow)}else{e.prettyPhoto.changePage("next")}};e.prettyPhoto.stopSlideshow=function(){$pp_pic_holder.find(".pp_pause").unbind("click").removeClass("pp_pause").addClass("pp_play").click(function(){e.prettyPhoto.startSlideshow();return false});clearInterval(m);m=undefined};e.prettyPhoto.close=function(){if($pp_overlay.is(":animated"))return;e.prettyPhoto.stopSlideshow();$pp_pic_holder.stop().find("object,embed").css("visibility","hidden");e("div.pp_pic_holder,div.ppt,.pp_fade").fadeOut(settings.animation_speed,function(){e(this).remove()});$pp_overlay.fadeOut(settings.animation_speed,function(){if(settings.hideflash)e("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","visible");e(this).remove();e(window).unbind("scroll.prettyphoto");r();settings.callback();doresize=true;f=false;delete settings})};if(!pp_alreadyInitialized&&t()){pp_alreadyInitialized=true;hashIndex=t();hashRel=hashIndex;hashIndex=hashIndex.substring(hashIndex.indexOf("/")+1,hashIndex.length-1);hashRel=hashRel.substring(0,hashRel.indexOf("/"));setTimeout(function(){e("a["+s.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger("click")},50)}return this.unbind("click.prettyphoto").bind("click.prettyphoto",e.prettyPhoto.initialize)};})(jQuery);var pp_alreadyInitialized=false
\ No newline at end of file
-- 
cgit v1.2.3


From 1a3ae295e0b2ff7374350e1f5051a6a8f593c35f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 22 Jan 2014 17:01:53 -0800
Subject: some intial work on a splashier homepage

---
 assets/home.html | 30 +++++++++++++++++++++---------
 assets/wide.css  | 10 +++++-----
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/assets/home.html b/assets/home.html
index 3f018edfc..8751f8485 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -30,23 +30,35 @@ $(window).scroll(function(e){
 
        
 
 
-
        
-The internet is broken. We're fixing it.
        
+
        
+Imagine
        
 
-
        
-
        
-
        
-ma·trix: something within or from which something else originates, develops, or takes form 
+
        
+
        
+
        Let's imagine a new internet. One that allows you to publish, communicate and share freely; yet the things you publish are only visible to those you choose. Period. Let's also imagine that this internet doesn't force you to remember a unique password for every site you wish to be involved with. Your website and your friends' websites connect together and they all just know who you are - yet what else they know about you is under your control.
+
        
 
        
+
+
+
        
+
        
+
        
+ma·trix: something within or from which something else originates, develops, or takes form 
+
        
 
        
 
-
        
-
        Imagine an internet slightly different than what we have today. The internet of the future won't require logging in with passwords on every site you wish to access. It will just know who you are. An internet where you need to keep track of hundreds/thousands of passwords on hundreds/thousands of websites is fundamentally broken. But an internet with no privacy and where all your online activities are monitored and tracked is likewise broken.
-
        
+
        
 
        Imagine if you had an internet where the people using it could create new services and communicate freely and privately - and where you didn't need a different account on every website in the network in order to use each website. Where you had your own space and could share anything you wanted with anybody you wanted, any time you wanted. Where the things you share in private stay private instead of being under constant surveillance from advertising corporations and government intelligence agencies.
 
        
 
        
 
+
+
+
        
+
+
        
+
+
 
        
 Decentralise
 Identity
diff --git a/assets/wide.css b/assets/wide.css
index 84dbc47a2..77b7370a3 100644
--- a/assets/wide.css
+++ b/assets/wide.css
@@ -2,7 +2,7 @@ body {
 	font-family: 'Ubuntu',Tahoma,Helvetica,Arial,sans-serif;
 	color: #111111; 
 	/*color: rgba(0,0,0,0.0); */
-		text-align: center;
+		text-align: center; 
 	/* background-image: url("redmatrixbkgd.jpg"); */
 	/*background: #ececec;*/
 	  padding:0 0 22px 0; 
@@ -15,8 +15,8 @@ body {
 	*/
 }
 
-#intro-text {
-color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify;
+#intro-textl, #intro-textr {
+text-align: left; color:#444444;font-size:1.3em;
 }
 div.section-text {
 color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify;
@@ -61,11 +61,11 @@ color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;tex
 
 #tagline {
 	color: #880000;
-	width:600px;
+/*	width:600px;
 	margin-top:0px;
 	margin-bottom:20px;
 	margin-left: auto; 
-	margin-right: auto; 
+	margin-right: auto; */
 }
 
 
-- 
cgit v1.2.3


From 66baa3cab0537a5a2f1a4aad54526b35987da90d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 22 Jan 2014 22:07:47 -0800
Subject: try to reduce the number of simulaneous deliveries of the same post
 when dealing with owner relays that have more than one channel instance. If
 things melt down in the next few hours and I'm not available please revert
 this. I've reviewed a few times and think it's OK, but this part of the
 delivery code is traditionally touchy.

---
 include/items.php    | 33 ++++++++++++++++++++-------------
 include/notifier.php | 24 ++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/include/items.php b/include/items.php
index ea46df9bf..12823c6f9 100755
--- a/include/items.php
+++ b/include/items.php
@@ -18,10 +18,17 @@ function collect_recipients($item,&$private) {
 
 	require_once('include/group.php');
 
-	if($item['item_private'])
-		$private = true;
+	$private = ((intval($item['item_private'])) ? true : false);
+	$recipients = array();
+
+	// if the post is marked private but there are no recipients, only add the author and owner
+	// as recipients. The ACL for the post may live on the hub of a different clone. We need to 
+	// get the post to that hub.
 
 	if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
+
+		// it is private
+
 		$allow_people = expand_acl($item['allow_cid']);
 		$allow_groups = expand_groups(expand_acl($item['allow_gid']));
 
@@ -54,19 +61,19 @@ function collect_recipients($item,&$private) {
 		$private = true;
 	}
 	else {
-		$recipients = array();
-		$r = q("select * from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d)",
-			intval($item['uid']),
-			intval(ABOOK_FLAG_SELF),
-			intval(ABOOK_FLAG_PENDING),
-			intval(ABOOK_FLAG_ARCHIVED)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$recipients[] = $rr['abook_xchan'];
+		if(! $private) {
+			$r = q("select abook_xchan from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d)",
+				intval($item['uid']),
+				intval(ABOOK_FLAG_SELF),
+				intval(ABOOK_FLAG_PENDING),
+				intval(ABOOK_FLAG_ARCHIVED)
+			);
+			if($r) {
+				foreach($r as $rr) {
+					$recipients[] = $rr['abook_xchan'];
+				}
 			}
 		}
-		$private = false;
 	}
 
 	// This is a somewhat expensive operation but important.
diff --git a/include/notifier.php b/include/notifier.php
index 0868ac77e..81f971107 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -425,8 +425,28 @@ function notifier_run($argv, $argc){
 
 	$sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' ");
 
-	$r = q("select hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc 
-		where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey");
+
+	if($relay_to_owner && (! $private) && ($cmd !== 'relay')) {
+
+		// If sending a followup to the post owner, only send it to one channel clone - to avoid race conditions.
+		// In this case we'll pick the most recently contacted hub, as their primary might be down and the most
+		// recently contacted has the best chance of being alive.
+
+		// For private posts or uplinks we have to do things differently as only the sending clone will have the recipient list. 
+		// We have to send to all clone channels of the owner to find out who has the definitive list. Posts with 
+		// item_private set (but no ACL list) will return empty recipients (except for the sender and owner) in 
+		// collect_recipients() above. The end result is we should get only one delivery per delivery chain if we 
+		// aren't the owner or author.  
+
+
+		$r = q("select hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc 
+			where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1");
+	} 
+	else {
+		$r = q("select hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc 
+			where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey");
+	}
+
 	if(! $r) {
 		logger('notifier: no hubs');
 		return;
-- 
cgit v1.2.3


From 43f2d6972c365d35924018311ac706690a6094ca Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 22 Jan 2014 22:56:16 -0800
Subject: API: provide a link to photo albums in api/red/albums

---
 include/photos.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/photos.php b/include/photos.php
index 5c03b2cdb..eebddd393 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -268,7 +268,11 @@ function photos_albums_list($channel,$observer) {
 	if($albums) {
 		$ret['success'] = true;
 		foreach($albums as $k => $album) {
-			$entry = array('text' => $album['album'], 'urlencode' => urlencode($album['album']),'bin2hex' => bin2hex($album['album']));
+			$entry = array(
+				'text' => $album['album'], 
+				'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album['album']), 
+				'urlencode' => urlencode($album['album']),
+				'bin2hex' => bin2hex($album['album']));
 			$ret[] = $entry;
 		}
 	}
-- 
cgit v1.2.3


From bc98f4ddf4cdfa655385c705d97fa006ada9c49f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 22 Jan 2014 23:04:19 -0800
Subject: fix api/red/photos when supplied with an album name

---
 include/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/api.php b/include/api.php
index 463d29cf8..e854012e5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -556,7 +556,7 @@ require_once('include/photos.php');
 
 	function api_photos(&$a,$type) {
 		$album = $_REQUEST['album'];
-		json_return_and_die(photos_list_photos($a->get_channel(),$a->get_observer()),$album);
+		json_return_and_die(photos_list_photos($a->get_channel(),$a->get_observer(),$album));
 	}
 	api_register_func('api/red/photos','api_photos', true);
 
-- 
cgit v1.2.3


From bf8e73ca739d60a9c80acb007d794d0a80c3e5ac Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 22 Jan 2014 23:54:14 -0800
Subject: missing filename in uploaded photos (we don't really use this, but we
 will need to have a filename to export via DAV or API and the original
 filename would be the most likely choice).

---
 include/photo/photo_driver.php | 2 +-
 include/photos.php             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index ff92e5a0f..c2eeafa54 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -357,7 +357,7 @@ abstract class photo_driver {
 				dbesc($p['resource_id']),
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
-				dbesc(basename($filename)),
+				dbesc(basename($p['filename'])),
 				dbesc($this->getType()),
 				dbesc($p['album']),
 				intval($this->getHeight()),
diff --git a/include/photos.php b/include/photos.php
index eebddd393..82af4aaeb 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -77,6 +77,7 @@ function photo_upload($channel, $observer, $args) {
 		$filesize   = intval($_FILES['userfile']['size']);
 		$type       = $_FILES['userfile']['type'];
 	}
+
 	if (! $type) 
 		$type=guess_image_type($filename);
 
-- 
cgit v1.2.3


From 420b330e55617ee9b968cbaeeb828f559cb8c56d Mon Sep 17 00:00:00 2001
From: tobiasd 
Date: Thu, 23 Jan 2014 11:58:56 +0100
Subject: the bootstrap theme is obsolete, use clean instead

---
 doc/External-Resources.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/External-Resources.md b/doc/External-Resources.md
index d5bed17a2..9339d0352 100644
--- a/doc/External-Resources.md
+++ b/doc/External-Resources.md
@@ -8,7 +8,7 @@ External Resources
 * [APW](https://github.com/beardy-unixer/apw)
 * [Redstrap](https://github.com/omigeot/redstrap3)
 * [Pluto](https://github.com/23n/Pluto)
-* [bootstrap](https://bitbucket.org/tobiasd/red-theme-bootstrap/overview)
+* [clean](https://bitbucket.org/tobiasd/red-clean)
 
 
 **Third-Party Addons**
-- 
cgit v1.2.3


From 524fff3a17fec184c87e855d09bf6a60f68e4e88 Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Thu, 23 Jan 2014 12:09:35 +0100
Subject: preperation for ping, need training in SQL :(

---
 mod/admin.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mod/admin.php b/mod/admin.php
index 57e285781..33b42d264 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -462,7 +462,12 @@ function admin_page_hubloc_post(&$a){
 	logger('POST input: '. print_r($_POST,true), LOGGER_DEBUG);
 
 	if ( $_POST['hublocid']) {
-		logger('hublocid is not empty: ' . $_POST['hublocid'], LOGGER_DEBUG);
+		$hublocid = $_POST['hublocid'];
+		logger('hublocid is not empty: ' . $hublocid , LOGGER_DEBUG);
+		$hublocurl = q("SELECT hubloc_url FROM hubloc WHERE hubloc_id = %d ",
+			intval($hublocid)
+		);
+		logger('hubloc_url : ' . print_r($hublocurl, true) , LOGGER_DEBUG);
 	}
 
 	//if ( $_POST'' == "check" ) {
-- 
cgit v1.2.3


From a2b07ed2814972507bf971a5ac6ed09c399e29e7 Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Thu, 23 Jan 2014 13:58:14 +0100
Subject: build url, deleted logger commands

---
 mod/admin.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 33b42d264..fbd342425 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -459,15 +459,14 @@ function admin_page_hubloc_post(&$a){
 	check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc');
 
 	//prepare for ping
-	logger('POST input: '. print_r($_POST,true), LOGGER_DEBUG);
 
 	if ( $_POST['hublocid']) {
 		$hublocid = $_POST['hublocid'];
-		logger('hublocid is not empty: ' . $hublocid , LOGGER_DEBUG);
-		$hublocurl = q("SELECT hubloc_url FROM hubloc WHERE hubloc_id = %d ",
+		$arrhublocurl = q("SELECT hubloc_url FROM hubloc WHERE hubloc_id = %d ",
 			intval($hublocid)
 		);
-		logger('hubloc_url : ' . print_r($hublocurl, true) , LOGGER_DEBUG);
+		$hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post';
+		logger('hubloc_url : ' . $hublocurl , LOGGER_DEBUG);
 	}
 
 	//if ( $_POST'' == "check" ) {
-- 
cgit v1.2.3


From 5e4f45c03a48ae5d7cb5d98add40cf1c6a2cecd1 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 23 Jan 2014 14:35:59 -0800
Subject: mod_profperm migrated

---
 mod/profperm.php     |   63 +-
 util/messages.po     | 1920 +++++++++++++++++++++++++-------------------------
 util/run_xgettext.sh |    7 +-
 version.inc          |    2 +-
 4 files changed, 1000 insertions(+), 992 deletions(-)

diff --git a/mod/profperm.php b/mod/profperm.php
index b31dfc128..08838831b 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -1,11 +1,15 @@
 user['nickname'];
+	$channel = $a->get_channel();
+	$which = $channel['channel_address'];
+
 	$profile = $a->argv[1];		
 
 	profile_load($a,$which,$profile);
@@ -21,7 +25,7 @@ function profperm_content(&$a) {
 	}
 
 
-	if($a->argc < 2) {
+	if(argc() < 2) {
 		notice( t('Invalid profile identifier.') . EOL );
 		return;
 	}
@@ -35,59 +39,59 @@ function profperm_content(&$a) {
 		$switchtotext = 400;
 
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
-		$r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0 
-			AND `network` = 'dfrn' AND `id` = %d AND `uid` = %d LIMIT 1",
-			intval($a->argv[2]),
+	if((argc() > 2) && intval(argv(1)) && intval(argv(2))) {
+		$r = q("SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1",
+			intval(argv(2)),
 			intval(local_user())
 		);
-		if(count($r))
-			$change = intval($a->argv[2]);
+		if($r)
+			$change = intval(argv(2));
 	}
 
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if((argc() > 1) && (intval(argv(1)))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
-			intval($a->argv[1]),
+			intval(argv(1)),
 			intval(local_user())
 		);
-		if(! count($r)) {
+		if(! $r) {
 			notice( t('Invalid profile identifier.') . EOL );
 			return;
 		}
+
 		$profile = $r[0];
 
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `profile_id` = %d",
+		$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = %d",
 			intval(local_user()),
-			intval($a->argv[1])
+			intval(argv(1))
 		);
 
 		$ingroup = array();
-		if(count($r))
+		if($r)
 			foreach($r as $member)
-				$ingroup[] = $member['id'];
+				$ingroup[] = $member['abook_id'];
 
 		$members = $r;
 
 		if($change) {
 			if(in_array($change,$ingroup)) {
-				q("UPDATE `contact` SET `profile_id` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				q("UPDATE abook SET abook_profile = 0 WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
 					intval($change),
 					intval(local_user())
 				);
 			}
 			else {
-				q("UPDATE `contact` SET `profile_id` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-					intval($a->argv[1]),
+				q("UPDATE abook SET abook_profile = %d WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
+					intval(argv(1)),
 					intval($change),
 					intval(local_user())
 				);
 
 			}
 
-			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `profile_id` = %d",
+			$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = %d",
 				intval(local_user()),
-				intval($a->argv[1])
+				intval(argv(1))
 			);
 
 			$members = $r;
@@ -95,7 +99,7 @@ function profperm_content(&$a) {
 			$ingroup = array();
 			if(count($r))
 				foreach($r as $member)
-					$ingroup[] = $member['id'];
+					$ingroup[] = $member['abook_id'];
 		}
 
 		$o .= '
        ' . t('Profile Visibility Editor') . '
        ';
@@ -118,8 +122,8 @@ function profperm_content(&$a) {
 	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 
 	foreach($members as $member) {
-		if($member['url']) {
-			$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
+		if($member['xchan_url']) {
+			$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
 			$o .= micropro($member,true,'mpprof', $textmode);
 		}
 	}
@@ -127,20 +131,17 @@ function profperm_content(&$a) {
 	$o .= '
        ';
 
 	$o .= '
        ';
-	$o .= '
        ' . t("All Contacts \x28with secure profile access\x29") . '
        ';
+	$o .= '
        ' . t("All Connections") . '
        ';
 	$o .= '
        ';
 	$o .= '
        ';
 		
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 
-			AND `network` = 'dfrn' ORDER BY `name` ASC",
-			intval(local_user())
-		);
+		$r = abook_connections(local_user());
 
-		if(count($r)) {
+		if($r) {
 			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 			foreach($r as $member) {
-				if(! in_array($member['id'],$ingroup)) {
-					$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
+				if(! in_array($member['abook_id'],$ingroup)) {
+					$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
 					$o .= micropro($member,true,'mpprof',$textmode);
 				}
 			}
diff --git a/util/messages.po b/util/messages.po
index 0c3f38257..1bb13af74 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-01-21.564\n"
+"Project-Id-Version: 2014-01-23.566\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-21 16:53-0800\n"
+"POT-Creation-Date: 2014-01-23 02:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:79 ../../include/conversation.php:1462
+#: ../../include/nav.php:79 ../../include/conversation.php:1473
 #: ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
@@ -152,7 +152,7 @@ msgstr ""
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../mod/directory.php:209
+#: ../../include/nav.php:138 ../../mod/directory.php:210
 msgid "Directory"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../include/nav.php:171 ../../include/conversation.php:1482
+#: ../../include/nav.php:171 ../../include/conversation.php:1491
 #: ../../mod/events.php:354
 msgid "Events"
 msgstr ""
@@ -296,8 +296,8 @@ msgstr ""
 
 #: ../../include/Contact.php:104 ../../include/identity.php:625
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../mod/directory.php:182 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:165
+#: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
+#: ../../mod/dirprofile.php:166
 msgid "Connect"
 msgstr ""
 
@@ -826,45 +826,6 @@ msgstr ""
 msgid "Pages"
 msgstr ""
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:223
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: ../../include/group.php:242 ../../mod/admin.php:700
-msgid "All Channels"
-msgstr ""
-
-#: ../../include/group.php:264
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:285
-msgid "Collections"
-msgstr ""
-
-#: ../../include/group.php:286
-msgid "Edit collection"
-msgstr ""
-
-#: ../../include/group.php:287
-msgid "Create a new collection"
-msgstr ""
-
-#: ../../include/group.php:288
-msgid "Channels not in any collection"
-msgstr ""
-
-#: ../../include/group.php:290 ../../include/widgets.php:253
-msgid "add"
-msgstr ""
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -1239,7 +1200,7 @@ msgstr ""
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/reddav.php:1012
+#: ../../include/reddav.php:1018
 msgid "Edit File properties"
 msgstr ""
 
@@ -1500,1608 +1461,1647 @@ msgstr ""
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/conversation.php:123
-msgid "channel"
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/conversation.php:161 ../../mod/like.php:134
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/group.php:223
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:136
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../include/group.php:242 ../../mod/admin.php:700
+msgid "All Channels"
 msgstr ""
 
-#: ../../include/conversation.php:201
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/group.php:264
+msgid "edit"
 msgstr ""
 
-#: ../../include/conversation.php:236
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/group.php:285
+msgid "Collections"
 msgstr ""
 
-#: ../../include/conversation.php:258 ../../mod/mood.php:63
-#, php-format
-msgid "%1$s is currently %2$s"
+#: ../../include/group.php:286
+msgid "Edit collection"
 msgstr ""
 
-#: ../../include/conversation.php:631 ../../include/ItemObject.php:114
-msgid "Select"
+#: ../../include/group.php:287
+msgid "Create a new collection"
 msgstr ""
 
-#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695
-#: ../../mod/group.php:176 ../../mod/photos.php:1019
-#: ../../mod/filestorage.php:172 ../../mod/settings.php:570
-msgid "Delete"
+#: ../../include/group.php:288
+msgid "Channels not in any collection"
 msgstr ""
 
-#: ../../include/conversation.php:642 ../../include/ItemObject.php:161
-msgid "Message is verified"
+#: ../../include/group.php:290 ../../include/widgets.php:253
+msgid "add"
 msgstr ""
 
-#: ../../include/conversation.php:662
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/notify.php:23
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/conversation.php:676
-msgid "Categories:"
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/conversation.php:677
-msgid "Filed under:"
+#: ../../include/photos.php:15 ../../include/attach.php:97
+#: ../../include/attach.php:128 ../../include/attach.php:184
+#: ../../include/attach.php:199 ../../include/attach.php:232
+#: ../../include/attach.php:246 ../../include/attach.php:267
+#: ../../include/attach.php:462 ../../include/attach.php:540
+#: ../../include/items.php:3454 ../../mod/common.php:35
+#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257
+#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../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/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:522 ../../mod/viewsrc.php:12
+#: ../../mod/menu.php:40 ../../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/achievements.php:27 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76
+#: ../../mod/filestorage.php:99 ../../mod/manage.php:6
+#: ../../mod/settings.php:484 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348
+msgid "Permission denied."
 msgstr ""
 
-#: ../../include/conversation.php:686 ../../include/ItemObject.php:217
+#: ../../include/photos.php:89
 #, php-format
-msgid " from %s"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/conversation.php:689 ../../include/ItemObject.php:220
-#, php-format
-msgid "last edited: %s"
+#: ../../include/photos.php:96
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/conversation.php:704
-msgid "View in context"
+#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/conversation.php:706 ../../include/conversation.php:1119
-#: ../../include/ItemObject.php:248 ../../mod/photos.php:950
-#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153
-#: ../../mod/editblock.php:129
-msgid "Please wait"
+#: ../../include/photos.php:185
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:833
-msgid "remove"
+#: ../../include/photos.php:302 ../../include/conversation.php:1476
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/conversation.php:837
-msgid "Loading..."
+#: ../../include/photos.php:306 ../../mod/photos.php:690
+#: ../../mod/photos.php:1165
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/conversation.php:838
-msgid "Delete Selected Items"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
 msgstr ""
 
-#: ../../include/conversation.php:929
-msgid "View Source"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
 msgstr ""
 
-#: ../../include/conversation.php:930
-msgid "Follow Thread"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/conversation.php:931
-msgid "View Status"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/conversation.php:933
-msgid "View Photos"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/conversation.php:934
-msgid "Matrix Activity"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/conversation.php:935
-msgid "Edit Contact"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/conversation.php:936
-msgid "Send PM"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/conversation.php:937
-msgid "Poke"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/conversation.php:999
-#, php-format
-msgid "%s likes this."
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/conversation.php:999
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/conversation.php:1003
-#, php-format
-msgid "%2$d people like this."
-msgid_plural "%2$d people like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1005
-#, php-format
-msgid "%2$d people don't like this."
-msgid_plural "%2$d people don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1011
-msgid "and"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/conversation.php:1014
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr ""
 
-#: ../../include/conversation.php:1015
-#, php-format
-msgid "%s like this."
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/conversation.php:1015
-#, php-format
-msgid "%s don't like this."
+#: ../../include/profile_selectors.php:23
+msgid "Males"
 msgstr ""
 
-#: ../../include/conversation.php:1065
-msgid "Visible to everybody"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
 msgstr ""
 
-#: ../../include/conversation.php:1066 ../../mod/mail.php:171
-#: ../../mod/mail.php:269
-msgid "Please enter a link URL:"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
 msgstr ""
 
-#: ../../include/conversation.php:1067
-msgid "Please enter a video link/URL:"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/conversation.php:1068
-msgid "Please enter an audio link/URL:"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/conversation.php:1069
-msgid "Tag term:"
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/conversation.php:1070 ../../mod/filer.php:35
-msgid "Save to Folder:"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/conversation.php:1071
-msgid "Where are you right now?"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/conversation.php:1072 ../../mod/mail.php:172
-#: ../../mod/mail.php:270 ../../mod/editpost.php:52
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/conversation.php:1082 ../../include/ItemObject.php:546
-#: ../../mod/webpages.php:122 ../../mod/photos.php:970
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127
-#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
-msgid "Preview"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/conversation.php:1096 ../../mod/photos.php:949
-msgid "Share"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140
-msgid "Page link title"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/conversation.php:1100 ../../mod/mail.php:219
-#: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145
-#: ../../mod/editblock.php:121
-msgid "Upload photo"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/conversation.php:1101
-msgid "upload photo"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
 msgstr ""
 
-#: ../../include/conversation.php:1102 ../../mod/mail.php:220
-#: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146
-#: ../../mod/editblock.php:122
-msgid "Attach file"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/conversation.php:1103
-msgid "attach file"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
 msgstr ""
 
-#: ../../include/conversation.php:1104 ../../mod/mail.php:221
-#: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147
-#: ../../mod/editblock.php:123
-msgid "Insert web link"
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/conversation.php:1105
-msgid "web link"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/conversation.php:1106
-msgid "Insert video link"
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/conversation.php:1107
-msgid "video link"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
 msgstr ""
 
-#: ../../include/conversation.php:1108
-msgid "Insert audio link"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/conversation.php:1109
-msgid "audio link"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151
-#: ../../mod/editblock.php:127
-msgid "Set your location"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/conversation.php:1111
-msgid "set location"
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
 msgstr ""
 
-#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152
-#: ../../mod/editblock.php:128
-msgid "Clear browser location"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/conversation.php:1113
-msgid "clear location"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
 msgstr ""
 
-#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169
-#: ../../mod/editblock.php:142
-msgid "Set title"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171
-#: ../../mod/editblock.php:145
-msgid "Categories (comma-separated list)"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
 msgstr ""
 
-#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154
-#: ../../mod/editblock.php:130
-msgid "Permission settings"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/conversation.php:1121
-msgid "permissions"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
 msgstr ""
 
-#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164
-#: ../../mod/editblock.php:139
-msgid "Public post"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
 msgstr ""
 
-#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172
-#: ../../mod/editblock.php:146
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:226
-#: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182
-#: ../../mod/editblock.php:156
-msgid "Set expiration date"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/conversation.php:1146 ../../include/ItemObject.php:549
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135
-msgid "Encrypt text"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/conversation.php:1148 ../../mod/editpost.php:136
-msgid "OK"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
 msgstr ""
 
-#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:508
-#: ../../mod/settings.php:534 ../../mod/editpost.php:137
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
-msgid "Cancel"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/conversation.php:1376
-msgid "Commented Order"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/conversation.php:1379
-msgid "Sort by Comment Date"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/conversation.php:1382
-msgid "Posted Order"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/conversation.php:1385
-msgid "Sort by Post Date"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/conversation.php:1389
-msgid "Personal"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/conversation.php:1392
-msgid "Posts that mention or involve you"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/conversation.php:1395 ../../mod/menu.php:57
-#: ../../mod/connections.php:209
-msgid "New"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/conversation.php:1398
-msgid "Activity Stream - by date"
+#: ../../include/attach.php:179 ../../include/attach.php:227
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/conversation.php:1405
-msgid "Starred"
+#: ../../include/attach.php:280
+msgid "No source file."
 msgstr ""
 
-#: ../../include/conversation.php:1408
-msgid "Favourite Posts"
+#: ../../include/attach.php:297
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/conversation.php:1415
-msgid "Spam"
+#: ../../include/attach.php:315
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/conversation.php:1418
-msgid "Posts flagged as SPAM"
+#: ../../include/attach.php:326
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/conversation.php:1448
-msgid "Channel"
+#: ../../include/attach.php:338
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/conversation.php:1451
-msgid "Status Messages and Posts"
+#: ../../include/attach.php:422
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/conversation.php:1455
-msgid "About"
+#: ../../include/attach.php:434
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/conversation.php:1458
-msgid "Profile Details"
+#: ../../include/attach.php:478 ../../include/attach.php:495
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/conversation.php:1465 ../../include/photos.php:297
-msgid "Photo Albums"
+#: ../../include/attach.php:545
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/conversation.php:1470 ../../mod/fbrowser.php:114
-msgid "Files"
+#: ../../include/attach.php:563
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/conversation.php:1473
-msgid "Files and Storage"
+#: ../../include/attach.php:588
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/conversation.php:1485
-msgid "Events and Calendar"
+#: ../../include/attach.php:633
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/conversation.php:1490
-msgid "Webpages"
+#: ../../include/attach.php:637
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:1493
-msgid "Manage Webpages"
+#: ../../include/taxonomy.php:210
+msgid "Tags"
 msgstr ""
 
-#: ../../include/notify.php:23
-msgid "created a new post"
+#: ../../include/taxonomy.php:227
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/notify.php:24
-#, php-format
-msgid "commented on %s's post"
+#: ../../include/taxonomy.php:252
+msgid "have"
 msgstr ""
 
-#: ../../include/photos.php:15 ../../include/attach.php:97
-#: ../../include/attach.php:128 ../../include/attach.php:184
-#: ../../include/attach.php:199 ../../include/attach.php:232
-#: ../../include/attach.php:246 ../../include/attach.php:267
-#: ../../include/attach.php:462 ../../include/attach.php:540
-#: ../../include/items.php:3447 ../../mod/common.php:35
-#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257
-#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../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/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:522 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../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/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76
-#: ../../mod/filestorage.php:99 ../../mod/manage.php:6
-#: ../../mod/settings.php:484 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348
-msgid "Permission denied."
+#: ../../include/taxonomy.php:252
+msgid "has"
 msgstr ""
 
-#: ../../include/photos.php:88
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/taxonomy.php:253
+msgid "want"
 msgstr ""
 
-#: ../../include/photos.php:95
-msgid "Image file is empty."
+#: ../../include/taxonomy.php:253
+msgid "wants"
 msgstr ""
 
-#: ../../include/photos.php:122 ../../mod/profile_photo.php:147
-msgid "Unable to process image"
+#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
+msgid "like"
 msgstr ""
 
-#: ../../include/photos.php:184
-msgid "Photo storage failed."
+#: ../../include/taxonomy.php:254
+msgid "likes"
 msgstr ""
 
-#: ../../include/photos.php:301 ../../mod/photos.php:690
-#: ../../mod/photos.php:1165
-msgid "Upload New Photos"
+#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
+msgid "dislike"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
+#: ../../include/taxonomy.php:255
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
+#: ../../include/auth.php:76
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
+#: ../../include/auth.php:188
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
+#: ../../include/auth.php:203
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
+#: ../../include/account.php:64
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
+#: ../../include/account.php:273
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
+#: ../../include/account.php:275 ../../include/account.php:302
+#: ../../include/account.php:359
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../include/account.php:297
+msgid "your registration password"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
+#: ../../include/account.php:300 ../../include/account.php:357
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
+#: ../../include/account.php:366
+msgid "Account approved."
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
+#: ../../include/account.php:400
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
+#: ../../include/enotify.php:40
+msgid "Red Matrix Notification"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
+#: ../../include/enotify.php:41
+msgid "redmatrix"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
+#: ../../include/enotify.php:43
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
+#: ../../include/enotify.php:45
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s "
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
+#: ../../include/enotify.php:87
+msgid "a private message"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
+#: ../../include/enotify.php:150
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
+#: ../../include/enotify.php:159
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
+#: ../../include/enotify.php:170
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
+#: ../../include/enotify.php:171
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
+#: ../../include/enotify.php:174 ../../include/enotify.php:189
+#: ../../include/enotify.php:215 ../../include/enotify.php:234
+#: ../../include/enotify.php:248
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
+#: ../../include/enotify.php:180
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
+#: ../../include/enotify.php:208
+#, php-format
+msgid "[Red:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
+#: ../../include/enotify.php:209
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
+#: ../../include/enotify.php:210
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
+#: ../../include/enotify.php:223
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
+#: ../../include/enotify.php:224
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
+#: ../../include/enotify.php:243
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
+#: ../../include/enotify.php:255
+msgid "[Red:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
+#: ../../include/enotify.php:256
+#, php-format
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/attach.php:179 ../../include/attach.php:227
-msgid "Item was not found."
+#: ../../include/enotify.php:261 ../../include/enotify.php:280
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/attach.php:280
-msgid "No source file."
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/attach.php:297
-msgid "Cannot locate file to replace"
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/attach.php:315
-msgid "Cannot locate file to revise/update"
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/attach.php:326
+#: ../../include/enotify.php:272
 #, php-format
-msgid "File exceeds size limit of %d"
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/attach.php:338
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../include/enotify.php:278
+msgid "Name:"
 msgstr ""
 
-#: ../../include/attach.php:422
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/enotify.php:279
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/attach.php:434
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/enotify.php:282
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/attach.php:478 ../../include/attach.php:495
-msgid "Path not available."
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
 msgstr ""
 
-#: ../../include/attach.php:545
-msgid "Empty pathname"
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/attach.php:563
-msgid "duplicate filename or path"
+#: ../../include/widgets.php:123 ../../mod/connections.php:236
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/attach.php:588
-msgid "Path not found."
+#: ../../include/widgets.php:124
+msgid "See more..."
 msgstr ""
 
-#: ../../include/attach.php:633
-msgid "mkdir failed."
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/attach.php:637
-msgid "database storage failed."
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
 msgstr ""
 
-#: ../../include/taxonomy.php:227
-msgid "Keywords"
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/taxonomy.php:252
-msgid "have"
+#: ../../include/widgets.php:171
+msgid "Notes"
 msgstr ""
 
-#: ../../include/taxonomy.php:252
-msgid "has"
+#: ../../include/widgets.php:243
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/taxonomy.php:253
-msgid "want"
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
 msgstr ""
 
-#: ../../include/taxonomy.php:253
-msgid "wants"
+#: ../../include/widgets.php:318 ../../include/items.php:3575
+msgid "Archives"
 msgstr ""
 
-#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
-msgid "like"
+#: ../../include/widgets.php:370
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/taxonomy.php:254
-msgid "likes"
+#: ../../include/widgets.php:371 ../../mod/connedit.php:386
+msgid "Me"
 msgstr ""
 
-#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
-msgid "dislike"
+#: ../../include/widgets.php:372 ../../mod/connedit.php:388
+msgid "Best Friends"
 msgstr ""
 
-#: ../../include/taxonomy.php:255
-msgid "dislikes"
+#: ../../include/widgets.php:374
+msgid "Co-workers"
 msgstr ""
 
-#: ../../include/auth.php:76
-msgid "Logged out."
+#: ../../include/widgets.php:375 ../../mod/connedit.php:390
+msgid "Former Friends"
 msgstr ""
 
-#: ../../include/auth.php:188
-msgid "Failed authentication"
+#: ../../include/widgets.php:376 ../../mod/connedit.php:391
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/auth.php:203
-msgid "Login failed."
+#: ../../include/widgets.php:377
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
+#: ../../include/widgets.php:409
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
+#: ../../include/widgets.php:415
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
+#: ../../include/widgets.php:421
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/account.php:64
-msgid "An invitation is required."
+#: ../../include/widgets.php:427
+msgid "Feature settings"
 msgstr ""
 
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
+#: ../../include/widgets.php:433
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/account.php:119
-msgid "Please enter the required information."
+#: ../../include/widgets.php:439
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/account.php:187
-msgid "Failed to store account information."
+#: ../../include/widgets.php:445
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/account.php:273
-#, php-format
-msgid "Registration request at %s"
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
 msgstr ""
 
-#: ../../include/account.php:275 ../../include/account.php:302
-#: ../../include/account.php:359
-msgid "Administrator"
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/account.php:297
-msgid "your registration password"
+#: ../../include/widgets.php:504
+msgid "Check Mail"
 msgstr ""
 
-#: ../../include/account.php:300 ../../include/account.php:357
+#: ../../include/contact_widgets.php:14
 #, php-format
-msgid "Registration details for %s"
-msgstr ""
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/account.php:366
-msgid "Account approved."
+#: ../../include/contact_widgets.php:20
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/account.php:400
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../include/contact_widgets.php:21
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
+#: ../../include/contact_widgets.php:22
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
+#: ../../include/contact_widgets.php:23
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
+#: ../../mod/directory.php:211 ../../mod/connections.php:355
+msgid "Find"
 msgstr ""
 
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../include/dir_fns.php:30
-msgid "Enable Safe Search"
+#: ../../include/contact_widgets.php:27
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/dir_fns.php:32
-msgid "Disable Safe Search"
+#: ../../include/contact_widgets.php:28
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/dir_fns.php:34
-msgid "Safe Mode"
+#: ../../include/contact_widgets.php:120
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/page_widgets.php:6
+msgid "New Page"
 msgstr ""
 
-#: ../../include/enotify.php:40
-msgid "Red Matrix Notification"
+#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
+#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
+#: ../../mod/layouts.php:102 ../../mod/filestorage.php:171
+#: ../../mod/settings.php:569 ../../mod/editlayout.php:106
+#: ../../mod/editpost.php:98 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
+msgid "Edit"
 msgstr ""
 
-#: ../../include/enotify.php:41
-msgid "redmatrix"
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/enotify.php:43
-msgid "Thank You,"
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/enotify.php:45
-#, php-format
-msgid "%s Administrator"
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/enotify.php:80
-#, php-format
-msgid "%s "
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/enotify.php:84
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
+#: ../../include/follow.php:26
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/enotify.php:86
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
 msgstr ""
 
-#: ../../include/enotify.php:87
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
 msgstr ""
 
-#: ../../include/enotify.php:87
-msgid "a private message"
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/enotify.php:88
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/follow.php:129
+msgid "local account not found."
 msgstr ""
 
-#: ../../include/enotify.php:142
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/enotify.php:150
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
 msgstr ""
 
-#: ../../include/enotify.php:159
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
 msgstr ""
 
-#: ../../include/enotify.php:170
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
 msgstr ""
 
-#: ../../include/enotify.php:171
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
 msgstr ""
 
-#: ../../include/enotify.php:174 ../../include/enotify.php:189
-#: ../../include/enotify.php:215 ../../include/enotify.php:234
-#: ../../include/enotify.php:248
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
 msgstr ""
 
-#: ../../include/enotify.php:180
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
 msgstr ""
 
-#: ../../include/enotify.php:182
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/enotify.php:208
-#, php-format
-msgid "[Red:Notify] %s tagged you"
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
 msgstr ""
 
-#: ../../include/enotify.php:209
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../include/enotify.php:210
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
 msgstr ""
 
-#: ../../include/enotify.php:223
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
 msgstr ""
 
-#: ../../include/enotify.php:224
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
 msgstr ""
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
 msgstr ""
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
+#: ../../include/permissions.php:27
+msgid "Requires compatible chat plugin"
 msgstr ""
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
 msgstr ""
 
-#: ../../include/enotify.php:243
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
 msgstr ""
 
-#: ../../include/enotify.php:255
-msgid "[Red:Notify] Introduction received"
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
 msgstr ""
 
-#: ../../include/enotify.php:256
-#, php-format
-msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
 msgstr ""
 
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+#: ../../include/permissions.php:32
+msgid "Can administer my channel resources"
 msgstr ""
 
-#: ../../include/enotify.php:261 ../../include/enotify.php:280
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/permissions.php:32
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
 msgstr ""
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Friend suggestion received"
+#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
+#: ../../mod/profperm.php:19 ../../index.php:347
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:150
+#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18
+#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/items.php:3743 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/enotify.php:278
-msgid "Name:"
+#: ../../include/items.php:3758
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/enotify.php:279
-msgid "Photo:"
+#: ../../include/items.php:3765
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/enotify.php:282
+#: ../../include/items.php:3776
 #, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
+#: ../../include/items.php:3779
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:841
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:236
-msgid "Suggestions"
+#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
+#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695
+#: ../../mod/group.php:176 ../../mod/photos.php:1019
+#: ../../mod/filestorage.php:172 ../../mod/settings.php:570
+msgid "Delete"
 msgstr ""
 
-#: ../../include/widgets.php:124
-msgid "See more..."
+#: ../../include/ItemObject.php:114 ../../include/conversation.php:631
+msgid "Select"
 msgstr ""
 
-#: ../../include/widgets.php:146
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/ItemObject.php:118
+msgid "save to folder"
 msgstr ""
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
+#: ../../include/ItemObject.php:146
+msgid "add star"
 msgstr ""
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
+#: ../../include/ItemObject.php:147
+msgid "remove star"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/ItemObject.php:148
+msgid "toggle star status"
 msgstr ""
 
-#: ../../include/widgets.php:171
-msgid "Notes"
+#: ../../include/ItemObject.php:152
+msgid "starred"
 msgstr ""
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
+#: ../../include/ItemObject.php:161 ../../include/conversation.php:642
+msgid "Message is verified"
 msgstr ""
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
+#: ../../include/ItemObject.php:169
+msgid "add tag"
 msgstr ""
 
-#: ../../include/widgets.php:318 ../../include/items.php:3568
-msgid "Archives"
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:947
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/widgets.php:370
-msgid "Refresh"
+#: ../../include/ItemObject.php:176 ../../mod/photos.php:948
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../include/widgets.php:371 ../../mod/connedit.php:386
-msgid "Me"
+#: ../../include/ItemObject.php:178
+msgid "Share this"
 msgstr ""
 
-#: ../../include/widgets.php:372 ../../mod/connedit.php:388
-msgid "Best Friends"
+#: ../../include/ItemObject.php:178
+msgid "share"
 msgstr ""
 
-#: ../../include/widgets.php:374
-msgid "Co-workers"
+#: ../../include/ItemObject.php:202 ../../include/ItemObject.php:203
+#, php-format
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/widgets.php:375 ../../mod/connedit.php:390
-msgid "Former Friends"
+#: ../../include/ItemObject.php:204
+msgid "to"
 msgstr ""
 
-#: ../../include/widgets.php:376 ../../mod/connedit.php:391
-msgid "Acquaintances"
+#: ../../include/ItemObject.php:205
+msgid "via"
 msgstr ""
 
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr ""
+#: ../../include/ItemObject.php:206
+msgid "Wall-to-Wall"
+msgstr ""
 
-#: ../../include/widgets.php:409
-msgid "Account settings"
+#: ../../include/ItemObject.php:207
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/widgets.php:415
-msgid "Channel settings"
+#: ../../include/ItemObject.php:217 ../../include/conversation.php:686
+#, php-format
+msgid " from %s"
 msgstr ""
 
-#: ../../include/widgets.php:421
-msgid "Additional features"
+#: ../../include/ItemObject.php:220 ../../include/conversation.php:689
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/widgets.php:427
-msgid "Feature settings"
+#: ../../include/ItemObject.php:221
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/widgets.php:433
-msgid "Display settings"
+#: ../../include/ItemObject.php:248 ../../include/conversation.php:706
+#: ../../include/conversation.php:1119 ../../mod/photos.php:950
+#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
+#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153
+#: ../../mod/editblock.php:129
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/widgets.php:439
-msgid "Connected apps"
+#: ../../include/ItemObject.php:269
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:534 ../../mod/photos.php:966
+#: ../../mod/photos.php:1053
+msgid "This is you"
 msgstr ""
 
-#: ../../include/widgets.php:445
-msgid "Export channel"
+#: ../../include/ItemObject.php:537 ../../mod/events.php:469
+#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
+#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
+#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
+#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828
+#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81
+#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929
+#: ../../mod/photos.php:969 ../../mod/photos.php:1056
+#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132
+#: ../../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/mail.php:223 ../../mod/mail.php:335
+#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142
+#: ../../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
+msgid "Submit"
 msgstr ""
 
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
+#: ../../include/ItemObject.php:538
+msgid "Bold"
 msgstr ""
 
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
+#: ../../include/ItemObject.php:539
+msgid "Italic"
 msgstr ""
 
-#: ../../include/widgets.php:504
-msgid "Check Mail"
+#: ../../include/ItemObject.php:540
+msgid "Underline"
 msgstr ""
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/ItemObject.php:541
+msgid "Quote"
+msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Find Channels"
+#: ../../include/ItemObject.php:542
+msgid "Code"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter name or interest"
+#: ../../include/ItemObject.php:543
+msgid "Image"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Connect/Follow"
+#: ../../include/ItemObject.php:544
+msgid "Link"
 msgstr ""
 
-#: ../../include/contact_widgets.php:23
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/ItemObject.php:545
+msgid "Video"
 msgstr ""
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:205
-#: ../../mod/directory.php:210 ../../mod/connections.php:355
-msgid "Find"
+#: ../../include/ItemObject.php:546 ../../include/conversation.php:1082
+#: ../../mod/webpages.php:122 ../../mod/photos.php:970
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127
+#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
+msgid "Preview"
 msgstr ""
 
-#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
-msgid "Channel Suggestions"
+#: ../../include/ItemObject.php:549 ../../include/conversation.php:1146
+#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Random Profile"
+#: ../../include/security.php:49
+msgid "Welcome "
 msgstr ""
 
-#: ../../include/contact_widgets.php:28
-msgid "Invite Friends"
+#: ../../include/security.php:50
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: ../../include/contact_widgets.php:120
+#: ../../include/security.php:53
+msgid "Welcome back "
+msgstr ""
+
+#: ../../include/security.php:363
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:161 ../../mod/like.php:134
 #, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
-#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:171
-#: ../../mod/settings.php:569 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:98 ../../mod/blocks.php:93
-#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
-msgid "Edit"
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/plugin.php:475 ../../include/plugin.php:477
-msgid "Click here to upgrade."
+#: ../../include/conversation.php:236
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/plugin.php:483
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
 msgstr ""
 
-#: ../../include/plugin.php:488
-msgid "This action is not available under your subscription plan."
+#: ../../include/conversation.php:662
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
+#: ../../include/conversation.php:676
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/follow.php:26
-msgid "Channel location missing."
+#: ../../include/conversation.php:677
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
+#: ../../include/conversation.php:704
+msgid "View in context"
 msgstr ""
 
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
+#: ../../include/conversation.php:833
+msgid "remove"
 msgstr ""
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
+#: ../../include/conversation.php:837
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/follow.php:129
-msgid "local account not found."
+#: ../../include/conversation.php:838
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/follow.php:138
-msgid "Cannot connect to yourself."
+#: ../../include/conversation.php:929
+msgid "View Source"
 msgstr ""
 
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
+#: ../../include/conversation.php:930
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
+#: ../../include/conversation.php:931
+msgid "View Status"
 msgstr ""
 
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
+#: ../../include/conversation.php:933
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
+#: ../../include/conversation.php:934
+msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
+#: ../../include/conversation.php:935
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
+#: ../../include/conversation.php:936
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
+#: ../../include/conversation.php:937
+msgid "Poke"
 msgstr ""
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/conversation.php:999
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
+#: ../../include/conversation.php:999
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1003
+#, php-format
+msgid "%2$d people like this."
+msgid_plural "%2$d people like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1005
+#, php-format
+msgid "%2$d people don't like this."
+msgid_plural "%2$d people don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1011
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1014
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1015
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1015
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1065
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/conversation.php:1066 ../../mod/mail.php:171
+#: ../../mod/mail.php:269
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
+#: ../../include/conversation.php:1067
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
+#: ../../include/conversation.php:1068
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/conversation.php:1069
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/conversation.php:1070 ../../mod/filer.php:35
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
+#: ../../include/conversation.php:1071
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
+#: ../../include/conversation.php:1072 ../../mod/mail.php:172
+#: ../../mod/mail.php:270 ../../mod/editpost.php:52
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
+#: ../../include/conversation.php:1096 ../../mod/photos.php:949
+msgid "Share"
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
+#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140
+msgid "Page link title"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Can source my \"public\" posts in derived channels"
+#: ../../include/conversation.php:1100 ../../mod/mail.php:219
+#: ../../mod/mail.php:332 ../../mod/editlayout.php:107
+#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145
+#: ../../mod/editblock.php:121
+msgid "Upload photo"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/conversation.php:1101
+msgid "upload photo"
 msgstr ""
 
-#: ../../include/permissions.php:32
-msgid "Can administer my channel resources"
+#: ../../include/conversation.php:1102 ../../mod/mail.php:220
+#: ../../mod/mail.php:333 ../../mod/editlayout.php:108
+#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146
+#: ../../mod/editblock.php:122
+msgid "Attach file"
 msgstr ""
 
-#: ../../include/permissions.php:32
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/conversation.php:1103
+msgid "attach file"
 msgstr ""
 
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
-#: ../../view/theme/apw/php/config.php:176
-msgid "Default"
+#: ../../include/conversation.php:1104 ../../mod/mail.php:221
+#: ../../mod/mail.php:334 ../../mod/editlayout.php:109
+#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147
+#: ../../mod/editblock.php:123
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:19 ../../index.php:347
-msgid "Permission denied"
+#: ../../include/conversation.php:1105
+msgid "web link"
 msgstr ""
 
-#: ../../include/items.php:3385 ../../mod/thing.php:74 ../../mod/admin.php:150
-#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18
-#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
-msgid "Item not found."
+#: ../../include/conversation.php:1106
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/items.php:3736 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
+#: ../../include/conversation.php:1107
+msgid "video link"
 msgstr ""
 
-#: ../../include/items.php:3751
-msgid "Collection is empty."
+#: ../../include/conversation.php:1108
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/items.php:3758
-#, php-format
-msgid "Collection: %s"
+#: ../../include/conversation.php:1109
+msgid "audio link"
 msgstr ""
 
-#: ../../include/items.php:3769
-#, php-format
-msgid "Connection: %s"
+#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113
+#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151
+#: ../../mod/editblock.php:127
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/items.php:3772
-msgid "Connection not found."
+#: ../../include/conversation.php:1111
+msgid "set location"
 msgstr ""
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:841
-msgid "Private Message"
+#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114
+#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152
+#: ../../mod/editblock.php:128
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/ItemObject.php:118
-msgid "save to folder"
+#: ../../include/conversation.php:1113
+msgid "clear location"
 msgstr ""
 
-#: ../../include/ItemObject.php:146
-msgid "add star"
+#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127
+#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169
+#: ../../mod/editblock.php:142
+msgid "Set title"
 msgstr ""
 
-#: ../../include/ItemObject.php:147
-msgid "remove star"
+#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130
+#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171
+#: ../../mod/editblock.php:145
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/ItemObject.php:148
-msgid "toggle star status"
+#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116
+#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154
+#: ../../mod/editblock.php:130
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/ItemObject.php:152
-msgid "starred"
+#: ../../include/conversation.php:1121
+msgid "permissions"
 msgstr ""
 
-#: ../../include/ItemObject.php:169
-msgid "add tag"
+#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124
+#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164
+#: ../../mod/editblock.php:139
+msgid "Public post"
 msgstr ""
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:947
-msgid "I like this (toggle)"
+#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131
+#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172
+#: ../../mod/editblock.php:146
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:948
-msgid "I don't like this (toggle)"
+#: ../../include/conversation.php:1144 ../../mod/mail.php:226
+#: ../../mod/mail.php:339 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182
+#: ../../mod/editblock.php:156
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/ItemObject.php:178
-msgid "Share this"
+#: ../../include/conversation.php:1148 ../../mod/editpost.php:136
+msgid "OK"
 msgstr ""
 
-#: ../../include/ItemObject.php:178
-msgid "share"
+#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/settings.php:508
+#: ../../mod/settings.php:534 ../../mod/editpost.php:137
+#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/ItemObject.php:202 ../../include/ItemObject.php:203
-#, php-format
-msgid "View %s's profile - %s"
+#: ../../include/conversation.php:1379
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/ItemObject.php:204
-msgid "to"
+#: ../../include/conversation.php:1382
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/ItemObject.php:205
-msgid "via"
+#: ../../include/conversation.php:1385
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/ItemObject.php:206
-msgid "Wall-to-Wall"
+#: ../../include/conversation.php:1388
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/ItemObject.php:207
-msgid "via Wall-To-Wall:"
+#: ../../include/conversation.php:1392
+msgid "Personal"
 msgstr ""
 
-#: ../../include/ItemObject.php:221
-#, php-format
-msgid "Expires: %s"
+#: ../../include/conversation.php:1395
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/ItemObject.php:269
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/conversation.php:1398 ../../mod/menu.php:57
+#: ../../mod/connections.php:209
+msgid "New"
+msgstr ""
 
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:966
-#: ../../mod/photos.php:1053
-msgid "This is you"
+#: ../../include/conversation.php:1401
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/ItemObject.php:537 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
-#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828
-#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1056
-#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132
-#: ../../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/mail.php:223 ../../mod/mail.php:335
-#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142
-#: ../../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
-msgid "Submit"
+#: ../../include/conversation.php:1408
+msgid "Starred"
 msgstr ""
 
-#: ../../include/ItemObject.php:538
-msgid "Bold"
+#: ../../include/conversation.php:1411
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/ItemObject.php:539
-msgid "Italic"
+#: ../../include/conversation.php:1418
+msgid "Spam"
 msgstr ""
 
-#: ../../include/ItemObject.php:540
-msgid "Underline"
+#: ../../include/conversation.php:1421
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/ItemObject.php:541
-msgid "Quote"
+#: ../../include/conversation.php:1452
+msgid "Channel"
 msgstr ""
 
-#: ../../include/ItemObject.php:542
-msgid "Code"
+#: ../../include/conversation.php:1455
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/ItemObject.php:543
-msgid "Image"
+#: ../../include/conversation.php:1464
+msgid "About"
 msgstr ""
 
-#: ../../include/ItemObject.php:544
-msgid "Link"
+#: ../../include/conversation.php:1467
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/ItemObject.php:545
-msgid "Video"
+#: ../../include/conversation.php:1482 ../../mod/fbrowser.php:114
+msgid "Files"
 msgstr ""
 
-#: ../../include/security.php:49
-msgid "Welcome "
+#: ../../include/conversation.php:1485
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/security.php:50
-msgid "Please upload a profile photo."
+#: ../../include/conversation.php:1494
+msgid "Events and Calendar"
 msgstr ""
 
-#: ../../include/security.php:53
-msgid "Welcome back "
+#: ../../include/conversation.php:1501
+msgid "Webpages"
 msgstr ""
 
-#: ../../include/security.php:363
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/conversation.php:1504
+msgid "Manage Webpages"
 msgstr ""
 
 #: ../../include/zot.php:545
@@ -3328,6 +3328,10 @@ msgid ""
 "com"
 msgstr ""
 
+#: ../../mod/cloud.php:88
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgstr ""
+
 #: ../../mod/connedit.php:49 ../../mod/connections.php:37
 msgid "Could not access contact record."
 msgstr ""
@@ -4070,7 +4074,7 @@ msgstr ""
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/chanview.php:97
+#: ../../mod/chanview.php:93
 msgid "toggle full screen mode"
 msgstr ""
 
@@ -4794,7 +4798,7 @@ msgid "Unable to add menu element."
 msgstr ""
 
 #: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:176
+#: ../../mod/dirprofile.php:177
 msgid "Not found."
 msgstr ""
 
@@ -5164,19 +5168,19 @@ msgstr ""
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:206
+#: ../../mod/directory.php:207
 msgid "Finding:"
 msgstr ""
 
-#: ../../mod/directory.php:214
+#: ../../mod/directory.php:215
 msgid "next page"
 msgstr ""
 
-#: ../../mod/directory.php:214
+#: ../../mod/directory.php:215
 msgid "previous page"
 msgstr ""
 
-#: ../../mod/directory.php:221
+#: ../../mod/directory.php:222
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -6762,7 +6766,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/removeme.php:53
-msgid "Remove My Account"
+msgid "Remove Channel"
 msgstr ""
 
 #: ../../mod/item.php:145
@@ -6831,7 +6835,7 @@ msgstr ""
 msgid "About: "
 msgstr ""
 
-#: ../../mod/dirprofile.php:163
+#: ../../mod/dirprofile.php:164
 msgid "Keywords: "
 msgstr ""
 
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 432e0f717..3be355c44 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -67,6 +67,7 @@ then
     sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
     sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE"
     sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+	sed -i '/^\"Plural-Forms/d' "$OUTFILE"
 else
     sed -i "s/SOME DESCRIPTIVE TITLE./Red Matrix Project/g" "$OUTFILE"
     sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Red Matrix Project/g" "$OUTFILE"
@@ -74,8 +75,10 @@ else
     sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
     sed -i "s/PACKAGE/Red/g" "$OUTFILE"
     sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+	sed -i '/^\"Plural-Forms/d' "$OUTFILE"
 fi
 
-grep -v "Plural-Forms:" $OUTFILE > tmpout
-mv tmpout $OUTFILE
+#grep -v "Plural-Forms:" $OUTFILE > tmpout
+#mv tmpout $OUTFILE
+
 echo "done."
diff --git a/version.inc b/version.inc
index a641cb0f8..fc2b6a5ae 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-22.565
+2014-01-23.566
-- 
cgit v1.2.3


From ab6b6794b4763f864ff29ff9748c669c88f2a1a5 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 23 Jan 2014 15:43:35 -0800
Subject: fix marital partner linking

---
 include/bbcode.php | 10 ++++++++++
 mod/profiles.php   | 40 ++++++++++++++--------------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 9f07b71ce..7e6ef3a2b 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -189,6 +189,10 @@ function bb_ShareAttributes($match) {
 	return($text);
 }
 
+function bb_location($match) {
+	// not yet implemented
+}
+
 function bb_ShareAttributesSimple($match) {
 
 	$attributes = $match[1];
@@ -256,6 +260,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
 	}
 
+//  Not yet implemented - thinking this should display a map or perhaps be a map directive
+//	if (strpos($Text,'[location]') !== false) {
+//		$Text = preg_replace_callback("/\[location\](.*?)\[\/location\]/ism", 'bb_location',$Text);
+//	}
+
 
 
 	// If we find any event code, turn it into an event.
@@ -266,6 +275,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	// process [observer] tags before we do anything else because we might
 	// be stripping away stuff that then doesn't need to be worked on anymore
+
 	$observer = $a->get_observer();
 	if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) {
 		if ($observer) {
diff --git a/mod/profiles.php b/mod/profiles.php
index b94e4bf03..c71ad9733 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -256,35 +256,23 @@ function profiles_post(&$a) {
 				if(strpos($lookup,'@') === 0)
 					$lookup = substr($lookup,1);
 				$lookup = str_replace('_',' ', $lookup);
-				if(strpos($lookup,'@') || (strpos($lookup,'http://'))) {
-					$newname = $lookup;
-					$links = @lrdd($lookup);
-					if(count($links)) {
-						foreach($links as $link) {
-							if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
-            	       			$prf = $link['@attributes']['href'];
-							}
-						}
-					}
-				}
-				else {
-					$newname = $lookup;
-
-					$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($newname),
+				$newname = $lookup;
+
+				$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
+					dbesc($newname),
+					intval(local_user())
+				);
+				if(! $r) {
+					$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1",
+						dbesc($lookup . '@%'),
 						intval(local_user())
 					);
-					if(! $r) {
-						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($lookup),
-							intval(local_user())
-						);
-					}
-					if(count($r)) {
-						$prf = $r[0]['url'];
-						$newname = $r[0]['name'];
-					}
 				}
+				if($r) {
+					$prf = $r[0]['xchan_url'];
+					$newname = $r[0]['xchan_name'];
+				}
+
 	
 				if($prf) {
 					$with = str_replace($lookup,'' . $newname	. '', $with);
-- 
cgit v1.2.3


From 357ddd1bf708bfa1c3973bf9a69a333b3338a5ce Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 23 Jan 2014 15:53:29 -0800
Subject: display a somewhat more pleasant hovertip on qr codes

---
 include/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 7e6ef3a2b..697260668 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -133,7 +133,7 @@ function bb_parse_crypt($match) {
 }
 
 function bb_qr($match) {
-	return '' . t('QR code') . '';
+	return '' . t('QR code') . '';
 } 	
 
 
-- 
cgit v1.2.3


From d57361ea4ace5d392623a316068fb5041d116ace Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Fri, 24 Jan 2014 03:44:50 +0000
Subject: Make share previews a bit longer.  We can't go any longer than this
 without suhosin starting to break things for channels with long names  - this
 limit works with the channel with the longest name in the matrix today, but
 we may need to make this a pconfig anyway.

---
 include/conversation.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 46a01d3c9..4b292ca4d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1296,12 +1296,18 @@ function render_location_default($item) {
 
 
 function prepare_page($item) {
+$foo = $item['owner_xchan'];
 
 	$a = get_app();
+	$upstreamshare = '1';
+	if ($foo == 'njsQ2vWa65pH-kwIKfGINOqDT2k_05ZIAeQxP9Ozk16z1WLTxTNlly4_vQKx2huTPCQqMz8shvgB3f7JVPzkdw') {
+		$upstreamshare = '';
+	}
 	$naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0);
 	$observer = $a->get_observer();
 	$zid = ($observer['xchan_addr']);
-	$preview = substr(urlencode($item['body']), 0, 100);
+	//240 chars is the longest we can have before we start hitting problems with suhosin sites
+	$preview = substr(urlencode($item['body']), 0, 240);
 	$link = z_root() . '/' . $a->cmd;
 	if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) {
 		if($a->layout['webpage']['authored'] === 'none')
@@ -1316,7 +1322,8 @@ function prepare_page($item) {
 		'$title' => smilies(bbcode($item['title'])),
 		'$body' => prepare_body($item,true),
 		'$preview' => $preview,
-		'$link' => $link
+		'$link' => $link,
+		'$upstreamshare' => $upstreamshare
 	));
 }
 
-- 
cgit v1.2.3


From ad67d3e48332204128209feb164c308af96e0ce1 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Fri, 24 Jan 2014 03:48:54 +0000
Subject: Ooops, included site specific hack

---
 include/conversation.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 4b292ca4d..cec5993b6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1296,13 +1296,8 @@ function render_location_default($item) {
 
 
 function prepare_page($item) {
-$foo = $item['owner_xchan'];
 
 	$a = get_app();
-	$upstreamshare = '1';
-	if ($foo == 'njsQ2vWa65pH-kwIKfGINOqDT2k_05ZIAeQxP9Ozk16z1WLTxTNlly4_vQKx2huTPCQqMz8shvgB3f7JVPzkdw') {
-		$upstreamshare = '';
-	}
 	$naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0);
 	$observer = $a->get_observer();
 	$zid = ($observer['xchan_addr']);
@@ -1323,7 +1318,6 @@ $foo = $item['owner_xchan'];
 		'$body' => prepare_body($item,true),
 		'$preview' => $preview,
 		'$link' => $link,
-		'$upstreamshare' => $upstreamshare
 	));
 }
 
-- 
cgit v1.2.3


From 34906049269853f58ab70f4a64441f3f8f1f2c5b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 23 Jan 2014 23:46:43 -0800
Subject: add zid to audio/video (again)

---
 include/bbcode.php | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
 include/oembed.php | 12 ++++++------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 697260668..084c02125 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -16,6 +16,40 @@ function tryoembed($match) {
 	return $html; 
 }
 
+function tryzrlaudio($match) {
+
+	$link = $match[1];
+	$m = @parse_url($link);
+	$zrl = false;
+	if($m['host']) {
+		$r = q("select hubloc_url from hubloc where hubloc_host = '%s' limit 1",
+			dbesc($m['host'])
+		);
+		if($r)
+			$zrl = true;
+	}
+	if($zrl)
+		$link = zid($link);
+	return	'';
+}
+
+function tryzrlvideo($match) {
+	$link = $match[1];
+	$m = @parse_url($link);
+	$zrl = false;
+	if($m['host']) {
+		$r = q("select hubloc_url from hubloc where hubloc_host = '%s' limit 1",
+			dbesc($m['host'])
+		);
+		if($r)
+			$zrl = true;
+	}
+	if($zrl)
+		$link = zid($link);
+	return	'';
+
+}
+
 // [noparse][i]italic[/i][/noparse] turns into
 // [noparse][ i ]italic[ /i ][/noparse],
 // to hide them from parser.
@@ -527,14 +561,18 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
        ' . t('Encrypted content') . '
        ', $Text);
 		$Text = preg_replace_callback("/\[crypt (.*?)\](.*?)\[\/crypt\]/ism", 'bb_parse_crypt', $Text);
 	}
+
+	// html5 video and audio
+	if (strpos($Text,'[/video]') !== false) {	
+		$Text = preg_replace_callback("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", 'tryzrlvideo', $Text);
+	}
+	if (strpos($Text,'[/audio]') !== false) {		
+		$Text = preg_replace_callback("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", 'tryzrlaudio', $Text);
+	}
+
 	// Try to Oembed
 	if ($tryoembed) {
-		if (strpos($Text,'[/video]') !== false) {	
-			$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '', $Text);
-		}
-		if (strpos($Text,'[/audio]') !== false) {		
-			$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '', $Text);
-		}
+
 		if (strpos($Text,'[/video]') !== false) {			
 			$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
 		}
@@ -552,7 +590,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	}
 
 
-	// html5 video and audio
 
 
 	if ($tryoembed){
diff --git a/include/oembed.php b/include/oembed.php
index 6946ba4b8..d8671a752 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,12 +1,10 @@
 width,$j->height);
-
-
+	$s = oembed_format_object($j);
+	return $s;  
 }
 
 
@@ -36,8 +34,9 @@ function oembed_fetch_url($embedurl){
 				if($r)
 					$zrl = true;
 			}
-			if($zrl)
+			if($zrl) {
 				$embedurl = zid($embedurl);
+			}			
 		}
 		else {
 			// try oembed autodiscovery
@@ -89,6 +88,7 @@ function oembed_format_object($j){
 	$a = get_app();
     $embedurl = $j->embedurl;
 	$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
+
 	$ret="";
 	switch ($j->type) {
 		case "video": {
-- 
cgit v1.2.3


From 3869b16298041887d0c90c884ffb5b22df8d56e9 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 24 Jan 2014 14:35:32 -0800
Subject: prettyphoto (js|css) not found

---
 doc/html/apw_2php_2style_8php.html      |   2 +-
 doc/html/bbcode_8php.html               |  54 ++++++++
 doc/html/bbcode_8php.js                 |   5 +-
 doc/html/boot_8php.html                 |  30 ++---
 doc/html/classRedDirectory-members.html |   1 +
 doc/html/classRedDirectory.html         |  17 +++
 doc/html/classRedDirectory.js           |   1 +
 doc/html/classRedDirectory.png          | Bin 615 -> 773 bytes
 doc/html/dba__driver_8php.html          |   4 +-
 doc/html/extract_8php.html              |   2 +-
 doc/html/functions_0x67.html            |  11 +-
 doc/html/functions_func_0x67.html       |  11 +-
 doc/html/globals_0x62.html              |   8 +-
 doc/html/globals_0x74.html              |   8 +-
 doc/html/globals_func_0x62.html         |   8 +-
 doc/html/globals_func_0x74.html         |   8 +-
 doc/html/hierarchy.html                 |  40 +++---
 doc/html/hierarchy.js                   |   3 +
 doc/html/identity_8php.html             |   4 +-
 doc/html/include_2menu_8php.html        |  34 +++++
 doc/html/include_2menu_8php.js          |   1 +
 doc/html/include_2network_8php.html     |   2 +-
 doc/html/item_8php.html                 |   2 +-
 doc/html/items_8php.html                |   4 +-
 doc/html/language_8php.html             |   2 +-
 doc/html/navtree.js                     |  16 +--
 doc/html/navtreeindex0.js               |  26 ++--
 doc/html/navtreeindex1.js               |   8 +-
 doc/html/navtreeindex2.js               |  22 ++--
 doc/html/navtreeindex3.js               |  10 +-
 doc/html/navtreeindex4.js               |  22 ++--
 doc/html/navtreeindex5.js               |  20 +--
 doc/html/navtreeindex6.js               |  12 +-
 doc/html/navtreeindex7.js               |  12 +-
 doc/html/navtreeindex8.js               |   5 +
 doc/html/php_2theme__init_8php.html     |   2 +-
 doc/html/plugin_8php.html               |   2 +-
 doc/html/search/all_62.js               |   2 +
 doc/html/search/all_67.js               |   1 +
 doc/html/search/all_74.js               |   2 +
 doc/html/search/functions_62.js         |   2 +
 doc/html/search/functions_67.js         |   1 +
 doc/html/search/functions_74.js         |   2 +
 doc/html/security_8php.html             |   4 +-
 doc/html/text_8php.html                 |   6 +-
 doc/html/typo_8php.html                 |   2 +-
 util/messages.po                        | 226 ++++++++++++++++----------------
 version.inc                             |   2 +-
 view/php/theme_init.php                 |   3 -
 49 files changed, 413 insertions(+), 259 deletions(-)

diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html
index e27362462..423bd9850 100644
--- a/doc/html/apw_2php_2style_8php.html
+++ b/doc/html/apw_2php_2style_8php.html
@@ -128,7 +128,7 @@ Variables
       
 
        
 
-
        Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
        
+
        Referenced by admin_page_users(), admin_page_users_post(), all_friends(), bookmarks_menu_fetch(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
        
 
 
        
 
        
diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html
index 017512ee6..21a1e3d19 100644
--- a/doc/html/bbcode_8php.html
+++ b/doc/html/bbcode_8php.html
@@ -114,6 +114,10 @@ $(document).ready(function(){initNavTree('bbcode_8php.html','');});
 Functions
  tryoembed ($match)
  
+ tryzrlaudio ($match)
+ 
+ tryzrlvideo ($match)
+ 
  bb_spacefy ($st)
  
  bb_unspacefy_and_trim ($st)
@@ -125,6 +129,8 @@ Functions
  
  bb_ShareAttributes ($match)
  
+ bb_location ($match)
+ 
  bb_ShareAttributesSimple ($match)
  
  rpost_callback ($match)
@@ -133,6 +139,22 @@ Functions
  
 
 
        Function Documentation
        
+
+
        
+
        
+      
+        
+          
+          
+          
+          
+          
+        
+      
        bb_location ( $match)
        
+
        
+
+
        
+
        
 
 
        
 
        
@@ -293,6 +315,38 @@ Functions
       
 
        
 
+
        
+
        
+
+
        
+
        
+      
+        
+          
+          
+          
+          
+          
+        
+      
        tryzrlaudio ( $match)
        
+
        
+
+
        
+
        
+
+
        
+
        
+      
+        
+          
+          
+          
+          
+          
+        
+      
        tryzrlvideo ( $match)
        
+
        
+
 
        
 
        
 
        
diff --git a/doc/html/bbcode_8php.js b/doc/html/bbcode_8php.js
index 3f6137594..1f7680fb8 100644
--- a/doc/html/bbcode_8php.js
+++ b/doc/html/bbcode_8php.js
@@ -1,5 +1,6 @@
 var bbcode_8php =
 [
+    [ "bb_location", "bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd", null ],
     [ "bb_parse_crypt", "bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f", null ],
     [ "bb_qr", "bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c", null ],
     [ "bb_ShareAttributes", "bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a", null ],
@@ -8,5 +9,7 @@ var bbcode_8php =
     [ "bb_unspacefy_and_trim", "bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d", null ],
     [ "bbcode", "bbcode_8php.html#a009f61aaf78771737ed0765c8463911b", null ],
     [ "rpost_callback", "bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7", null ],
-    [ "tryoembed", "bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7", null ]
+    [ "tryoembed", "bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7", null ],
+    [ "tryzrlaudio", "bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322", null ],
+    [ "tryzrlvideo", "bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html
index 352af773a..cf222ff37 100644
--- a/doc/html/boot_8php.html
+++ b/doc/html/boot_8php.html
@@ -200,7 +200,7 @@ Variables
  
 const ZOT_REVISION 1
  
-const DB_UPDATE_VERSION 1091
+const DB_UPDATE_VERSION 1092
  
 const EOL '<br />' . "\r\n"
  
@@ -712,7 +712,7 @@ Variables
       
 
        
 
-
        Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), attach_init(), blocks_content(), channel_init(), cloud_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(), mail_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(), xref_init(), and zotfeed_init().
        
+
        Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), attach_init(), blocks_content(), channel_init(), cloud_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(), mail_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(), profperm_content(), 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(), xref_init(), and zotfeed_init().
        
 
 
        
 
        
@@ -730,7 +730,7 @@ Variables
       
 
        
 
-
        Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), cloud_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(), mail_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(), thing_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(), xref_init(), and zotfeed_init().
        
+
        Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), cloud_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(), mail_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(), profperm_content(), queue_run(), register_init(), regmod_content(), rpost_content(), 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(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().
        
 
 
        
 
        
@@ -952,7 +952,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(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dir_tagblock(), drop_item(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), 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(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), RedBrowser\htmlActionsPanel(), 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(), photos_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_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), 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(), dir_tagblock(), drop_item(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), 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(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), RedBrowser\htmlActionsPanel(), 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(), photos_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(), tryzrlvideo(), 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_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

        @@ -1032,7 +1032,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_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().

        +

        Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), filestorage_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().

        @@ -1321,7 +1321,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_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(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), 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_content(), mail_post(), mail_store(), 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(), 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(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), 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(), group_side(), 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_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), 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(), 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().

        @@ -1355,7 +1355,7 @@ Variables
        -

        Referenced by allowed_public_recips(), bb_parse_crypt(), bbcode(), 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(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), 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(), photos_post(), post_activity_item(), 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(), sslify(), 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_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

        +

        Referenced by allowed_public_recips(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), 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_albums_list(), photos_create_item(), photos_list_photos(), post_activity_item(), 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(), sslify(), 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_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

        @@ -1818,7 +1818,7 @@ Variables
        -

        Referenced by get_atom_elements(), localize_item(), photos_post(), and poke_init().

        +

        Referenced by get_atom_elements(), localize_item(), and poke_init().

        @@ -1832,7 +1832,7 @@ Variables
        -

        Referenced by like_content(), localize_item(), photos_post(), subthread_content(), and tagger_content().

        +

        Referenced by like_content(), localize_item(), subthread_content(), and tagger_content().

        @@ -1930,7 +1930,7 @@ Variables
        -

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

        +

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

        @@ -2104,7 +2104,7 @@ Variables
        - +
        const DB_UPDATE_VERSION 1091const DB_UPDATE_VERSION 1092
        @@ -2606,7 +2606,7 @@ Variables
        -

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

        +

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

        @@ -3630,7 +3630,7 @@ Variables
        -

        Referenced by change_channel(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedDirectory\getDir(), manage_content(), post_init(), profile_load(), RedFile\put(), RedChannelList(), and zfinger_init().

        +

        Referenced by change_channel(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), manage_content(), post_init(), profile_load(), RedFile\put(), RedChannelList(), and zfinger_init().

        @@ -4205,7 +4205,7 @@ Variables

        Default permissions for file-based storage (webDAV, etc.) These files will be owned by the webserver who will need write access to the "storage" folder. Ideally you should make this 700, however some hosted platforms may not let you change ownership of this directory so we're defaulting to both owner-write and group-write privilege. This should work for most cases without modification. Over-ride this in your .htconfig.php if you need something either more or less restrictive.

        -

        Referenced by attach_mkdir(), change_channel(), and check_store().

        +

        Referenced by attach_mkdir(), change_channel(), check_store(), and cloud_init().

        @@ -4311,7 +4311,7 @@ Variables
        -

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

        +

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

        diff --git a/doc/html/classRedDirectory-members.html b/doc/html/classRedDirectory-members.html index 46a905a33..cb01d9724 100644 --- a/doc/html/classRedDirectory-members.html +++ b/doc/html/classRedDirectory-members.html @@ -127,6 +127,7 @@ $(document).ready(function(){initNavTree('classRedDirectory.html','');}); getDir()RedDirectory getLastModified()RedDirectory getName()RedDirectory + getQuotaInfo()RedDirectory diff --git a/doc/html/classRedDirectory.html b/doc/html/classRedDirectory.html index 31935fd38..878dbba76 100644 --- a/doc/html/classRedDirectory.html +++ b/doc/html/classRedDirectory.html @@ -142,6 +142,8 @@ Public Member Functions    getLastModified ()   + getQuotaInfo () +  @@ -320,6 +322,21 @@ Private Attributes

        Private Attributes

        +
        + + +
        +
        + + + + + + + +
        RedDirectory::getQuotaInfo ()
        +
        +

        Member Data Documentation

        diff --git a/doc/html/classRedDirectory.js b/doc/html/classRedDirectory.js index aa5794ad8..b626b9e5c 100644 --- a/doc/html/classRedDirectory.js +++ b/doc/html/classRedDirectory.js @@ -9,6 +9,7 @@ var classRedDirectory = [ "getDir", "classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4", null ], [ "getLastModified", "classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc", null ], [ "getName", "classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583", null ], + [ "getQuotaInfo", "classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375", null ], [ "$auth", "classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44", null ], [ "$ext_path", "classRedDirectory.html#a0f113244cd85c17848df991001d024f4", null ], [ "$folder_hash", "classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b", null ], diff --git a/doc/html/classRedDirectory.png b/doc/html/classRedDirectory.png index 192133f6a..75da336b4 100644 Binary files a/doc/html/classRedDirectory.png and b/doc/html/classRedDirectory.png differ diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 842c2336d..6ae602eec 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), 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(), 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(), RedDirectory\createFile(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), 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(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), 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(), 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(), RedDirectory\createFile(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), 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(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_init(), 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(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_sys_channel(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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_content(), 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(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), 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(), 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(), RedFile\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_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().

        +

        Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmarks_menu_fetch(), 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(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_sys_channel(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), 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(), 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(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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/extract_8php.html b/doc/html/extract_8php.html index ae2617c3b..e853b8bfc 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_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_cloudpath(), 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().

        +

        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_cloudpath(), 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(), 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().

        diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html index 5a3f55201..9d6326e00 100644 --- a/doc/html/functions_0x67.html +++ b/doc/html/functions_0x67.html @@ -283,17 +283,20 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); : photo_driver
      1. getImage() -: photo_gd +: photo_imagick +, photo_gd , photo_driver -, photo_imagick
      2. getLastModified() : RedDirectory , RedFile
      3. getName() -: RedFile -, RedDirectory +: RedDirectory +, RedFile +
        4. +
      4. getQuotaInfo() +: RedDirectory
      5. getSize() : RedFile diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html index 02e11924f..efe646350 100644 --- a/doc/html/functions_func_0x67.html +++ b/doc/html/functions_func_0x67.html @@ -282,17 +282,20 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');}); : photo_driver
      6. getImage() -: photo_gd +: photo_imagick +, photo_gd , photo_driver -, photo_imagick
      7. getLastModified() : RedDirectory , RedFile
      8. getName() -: RedFile -, RedDirectory +: RedDirectory +, RedFile +
        9. +
      9. getQuotaInfo() +: RedDirectory
      10. getSize() : RedFile diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html index 6676a53b5..6d06af0a4 100644 --- a/doc/html/globals_0x62.html +++ b/doc/html/globals_0x62.html @@ -153,6 +153,9 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
      11. bb2diaspora() : bb2diaspora.php
        12. +
      12. bb_location() +: bbcode.php +
      13. bb_parse_crypt() : bbcode.php
        14. @@ -205,11 +208,14 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');}); : theme.php
      14. blogtheme_form() -: config.php +: config.php
      15. blogtheme_imgurl() : theme.php
        16. +
      16. bookmarks_menu_fetch() +: menu.php +
      17. breaklines() : html2plain.php
        18. diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index 8f69addac..0617b994a 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -244,7 +244,7 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');}); : plugin.php
      18. theme_post() -: config.php +: config.php
      19. theme_status() : admin.php @@ -276,6 +276,12 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
      20. tryoembed() : bbcode.php
        21. +
      21. tryzrlaudio() +: bbcode.php +
        22. +
      22. tryzrlvideo() +: bbcode.php +
      23. tt() : language.php
        24. diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html index 4474534e3..0c3cc4bec 100644 --- a/doc/html/globals_func_0x62.html +++ b/doc/html/globals_func_0x62.html @@ -152,6 +152,9 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
      24. bb2diaspora() : bb2diaspora.php
        25. +
      25. bb_location() +: bbcode.php +
      26. bb_parse_crypt() : bbcode.php
        27. @@ -204,11 +207,14 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');}); : theme.php
      27. blogtheme_form() -: config.php +: config.php
      28. blogtheme_imgurl() : theme.php
        29. +
      29. bookmarks_menu_fetch() +: menu.php +
      30. breaklines() : html2plain.php
        31. diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html index f7a827882..025d49fd3 100644 --- a/doc/html/globals_func_0x74.html +++ b/doc/html/globals_func_0x74.html @@ -201,7 +201,7 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');}); : plugin.php
      31. theme_post() -: config.php +: config.php
      32. theme_status() : admin.php @@ -233,6 +233,12 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
      33. tryoembed() : bbcode.php
        34. +
      34. tryzrlaudio() +: bbcode.php +
        35. +
      35. tryzrlvideo() +: bbcode.php +
      36. tt() : language.php
        37. diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index ad25b4dd7..d35fdc010 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -126,25 +126,27 @@ $(document).ready(function(){initNavTree('hierarchy.html','');}); |\CRedDirectory oCIFile |\CRedFile -oCITemplateEngine -|oCFriendicaSmartyEngine -|\CTemplate -oCNode -|oCRedDirectory -|\CRedFile -oCOAuthDataStore -|\CFKOAuthDataStore -oCOAuthServer -|\CFKOAuth1 -oCphoto_driver -|oCphoto_gd -|\Cphoto_imagick -oCPlugin -|\CRedBrowser -oCProtoDriver -|\CZotDriver -\CSmarty - \CFriendicaSmarty +oCIQuota +|\CRedDirectory +oCITemplateEngine +|oCFriendicaSmartyEngine +|\CTemplate +oCNode +|oCRedDirectory +|\CRedFile +oCOAuthDataStore +|\CFKOAuthDataStore +oCOAuthServer +|\CFKOAuth1 +oCphoto_driver +|oCphoto_gd +|\Cphoto_imagick +oCPlugin +|\CRedBrowser +oCProtoDriver +|\CZotDriver +\CSmarty + \CFriendicaSmarty diff --git a/doc/html/hierarchy.js b/doc/html/hierarchy.js index 1dde32375..6259fc750 100644 --- a/doc/html/hierarchy.js +++ b/doc/html/hierarchy.js @@ -20,6 +20,9 @@ var hierarchy = [ "IFile", null, [ [ "RedFile", "classRedFile.html", null ] ] ], + [ "IQuota", null, [ + [ "RedDirectory", "classRedDirectory.html", null ] + ] ], [ "ITemplateEngine", "interfaceITemplateEngine.html", [ [ "FriendicaSmartyEngine", "classFriendicaSmartyEngine.html", null ], [ "Template", "classTemplate.html", null ] diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index c00a3e77b..93673bb26 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -433,7 +433,7 @@ Functions
        Returns
        boolean true or false
        -

        Referenced by chanview_content(), and is_member().

        +

        Referenced by is_member().

        @@ -677,7 +677,7 @@ Functions
        Returns
        string

        'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else

        -

        Referenced by conversation(), dirprofile_init(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), and viewconnections_content().

        +

        Referenced by chanview_content(), conversation(), dirprofile_init(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), oembed_fetch_url(), tryzrlaudio(), tryzrlvideo(), and viewconnections_content().

        diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html index d8ccbd4ba..baf3b92f7 100644 --- a/doc/html/include_2menu_8php.html +++ b/doc/html/include_2menu_8php.html @@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('include_2menu_8php.html','');}); Functions  menu_fetch ($name, $uid, $observer_xchan)   + bookmarks_menu_fetch ($uid, $observer_xchan, $flags=MENU_BOOKMARK) +   menu_render ($menu)    menu_fetch_id ($menu_id, $channel_id) @@ -136,6 +138,38 @@ Functions  

        Function Documentation

        + +
        +
        + + + + + + + + + + + + + + + + + + + + + + + + +
        bookmarks_menu_fetch ( $uid,
         $observer_xchan,
         $flags = MENU_BOOKMARK 
        )
        +
        + +
        +
        diff --git a/doc/html/include_2menu_8php.js b/doc/html/include_2menu_8php.js index b5ace532a..2f2bb4b73 100644 --- a/doc/html/include_2menu_8php.js +++ b/doc/html/include_2menu_8php.js @@ -1,5 +1,6 @@ var include_2menu_8php = [ + [ "bookmarks_menu_fetch", "include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc", null ], [ "menu_add_item", "include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8", null ], [ "menu_create", "include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98", null ], [ "menu_del_item", "include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a", null ], diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index c21a30846..337fc9051 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -367,7 +367,7 @@ Functions
        Returns
        (does not return, process is terminated)
        -

        Referenced by _well_known_init(), get_feed_for(), and poco_init().

        +

        Referenced by _well_known_init(), cloud_init(), get_feed_for(), and poco_init().

        diff --git a/doc/html/item_8php.html b/doc/html/item_8php.html index c8709a1eb..87ae6f190 100644 --- a/doc/html/item_8php.html +++ b/doc/html/item_8php.html @@ -302,7 +302,7 @@ Functions
        Returns
        boolean true if replaced, false if not replaced
        -

        Referenced by item_post().

        +

        Referenced by item_post(), and photos_post().

        diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 14c34b581..1cba27d43 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -1195,7 +1195,7 @@ Functions
        -

        Referenced by event_store(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), photos_post(), post_activity_item(), process_delivery(), profile_activity(), and subthread_content().

        +

        Referenced by event_store(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), and subthread_content().

        @@ -1223,7 +1223,7 @@ Functions
        -

        Referenced by item_post(), and update_imported_item().

        +

        Referenced by item_post(), photos_post(), and update_imported_item().

        diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index d9339f2be..c9615c7f0 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
        -

        Referenced by achievements_content(), 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(), check_store(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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().

        +

        Referenced by achievements_content(), 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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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/navtree.js b/doc/html/navtree.js index d4585f770..3eb466368 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,14 +36,14 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6", -"classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a", -"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e", -"functions_func_0x64.html", -"include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b", -"page__widgets_8php.html", -"sitelist_8php.html", -"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01" +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688", +"classConversation.html#ae81221251307e315f566a11f921ce0a9", +"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf", +"functions_func.html", +"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571", +"opensearch_8php.html", +"share_8php.html", +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index ab0139ee1..ffdfa6227 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -87,15 +87,18 @@ var NAVTREEINDEX0 = "bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba":[5,0,0,9,1], "bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc":[5,0,0,9,4], "bbcode_8php.html":[5,0,0,10], -"bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,6], -"bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,5], -"bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a":[5,0,0,10,2], -"bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,3], -"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,7], -"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,8], -"bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f":[5,0,0,10,0], -"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,4], -"bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c":[5,0,0,10,1], +"bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,7], +"bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,6], +"bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a":[5,0,0,10,3], +"bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,4], +"bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd":[5,0,0,10,0], +"bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322":[5,0,0,10,10], +"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,8], +"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,9], +"bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f":[5,0,0,10,1], +"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,5], +"bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c":[5,0,0,10,2], +"bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8":[5,0,0,10,11], "blocks_8php.html":[5,0,1,7], "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0], "blogga_2php_2theme_8php.html":[5,0,3,1,1,0,2], @@ -246,8 +249,5 @@ var NAVTREEINDEX0 = "boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,113], "boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,197], "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,49], -"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,107], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,53], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,120], -"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,112] +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,107] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index f7883337f..0c2c55806 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,8 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,53], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,120], +"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,112], "boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,250], "boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,249], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,176], @@ -246,8 +249,5 @@ var NAVTREEINDEX1 = "classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3":[4,0,8,8], "classConversation.html#aa95c1a62af38bdfba7add9549bec083b":[4,0,8,13], "classConversation.html#adf25ce023b69a166c63c6e84e02c136a":[4,0,8,9], -"classConversation.html#ae3d4190142e12b57051f11f2911f77a0":[4,0,8,4], -"classConversation.html#ae81221251307e315f566a11f921ce0a9":[4,0,8,21], -"classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae":[4,0,8,18], -"classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0] +"classConversation.html#ae3d4190142e12b57051f11f2911f77a0":[4,0,8,4] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 6d3a0e13c..3d78c394d 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,8 @@ var NAVTREEINDEX2 = { +"classConversation.html#ae81221251307e315f566a11f921ce0a9":[4,0,8,21], +"classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae":[4,0,8,18], +"classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0], "classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a":[4,0,8,15], "classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6":[4,0,8,14], "classFKOAuth1.html":[4,0,13], @@ -95,20 +98,21 @@ var NAVTREEINDEX2 = "classRedBrowser.html#a7f6bf0bda07833f4c647557bd172e349":[4,0,24,2], "classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35":[4,0,24,4], "classRedDirectory.html":[4,0,25], -"classRedDirectory.html#a0f113244cd85c17848df991001d024f4":[4,0,25,10], +"classRedDirectory.html#a0f113244cd85c17848df991001d024f4":[4,0,25,11], "classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180":[4,0,25,0], "classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0":[4,0,25,3], -"classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021":[4,0,25,12], +"classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375":[4,0,25,9], +"classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021":[4,0,25,13], "classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec":[4,0,25,1], "classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc":[4,0,25,7], "classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4":[4,0,25,6], -"classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44":[4,0,25,9], +"classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44":[4,0,25,10], "classRedDirectory.html#a986936910f0216887a25e28916c166c7":[4,0,25,2], -"classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b":[4,0,25,11], +"classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b":[4,0,25,12], "classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a":[4,0,25,5], "classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569":[4,0,25,4], -"classRedDirectory.html#acb32b8df27538c57772824a745e751d7":[4,0,25,13], -"classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4":[4,0,25,14], +"classRedDirectory.html#acb32b8df27538c57772824a745e751d7":[4,0,25,14], +"classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4":[4,0,25,15], "classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583":[4,0,25,8], "classRedFile.html":[4,0,26], "classRedFile.html#a0c961c5f49544d2502420361fa526437":[4,0,26,6], @@ -245,9 +249,5 @@ var NAVTREEINDEX2 = "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], -"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,15,1], -"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,15,3], -"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,15,0], -"comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f":[5,0,0,15,6], -"comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,15,5] +"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,15,1] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 946c7d3c0..9172e91b1 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,9 @@ var NAVTREEINDEX3 = { +"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,15,3], +"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,15,0], +"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], @@ -245,9 +249,5 @@ var NAVTREEINDEX3 = "functions_0x73.html":[4,3,0,17], "functions_0x74.html":[4,3,0,18], "functions_0x76.html":[4,3,0,19], -"functions_func.html":[4,3,1], -"functions_func.html":[4,3,1,0], -"functions_func_0x61.html":[4,3,1,1], -"functions_func_0x62.html":[4,3,1,2], -"functions_func_0x63.html":[4,3,1,3] +"functions_func.html":[4,3,1] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 43c6720ef..b9cfd47e0 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,9 @@ var NAVTREEINDEX4 = { +"functions_func.html":[4,3,1,0], +"functions_func_0x61.html":[4,3,1,1], +"functions_func_0x62.html":[4,3,1,2], +"functions_func_0x63.html":[4,3,1,3], "functions_func_0x64.html":[4,3,1,4], "functions_func_0x65.html":[4,3,1,5], "functions_func_0x66.html":[4,3,1,6], @@ -16,8 +20,8 @@ var NAVTREEINDEX4 = "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], "globals.html":[5,1,0,0], +"globals.html":[5,1,0], "globals_0x5f.html":[5,1,0,1], "globals_0x61.html":[5,1,0,2], "globals_0x62.html":[5,1,0,3], @@ -44,8 +48,8 @@ var NAVTREEINDEX4 = "globals_0x77.html":[5,1,0,24], "globals_0x78.html":[5,1,0,25], "globals_0x7a.html":[5,1,0,26], -"globals_func.html":[5,1,1], "globals_func.html":[5,1,1,0], +"globals_func.html":[5,1,1], "globals_func_0x61.html":[5,1,1,1], "globals_func_0x62.html":[5,1,1,2], "globals_func_0x63.html":[5,1,1,3], @@ -71,8 +75,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], @@ -242,12 +246,8 @@ var NAVTREEINDEX4 = "include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,35,3], "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], -"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,43,3], -"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,43,8], -"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,43,7], -"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,43,5], -"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,43,10], -"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,43,2], -"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,43,6] +"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,43,2], +"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,43,4], +"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,43,9], +"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,43,8] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 796414f1d..7711618c0 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,8 +1,13 @@ var NAVTREEINDEX5 = { -"include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b":[5,0,0,43,9], -"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,43,4], -"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,43,0], +"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,43,6], +"include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc":[5,0,0,43,0], +"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,43,11], +"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,43,3], +"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,43,7], +"include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b":[5,0,0,43,10], +"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,43,5], +"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,43,1], "include_2message_8php.html":[5,0,0,44], "include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,44,2], "include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,44,1], @@ -209,8 +214,8 @@ var NAVTREEINDEX5 = "namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], -"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacefriendica-to-smarty-tpl.html":[3,0,2], +"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacemembers.html":[3,1,0], "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], @@ -244,10 +249,5 @@ var NAVTREEINDEX5 = "onedirsync_8php.html":[5,0,0,51], "onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,51,0], "onepoll_8php.html":[5,0,0,52], -"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,52,0], -"opensearch_8php.html":[5,0,1,63], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,63,0], -"page_8php.html":[5,0,1,64], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,64,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,64,0] +"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,52,0] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 8facf6231..9e73739f5 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,10 @@ var NAVTREEINDEX6 = { +"opensearch_8php.html":[5,0,1,63], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,63,0], +"page_8php.html":[5,0,1,64], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,64,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,64,0], "page__widgets_8php.html":[5,0,0,53], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,53,1], "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,53,0], @@ -244,10 +249,5 @@ var NAVTREEINDEX6 = "setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,90,16], "setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,90,0], "setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,90,15], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,90,6], -"share_8php.html":[5,0,1,91], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,91,0], -"siteinfo_8php.html":[5,0,1,92], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,92,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,92,0] +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,90,6] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index d574884cf..3edb82cc6 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,10 @@ var NAVTREEINDEX7 = { +"share_8php.html":[5,0,1,91], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,91,0], +"siteinfo_8php.html":[5,0,1,92], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,92,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,92,0], "sitelist_8php.html":[5,0,1,93], "sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,93,0], "smilies_8php.html":[5,0,1,94], @@ -244,10 +249,5 @@ var NAVTREEINDEX7 = "widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,70,14], "widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,70,8], "widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,70,20], -"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,70,15], -"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,11], -"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,70,1], -"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,17], -"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,70,6], -"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,70,3] +"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,70,15] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index f0564ecb0..147258fa5 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,10 @@ var NAVTREEINDEX8 = { +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,11], +"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,70,1], +"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,17], +"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,70,6], +"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,70,3], "widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,70,18], "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,70,16], "widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,70,22], diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index c969bd61e..b2af22595 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(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), 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(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), 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 1332d5561..0525ddcc1 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -691,7 +691,7 @@ Functions
        -

        Referenced by attach_store(), RedDirectory\createFile(), filestorage_content(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().

        +

        Referenced by attach_store(), RedDirectory\createFile(), filestorage_content(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().

        diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js index 2983a3a0b..1ab2883a1 100644 --- a/doc/html/search/all_62.js +++ b/doc/html/search/all_62.js @@ -6,6 +6,7 @@ var searchData= ['baseobject_2ephp',['BaseObject.php',['../BaseObject_8php.html',1,'']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]], + ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]], ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]], ['bb_5fqr',['bb_qr',['../bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c',1,'bbcode.php']]], ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a',1,'bbcode.php']]], @@ -27,6 +28,7 @@ var searchData= ['blogtheme_5fdisplay_5fitem',['blogtheme_display_item',['../blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5',1,'theme.php']]], ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]], ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]], + ['bookmarks_5fmenu_5ffetch',['bookmarks_menu_fetch',['../include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc',1,'menu.php']]], ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]], ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]], ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 7a9586569..e4e6a3fc7 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -98,6 +98,7 @@ var searchData= ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], ['getlastmodified',['getLastModified',['../classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc',1,'RedDirectory\getLastModified()'],['../classRedFile.html#a41562a28007789bbe7fe06d6a20eef47',1,'RedFile\getLastModified()']]], ['getname',['getName',['../classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583',1,'RedDirectory\getName()'],['../classRedFile.html#a0c961c5f49544d2502420361fa526437',1,'RedFile\getName()']]], + ['getquotainfo',['getQuotaInfo',['../classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375',1,'RedDirectory']]], ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index a93bf7ab4..2d4d9c169 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -63,6 +63,8 @@ var searchData= ['tpldebug_2ephp',['tpldebug.php',['../tpldebug_8php.html',1,'']]], ['tplpaths',['tplpaths',['../namespaceupdatetpl.html#a52a85ffa6b6d63d840b185a133478c12',1,'updatetpl']]], ['tryoembed',['tryoembed',['../bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7',1,'bbcode.php']]], + ['tryzrlaudio',['tryzrlaudio',['../bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322',1,'bbcode.php']]], + ['tryzrlvideo',['tryzrlvideo',['../bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8',1,'bbcode.php']]], ['tt',['tt',['../language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d',1,'language.php']]], ['typo_2ephp',['typo.php',['../typo_8php.html',1,'']]], ['typohelper_2ephp',['typohelper.php',['../typohelper_8php.html',1,'']]] diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js index 106f84da7..71a07a373 100644 --- a/doc/html/search/functions_62.js +++ b/doc/html/search/functions_62.js @@ -3,6 +3,7 @@ var searchData= ['base64url_5fdecode',['base64url_decode',['../text_8php.html#a13286f8a95d2de6b102966ecc270c8d6',1,'text.php']]], ['base64url_5fencode',['base64url_encode',['../text_8php.html#a070384ec000fd65043fce11d5392d241',1,'text.php']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], + ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]], ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]], ['bb_5fqr',['bb_qr',['../bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c',1,'bbcode.php']]], ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a',1,'bbcode.php']]], @@ -22,6 +23,7 @@ var searchData= ['blogtheme_5fdisplay_5fitem',['blogtheme_display_item',['../blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5',1,'theme.php']]], ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]], ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]], + ['bookmarks_5fmenu_5ffetch',['bookmarks_menu_fetch',['../include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc',1,'menu.php']]], ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]], ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]], ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 6adfcbeb4..36c34ffd7 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -98,6 +98,7 @@ var searchData= ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]], ['getlastmodified',['getLastModified',['../classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc',1,'RedDirectory\getLastModified()'],['../classRedFile.html#a41562a28007789bbe7fe06d6a20eef47',1,'RedFile\getLastModified()']]], ['getname',['getName',['../classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583',1,'RedDirectory\getName()'],['../classRedFile.html#a0c961c5f49544d2502420361fa526437',1,'RedFile\getName()']]], + ['getquotainfo',['getQuotaInfo',['../classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375',1,'RedDirectory']]], ['getsize',['getSize',['../classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f',1,'RedFile']]], ['gettype',['getType',['../classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3',1,'photo_driver']]], ['getwidth',['getWidth',['../classphoto__driver.html#acc30486acee9e89e32701f44a1738117',1,'photo_driver']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index 6b9dca5d7..7cef73235 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -31,5 +31,7 @@ var searchData= ['toggle_5fsafesearch_5finit',['toggle_safesearch_init',['../toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79',1,'toggle_safesearch.php']]], ['toggle_5ftheme',['toggle_theme',['../admin_8php.html#af81f081851791cd15e49e8ff6722dc27',1,'admin.php']]], ['tryoembed',['tryoembed',['../bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7',1,'bbcode.php']]], + ['tryzrlaudio',['tryzrlaudio',['../bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322',1,'bbcode.php']]], + ['tryzrlvideo',['tryzrlvideo',['../bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8',1,'bbcode.php']]], ['tt',['tt',['../language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d',1,'language.php']]] ]; diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 3451d9736..e2c19b6b5 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -323,7 +323,7 @@ Functions
        -

        Referenced by admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_themes(), admin_page_users(), group_content(), invite_content(), and profiles_content().

        +

        Referenced by admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_themes(), admin_page_users(), group_content(), invite_content(), and profiles_content().

        @@ -399,7 +399,7 @@ Functions

        Profile owner - everything is visible

        Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.

        -

        Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedCollectionData(), RedFileData(), and z_readdir().

        +

        Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), bookmarks_menu_fetch(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedCollectionData(), RedFileData(), and z_readdir().

        diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index ba12fa22c..f7b4d5a41 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1088,7 +1088,7 @@ Variables
        -

        Referenced by event_store(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), photos_post(), post_activity_item(), profile_activity(), and subthread_content().

        +

        Referenced by event_store(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), profile_activity(), and subthread_content().

        @@ -1289,7 +1289,7 @@ Variables
        -

        Referenced by RedDirectory\__construct(), RedFile\__construct(), 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(), RedDirectory\childExists(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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 RedDirectory\__construct(), RedFile\__construct(), 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(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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().

        @@ -2184,7 +2184,7 @@ Variables
        Returns
        string Escaped text.
        -

        Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), photos_post(), subthread_content(), tagger_content(), and xml_status().

        +

        Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), subthread_content(), tagger_content(), and xml_status().

        diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 88f40537c..354ea916c 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(), achievements_content(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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(), 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().

        +

        Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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/util/messages.po b/util/messages.po index 1bb13af74..328875302 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-01-23.566\n" +"Project-Id-Version: 2014-01-24.567\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-23 02:30-0800\n" +"POT-Creation-Date: 2014-01-24 00:03-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,7 +89,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:79 ../../include/conversation.php:1473 +#: ../../include/nav.php:79 ../../include/conversation.php:1474 #: ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" @@ -236,7 +236,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:171 ../../include/conversation.php:1491 +#: ../../include/nav.php:171 ../../include/conversation.php:1492 #: ../../mod/events.php:354 msgid "Events" msgstr "" @@ -1017,7 +1017,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:639 ../../mod/profiles.php:615 +#: ../../include/identity.php:639 ../../mod/profiles.php:603 msgid "Change profile photo" msgstr "" @@ -1029,7 +1029,7 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:646 ../../mod/profiles.php:616 +#: ../../include/identity.php:646 ../../mod/profiles.php:604 msgid "Create New Profile" msgstr "" @@ -1037,15 +1037,15 @@ msgstr "" msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:660 ../../mod/profiles.php:627 +#: ../../include/identity.php:660 ../../mod/profiles.php:615 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:663 ../../mod/profiles.php:630 +#: ../../include/identity.php:663 ../../mod/profiles.php:618 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:664 ../../mod/profiles.php:631 +#: ../../include/identity.php:664 ../../mod/profiles.php:619 msgid "Edit visibility" msgstr "" @@ -1099,7 +1099,7 @@ msgid "Events this week:" msgstr "" #: ../../include/identity.php:893 ../../include/identity.php:977 -#: ../../mod/profperm.php:103 +#: ../../mod/profperm.php:107 msgid "Profile" msgstr "" @@ -1128,11 +1128,11 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:932 ../../mod/profiles.php:538 +#: ../../include/identity.php:932 ../../mod/profiles.php:526 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:936 ../../mod/profiles.php:540 +#: ../../include/identity.php:936 ../../mod/profiles.php:528 msgid "Hometown:" msgstr "" @@ -1140,7 +1140,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: ../../include/identity.php:940 ../../mod/profiles.php:541 +#: ../../include/identity.php:940 ../../mod/profiles.php:529 msgid "Political Views:" msgstr "" @@ -1156,11 +1156,11 @@ msgstr "" msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:948 ../../mod/profiles.php:544 +#: ../../include/identity.php:948 ../../mod/profiles.php:532 msgid "Likes:" msgstr "" -#: ../../include/identity.php:950 ../../mod/profiles.php:545 +#: ../../include/identity.php:950 ../../mod/profiles.php:533 msgid "Dislikes:" msgstr "" @@ -1204,29 +1204,29 @@ msgstr "" msgid "Edit File properties" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:509 -#: ../../include/bbcode.php:512 +#: ../../include/bbcode.php:128 ../../include/bbcode.php:553 +#: ../../include/bbcode.php:556 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:129 ../../include/bbcode.php:517 +#: ../../include/bbcode.php:163 ../../include/bbcode.php:561 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:136 +#: ../../include/bbcode.php:170 msgid "QR code" msgstr "" -#: ../../include/bbcode.php:179 +#: ../../include/bbcode.php:213 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:181 +#: ../../include/bbcode.php:215 msgid "post" msgstr "" -#: ../../include/bbcode.php:469 ../../include/bbcode.php:489 +#: ../../include/bbcode.php:513 ../../include/bbcode.php:533 msgid "$1 wrote:" msgstr "" @@ -1525,7 +1525,7 @@ msgstr "" #: ../../mod/photos.php:68 ../../mod/photos.php:522 ../../mod/viewsrc.php:12 #: ../../mod/menu.php:40 ../../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/profiles.php:152 ../../mod/profiles.php:453 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 #: ../../mod/achievements.php:27 ../../mod/filestorage.php:10 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76 @@ -1562,7 +1562,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:302 ../../include/conversation.php:1476 +#: ../../include/photos.php:302 ../../include/conversation.php:1477 msgid "Photo Albums" msgstr "" @@ -2491,7 +2491,7 @@ msgid "Default" msgstr "" #: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68 -#: ../../mod/profperm.php:19 ../../index.php:347 +#: ../../mod/profperm.php:23 ../../index.php:347 msgid "Permission denied" msgstr "" @@ -2646,7 +2646,7 @@ msgstr "" #: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81 #: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929 #: ../../mod/photos.php:969 ../../mod/photos.php:1056 -#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132 +#: ../../mod/profiles.php:506 ../../mod/filestorage.php:132 #: ../../mod/import.php:387 ../../mod/settings.php:507 #: ../../mod/settings.php:619 ../../mod/settings.php:647 #: ../../mod/settings.php:671 ../../mod/settings.php:742 @@ -3019,88 +3019,88 @@ msgstr "" msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1379 +#: ../../include/conversation.php:1380 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1382 +#: ../../include/conversation.php:1383 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1385 +#: ../../include/conversation.php:1386 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1388 +#: ../../include/conversation.php:1389 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1393 msgid "Personal" msgstr "" -#: ../../include/conversation.php:1395 +#: ../../include/conversation.php:1396 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1398 ../../mod/menu.php:57 +#: ../../include/conversation.php:1399 ../../mod/menu.php:57 #: ../../mod/connections.php:209 msgid "New" msgstr "" -#: ../../include/conversation.php:1401 +#: ../../include/conversation.php:1402 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1408 +#: ../../include/conversation.php:1409 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1411 +#: ../../include/conversation.php:1412 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1418 +#: ../../include/conversation.php:1419 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1421 +#: ../../include/conversation.php:1422 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1452 +#: ../../include/conversation.php:1453 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1455 +#: ../../include/conversation.php:1456 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1464 +#: ../../include/conversation.php:1465 msgid "About" msgstr "" -#: ../../include/conversation.php:1467 +#: ../../include/conversation.php:1468 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1482 ../../mod/fbrowser.php:114 +#: ../../include/conversation.php:1483 ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/conversation.php:1485 +#: ../../include/conversation.php:1486 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1494 +#: ../../include/conversation.php:1495 msgid "Events and Calendar" msgstr "" -#: ../../include/conversation.php:1501 +#: ../../include/conversation.php:1502 msgid "Webpages" msgstr "" -#: ../../include/conversation.php:1504 +#: ../../include/conversation.php:1505 msgid "Manage Webpages" msgstr "" @@ -3679,12 +3679,12 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865 +#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:865 #: ../../mod/settings.php:870 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/profiles.php:496 ../../mod/settings.php:865 +#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:865 #: ../../mod/settings.php:870 msgid "No" msgstr "" @@ -5159,7 +5159,7 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: ../../mod/directory.php:143 ../../mod/profiles.php:573 +#: ../../mod/directory.php:143 ../../mod/profiles.php:561 #: ../../mod/dirprofile.php:95 msgid "Age: " msgstr "" @@ -5212,7 +5212,7 @@ msgstr "" msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:248 +#: ../../mod/connections.php:248 ../../mod/profperm.php:134 msgid "All Connections" msgstr "" @@ -5349,7 +5349,7 @@ msgid "Hub not found." msgstr "" #: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:168 ../../mod/profiles.php:475 +#: ../../mod/profiles.php:168 ../../mod/profiles.php:463 msgid "Profile not found." msgstr "" @@ -5373,226 +5373,226 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:306 +#: ../../mod/profiles.php:294 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:310 +#: ../../mod/profiles.php:298 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:314 +#: ../../mod/profiles.php:302 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:318 +#: ../../mod/profiles.php:306 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:322 +#: ../../mod/profiles.php:310 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:325 +#: ../../mod/profiles.php:313 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:329 +#: ../../mod/profiles.php:317 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:333 +#: ../../mod/profiles.php:321 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:337 +#: ../../mod/profiles.php:325 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:341 +#: ../../mod/profiles.php:329 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:345 +#: ../../mod/profiles.php:333 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:349 +#: ../../mod/profiles.php:337 msgid "Address" msgstr "" -#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31 +#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31 msgid "Location" msgstr "" -#: ../../mod/profiles.php:439 +#: ../../mod/profiles.php:427 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:494 +#: ../../mod/profiles.php:482 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:517 +#: ../../mod/profiles.php:505 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:519 +#: ../../mod/profiles.php:507 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:520 +#: ../../mod/profiles.php:508 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:521 +#: ../../mod/profiles.php:509 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:522 +#: ../../mod/profiles.php:510 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:523 +#: ../../mod/profiles.php:511 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:524 +#: ../../mod/profiles.php:512 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:525 +#: ../../mod/profiles.php:513 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:526 +#: ../../mod/profiles.php:514 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:527 +#: ../../mod/profiles.php:515 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:516 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:529 +#: ../../mod/profiles.php:517 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:518 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:519 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:532 +#: ../../mod/profiles.php:520 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:533 +#: ../../mod/profiles.php:521 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:522 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:535 +#: ../../mod/profiles.php:523 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:536 +#: ../../mod/profiles.php:524 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:537 +#: ../../mod/profiles.php:525 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:539 +#: ../../mod/profiles.php:527 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:542 +#: ../../mod/profiles.php:530 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:543 +#: ../../mod/profiles.php:531 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:546 +#: ../../mod/profiles.php:534 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:547 +#: ../../mod/profiles.php:535 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:548 +#: ../../mod/profiles.php:536 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:549 +#: ../../mod/profiles.php:537 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:550 +#: ../../mod/profiles.php:538 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:551 +#: ../../mod/profiles.php:539 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:552 +#: ../../mod/profiles.php:540 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:553 +#: ../../mod/profiles.php:541 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:554 +#: ../../mod/profiles.php:542 msgid "Television" msgstr "" -#: ../../mod/profiles.php:555 +#: ../../mod/profiles.php:543 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:556 +#: ../../mod/profiles.php:544 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:545 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:546 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:551 msgid "" "This is your public profile.
        It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:600 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:601 msgid "Add profile things" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:602 msgid "Include desirable objects in your profile" msgstr "" @@ -6557,26 +6557,22 @@ msgstr "" msgid "Delete Block" msgstr "" -#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 +#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 msgid "Invalid profile identifier." msgstr "" -#: ../../mod/profperm.php:101 +#: ../../mod/profperm.php:105 msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:105 +#: ../../mod/profperm.php:109 msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/profperm.php:114 +#: ../../mod/profperm.php:118 msgid "Visible To" msgstr "" -#: ../../mod/profperm.php:130 -msgid "All Contacts (with secure profile access)" -msgstr "" - #: ../../mod/siteinfo.php:57 #, php-format msgid "Version %s" diff --git a/version.inc b/version.inc index fc2b6a5ae..d9b792b26 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-23.566 +2014-01-24.567 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index a8edb0673..0e473f728 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -8,10 +8,8 @@ head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); -head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); -// head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); @@ -43,7 +41,6 @@ head_add_js('main.js'); head_add_js('crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); -head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); head_add_js('library/bootstrap-datetimepicker/js/moment.js'); head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); -- cgit v1.2.3 From d3a0d37b0ddb73fed81fa71d355d6cb596e139ca Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 24 Jan 2014 23:58:41 +0000 Subject: Add admin info to admin panel and site info. Since we can have multiple admins, this is freeform bbcode. --- mod/admin.php | 22 +++++++++++++++++----- mod/siteinfo.php | 4 ++++ view/tpl/admin_site.tpl | 1 + view/tpl/siteinfo.tpl | 2 ++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 749b94de2..f64b54bfe 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -215,13 +215,14 @@ function admin_page_site_post(&$a){ check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : ''); - $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); + $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); + $admininfo = ((x($_POST,'admininfo')) ? trim($_POST['admininfo']) : false); $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); - $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); - $theme_accessibility = ((x($_POST,'theme_accessibility')) ? notags(trim($_POST['theme_accessibility'])) : ''); - $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); - $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); + $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); + $theme_accessibility = ((x($_POST,'theme_accessibility')) ? notags(trim($_POST['theme_accessibility'])) : ''); + $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); + $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); @@ -301,6 +302,12 @@ function admin_page_site_post(&$a){ set_config('system','banner', $banner); } + if ($admininfo==''){ + del_config('system','admininfo'); + } + else { + set_config('system','admininfo', $admininfo); + } set_config('system','language', $language); set_config('system','theme', $theme); if ( $theme_mobile === '---' ) { @@ -393,6 +400,10 @@ function admin_page_site(&$a) { $banner = 'red'; $banner = htmlspecialchars($banner); + /* Admin Info */ + $admininfo = get_config('system','admininfo'); + $admininfo = $admininfo; + /* Register policy */ $register_choices = Array( REGISTER_CLOSED => t("Closed"), @@ -427,6 +438,7 @@ function admin_page_site(&$a) { // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), + '$admininfo' => array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here")), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 9f65f59e4..37cba02ec 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -88,6 +88,8 @@ function siteinfo_content(&$a) { else $plugins_text = t('No installed plugins/addons/apps'); + $admininfo = bbcode(get_config('system','admininfo')); + $o = replace_macros(get_markup_template('siteinfo.tpl'), array( '$title' => t('Red'), '$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'), @@ -99,6 +101,8 @@ function siteinfo_content(&$a) { '$bug_link_url' => 'https://github.com/friendica/red/issues', '$bug_link_text' => 'redmatrix issues', '$contact' => t('Suggestions, praise, donations, etc. - please email "redmatrix" at librelist - dot com'), + '$adminlabel' => t('Site Administrators'), + '$admininfo' => $admininfo, '$plugins_text' => $plugins_text, '$plugins_list' => $plugins_list )); diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index b0f9d4a74..9b90fb4b0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -42,6 +42,7 @@ {{include file="field_input.tpl" field=$sitename}} {{include file="field_textarea.tpl" field=$banner}} + {{include file="field_textarea.tpl" field=$admininfo}} {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index a60b406cf..4baa1969b 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -7,6 +7,8 @@

        {{$web_location}}

        {{$visit}}

        {{$bug_text}} {{$bug_link_text}}

        +

        {{$adminlabel}}

        +

        {{$admininfo}}

        {{$contact}}

        {{$plugins_text}}

        {{if $plugins_list}} -- cgit v1.2.3 From 692822bdf0e6983af151106a927189c2179c0ac6 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 25 Jan 2014 00:13:29 +0000 Subject: Left over line from placeholder. --- mod/admin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index f64b54bfe..70a753c46 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -402,7 +402,6 @@ function admin_page_site(&$a) { /* Admin Info */ $admininfo = get_config('system','admininfo'); - $admininfo = $admininfo; /* Register policy */ $register_choices = Array( -- cgit v1.2.3 From 6b3ea9dc141e668e4f88e20e864daf845b349995 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 25 Jan 2014 03:50:47 +0100 Subject: API My wall posts --- include/api.php | 46 ++++++++++++++++++++++++++++------------------ include/items.php | 8 +++++--- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/include/api.php b/include/api.php index 463d29cf8..8cb2c3152 100644 --- a/include/api.php +++ b/include/api.php @@ -7,6 +7,7 @@ require_once("oauth.php"); require_once("html2plain.php"); require_once('include/security.php'); require_once('include/photos.php'); +require_once('include/items.php'); /* * @@ -1244,24 +1245,33 @@ require_once('include/photos.php'); if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 "; if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, - `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, `contact` - WHERE `item`.`uid` = %d - AND `item`.`contact-id` = %d - AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 - AND `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $sql_extra - AND `item`.`id`>%d - ORDER BY `item`.`received` DESC LIMIT %d ,%d ", - intval(api_user()), - intval($user_info['id']), - intval($since_id), - intval($start), intval($count) - ); +// $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, +// `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, +// `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`, +// `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` +// FROM `item`, `contact` +// WHERE `item`.`uid` = %d +// AND `item`.`contact-id` = %d +// AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 +// AND `contact`.`id` = `item`.`contact-id` +// AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 +// $sql_extra +// AND `item`.`id`>%d +// ORDER BY `item`.`received` DESC LIMIT %d ,%d ", +// intval(api_user()), +// intval($user_info['id']), +// intval($since_id), +// intval($start), intval($count) +// ); + + $r = items_fetch(array( + 'uid' => api_user(), + 'cid' => $user_info['id'], + 'since_id' => $since_id, + 'start' => $start, + 'records' => $count, + 'wall' => 1)); + $ret = api_format_items($r,$user_info); diff --git a/include/items.php b/include/items.php index 6e4f9f0d6..3b2fd2eec 100755 --- a/include/items.php +++ b/include/items.php @@ -3712,7 +3712,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $def_acl = ''; $item_uids = ' true '; - + + if ($arr['uid']) $uid= $arr['uid']; + if($channel) { $uid = $channel['channel_id']; $uidhash = $channel['channel_hash']; @@ -3724,7 +3726,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C if($arr['wall']) $sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ") "; - + $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ") $sql_options ) "; if($arr['since_id']) @@ -3893,7 +3895,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C ORDER BY item.$ordering DESC $pager_sql ", intval(ABOOK_FLAG_BLOCKED) ); - + } else { // update -- cgit v1.2.3 From 88f25191e06ecf74f863f15e4f87c118a6c5dde0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 25 Jan 2014 07:28:30 +0100 Subject: DE: update to the strings --- view/de/messages.po | 2515 ++++++++++++++++++++++++++------------------------- view/de/strings.php | 440 ++++----- 2 files changed, 1481 insertions(+), 1474 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index c1d036c13..68f1e0dd5 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -1,5 +1,5 @@ -# Red Communications Project -# Copyright (C) 2013 the Red Matrix Project +# Red Matrix Project +# Copyright (C) 2012-2014 the Red Matrix Project # This file is distributed under the same license as the Red package. # # Translators: @@ -14,13 +14,13 @@ # Fraengii , 2013 # Oliver , 2013 # bavatar , 2013-2014 -# zottel , 2013 +# zottel , 2013-2014 msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 00:02-0800\n" -"PO-Revision-Date: 2014-01-13 06:23+0000\n" +"POT-Creation-Date: 2014-01-23 02:30-0800\n" +"PO-Revision-Date: 2014-01-25 06:22+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n" "MIME-Version: 1.0\n" @@ -68,7 +68,7 @@ msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert." msgid "Public Timeline" msgstr "Öffentliche Zeitleiste" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1415 +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420 msgid "Logout" msgstr "Abmelden" @@ -101,7 +101,7 @@ msgstr "Profile bearbeiten" msgid "Manage/Edit Profiles" msgstr "Verwalte/Bearbeite Profile" -#: ../../include/nav.php:79 ../../include/conversation.php:1462 +#: ../../include/nav.php:79 ../../include/conversation.php:1473 #: ../../mod/fbrowser.php:25 msgid "Photos" msgstr "Fotos" @@ -110,7 +110,7 @@ msgstr "Fotos" msgid "Your photos" msgstr "Deine Bilder" -#: ../../include/nav.php:85 ../../boot.php:1416 +#: ../../include/nav.php:85 ../../boot.php:1421 msgid "Login" msgstr "Anmelden" @@ -131,7 +131,7 @@ msgstr "Klick zum Authentifizieren bei Deinem Heimat-Hub" msgid "Home Page" msgstr "Homepage" -#: ../../include/nav.php:125 ../../mod/register.php:206 ../../boot.php:1392 +#: ../../include/nav.php:125 ../../mod/register.php:206 ../../boot.php:1397 msgid "Register" msgstr "Registrieren" @@ -156,7 +156,7 @@ msgid "Addon applications, utilities, games" msgstr "Addon Programme, Helferlein, Spiele" #: ../../include/nav.php:135 ../../include/text.php:736 -#: ../../include/text.php:750 ../../mod/search.php:28 +#: ../../include/text.php:750 ../../mod/search.php:29 msgid "Search" msgstr "Suche" @@ -164,7 +164,7 @@ msgstr "Suche" msgid "Search site content" msgstr "Durchsuche Seiten-Inhalt" -#: ../../include/nav.php:138 ../../mod/directory.php:209 +#: ../../include/nav.php:138 ../../mod/directory.php:210 msgid "Directory" msgstr "Verzeichnis" @@ -248,7 +248,7 @@ msgstr "Ausgang" msgid "New Message" msgstr "Neue Nachricht" -#: ../../include/nav.php:171 ../../include/conversation.php:1482 +#: ../../include/nav.php:171 ../../include/conversation.php:1491 #: ../../mod/events.php:354 msgid "Events" msgstr "Veranstaltungen" @@ -274,7 +274,7 @@ msgid "Manage Your Channels" msgstr "Verwalte Deine Kanäle" #: ../../include/nav.php:177 ../../include/widgets.php:487 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../mod/admin.php:787 ../../mod/admin.php:992 msgid "Settings" msgstr "Einstellungen" @@ -306,14 +306,10 @@ msgstr "Nichts Neues hier" msgid "Please wait..." msgstr "Bitte warten..." -#: ../../include/reddav.php:940 -msgid "Edit File properties" -msgstr "Dateieigenschaften ändern" - -#: ../../include/Contact.php:104 ../../include/widgets.php:115 -#: ../../include/widgets.php:155 ../../include/identity.php:625 -#: ../../mod/directory.php:182 ../../mod/match.php:62 ../../mod/suggest.php:51 -#: ../../mod/dirprofile.php:165 +#: ../../include/Contact.php:104 ../../include/identity.php:625 +#: ../../include/widgets.php:115 ../../include/widgets.php:155 +#: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51 +#: ../../mod/dirprofile.php:166 msgid "Connect" msgstr "Verbinden" @@ -325,152 +321,6 @@ msgstr "Neues Fenster" msgid "Open the selected location in a different window or browser tab" msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab" -#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87 -msgid "Categories" -msgstr "Kategorien" - -#: ../../include/widgets.php:117 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "Ignorieren/Verstecken" - -#: ../../include/widgets.php:123 ../../mod/connections.php:236 -msgid "Suggestions" -msgstr "Vorschläge" - -#: ../../include/widgets.php:124 -msgid "See more..." -msgstr "Mehr anzeigen..." - -#: ../../include/widgets.php:146 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen." - -#: ../../include/widgets.php:152 -msgid "Add New Connection" -msgstr "Neue Verbindung hinzufügen" - -#: ../../include/widgets.php:153 -msgid "Enter the channel address" -msgstr "Adresse des Kanals eingeben" - -#: ../../include/widgets.php:154 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara" - -#: ../../include/widgets.php:171 -msgid "Notes" -msgstr "Notizen" - -#: ../../include/widgets.php:173 ../../include/text.php:738 -#: ../../include/text.php:752 ../../mod/filer.php:36 -msgid "Save" -msgstr "Speichern" - -#: ../../include/widgets.php:243 -msgid "Remove term" -msgstr "Eintrag löschen" - -#: ../../include/widgets.php:252 ../../include/features.php:50 -msgid "Saved Searches" -msgstr "Gesicherte Suchanfragen" - -#: ../../include/widgets.php:253 ../../include/group.php:290 -msgid "add" -msgstr "hinzufügen" - -#: ../../include/widgets.php:283 ../../include/features.php:64 -#: ../../include/contact_widgets.php:53 -msgid "Saved Folders" -msgstr "Gesicherte Ordner" - -#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56 -#: ../../include/contact_widgets.php:90 -msgid "Everything" -msgstr "Alles" - -#: ../../include/widgets.php:318 ../../include/items.php:3566 -msgid "Archives" -msgstr "Archive" - -#: ../../include/widgets.php:370 -msgid "Refresh" -msgstr "Aktualisieren" - -#: ../../include/widgets.php:371 ../../mod/connedit.php:386 -msgid "Me" -msgstr "Ich" - -#: ../../include/widgets.php:372 ../../mod/connedit.php:388 -msgid "Best Friends" -msgstr "Beste Freunde" - -#: ../../include/widgets.php:373 ../../include/profile_selectors.php:42 -#: ../../include/identity.php:310 ../../mod/connedit.php:389 -msgid "Friends" -msgstr "Freunde" - -#: ../../include/widgets.php:374 -msgid "Co-workers" -msgstr "Kollegen" - -#: ../../include/widgets.php:375 ../../mod/connedit.php:390 -msgid "Former Friends" -msgstr "ehem. Freunde" - -#: ../../include/widgets.php:376 ../../mod/connedit.php:391 -msgid "Acquaintances" -msgstr "Bekanntschaften" - -#: ../../include/widgets.php:377 -msgid "Everybody" -msgstr "Jeder" - -#: ../../include/widgets.php:409 -msgid "Account settings" -msgstr "Konto-Einstellungen" - -#: ../../include/widgets.php:415 -msgid "Channel settings" -msgstr "Kanal-Einstellungen" - -#: ../../include/widgets.php:421 -msgid "Additional features" -msgstr "Zusätzliche Funktionen" - -#: ../../include/widgets.php:427 -msgid "Feature settings" -msgstr "Funktions-Einstellungen" - -#: ../../include/widgets.php:433 -msgid "Display settings" -msgstr "Anzeige-Einstellungen" - -#: ../../include/widgets.php:439 -msgid "Connected apps" -msgstr "Verbundene Apps" - -#: ../../include/widgets.php:445 -msgid "Export channel" -msgstr "Kanal exportieren" - -#: ../../include/widgets.php:457 -msgid "Automatic Permissions (Advanced)" -msgstr "Automatische Berechtigungen (Erweitert)" - -#: ../../include/widgets.php:467 -msgid "Premium Channel Settings" -msgstr "Prämium-Kanal Einstellungen" - -#: ../../include/widgets.php:476 ../../include/features.php:41 -#: ../../mod/sources.php:81 -msgid "Channel Sources" -msgstr "Kanal Quellen" - -#: ../../include/widgets.php:504 -msgid "Check Mail" -msgstr "E-Mails abrufen" - #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "Unbekannt | Nicht kategorisiert" @@ -531,8 +381,8 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 -#: ../../mod/admin.php:698 ../../boot.php:1418 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:691 +#: ../../mod/admin.php:700 ../../boot.php:1423 msgid "Email" msgstr "E-Mail" @@ -636,7 +486,7 @@ msgstr "vor %1$d %2$s" #: ../../include/dba/dba_driver.php:50 #, php-format msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kann die DNS Information für den Datenbank Server '%s' nicht finden" +msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden" #: ../../include/event.php:11 ../../include/bb2diaspora.php:433 msgid "l F d, Y \\@ g:i A" @@ -651,7 +501,7 @@ msgid "Finishes:" msgstr "Endet:" #: ../../include/event.php:40 ../../include/identity.php:676 -#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 +#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462 #: ../../mod/directory.php:156 ../../mod/dirprofile.php:108 msgid "Location:" msgstr "Ort:" @@ -695,6 +545,11 @@ msgstr[1] "%d Verbindungen" msgid "View Connections" msgstr "Zeige Verbindungen" +#: ../../include/text.php:738 ../../include/text.php:752 +#: ../../include/widgets.php:173 ../../mod/filer.php:36 +msgid "Save" +msgstr "Speichern" + #: ../../include/text.php:818 msgid "poke" msgstr "anstupsen" @@ -983,47 +838,12 @@ msgstr "Layouts" msgid "Pages" msgstr "Seiten" -#: ../../include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente." - -#: ../../include/group.php:223 -msgid "Default privacy group for new contacts" -msgstr "Standard-Privatsphärengruppe für neue Kontakte" - -#: ../../include/group.php:242 ../../mod/admin.php:698 -msgid "All Channels" -msgstr "Alle Kanäle" - -#: ../../include/group.php:264 -msgid "edit" -msgstr "Bearbeiten" - -#: ../../include/group.php:285 -msgid "Collections" -msgstr "Sammlungen" - -#: ../../include/group.php:286 -msgid "Edit collection" -msgstr "Bearbeite Sammlungen" - -#: ../../include/group.php:287 -msgid "Create a new collection" -msgstr "Neue Sammlung erzeugen" - -#: ../../include/group.php:288 -msgid "Channels not in any collection" -msgstr "Kanäle, die nicht in einer Sammlung sind" - #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "Dieses Element löschen?" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:536 -#: ../../mod/photos.php:1099 ../../mod/photos.php:1186 +#: ../../mod/photos.php:968 ../../mod/photos.php:1055 msgid "Comment" msgstr "Kommentar" @@ -1146,7 +966,7 @@ msgid "Stored post could not be verified." msgstr "Gespeicherter Beitrag konnten nicht überprüft werden." #: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51 -#: ../../mod/photos.php:91 ../../mod/photos.php:783 ../../mod/photos.php:805 +#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 #: ../../mod/profile_photo.php:336 msgid "Profile Photos" @@ -1156,61 +976,301 @@ msgstr "Profilfotos" msgid "view full size" msgstr "In Vollbildansicht anschauen" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:509 -#: ../../include/bbcode.php:512 -msgid "Image/photo" -msgstr "Bild/Foto" - -#: ../../include/bbcode.php:129 ../../include/bbcode.php:517 -msgid "Encrypted content" -msgstr "Verschlüsselter Inhalt" +#: ../../include/identity.php:29 ../../mod/item.php:1150 +msgid "Unable to obtain identity information from database" +msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen" -#: ../../include/bbcode.php:136 -msgid "QR code" -msgstr "QR Code" +#: ../../include/identity.php:62 +msgid "Empty name" +msgstr "Namensfeld leer" -#: ../../include/bbcode.php:179 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s schrieb den folgenden %2$s %3$s" +#: ../../include/identity.php:64 +msgid "Name too long" +msgstr "Name ist zu lang" -#: ../../include/bbcode.php:181 -msgid "post" -msgstr "Beitrag" +#: ../../include/identity.php:143 +msgid "No account identifier" +msgstr "Keine Account-Kennung" -#: ../../include/bbcode.php:469 ../../include/bbcode.php:489 -msgid "$1 wrote:" -msgstr "$1 schrieb:" +#: ../../include/identity.php:153 +msgid "Nickname is required." +msgstr "Spitzname ist erforderlich." -#: ../../include/oembed.php:150 -msgid "Embedded content" -msgstr "Eingebetteter Inhalt" +#: ../../include/identity.php:167 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt." -#: ../../include/oembed.php:159 -msgid "Embedding disabled" -msgstr "Einbetten ausgeschaltet" +#: ../../include/identity.php:226 +msgid "Unable to retrieve created identity" +msgstr "Kann die erstellte Identität nicht empfangen" -#: ../../include/features.php:21 -msgid "General Features" -msgstr "Allgemeine Funktionen" +#: ../../include/identity.php:285 +msgid "Default Profile" +msgstr "Standard-Profil" -#: ../../include/features.php:23 -msgid "Content Expiration" -msgstr "Verfall von Inhalten" +#: ../../include/identity.php:310 ../../include/profile_selectors.php:42 +#: ../../include/widgets.php:373 ../../mod/connedit.php:389 +msgid "Friends" +msgstr "Freunde" -#: ../../include/features.php:23 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum." +#: ../../include/identity.php:477 +msgid "Requested channel is not available." +msgstr "Angeforderte Kanal nicht verfügbar." -#: ../../include/features.php:24 -msgid "Multiple Profiles" -msgstr "Mehrfachprofile" +#: ../../include/identity.php:489 +msgid " Sorry, you don't have the permission to view this profile. " +msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen." -#: ../../include/features.php:24 -msgid "Ability to create multiple profiles" -msgstr "Mehrfachprofile anlegen können" +#: ../../include/identity.php:524 ../../mod/webpages.php:8 +#: ../../mod/connect.php:13 ../../mod/layouts.php:8 +#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40 +#: ../../mod/blocks.php:10 ../../mod/profile.php:16 +msgid "Requested profile is not available." +msgstr "Erwünschte Profil ist nicht verfügbar." -#: ../../include/features.php:25 +#: ../../include/identity.php:639 ../../mod/profiles.php:615 +msgid "Change profile photo" +msgstr "Ändere das Profilfoto" + +#: ../../include/identity.php:645 +msgid "Profiles" +msgstr "Profile" + +#: ../../include/identity.php:645 +msgid "Manage/edit profiles" +msgstr "Verwalte/Bearbeite Profile" + +#: ../../include/identity.php:646 ../../mod/profiles.php:616 +msgid "Create New Profile" +msgstr "Neues Profil erstellen" + +#: ../../include/identity.php:649 +msgid "Edit Profile" +msgstr "Profile bearbeiten" + +#: ../../include/identity.php:660 ../../mod/profiles.php:627 +msgid "Profile Image" +msgstr "Profilfoto:" + +#: ../../include/identity.php:663 ../../mod/profiles.php:630 +msgid "visible to everybody" +msgstr "sichtbar für jeden" + +#: ../../include/identity.php:664 ../../mod/profiles.php:631 +msgid "Edit visibility" +msgstr "Sichtbarkeit bearbeiten" + +#: ../../include/identity.php:678 ../../include/identity.php:903 +#: ../../mod/directory.php:158 +msgid "Gender:" +msgstr "Geschlecht:" + +#: ../../include/identity.php:679 ../../include/identity.php:923 +#: ../../mod/directory.php:160 +msgid "Status:" +msgstr "Status:" + +#: ../../include/identity.php:680 ../../include/identity.php:934 +#: ../../mod/directory.php:162 +msgid "Homepage:" +msgstr "Homepage:" + +#: ../../include/identity.php:747 ../../include/identity.php:827 +#: ../../mod/ping.php:230 +msgid "g A l F d" +msgstr "l, d. F G \\\\U\\\\h\\\\r" + +#: ../../include/identity.php:748 ../../include/identity.php:828 +msgid "F d" +msgstr "d. F" + +#: ../../include/identity.php:793 ../../include/identity.php:868 +#: ../../mod/ping.php:252 +msgid "[today]" +msgstr "[Heute]" + +#: ../../include/identity.php:805 +msgid "Birthday Reminders" +msgstr "Geburtstags Erinnerungen" + +#: ../../include/identity.php:806 +msgid "Birthdays this week:" +msgstr "Geburtstage in dieser Woche:" + +#: ../../include/identity.php:861 +msgid "[No description]" +msgstr "[Keine Beschreibung]" + +#: ../../include/identity.php:879 +msgid "Event Reminders" +msgstr "Veranstaltungs- Erinnerungen" + +#: ../../include/identity.php:880 +msgid "Events this week:" +msgstr "Veranstaltungen in dieser Woche:" + +#: ../../include/identity.php:893 ../../include/identity.php:977 +#: ../../mod/profperm.php:103 +msgid "Profile" +msgstr "Profil" + +#: ../../include/identity.php:901 ../../mod/settings.php:911 +msgid "Full Name:" +msgstr "Voller Name:" + +#: ../../include/identity.php:908 +msgid "j F, Y" +msgstr "j F, Y" + +#: ../../include/identity.php:909 +msgid "j F" +msgstr "j F" + +#: ../../include/identity.php:916 +msgid "Birthday:" +msgstr "Geburtstag:" + +#: ../../include/identity.php:920 +msgid "Age:" +msgstr "Alter:" + +#: ../../include/identity.php:929 +#, php-format +msgid "for %1$d %2$s" +msgstr "für %1$d %2$s" + +#: ../../include/identity.php:932 ../../mod/profiles.php:538 +msgid "Sexual Preference:" +msgstr "Sexuelle Orientierung:" + +#: ../../include/identity.php:936 ../../mod/profiles.php:540 +msgid "Hometown:" +msgstr "Heimatstadt:" + +#: ../../include/identity.php:938 +msgid "Tags:" +msgstr "Schlagworte:" + +#: ../../include/identity.php:940 ../../mod/profiles.php:541 +msgid "Political Views:" +msgstr "Politische Ansichten:" + +#: ../../include/identity.php:942 +msgid "Religion:" +msgstr "Religion:" + +#: ../../include/identity.php:944 ../../mod/directory.php:164 +msgid "About:" +msgstr "Über:" + +#: ../../include/identity.php:946 +msgid "Hobbies/Interests:" +msgstr "Hobbys/Interessen:" + +#: ../../include/identity.php:948 ../../mod/profiles.php:544 +msgid "Likes:" +msgstr "Gefällt-mir:" + +#: ../../include/identity.php:950 ../../mod/profiles.php:545 +msgid "Dislikes:" +msgstr "Gefällt-mir-nicht:" + +#: ../../include/identity.php:953 +msgid "Contact information and Social Networks:" +msgstr "Kontaktinformation und soziale Netzwerke:" + +#: ../../include/identity.php:955 +msgid "My other channels:" +msgstr "Meine anderen Kanäle:" + +#: ../../include/identity.php:957 +msgid "Musical interests:" +msgstr "Musikalische Interessen:" + +#: ../../include/identity.php:959 +msgid "Books, literature:" +msgstr "Bücher, Literatur:" + +#: ../../include/identity.php:961 +msgid "Television:" +msgstr "Fernsehen:" + +#: ../../include/identity.php:963 +msgid "Film/dance/culture/entertainment:" +msgstr "Film/Tanz/Kultur/Unterhaltung:" + +#: ../../include/identity.php:965 +msgid "Love/Romance:" +msgstr "Liebe/Romantik:" + +#: ../../include/identity.php:967 +msgid "Work/employment:" +msgstr "Arbeit/Anstellung:" + +#: ../../include/identity.php:969 +msgid "School/education:" +msgstr "Schule/Ausbildung:" + +#: ../../include/reddav.php:1018 +msgid "Edit File properties" +msgstr "Dateieigenschaften ändern" + +#: ../../include/bbcode.php:94 ../../include/bbcode.php:509 +#: ../../include/bbcode.php:512 +msgid "Image/photo" +msgstr "Bild/Foto" + +#: ../../include/bbcode.php:129 ../../include/bbcode.php:517 +msgid "Encrypted content" +msgstr "Verschlüsselter Inhalt" + +#: ../../include/bbcode.php:136 +msgid "QR code" +msgstr "QR Code" + +#: ../../include/bbcode.php:179 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s schrieb den folgenden %2$s %3$s" + +#: ../../include/bbcode.php:181 +msgid "post" +msgstr "Beitrag" + +#: ../../include/bbcode.php:469 ../../include/bbcode.php:489 +msgid "$1 wrote:" +msgstr "$1 schrieb:" + +#: ../../include/oembed.php:157 +msgid "Embedded content" +msgstr "Eingebetteter Inhalt" + +#: ../../include/oembed.php:166 +msgid "Embedding disabled" +msgstr "Einbetten ausgeschaltet" + +#: ../../include/features.php:21 +msgid "General Features" +msgstr "Allgemeine Funktionen" + +#: ../../include/features.php:23 +msgid "Content Expiration" +msgstr "Verfall von Inhalten" + +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum." + +#: ../../include/features.php:24 +msgid "Multiple Profiles" +msgstr "Mehrfachprofile" + +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" +msgstr "Mehrfachprofile anlegen können" + +#: ../../include/features.php:25 msgid "Web Pages" msgstr "Webseiten" @@ -1274,6 +1334,11 @@ msgstr "Voransicht" msgid "Allow previewing posts and comments before publishing them" msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung" +#: ../../include/features.php:41 ../../include/widgets.php:476 +#: ../../mod/sources.php:81 +msgid "Channel Sources" +msgstr "Kanal Quellen" + #: ../../include/features.php:41 msgid "Automatically import channel content from other channels or feeds" msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds." @@ -1307,6 +1372,10 @@ msgstr "Filter für Sammlung" msgid "Enable widget to display Network posts only from selected collections" msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen" +#: ../../include/features.php:50 ../../include/widgets.php:252 +msgid "Saved Searches" +msgstr "Gesicherte Suchanfragen" + #: ../../include/features.php:50 msgid "Save search terms for re-use" msgstr "Gesicherte Suchbegriffe zur Wiederverwendung" @@ -1371,6 +1440,11 @@ msgstr "Beitrags-Kategorien" msgid "Add categories to your posts" msgstr "Kategorien für Beiträge" +#: ../../include/features.php:64 ../../include/widgets.php:283 +#: ../../include/contact_widgets.php:53 +msgid "Saved Folders" +msgstr "Gesicherte Ordner" + #: ../../include/features.php:64 msgid "Ability to file posts under folders" msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln" @@ -1399,437 +1473,44 @@ msgstr "Tag Wolke" msgid "Provide a personal tag cloud on your channel page" msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen" -#: ../../include/conversation.php:123 -msgid "channel" -msgstr "Kanal" +#: ../../include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente." -#: ../../include/conversation.php:161 ../../mod/like.php:134 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s mag %2$s's %3$s" - -#: ../../include/conversation.php:164 ../../mod/like.php:136 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s mag %2$s's %3$s nicht" - -#: ../../include/conversation.php:201 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s ist jetzt mit %2$s verbunden" - -#: ../../include/conversation.php:236 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s stupste %2$s" - -#: ../../include/conversation.php:258 ../../mod/mood.php:63 -#, php-format -msgid "%1$s is currently %2$s" -msgstr "%1$s ist momentan %2$s" - -#: ../../include/conversation.php:631 ../../include/ItemObject.php:114 -msgid "Select" -msgstr "Auswählen" - -#: ../../include/conversation.php:632 ../../include/ItemObject.php:108 -#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:693 -#: ../../mod/group.php:176 ../../mod/photos.php:1150 -#: ../../mod/filestorage.php:172 ../../mod/settings.php:570 -msgid "Delete" -msgstr "Löschen" - -#: ../../include/conversation.php:642 ../../include/ItemObject.php:161 -msgid "Message is verified" -msgstr "Nachricht überprüft" - -#: ../../include/conversation.php:662 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Schaue Dir %s's Profil auf %s an." - -#: ../../include/conversation.php:676 -msgid "Categories:" -msgstr "Kategorien:" - -#: ../../include/conversation.php:677 -msgid "Filed under:" -msgstr "Gespeichert unter:" - -#: ../../include/conversation.php:686 ../../include/ItemObject.php:217 -#, php-format -msgid " from %s" -msgstr "von %s" - -#: ../../include/conversation.php:689 ../../include/ItemObject.php:220 -#, php-format -msgid "last edited: %s" -msgstr "zuletzt bearbeitet: %s" - -#: ../../include/conversation.php:704 -msgid "View in context" -msgstr "Im Zusammenhang anschauen" - -#: ../../include/conversation.php:706 ../../include/conversation.php:1119 -#: ../../include/ItemObject.php:248 ../../mod/photos.php:1081 -#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:110 -#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153 -#: ../../mod/editblock.php:124 -msgid "Please wait" -msgstr "Bitte warten" - -#: ../../include/conversation.php:833 -msgid "remove" -msgstr "lösche" - -#: ../../include/conversation.php:837 -msgid "Loading..." -msgstr "Lädt ..." - -#: ../../include/conversation.php:838 -msgid "Delete Selected Items" -msgstr "Lösche die ausgewählten Elemente" - -#: ../../include/conversation.php:929 -msgid "View Source" -msgstr "Quelle anzeigen" - -#: ../../include/conversation.php:930 -msgid "Follow Thread" -msgstr "Unterhaltung folgen" - -#: ../../include/conversation.php:931 -msgid "View Status" -msgstr "Status ansehen" - -#: ../../include/conversation.php:933 -msgid "View Photos" -msgstr "Fotos ansehen" - -#: ../../include/conversation.php:934 -msgid "Matrix Activity" -msgstr "Matrix Aktivität" - -#: ../../include/conversation.php:935 -msgid "Edit Contact" -msgstr "Kontakt bearbeiten" - -#: ../../include/conversation.php:936 -msgid "Send PM" -msgstr "Sende PN" - -#: ../../include/conversation.php:937 -msgid "Poke" -msgstr "Anstupsen" - -#: ../../include/conversation.php:999 -#, php-format -msgid "%s likes this." -msgstr "%s gefällt das." - -#: ../../include/conversation.php:999 -#, php-format -msgid "%s doesn't like this." -msgstr "%s gefällt das nicht." - -#: ../../include/conversation.php:1003 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "%2$d Person gefällt das." -msgstr[1] "%2$d Leuten gefällt das." - -#: ../../include/conversation.php:1005 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "%2$d Person gefällt das nicht." -msgstr[1] "%2$d Leuten gefällt das nicht." - -#: ../../include/conversation.php:1011 -msgid "and" -msgstr "und" - -#: ../../include/conversation.php:1014 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] ", und %d andere" - -#: ../../include/conversation.php:1015 -#, php-format -msgid "%s like this." -msgstr "%s gefällt das." - -#: ../../include/conversation.php:1015 -#, php-format -msgid "%s don't like this." -msgstr "%s gefällt das nicht." - -#: ../../include/conversation.php:1065 -msgid "Visible to everybody" -msgstr "Sichtbar für jeden" - -#: ../../include/conversation.php:1066 ../../mod/mail.php:171 -#: ../../mod/mail.php:269 -msgid "Please enter a link URL:" -msgstr "Gib eine URL ein:" - -#: ../../include/conversation.php:1067 -msgid "Please enter a video link/URL:" -msgstr "Gib einen Video-Link/URL ein:" - -#: ../../include/conversation.php:1068 -msgid "Please enter an audio link/URL:" -msgstr "Gib einen Audio-Link/URL ein:" - -#: ../../include/conversation.php:1069 -msgid "Tag term:" -msgstr "Schlagwort:" - -#: ../../include/conversation.php:1070 ../../mod/filer.php:35 -msgid "Save to Folder:" -msgstr "Speichern in Ordner:" - -#: ../../include/conversation.php:1071 -msgid "Where are you right now?" -msgstr "Wo bist du jetzt grade?" - -#: ../../include/conversation.php:1072 ../../mod/mail.php:172 -#: ../../mod/mail.php:270 ../../mod/editpost.php:52 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Verfällt YYYY-MM-DD HH;MM" - -#: ../../include/conversation.php:1082 ../../include/ItemObject.php:546 -#: ../../mod/webpages.php:122 ../../mod/photos.php:1101 -#: ../../mod/editlayout.php:130 ../../mod/editpost.php:127 -#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:145 -msgid "Preview" -msgstr "Vorschau" - -#: ../../include/conversation.php:1096 ../../mod/photos.php:1080 -msgid "Share" -msgstr "Teilen" - -#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140 -msgid "Page link title" -msgstr "Seitentitel-Link" - -#: ../../include/conversation.php:1100 ../../mod/mail.php:219 -#: ../../mod/mail.php:332 ../../mod/editlayout.php:102 -#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145 -#: ../../mod/editblock.php:116 -msgid "Upload photo" -msgstr "Foto hochladen" - -#: ../../include/conversation.php:1101 -msgid "upload photo" -msgstr "Foto hochladen" - -#: ../../include/conversation.php:1102 ../../mod/mail.php:220 -#: ../../mod/mail.php:333 ../../mod/editlayout.php:103 -#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146 -#: ../../mod/editblock.php:117 -msgid "Attach file" -msgstr "Datei anhängen" - -#: ../../include/conversation.php:1103 -msgid "attach file" -msgstr "Datei anfügen" - -#: ../../include/conversation.php:1104 ../../mod/mail.php:221 -#: ../../mod/mail.php:334 ../../mod/editlayout.php:104 -#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147 -#: ../../mod/editblock.php:118 -msgid "Insert web link" -msgstr "Link einfügen" - -#: ../../include/conversation.php:1105 -msgid "web link" -msgstr "Web-Link" - -#: ../../include/conversation.php:1106 -msgid "Insert video link" -msgstr "Video-Link einfügen" - -#: ../../include/conversation.php:1107 -msgid "video link" -msgstr "Video-Link" - -#: ../../include/conversation.php:1108 -msgid "Insert audio link" -msgstr "Audio-Link einfügen" - -#: ../../include/conversation.php:1109 -msgid "audio link" -msgstr "Audio-Link" - -#: ../../include/conversation.php:1110 ../../mod/editlayout.php:108 -#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151 -#: ../../mod/editblock.php:122 -msgid "Set your location" -msgstr "Standort" - -#: ../../include/conversation.php:1111 -msgid "set location" -msgstr "Standort" - -#: ../../include/conversation.php:1112 ../../mod/editlayout.php:109 -#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152 -#: ../../mod/editblock.php:123 -msgid "Clear browser location" -msgstr "Browser-Standort löschen" - -#: ../../include/conversation.php:1113 -msgid "clear location" -msgstr "Standort löschen" - -#: ../../include/conversation.php:1115 ../../mod/editlayout.php:122 -#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169 -#: ../../mod/editblock.php:137 -msgid "Set title" -msgstr "Titel" - -#: ../../include/conversation.php:1118 ../../mod/editlayout.php:124 -#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171 -#: ../../mod/editblock.php:139 -msgid "Categories (comma-separated list)" -msgstr "Kategorien (Kommagetrennte Liste)" - -#: ../../include/conversation.php:1120 ../../mod/editlayout.php:111 -#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154 -#: ../../mod/editblock.php:125 -msgid "Permission settings" -msgstr "Berechtigungs-Einstellungen" - -#: ../../include/conversation.php:1121 -msgid "permissions" -msgstr "Berechtigungen" - -#: ../../include/conversation.php:1129 ../../mod/editlayout.php:119 -#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164 -#: ../../mod/editblock.php:134 -msgid "Public post" -msgstr "Öffentlicher Beitrag" - -#: ../../include/conversation.php:1131 ../../mod/editlayout.php:125 -#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172 -#: ../../mod/editblock.php:140 -msgid "Example: bob@example.com, mary@example.com" -msgstr "Beispiel: bob@example.com, mary@example.com" - -#: ../../include/conversation.php:1144 ../../mod/mail.php:226 -#: ../../mod/mail.php:339 ../../mod/editlayout.php:135 -#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182 -#: ../../mod/editblock.php:150 -msgid "Set expiration date" -msgstr "Verfallsdatum" - -#: ../../include/conversation.php:1146 ../../include/ItemObject.php:549 -#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135 -msgid "Encrypt text" -msgstr "Text verschlüsseln" - -#: ../../include/conversation.php:1148 ../../mod/editpost.php:136 -msgid "OK" -msgstr "OK" - -#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 ../../mod/settings.php:508 -#: ../../mod/settings.php:534 ../../mod/editpost.php:137 -#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 -msgid "Cancel" -msgstr "Abbrechen" - -#: ../../include/conversation.php:1376 -msgid "Commented Order" -msgstr "Neueste Kommentare" - -#: ../../include/conversation.php:1379 -msgid "Sort by Comment Date" -msgstr "Nach Kommentardatum sortiert" - -#: ../../include/conversation.php:1382 -msgid "Posted Order" -msgstr "Neueste Beiträge" - -#: ../../include/conversation.php:1385 -msgid "Sort by Post Date" -msgstr "Nach Beitragsdatum sortiert" - -#: ../../include/conversation.php:1389 -msgid "Personal" -msgstr "Persönlich" - -#: ../../include/conversation.php:1392 -msgid "Posts that mention or involve you" -msgstr "Beiträge, in denen es um dich geht" - -#: ../../include/conversation.php:1395 ../../mod/menu.php:57 -#: ../../mod/connections.php:209 -msgid "New" -msgstr "Neu" - -#: ../../include/conversation.php:1398 -msgid "Activity Stream - by date" -msgstr "Activity Stream - nach Datum sortiert" - -#: ../../include/conversation.php:1405 -msgid "Starred" -msgstr "Markiert" - -#: ../../include/conversation.php:1408 -msgid "Favourite Posts" -msgstr "Beiträge mit Sternchen" - -#: ../../include/conversation.php:1415 -msgid "Spam" -msgstr "Spam" - -#: ../../include/conversation.php:1418 -msgid "Posts flagged as SPAM" -msgstr "Nachrichten die als SPAM markiert wurden" - -#: ../../include/conversation.php:1448 -msgid "Channel" -msgstr "Kanal" - -#: ../../include/conversation.php:1451 -msgid "Status Messages and Posts" -msgstr "Statusnachrichten und Beiträge" - -#: ../../include/conversation.php:1455 -msgid "About" -msgstr "Über" +#: ../../include/group.php:223 +msgid "Default privacy group for new contacts" +msgstr "Standard-Privatsphärengruppe für neue Kontakte" -#: ../../include/conversation.php:1458 -msgid "Profile Details" -msgstr "Profil-Details" +#: ../../include/group.php:242 ../../mod/admin.php:700 +msgid "All Channels" +msgstr "Alle Kanäle" -#: ../../include/conversation.php:1465 ../../include/photos.php:297 -msgid "Photo Albums" -msgstr "Fotoalben" +#: ../../include/group.php:264 +msgid "edit" +msgstr "Bearbeiten" -#: ../../include/conversation.php:1470 ../../mod/fbrowser.php:114 -msgid "Files" -msgstr "Dateien" +#: ../../include/group.php:285 +msgid "Collections" +msgstr "Sammlungen" -#: ../../include/conversation.php:1473 -msgid "Files and Storage" -msgstr "Dateien und Speicher" +#: ../../include/group.php:286 +msgid "Edit collection" +msgstr "Bearbeite Sammlungen" -#: ../../include/conversation.php:1485 -msgid "Events and Calendar" -msgstr "Veranstaltungen und Kalender" +#: ../../include/group.php:287 +msgid "Create a new collection" +msgstr "Neue Sammlung erzeugen" -#: ../../include/conversation.php:1490 -msgid "Webpages" -msgstr "Webseiten" +#: ../../include/group.php:288 +msgid "Channels not in any collection" +msgstr "Kanäle, die nicht in einer Sammlung sind" -#: ../../include/conversation.php:1493 -msgid "Manage Webpages" -msgstr "Webseiten verwalten" +#: ../../include/group.php:290 ../../include/widgets.php:253 +msgid "add" +msgstr "hinzufügen" #: ../../include/notify.php:23 msgid "created a new post" @@ -1844,8 +1525,8 @@ msgstr "hat %s's Beitrag kommentiert" #: ../../include/attach.php:128 ../../include/attach.php:184 #: ../../include/attach.php:199 ../../include/attach.php:232 #: ../../include/attach.php:246 ../../include/attach.php:267 -#: ../../include/attach.php:461 ../../include/attach.php:539 -#: ../../include/items.php:3445 ../../mod/common.php:35 +#: ../../include/attach.php:462 ../../include/attach.php:540 +#: ../../include/items.php:3454 ../../mod/common.php:35 #: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257 #: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104 #: ../../mod/connedit.php:179 ../../mod/webpages.php:40 ../../mod/api.php:26 @@ -1853,7 +1534,7 @@ msgstr "hat %s's Beitrag kommentiert" #: ../../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:653 ../../mod/viewsrc.php:12 +#: ../../mod/photos.php:68 ../../mod/photos.php:522 ../../mod/viewsrc.php:12 #: ../../mod/menu.php:40 ../../mod/connections.php:167 #: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12 #: ../../mod/profiles.php:152 ../../mod/profiles.php:465 @@ -1867,34 +1548,38 @@ msgstr "hat %s's Beitrag kommentiert" #: ../../mod/notifications.php:66 ../../mod/blocks.php:29 #: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44 #: ../../mod/editwebpage.php:83 ../../mod/poke.php:128 -#: ../../mod/channel.php:88 ../../mod/channel.php:225 -#: ../../mod/fsuggest.php:78 ../../mod/editblock.php:48 -#: ../../mod/suggest.php:26 ../../mod/message.php:16 ../../mod/register.php:68 -#: ../../mod/regmod.php:18 ../../mod/authtest.php:13 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/mood.php:119 ../../index.php:176 -#: ../../index.php:344 +#: ../../mod/channel.php:88 ../../mod/channel.php:188 +#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78 +#: ../../mod/editblock.php:48 ../../mod/suggest.php:26 +#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190 +#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348 msgid "Permission denied." msgstr "Zugang verweigert" -#: ../../include/photos.php:88 +#: ../../include/photos.php:89 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "Bild überschreitet das Limit der Webseite von %lu bytes" -#: ../../include/photos.php:95 +#: ../../include/photos.php:96 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../include/photos.php:122 ../../mod/profile_photo.php:147 +#: ../../include/photos.php:123 ../../mod/profile_photo.php:147 msgid "Unable to process image" msgstr "Kann Bild nicht verarbeiten" -#: ../../include/photos.php:184 +#: ../../include/photos.php:185 msgid "Photo storage failed." msgstr "Foto speichern schlug fehl" -#: ../../include/photos.php:301 ../../mod/photos.php:821 -#: ../../mod/photos.php:1296 +#: ../../include/photos.php:302 ../../include/conversation.php:1476 +msgid "Photo Albums" +msgstr "Fotoalben" + +#: ../../include/photos.php:306 ../../mod/photos.php:690 +#: ../../mod/photos.php:1165 msgid "Upload New Photos" msgstr "Lade neue Fotos hoch" @@ -2147,40 +1832,40 @@ msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden" msgid "File exceeds size limit of %d" msgstr "Datei überschreitet das Größen-Limit von %d" -#: ../../include/attach.php:337 +#: ../../include/attach.php:338 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht." -#: ../../include/attach.php:421 +#: ../../include/attach.php:422 msgid "File upload failed. Possible system limit or action terminated." msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess." -#: ../../include/attach.php:433 +#: ../../include/attach.php:434 msgid "Stored file could not be verified. Upload failed." msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen." -#: ../../include/attach.php:477 ../../include/attach.php:494 +#: ../../include/attach.php:478 ../../include/attach.php:495 msgid "Path not available." msgstr "Pfad nicht verfügbar." -#: ../../include/attach.php:544 +#: ../../include/attach.php:545 msgid "Empty pathname" msgstr "leere Pfadangabe" -#: ../../include/attach.php:562 +#: ../../include/attach.php:563 msgid "duplicate filename or path" msgstr "doppelter Dateiname oder Pfad" -#: ../../include/attach.php:587 +#: ../../include/attach.php:588 msgid "Path not found." msgstr "Pfad nicht gefunden." -#: ../../include/attach.php:632 +#: ../../include/attach.php:633 msgid "mkdir failed." msgstr "mkdir fehlgeschlagen." -#: ../../include/attach.php:636 +#: ../../include/attach.php:637 msgid "database storage failed." msgstr "Speichern in der Datenbank fehlgeschlagen." @@ -2224,6 +1909,18 @@ msgstr "Gefällt-mir-nicht" msgid "dislikes" msgstr "Gefällt-mir-nicht" +#: ../../include/auth.php:76 +msgid "Logged out." +msgstr "Ausgeloggt." + +#: ../../include/auth.php:188 +msgid "Failed authentication" +msgstr "Authentifizierung fehlgeschlagen" + +#: ../../include/auth.php:203 +msgid "Login failed." +msgstr "Login fehlgeschlagen." + #: ../../include/account.php:23 msgid "Not a valid email address" msgstr "Ungültige E-Mail-Adresse" @@ -2372,7 +2069,7 @@ msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert" #: ../../include/enotify.php:170 #, php-format msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" -msgstr "[Red:Notify] Kommentar in Unterhaltung #%1$d von %2$s" +msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s" #: ../../include/enotify.php:171 #, php-format @@ -2434,7 +2131,7 @@ msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]." #: ../../include/enotify.php:241 #, php-format msgid "[Red:Notify] %s tagged your post" -msgstr "[Red:Hinweis] %s hat Dich getagged" +msgstr "[Red:Hinweis] %s hat Dich getaggt" #: ../../include/enotify.php:242 #, php-format @@ -2472,7 +2169,7 @@ msgstr "Bitte besuche %s um sie anzunehmen oder abzulehnen." #: ../../include/enotify.php:270 msgid "[Red:Notify] Friend suggestion received" -msgstr "[Red:Hinweis] Freundschaftsvorschlag erhalten" +msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten" #: ../../include/enotify.php:271 #, php-format @@ -2499,17 +2196,123 @@ msgstr "Foto:" msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen." -#: ../../include/auth.php:69 -msgid "Logged out." -msgstr "Ausgeloggt." +#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87 +msgid "Categories" +msgstr "Kategorien" -#: ../../include/auth.php:181 -msgid "Failed authentication" -msgstr "Authentifizierung fehlgeschlagen" +#: ../../include/widgets.php:117 ../../mod/suggest.php:53 +msgid "Ignore/Hide" +msgstr "Ignorieren/Verstecken" -#: ../../include/auth.php:190 -msgid "Login failed." -msgstr "Login fehlgeschlagen." +#: ../../include/widgets.php:123 ../../mod/connections.php:236 +msgid "Suggestions" +msgstr "Vorschläge" + +#: ../../include/widgets.php:124 +msgid "See more..." +msgstr "Mehr anzeigen..." + +#: ../../include/widgets.php:146 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen." + +#: ../../include/widgets.php:152 +msgid "Add New Connection" +msgstr "Neue Verbindung hinzufügen" + +#: ../../include/widgets.php:153 +msgid "Enter the channel address" +msgstr "Adresse des Kanals eingeben" + +#: ../../include/widgets.php:154 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara" + +#: ../../include/widgets.php:171 +msgid "Notes" +msgstr "Notizen" + +#: ../../include/widgets.php:243 +msgid "Remove term" +msgstr "Eintrag löschen" + +#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56 +#: ../../include/contact_widgets.php:90 +msgid "Everything" +msgstr "Alles" + +#: ../../include/widgets.php:318 ../../include/items.php:3575 +msgid "Archives" +msgstr "Archive" + +#: ../../include/widgets.php:370 +msgid "Refresh" +msgstr "Aktualisieren" + +#: ../../include/widgets.php:371 ../../mod/connedit.php:386 +msgid "Me" +msgstr "Ich" + +#: ../../include/widgets.php:372 ../../mod/connedit.php:388 +msgid "Best Friends" +msgstr "Beste Freunde" + +#: ../../include/widgets.php:374 +msgid "Co-workers" +msgstr "Kollegen" + +#: ../../include/widgets.php:375 ../../mod/connedit.php:390 +msgid "Former Friends" +msgstr "ehem. Freunde" + +#: ../../include/widgets.php:376 ../../mod/connedit.php:391 +msgid "Acquaintances" +msgstr "Bekanntschaften" + +#: ../../include/widgets.php:377 +msgid "Everybody" +msgstr "Jeder" + +#: ../../include/widgets.php:409 +msgid "Account settings" +msgstr "Konto-Einstellungen" + +#: ../../include/widgets.php:415 +msgid "Channel settings" +msgstr "Kanal-Einstellungen" + +#: ../../include/widgets.php:421 +msgid "Additional features" +msgstr "Zusätzliche Funktionen" + +#: ../../include/widgets.php:427 +msgid "Feature settings" +msgstr "Funktions-Einstellungen" + +#: ../../include/widgets.php:433 +msgid "Display settings" +msgstr "Anzeige-Einstellungen" + +#: ../../include/widgets.php:439 +msgid "Connected apps" +msgstr "Verbundene Apps" + +#: ../../include/widgets.php:445 +msgid "Export channel" +msgstr "Kanal exportieren" + +#: ../../include/widgets.php:457 +msgid "Automatic Permissions (Advanced)" +msgstr "Automatische Berechtigungen (Erweitert)" + +#: ../../include/widgets.php:467 +msgid "Premium Channel Settings" +msgstr "Prämium-Kanal Einstellungen" + +#: ../../include/widgets.php:504 +msgid "Check Mail" +msgstr "E-Mails abrufen" #: ../../include/contact_widgets.php:14 #, php-format @@ -2534,8 +2337,8 @@ msgstr "Verbinden/Folgen" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Beispiele: Robert Morgenstein, Angeln" -#: ../../include/contact_widgets.php:24 ../../mod/directory.php:205 -#: ../../mod/directory.php:210 ../../mod/connections.php:355 +#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206 +#: ../../mod/directory.php:211 ../../mod/connections.php:355 msgid "Find" msgstr "Finde" @@ -2565,9 +2368,9 @@ msgstr "Neue Seite" #: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96 #: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55 #: ../../mod/layouts.php:102 ../../mod/filestorage.php:171 -#: ../../mod/settings.php:569 ../../mod/editlayout.php:101 +#: ../../mod/settings.php:569 ../../mod/editlayout.php:106 #: ../../mod/editpost.php:98 ../../mod/blocks.php:93 -#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:115 +#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120 msgid "Edit" msgstr "Bearbeiten" @@ -2623,497 +2426,697 @@ msgstr "Kann meinen öffentliches Kanal-Profil sehen" msgid "Can view my \"public\" photo albums" msgstr "Kann meine öffentlichen Fotoalben sehen" -#: ../../include/permissions.php:16 -msgid "Can view my \"public\" address book" -msgstr "Kann mein öffentliches Adressbuch sehen" +#: ../../include/permissions.php:16 +msgid "Can view my \"public\" address book" +msgstr "Kann mein öffentliches Adressbuch sehen" + +#: ../../include/permissions.php:17 +msgid "Can view my \"public\" file storage" +msgstr "Kann meinen öffentlichen Dateiordner sehen" + +#: ../../include/permissions.php:18 +msgid "Can view my \"public\" pages" +msgstr "Kann meine öffentlichen Seiten sehen" + +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" +msgstr "Können mir den Stream und die Beiträge aus ihrem Kanal schicken" + +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" +msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen" + +#: ../../include/permissions.php:23 +msgid "Can comment on my posts" +msgstr "Kann meine Beiträge kommentieren" + +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" +msgstr "Kann mir private Nachrichten schicken" + +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" +msgstr "Kann Fotos in meinen Fotoalben veröffentlichen" + +#: ../../include/permissions.php:26 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten" + +#: ../../include/permissions.php:26 +msgid "Advanced - useful for creating group forum channels" +msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen" + +#: ../../include/permissions.php:27 +msgid "Can chat with me (when available)" +msgstr "Kann mit mir chatten (wenn verfügbar)" + +#: ../../include/permissions.php:27 +msgid "Requires compatible chat plugin" +msgstr "Benötigt ein kompatibles Chat-Plugin" + +#: ../../include/permissions.php:28 +msgid "Can write to my \"public\" file storage" +msgstr "Kann in meinen öffentlichen Dateiordner schreiben" + +#: ../../include/permissions.php:29 +msgid "Can edit my \"public\" pages" +msgstr "Kann meine öffentlichen Seiten bearbeiten" + +#: ../../include/permissions.php:31 +msgid "Can source my \"public\" posts in derived channels" +msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden" + +#: ../../include/permissions.php:31 +msgid "Somewhat advanced - very useful in open communities" +msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften." + +#: ../../include/permissions.php:32 +msgid "Can administer my channel resources" +msgstr "Kann meine Kanäle administrieren" + +#: ../../include/permissions.php:32 +msgid "" +"Extremely advanced. Leave this alone unless you know what you are doing" +msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst" + +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 +#: ../../view/theme/apw/php/config.php:176 +msgid "Default" +msgstr "Standard" + +#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68 +#: ../../mod/profperm.php:19 ../../index.php:347 +msgid "Permission denied" +msgstr "Keine Berechtigung" + +#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:150 +#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18 +#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32 +msgid "Item not found." +msgstr "Element nicht gefunden." + +#: ../../include/items.php:3743 ../../mod/group.php:38 ../../mod/group.php:140 +msgid "Collection not found." +msgstr "Sammlung nicht gefunden" + +#: ../../include/items.php:3758 +msgid "Collection is empty." +msgstr "Sammlung ist leer." + +#: ../../include/items.php:3765 +#, php-format +msgid "Collection: %s" +msgstr "Sammlung: %s" + +#: ../../include/items.php:3776 +#, php-format +msgid "Connection: %s" +msgstr "Verbindung: %s" + +#: ../../include/items.php:3779 +msgid "Connection not found." +msgstr "Die Verbindung wurde nicht gefunden." + +#: ../../include/ItemObject.php:89 ../../mod/photos.php:841 +msgid "Private Message" +msgstr "Private Nachricht" + +#: ../../include/ItemObject.php:108 ../../include/conversation.php:632 +#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695 +#: ../../mod/group.php:176 ../../mod/photos.php:1019 +#: ../../mod/filestorage.php:172 ../../mod/settings.php:570 +msgid "Delete" +msgstr "Löschen" + +#: ../../include/ItemObject.php:114 ../../include/conversation.php:631 +msgid "Select" +msgstr "Auswählen" + +#: ../../include/ItemObject.php:118 +msgid "save to folder" +msgstr "In Ordner speichern" + +#: ../../include/ItemObject.php:146 +msgid "add star" +msgstr "markieren" + +#: ../../include/ItemObject.php:147 +msgid "remove star" +msgstr "Markierung entfernen" + +#: ../../include/ItemObject.php:148 +msgid "toggle star status" +msgstr "Stern-Status umschalten" + +#: ../../include/ItemObject.php:152 +msgid "starred" +msgstr "markiert" + +#: ../../include/ItemObject.php:161 ../../include/conversation.php:642 +msgid "Message is verified" +msgstr "Nachricht überprüft" + +#: ../../include/ItemObject.php:169 +msgid "add tag" +msgstr "Schlagwort hinzufügen" + +#: ../../include/ItemObject.php:175 ../../mod/photos.php:947 +msgid "I like this (toggle)" +msgstr "Ich mag das (Umschalter)" -#: ../../include/permissions.php:17 -msgid "Can view my \"public\" file storage" -msgstr "Kann meinen öffentlichen Dateiordner sehen" +#: ../../include/ItemObject.php:176 ../../mod/photos.php:948 +msgid "I don't like this (toggle)" +msgstr "Ich mag das nicht (Umschalter)" -#: ../../include/permissions.php:18 -msgid "Can view my \"public\" pages" -msgstr "Kann meine öffentlichen Seiten sehen" +#: ../../include/ItemObject.php:178 +msgid "Share this" +msgstr "Teile dies" -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" -msgstr "Können mir den Stream und die Beiträge aus ihrem Kanal schicken" +#: ../../include/ItemObject.php:178 +msgid "share" +msgstr "Teilen" -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" -msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen" +#: ../../include/ItemObject.php:202 ../../include/ItemObject.php:203 +#, php-format +msgid "View %s's profile - %s" +msgstr "Schaue dir %s's Profil an - %s" -#: ../../include/permissions.php:23 -msgid "Can comment on my posts" -msgstr "Kann meine Beiträge kommentieren" +#: ../../include/ItemObject.php:204 +msgid "to" +msgstr "zu" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" -msgstr "Kann mir private Nachrichten schicken" +#: ../../include/ItemObject.php:205 +msgid "via" +msgstr "via" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" -msgstr "Kann Fotos in meinen Fotoalben veröffentlichen" +#: ../../include/ItemObject.php:206 +msgid "Wall-to-Wall" +msgstr "Wall-to-Wall" -#: ../../include/permissions.php:26 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten" +#: ../../include/ItemObject.php:207 +msgid "via Wall-To-Wall:" +msgstr "via Wall-To-Wall:" -#: ../../include/permissions.php:26 -msgid "Advanced - useful for creating group forum channels" -msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen" +#: ../../include/ItemObject.php:217 ../../include/conversation.php:686 +#, php-format +msgid " from %s" +msgstr "von %s" -#: ../../include/permissions.php:27 -msgid "Can chat with me (when available)" -msgstr "Kann mit mir chatten (wenn verfügbar)" +#: ../../include/ItemObject.php:220 ../../include/conversation.php:689 +#, php-format +msgid "last edited: %s" +msgstr "zuletzt bearbeitet: %s" -#: ../../include/permissions.php:27 -msgid "Requires compatible chat plugin" -msgstr "Benötigt ein kompatibles Chat-Plugin" +#: ../../include/ItemObject.php:221 +#, php-format +msgid "Expires: %s" +msgstr "Verfällt: %s" -#: ../../include/permissions.php:28 -msgid "Can write to my \"public\" file storage" -msgstr "Kann in meinen öffentlichen Dateiordner schreiben" +#: ../../include/ItemObject.php:248 ../../include/conversation.php:706 +#: ../../include/conversation.php:1119 ../../mod/photos.php:950 +#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115 +#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153 +#: ../../mod/editblock.php:129 +msgid "Please wait" +msgstr "Bitte warten" -#: ../../include/permissions.php:29 -msgid "Can edit my \"public\" pages" -msgstr "Kann meine öffentlichen Seiten bearbeiten" +#: ../../include/ItemObject.php:269 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d Kommentar" +msgstr[1] "%d Kommentare" -#: ../../include/permissions.php:31 -msgid "Can source my \"public\" posts in derived channels" -msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden" +#: ../../include/ItemObject.php:534 ../../mod/photos.php:966 +#: ../../mod/photos.php:1053 +msgid "This is you" +msgstr "Das bist du" -#: ../../include/permissions.php:31 -msgid "Somewhat advanced - very useful in open communities" -msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften." +#: ../../include/ItemObject.php:537 ../../mod/events.php:469 +#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156 +#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347 +#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131 +#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828 +#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81 +#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929 +#: ../../mod/photos.php:969 ../../mod/photos.php:1056 +#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132 +#: ../../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/mail.php:223 ../../mod/mail.php:335 +#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142 +#: ../../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 +msgid "Submit" +msgstr "Bestätigen" -#: ../../include/permissions.php:32 -msgid "Can administer my channel resources" -msgstr "Kann meine Kanäle administrieren" +#: ../../include/ItemObject.php:538 +msgid "Bold" +msgstr "Fett" -#: ../../include/permissions.php:32 -msgid "" -"Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst" +#: ../../include/ItemObject.php:539 +msgid "Italic" +msgstr "Kursiv" -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 -#: ../../view/theme/apw/php/config.php:176 -msgid "Default" -msgstr "Standard" +#: ../../include/ItemObject.php:540 +msgid "Underline" +msgstr "Unterstrichen" -#: ../../include/identity.php:29 ../../mod/item.php:1143 -msgid "Unable to obtain identity information from database" -msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen" +#: ../../include/ItemObject.php:541 +msgid "Quote" +msgstr "Zitat" -#: ../../include/identity.php:62 -msgid "Empty name" -msgstr "Namensfeld leer" +#: ../../include/ItemObject.php:542 +msgid "Code" +msgstr "Code" -#: ../../include/identity.php:64 -msgid "Name too long" -msgstr "Name ist zu lang" +#: ../../include/ItemObject.php:543 +msgid "Image" +msgstr "Bild" -#: ../../include/identity.php:143 -msgid "No account identifier" -msgstr "Keine Account-Kennung" +#: ../../include/ItemObject.php:544 +msgid "Link" +msgstr "Link" -#: ../../include/identity.php:153 -msgid "Nickname is required." -msgstr "Spitzname ist erforderlich." +#: ../../include/ItemObject.php:545 +msgid "Video" +msgstr "Video" -#: ../../include/identity.php:167 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt." +#: ../../include/ItemObject.php:546 ../../include/conversation.php:1082 +#: ../../mod/webpages.php:122 ../../mod/photos.php:970 +#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127 +#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151 +msgid "Preview" +msgstr "Vorschau" -#: ../../include/identity.php:226 -msgid "Unable to retrieve created identity" -msgstr "Kann die erstellte Identität nicht empfangen" +#: ../../include/ItemObject.php:549 ../../include/conversation.php:1146 +#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135 +msgid "Encrypt text" +msgstr "Text verschlüsseln" -#: ../../include/identity.php:285 -msgid "Default Profile" -msgstr "Standard-Profil" +#: ../../include/security.php:49 +msgid "Welcome " +msgstr "Willkommen" -#: ../../include/identity.php:477 -msgid "Requested channel is not available." -msgstr "Angeforderte Kanal nicht verfügbar." +#: ../../include/security.php:50 +msgid "Please upload a profile photo." +msgstr "Bitte lade ein Profilfoto hoch." -#: ../../include/identity.php:489 -msgid " Sorry, you don't have the permission to view this profile. " -msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen." +#: ../../include/security.php:53 +msgid "Welcome back " +msgstr "Willkommen zurück" -#: ../../include/identity.php:524 ../../mod/webpages.php:8 -#: ../../mod/connect.php:13 ../../mod/layouts.php:8 -#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40 -#: ../../mod/blocks.php:10 ../../mod/profile.php:16 -msgid "Requested profile is not available." -msgstr "Erwünschte Profil ist nicht verfügbar." +#: ../../include/security.php:363 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." -#: ../../include/identity.php:639 ../../mod/profiles.php:615 -msgid "Change profile photo" -msgstr "Ändere das Profilfoto" +#: ../../include/conversation.php:123 +msgid "channel" +msgstr "Kanal" -#: ../../include/identity.php:645 -msgid "Profiles" -msgstr "Profile" +#: ../../include/conversation.php:161 ../../mod/like.php:134 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s mag %2$s's %3$s" -#: ../../include/identity.php:645 -msgid "Manage/edit profiles" -msgstr "Verwalte/Bearbeite Profile" +#: ../../include/conversation.php:164 ../../mod/like.php:136 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s mag %2$s's %3$s nicht" -#: ../../include/identity.php:646 ../../mod/profiles.php:616 -msgid "Create New Profile" -msgstr "Neues Profil erstellen" +#: ../../include/conversation.php:201 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s ist jetzt mit %2$s verbunden" -#: ../../include/identity.php:649 -msgid "Edit Profile" -msgstr "Profile bearbeiten" +#: ../../include/conversation.php:236 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s stupste %2$s" -#: ../../include/identity.php:660 ../../mod/profiles.php:627 -msgid "Profile Image" -msgstr "Profilfoto:" +#: ../../include/conversation.php:258 ../../mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "%1$s ist momentan %2$s" -#: ../../include/identity.php:663 ../../mod/profiles.php:630 -msgid "visible to everybody" -msgstr "sichtbar für jeden" +#: ../../include/conversation.php:662 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Schaue Dir %s's Profil auf %s an." -#: ../../include/identity.php:664 ../../mod/profiles.php:631 -msgid "Edit visibility" -msgstr "Sichtbarkeit bearbeiten" +#: ../../include/conversation.php:676 +msgid "Categories:" +msgstr "Kategorien:" -#: ../../include/identity.php:678 ../../include/identity.php:903 -#: ../../mod/directory.php:158 -msgid "Gender:" -msgstr "Geschlecht:" +#: ../../include/conversation.php:677 +msgid "Filed under:" +msgstr "Gespeichert unter:" -#: ../../include/identity.php:679 ../../include/identity.php:923 -#: ../../mod/directory.php:160 -msgid "Status:" -msgstr "Status:" +#: ../../include/conversation.php:704 +msgid "View in context" +msgstr "Im Zusammenhang anschauen" -#: ../../include/identity.php:680 ../../include/identity.php:934 -#: ../../mod/directory.php:162 -msgid "Homepage:" -msgstr "Homepage:" +#: ../../include/conversation.php:833 +msgid "remove" +msgstr "lösche" -#: ../../include/identity.php:747 ../../include/identity.php:827 -#: ../../mod/ping.php:230 -msgid "g A l F d" -msgstr "l, d. F G \\\\U\\\\h\\\\r" +#: ../../include/conversation.php:837 +msgid "Loading..." +msgstr "Lädt ..." -#: ../../include/identity.php:748 ../../include/identity.php:828 -msgid "F d" -msgstr "d. F" +#: ../../include/conversation.php:838 +msgid "Delete Selected Items" +msgstr "Lösche die ausgewählten Elemente" -#: ../../include/identity.php:793 ../../include/identity.php:868 -#: ../../mod/ping.php:252 -msgid "[today]" -msgstr "[Heute]" +#: ../../include/conversation.php:929 +msgid "View Source" +msgstr "Quelle anzeigen" -#: ../../include/identity.php:805 -msgid "Birthday Reminders" -msgstr "Geburtstags Erinnerungen" +#: ../../include/conversation.php:930 +msgid "Follow Thread" +msgstr "Unterhaltung folgen" -#: ../../include/identity.php:806 -msgid "Birthdays this week:" -msgstr "Geburtstage in dieser Woche:" +#: ../../include/conversation.php:931 +msgid "View Status" +msgstr "Status ansehen" -#: ../../include/identity.php:861 -msgid "[No description]" -msgstr "[Keine Beschreibung]" +#: ../../include/conversation.php:933 +msgid "View Photos" +msgstr "Fotos ansehen" -#: ../../include/identity.php:879 -msgid "Event Reminders" -msgstr "Veranstaltungs- Erinnerungen" +#: ../../include/conversation.php:934 +msgid "Matrix Activity" +msgstr "Matrix Aktivität" -#: ../../include/identity.php:880 -msgid "Events this week:" -msgstr "Veranstaltungen in dieser Woche:" +#: ../../include/conversation.php:935 +msgid "Edit Contact" +msgstr "Kontakt bearbeiten" -#: ../../include/identity.php:893 ../../include/identity.php:975 -#: ../../mod/profperm.php:103 -msgid "Profile" -msgstr "Profil" +#: ../../include/conversation.php:936 +msgid "Send PM" +msgstr "Sende PN" -#: ../../include/identity.php:901 ../../mod/settings.php:911 -msgid "Full Name:" -msgstr "Voller Name:" +#: ../../include/conversation.php:937 +msgid "Poke" +msgstr "Anstupsen" -#: ../../include/identity.php:908 -msgid "j F, Y" -msgstr "j F, Y" +#: ../../include/conversation.php:999 +#, php-format +msgid "%s likes this." +msgstr "%s gefällt das." -#: ../../include/identity.php:909 -msgid "j F" -msgstr "j F" +#: ../../include/conversation.php:999 +#, php-format +msgid "%s doesn't like this." +msgstr "%s gefällt das nicht." -#: ../../include/identity.php:916 -msgid "Birthday:" -msgstr "Geburtstag:" +#: ../../include/conversation.php:1003 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "%2$d Person gefällt das." +msgstr[1] "%2$d Leuten gefällt das." -#: ../../include/identity.php:920 -msgid "Age:" -msgstr "Alter:" +#: ../../include/conversation.php:1005 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "%2$d Person gefällt das nicht." +msgstr[1] "%2$d Leuten gefällt das nicht." -#: ../../include/identity.php:929 +#: ../../include/conversation.php:1011 +msgid "and" +msgstr "und" + +#: ../../include/conversation.php:1014 #, php-format -msgid "for %1$d %2$s" -msgstr "für %1$d %2$s" +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] ", und %d andere" -#: ../../include/identity.php:932 ../../mod/profiles.php:538 -msgid "Sexual Preference:" -msgstr "Sexuelle Orientierung:" +#: ../../include/conversation.php:1015 +#, php-format +msgid "%s like this." +msgstr "%s gefällt das." -#: ../../include/identity.php:936 ../../mod/profiles.php:540 -msgid "Hometown:" -msgstr "Heimatstadt:" +#: ../../include/conversation.php:1015 +#, php-format +msgid "%s don't like this." +msgstr "%s gefällt das nicht." -#: ../../include/identity.php:938 -msgid "Tags:" -msgstr "Schlagworte:" +#: ../../include/conversation.php:1065 +msgid "Visible to everybody" +msgstr "Sichtbar für jeden" -#: ../../include/identity.php:940 ../../mod/profiles.php:541 -msgid "Political Views:" -msgstr "Politische Ansichten:" +#: ../../include/conversation.php:1066 ../../mod/mail.php:171 +#: ../../mod/mail.php:269 +msgid "Please enter a link URL:" +msgstr "Gib eine URL ein:" -#: ../../include/identity.php:942 -msgid "Religion:" -msgstr "Religion:" +#: ../../include/conversation.php:1067 +msgid "Please enter a video link/URL:" +msgstr "Gib einen Video-Link/URL ein:" -#: ../../include/identity.php:944 ../../mod/directory.php:164 -msgid "About:" -msgstr "Über:" +#: ../../include/conversation.php:1068 +msgid "Please enter an audio link/URL:" +msgstr "Gib einen Audio-Link/URL ein:" -#: ../../include/identity.php:946 -msgid "Hobbies/Interests:" -msgstr "Hobbys/Interessen:" +#: ../../include/conversation.php:1069 +msgid "Tag term:" +msgstr "Schlagwort:" -#: ../../include/identity.php:948 ../../mod/profiles.php:544 -msgid "Likes:" -msgstr "Gefällt-mir:" +#: ../../include/conversation.php:1070 ../../mod/filer.php:35 +msgid "Save to Folder:" +msgstr "Speichern in Ordner:" -#: ../../include/identity.php:950 ../../mod/profiles.php:545 -msgid "Dislikes:" -msgstr "Gefällt-mir-nicht:" +#: ../../include/conversation.php:1071 +msgid "Where are you right now?" +msgstr "Wo bist du jetzt grade?" -#: ../../include/identity.php:953 -msgid "Contact information and Social Networks:" -msgstr "Kontaktinformation und soziale Netzwerke:" +#: ../../include/conversation.php:1072 ../../mod/mail.php:172 +#: ../../mod/mail.php:270 ../../mod/editpost.php:52 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Verfällt YYYY-MM-DD HH;MM" -#: ../../include/identity.php:955 -msgid "Musical interests:" -msgstr "Musikalische Interessen:" +#: ../../include/conversation.php:1096 ../../mod/photos.php:949 +msgid "Share" +msgstr "Teilen" -#: ../../include/identity.php:957 -msgid "Books, literature:" -msgstr "Bücher, Literatur:" +#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140 +msgid "Page link title" +msgstr "Seitentitel-Link" -#: ../../include/identity.php:959 -msgid "Television:" -msgstr "Fernsehen:" +#: ../../include/conversation.php:1100 ../../mod/mail.php:219 +#: ../../mod/mail.php:332 ../../mod/editlayout.php:107 +#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145 +#: ../../mod/editblock.php:121 +msgid "Upload photo" +msgstr "Foto hochladen" -#: ../../include/identity.php:961 -msgid "Film/dance/culture/entertainment:" -msgstr "Film/Tanz/Kultur/Unterhaltung:" +#: ../../include/conversation.php:1101 +msgid "upload photo" +msgstr "Foto hochladen" -#: ../../include/identity.php:963 -msgid "Love/Romance:" -msgstr "Liebe/Romantik:" +#: ../../include/conversation.php:1102 ../../mod/mail.php:220 +#: ../../mod/mail.php:333 ../../mod/editlayout.php:108 +#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146 +#: ../../mod/editblock.php:122 +msgid "Attach file" +msgstr "Datei anhängen" -#: ../../include/identity.php:965 -msgid "Work/employment:" -msgstr "Arbeit/Anstellung:" +#: ../../include/conversation.php:1103 +msgid "attach file" +msgstr "Datei anfügen" -#: ../../include/identity.php:967 -msgid "School/education:" -msgstr "Schule/Ausbildung:" +#: ../../include/conversation.php:1104 ../../mod/mail.php:221 +#: ../../mod/mail.php:334 ../../mod/editlayout.php:109 +#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147 +#: ../../mod/editblock.php:123 +msgid "Insert web link" +msgstr "Link einfügen" -#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:68 -#: ../../mod/profperm.php:19 ../../index.php:343 -msgid "Permission denied" -msgstr "Keine Berechtigung" +#: ../../include/conversation.php:1105 +msgid "web link" +msgstr "Web-Link" -#: ../../include/items.php:3383 ../../mod/thing.php:74 ../../mod/admin.php:150 -#: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18 -#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32 -#: ../../mod/channel.php:182 -msgid "Item not found." -msgstr "Element nicht gefunden." +#: ../../include/conversation.php:1106 +msgid "Insert video link" +msgstr "Video-Link einfügen" -#: ../../include/items.php:3734 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." -msgstr "Sammlung nicht gefunden" +#: ../../include/conversation.php:1107 +msgid "video link" +msgstr "Video-Link" -#: ../../include/items.php:3749 -msgid "Collection is empty." -msgstr "Sammlung ist leer." +#: ../../include/conversation.php:1108 +msgid "Insert audio link" +msgstr "Audio-Link einfügen" -#: ../../include/items.php:3756 -#, php-format -msgid "Collection: %s" -msgstr "Sammlung: %s" +#: ../../include/conversation.php:1109 +msgid "audio link" +msgstr "Audio-Link" -#: ../../include/items.php:3767 -#, php-format -msgid "Connection: %s" -msgstr "Verbindung: %s" +#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113 +#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151 +#: ../../mod/editblock.php:127 +msgid "Set your location" +msgstr "Standort" -#: ../../include/items.php:3770 -msgid "Connection not found." -msgstr "Die Verbindung wurde nicht gefunden." +#: ../../include/conversation.php:1111 +msgid "set location" +msgstr "Standort" -#: ../../include/ItemObject.php:89 ../../mod/photos.php:972 -msgid "Private Message" -msgstr "Private Nachricht" +#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114 +#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152 +#: ../../mod/editblock.php:128 +msgid "Clear browser location" +msgstr "Browser-Standort löschen" -#: ../../include/ItemObject.php:118 -msgid "save to folder" -msgstr "In Ordner speichern" +#: ../../include/conversation.php:1113 +msgid "clear location" +msgstr "Standort löschen" -#: ../../include/ItemObject.php:146 -msgid "add star" -msgstr "markieren" +#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127 +#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169 +#: ../../mod/editblock.php:142 +msgid "Set title" +msgstr "Titel" -#: ../../include/ItemObject.php:147 -msgid "remove star" -msgstr "Markierung entfernen" +#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130 +#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171 +#: ../../mod/editblock.php:145 +msgid "Categories (comma-separated list)" +msgstr "Kategorien (Kommagetrennte Liste)" -#: ../../include/ItemObject.php:148 -msgid "toggle star status" -msgstr "Stern-Status umschalten" +#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116 +#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154 +#: ../../mod/editblock.php:130 +msgid "Permission settings" +msgstr "Berechtigungs-Einstellungen" -#: ../../include/ItemObject.php:152 -msgid "starred" -msgstr "markiert" +#: ../../include/conversation.php:1121 +msgid "permissions" +msgstr "Berechtigungen" -#: ../../include/ItemObject.php:169 -msgid "add tag" -msgstr "Schlagwort hinzufügen" +#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124 +#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164 +#: ../../mod/editblock.php:139 +msgid "Public post" +msgstr "Öffentlicher Beitrag" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1078 -msgid "I like this (toggle)" -msgstr "Ich mag das (Umschalter)" +#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131 +#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172 +#: ../../mod/editblock.php:146 +msgid "Example: bob@example.com, mary@example.com" +msgstr "Beispiel: bob@example.com, mary@example.com" -#: ../../include/ItemObject.php:176 ../../mod/photos.php:1079 -msgid "I don't like this (toggle)" -msgstr "Ich mag das nicht (Umschalter)" +#: ../../include/conversation.php:1144 ../../mod/mail.php:226 +#: ../../mod/mail.php:339 ../../mod/editlayout.php:141 +#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182 +#: ../../mod/editblock.php:156 +msgid "Set expiration date" +msgstr "Verfallsdatum" -#: ../../include/ItemObject.php:178 -msgid "Share this" -msgstr "Teile dies" +#: ../../include/conversation.php:1148 ../../mod/editpost.php:136 +msgid "OK" +msgstr "OK" -#: ../../include/ItemObject.php:178 -msgid "share" -msgstr "Teilen" +#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:94 ../../mod/settings.php:508 +#: ../../mod/settings.php:534 ../../mod/editpost.php:137 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 +msgid "Cancel" +msgstr "Abbrechen" -#: ../../include/ItemObject.php:202 ../../include/ItemObject.php:203 -#, php-format -msgid "View %s's profile - %s" -msgstr "Schaue dir %s's Profil an - %s" +#: ../../include/conversation.php:1379 +msgid "Commented Order" +msgstr "Neueste Kommentare" -#: ../../include/ItemObject.php:204 -msgid "to" -msgstr "zu" +#: ../../include/conversation.php:1382 +msgid "Sort by Comment Date" +msgstr "Nach Kommentardatum sortiert" -#: ../../include/ItemObject.php:205 -msgid "via" -msgstr "via" +#: ../../include/conversation.php:1385 +msgid "Posted Order" +msgstr "Neueste Beiträge" -#: ../../include/ItemObject.php:206 -msgid "Wall-to-Wall" -msgstr "Wall-to-Wall" +#: ../../include/conversation.php:1388 +msgid "Sort by Post Date" +msgstr "Nach Beitragsdatum sortiert" -#: ../../include/ItemObject.php:207 -msgid "via Wall-To-Wall:" -msgstr "via Wall-To-Wall:" +#: ../../include/conversation.php:1392 +msgid "Personal" +msgstr "Persönlich" -#: ../../include/ItemObject.php:221 -#, php-format -msgid "Expires: %s" -msgstr "Verfällt: %s" +#: ../../include/conversation.php:1395 +msgid "Posts that mention or involve you" +msgstr "Beiträge mit Beteiligung deinerseits" -#: ../../include/ItemObject.php:269 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d Kommentar" -msgstr[1] "%d Kommentare" +#: ../../include/conversation.php:1398 ../../mod/menu.php:57 +#: ../../mod/connections.php:209 +msgid "New" +msgstr "Neu" -#: ../../include/ItemObject.php:534 ../../mod/photos.php:1097 -#: ../../mod/photos.php:1184 -msgid "This is you" -msgstr "Das bist du" +#: ../../include/conversation.php:1401 +msgid "Activity Stream - by date" +msgstr "Activity Stream - nach Datum sortiert" -#: ../../include/ItemObject.php:537 ../../mod/events.php:470 -#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156 -#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347 -#: ../../mod/connect.php:92 ../../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:81 -#: ../../mod/photos.php:693 ../../mod/photos.php:798 ../../mod/photos.php:1060 -#: ../../mod/photos.php:1100 ../../mod/photos.php:1187 -#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132 -#: ../../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/mail.php:223 ../../mod/mail.php:335 -#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142 -#: ../../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 -msgid "Submit" -msgstr "Bestätigen" +#: ../../include/conversation.php:1408 +msgid "Starred" +msgstr "Markiert" -#: ../../include/ItemObject.php:538 -msgid "Bold" -msgstr "Fett" +#: ../../include/conversation.php:1411 +msgid "Favourite Posts" +msgstr "Beiträge mit Sternchen" -#: ../../include/ItemObject.php:539 -msgid "Italic" -msgstr "Kursiv" +#: ../../include/conversation.php:1418 +msgid "Spam" +msgstr "Spam" -#: ../../include/ItemObject.php:540 -msgid "Underline" -msgstr "Unterstrichen" +#: ../../include/conversation.php:1421 +msgid "Posts flagged as SPAM" +msgstr "Nachrichten die als SPAM markiert wurden" -#: ../../include/ItemObject.php:541 -msgid "Quote" -msgstr "Zitat" +#: ../../include/conversation.php:1452 +msgid "Channel" +msgstr "Kanal" -#: ../../include/ItemObject.php:542 -msgid "Code" -msgstr "Code" +#: ../../include/conversation.php:1455 +msgid "Status Messages and Posts" +msgstr "Statusnachrichten und Beiträge" -#: ../../include/ItemObject.php:543 -msgid "Image" -msgstr "Bild" +#: ../../include/conversation.php:1464 +msgid "About" +msgstr "Über" -#: ../../include/ItemObject.php:544 -msgid "Link" -msgstr "Link" +#: ../../include/conversation.php:1467 +msgid "Profile Details" +msgstr "Profil-Details" -#: ../../include/ItemObject.php:545 -msgid "Video" -msgstr "Video" +#: ../../include/conversation.php:1482 ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "Dateien" -#: ../../include/security.php:49 -msgid "Welcome " -msgstr "Willkommen" +#: ../../include/conversation.php:1485 +msgid "Files and Storage" +msgstr "Dateien und Speicher" -#: ../../include/security.php:50 -msgid "Please upload a profile photo." -msgstr "Bitte lade ein Profilfoto hoch." +#: ../../include/conversation.php:1494 +msgid "Events and Calendar" +msgstr "Veranstaltungen und Kalender" -#: ../../include/security.php:53 -msgid "Welcome back " -msgstr "Willkommen zurück" +#: ../../include/conversation.php:1501 +msgid "Webpages" +msgstr "Webseiten" -#: ../../include/security.php:360 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." +#: ../../include/conversation.php:1504 +msgid "Manage Webpages" +msgstr "Webseiten verwalten" #: ../../include/zot.php:545 msgid "Invalid data packet" @@ -3130,7 +3133,7 @@ msgstr "Kann die Signatur der Seite von %s nicht verifizieren" #: ../../mod/common.php:10 msgid "No channel." -msgstr "Kein Channel." +msgstr "Kein Kanal." #: ../../mod/common.php:39 msgid "Common connections" @@ -3164,48 +3167,48 @@ msgstr "Voriges" msgid "Next" msgstr "Nächste" -#: ../../mod/events.php:429 +#: ../../mod/events.php:428 msgid "hour:minute" msgstr "Stunde:Minute" -#: ../../mod/events.php:448 +#: ../../mod/events.php:447 msgid "Event details" msgstr "Veranstaltungs-Details" -#: ../../mod/events.php:449 +#: ../../mod/events.php:448 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "Format ist %s %s. Startzeit und Titel sind erforderlich." -#: ../../mod/events.php:451 +#: ../../mod/events.php:450 msgid "Event Starts:" msgstr "Veranstaltung startet:" -#: ../../mod/events.php:451 ../../mod/events.php:465 +#: ../../mod/events.php:450 ../../mod/events.php:464 msgid "Required" msgstr "Benötigt" -#: ../../mod/events.php:454 +#: ../../mod/events.php:453 msgid "Finish date/time is not known or not relevant" msgstr "Ende Datum/Zeit sind unbekannt oder unwichtig" -#: ../../mod/events.php:456 +#: ../../mod/events.php:455 msgid "Event Finishes:" msgstr "Veranstaltung endet:" -#: ../../mod/events.php:459 +#: ../../mod/events.php:458 msgid "Adjust for viewer timezone" msgstr "An die Zeitzone des Betrachters anpassen" -#: ../../mod/events.php:461 +#: ../../mod/events.php:460 msgid "Description:" msgstr "Beschreibung:" -#: ../../mod/events.php:465 +#: ../../mod/events.php:464 msgid "Title:" msgstr "Titel:" -#: ../../mod/events.php:467 +#: ../../mod/events.php:466 msgid "Share this event" msgstr "Die Veranstaltung teilen" @@ -3273,7 +3276,7 @@ msgstr "%s : Keine gültige Email Adresse." #: ../../mod/invite.php:76 msgid "Please join us on Red" -msgstr "Bitte schließe Dich uns an und werde Teil der Red Matrix" +msgstr "Schließe Dich uns an und werde Teil der Red-Matrix" #: ../../mod/invite.php:87 msgid "Invitation limit exceeded. Please contact your site administrator." @@ -3339,6 +3342,10 @@ msgid "" "http://getzot.com" msgstr "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an" +#: ../../mod/cloud.php:88 +msgid "Red Matrix - Guests: Username: {your email address}, Password: +++" +msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++" + #: ../../mod/connedit.php:49 ../../mod/connections.php:37 msgid "Could not access contact record." msgstr "Konnte auf den Kontakteintrag nicht zugreifen." @@ -3435,12 +3442,12 @@ msgid "View recent posts and comments" msgstr "Betrachte die neuesten Beiträge und Kommentare" #: ../../mod/connedit.php:330 ../../mod/connedit.php:472 -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:697 msgid "Unblock" msgstr "Freigeben" #: ../../mod/connedit.php:330 ../../mod/connedit.php:472 -#: ../../mod/admin.php:694 +#: ../../mod/admin.php:696 msgid "Block" msgstr "Blockieren" @@ -3684,7 +3691,7 @@ msgstr "Zum Weitermachen, bitte einloggen." msgid "" "Do you want to authorize this application to access your posts and contacts," " and/or create new posts for you?" -msgstr "Möchtest du der Anwendung erlauben deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?" +msgstr "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?" #: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865 #: ../../mod/settings.php:870 @@ -4082,7 +4089,7 @@ msgstr "%1$s folgt nun %2$s's %3$s" msgid "[Embedded content - reload page to view]" msgstr "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]" -#: ../../mod/chanview.php:97 +#: ../../mod/chanview.php:93 msgid "toggle full screen mode" msgstr "auf Vollbildmodus umschalten" @@ -4091,8 +4098,8 @@ msgstr "auf Vollbildmodus umschalten" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s hat %2$s's %3$s mit %4$s getaggt" -#: ../../mod/viewconnections.php:17 ../../mod/search.php:12 -#: ../../mod/photos.php:573 ../../mod/directory.php:15 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 ../../mod/search.php:13 +#: ../../mod/photos.php:442 ../../mod/directory.php:15 ../../mod/display.php:9 #: ../../mod/community.php:18 ../../mod/dirprofile.php:9 msgid "Public access denied." msgstr "Öffentlicher Zugang verweigert." @@ -4241,7 +4248,7 @@ msgstr "Leer lassen um alle öffentlichen Beiträge zu importieren" #: ../../mod/sources.php:96 ../../mod/sources.php:130 #: ../../mod/new_channel.php:110 msgid "Channel Name" -msgstr "Channel-Name" +msgstr "Name des Kanals" #: ../../mod/sources.php:116 ../../mod/sources.php:143 msgid "Source not found." @@ -4271,19 +4278,19 @@ msgstr "Theme-Einstellungen aktualisiert." msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:88 ../../mod/admin.php:685 ../../mod/admin.php:697 +#: ../../mod/admin.php:88 ../../mod/admin.php:687 ../../mod/admin.php:699 msgid "Users" msgstr "Benutzer" -#: ../../mod/admin.php:89 ../../mod/admin.php:783 ../../mod/admin.php:825 +#: ../../mod/admin.php:89 ../../mod/admin.php:785 ../../mod/admin.php:827 msgid "Plugins" msgstr "Plug-Ins" -#: ../../mod/admin.php:90 ../../mod/admin.php:988 ../../mod/admin.php:1024 +#: ../../mod/admin.php:90 ../../mod/admin.php:990 ../../mod/admin.php:1026 msgid "Themes" msgstr "Themes" -#: ../../mod/admin.php:91 ../../mod/admin.php:478 +#: ../../mod/admin.php:91 ../../mod/admin.php:479 msgid "Server" msgstr "Server" @@ -4291,7 +4298,7 @@ msgstr "Server" msgid "DB updates" msgstr "DB-Aktualisierungen" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1111 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1113 msgid "Logs" msgstr "Protokolle" @@ -4307,9 +4314,9 @@ msgstr "Nutzer Anmeldungen die auf Bestätigung warten" msgid "Message queues" msgstr "Nachrichten Warteschlange" -#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:477 -#: ../../mod/admin.php:684 ../../mod/admin.php:782 ../../mod/admin.php:824 -#: ../../mod/admin.php:987 ../../mod/admin.php:1023 ../../mod/admin.php:1110 +#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:478 +#: ../../mod/admin.php:686 ../../mod/admin.php:784 ../../mod/admin.php:826 +#: ../../mod/admin.php:989 ../../mod/admin.php:1025 ../../mod/admin.php:1112 msgid "Administration" msgstr "Administration" @@ -4321,7 +4328,7 @@ msgstr "Zusammenfassung" msgid "Registered users" msgstr "Registrierte Benutzer" -#: ../../mod/admin.php:198 ../../mod/admin.php:481 +#: ../../mod/admin.php:198 ../../mod/admin.php:482 msgid "Pending registrations" msgstr "Ausstehende Registrierungen" @@ -4329,7 +4336,7 @@ msgstr "Ausstehende Registrierungen" msgid "Version" msgstr "Version" -#: ../../mod/admin.php:201 ../../mod/admin.php:482 +#: ../../mod/admin.php:201 ../../mod/admin.php:483 msgid "Active plugins" msgstr "Aktive Plug-Ins" @@ -4569,224 +4576,219 @@ msgid "" "default 50." msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:470 msgid "No server found" msgstr "Kein Server gefunden" -#: ../../mod/admin.php:476 ../../mod/admin.php:698 +#: ../../mod/admin.php:477 ../../mod/admin.php:700 msgid "ID" msgstr "ID" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:477 msgid "for channel" msgstr "für Kanal" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:477 msgid "on server" msgstr "auf Server" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:477 msgid "Status" msgstr "Status" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:498 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:508 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs." -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:511 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s wurde erfolgreich angewandt." -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:515 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s liefert keinen Rückgabewert. Unbekannt ob es erfolgreich war." -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:518 #, php-format msgid "Update function %s could not be found." msgstr "Update Funktion %s konnte nicht gefunden werden." -#: ../../mod/admin.php:531 +#: ../../mod/admin.php:533 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Aktualisierungen." -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:537 msgid "Failed Updates" msgstr "Fehlgeschlagene Aktualisierungen" -#: ../../mod/admin.php:537 +#: ../../mod/admin.php:539 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)" -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:540 msgid "Attempt to execute this update step automatically" msgstr "Versuche diesen Updateschritt automatisch anzuwenden" -#: ../../mod/admin.php:564 +#: ../../mod/admin.php:566 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Nutzer blockiert/freigegeben" msgstr[1] "%s Nutzer blockiert/freigegeben" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:573 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/admin.php:602 +#: ../../mod/admin.php:604 msgid "Account not found" msgstr "Konto nicht gefunden" -#: ../../mod/admin.php:613 +#: ../../mod/admin.php:615 #, php-format msgid "User '%s' deleted" msgstr "Benutzer '%s' gelöscht" -#: ../../mod/admin.php:622 +#: ../../mod/admin.php:624 #, php-format msgid "User '%s' unblocked" msgstr "Benutzer '%s' freigegeben" -#: ../../mod/admin.php:622 +#: ../../mod/admin.php:624 #, php-format msgid "User '%s' blocked" msgstr "Benutzer '%s' blockiert" -#: ../../mod/admin.php:687 +#: ../../mod/admin.php:689 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:688 +#: ../../mod/admin.php:690 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:691 msgid "Request date" msgstr "Antragsdatum" -#: ../../mod/admin.php:689 ../../mod/settings.php:509 -#: ../../mod/settings.php:535 -msgid "Name" -msgstr "Name" - -#: ../../mod/admin.php:690 +#: ../../mod/admin.php:692 msgid "No registrations." msgstr "Keine Registrierungen." -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:693 msgid "Approve" msgstr "Genehmigen" -#: ../../mod/admin.php:692 +#: ../../mod/admin.php:694 msgid "Deny" msgstr "Verweigern" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Register date" msgstr "Registrierungs-Datum" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Expires" msgstr "Verfällt" -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:700 msgid "Service Class" msgstr "Service-Klasse" -#: ../../mod/admin.php:700 +#: ../../mod/admin.php:702 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?" -#: ../../mod/admin.php:701 +#: ../../mod/admin.php:703 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?" -#: ../../mod/admin.php:742 +#: ../../mod/admin.php:744 #, php-format msgid "Plugin %s disabled." msgstr "Plug-In %s deaktiviert." -#: ../../mod/admin.php:746 +#: ../../mod/admin.php:748 #, php-format msgid "Plugin %s enabled." msgstr "Plug-In %s aktiviert." -#: ../../mod/admin.php:756 ../../mod/admin.php:958 +#: ../../mod/admin.php:758 ../../mod/admin.php:960 msgid "Disable" msgstr "Deaktivieren" -#: ../../mod/admin.php:758 ../../mod/admin.php:960 +#: ../../mod/admin.php:760 ../../mod/admin.php:962 msgid "Enable" msgstr "Aktivieren" -#: ../../mod/admin.php:784 ../../mod/admin.php:989 +#: ../../mod/admin.php:786 ../../mod/admin.php:991 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:792 ../../mod/admin.php:999 +#: ../../mod/admin.php:794 ../../mod/admin.php:1001 msgid "Author: " msgstr "Autor: " -#: ../../mod/admin.php:793 ../../mod/admin.php:1000 +#: ../../mod/admin.php:795 ../../mod/admin.php:1002 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:922 +#: ../../mod/admin.php:924 msgid "No themes found." msgstr "Keine Theme gefunden." -#: ../../mod/admin.php:981 +#: ../../mod/admin.php:983 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:1029 +#: ../../mod/admin.php:1031 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:1030 +#: ../../mod/admin.php:1032 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:1057 +#: ../../mod/admin.php:1059 msgid "Log settings updated." msgstr "Protokoll-Einstellungen aktualisiert." -#: ../../mod/admin.php:1113 +#: ../../mod/admin.php:1115 msgid "Clear" msgstr "Leeren" -#: ../../mod/admin.php:1119 +#: ../../mod/admin.php:1121 msgid "Debugging" msgstr "Debugging" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1122 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1122 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis." -#: ../../mod/admin.php:1121 +#: ../../mod/admin.php:1123 msgid "Log level" msgstr "Protokollstufe" @@ -4811,7 +4813,7 @@ msgid "Unable to add menu element." msgstr "Kann Menü-Bestandteil nicht hinzufügen." #: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113 -#: ../../mod/dirprofile.php:176 +#: ../../mod/dirprofile.php:177 msgid "Not found." msgstr "Nicht gefunden." @@ -4953,7 +4955,7 @@ msgstr "Mitglieder" #: ../../mod/group.php:198 msgid "All Connected Channels" -msgstr "Alle verbundene Channels" +msgstr "Alle verbundenen Kanäle" #: ../../mod/group.php:231 msgid "Click on a channel to add or remove." @@ -4967,133 +4969,124 @@ msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werde msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:119 ../../mod/photos.php:799 +#: ../../mod/photos.php:119 ../../mod/photos.php:668 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:159 ../../mod/photos.php:1061 +#: ../../mod/photos.php:159 ../../mod/photos.php:930 msgid "Delete Photo" msgstr "Foto löschen" -#: ../../mod/photos.php:500 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "%1$s wurde auf %2$s von %3$s getaggt" - -#: ../../mod/photos.php:500 -msgid "a photo" -msgstr "Foto" - -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:452 msgid "No photos selected" msgstr "Keine Fotos ausgewählt" -#: ../../mod/photos.php:630 +#: ../../mod/photos.php:499 msgid "Access to this item is restricted." msgstr "Zugriff auf dieses Foto wurde eingeschränkt." -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:573 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers." -#: ../../mod/photos.php:707 +#: ../../mod/photos.php:576 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "Du verwendets %1$.2f MBytes deines Foto-Speichers." -#: ../../mod/photos.php:726 +#: ../../mod/photos.php:595 msgid "Upload Photos" msgstr "Fotos hochladen" -#: ../../mod/photos.php:730 ../../mod/photos.php:794 +#: ../../mod/photos.php:599 ../../mod/photos.php:663 msgid "New album name: " msgstr "Name des neuen Albums:" -#: ../../mod/photos.php:731 +#: ../../mod/photos.php:600 msgid "or existing album name: " msgstr "oder bestehenden Album Namen:" -#: ../../mod/photos.php:732 +#: ../../mod/photos.php:601 msgid "Do not show a status post for this upload" msgstr "Keine Statusnachricht für diesen Upload senden" -#: ../../mod/photos.php:734 ../../mod/photos.php:1056 +#: ../../mod/photos.php:603 ../../mod/photos.php:925 #: ../../mod/filestorage.php:125 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:783 ../../mod/photos.php:805 ../../mod/photos.php:1232 -#: ../../mod/photos.php:1247 +#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1101 +#: ../../mod/photos.php:1116 msgid "Contact Photos" msgstr "Kontakt Bilder" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:678 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:815 +#: ../../mod/photos.php:684 msgid "Show Newest First" msgstr "Zeige neueste zuerst" -#: ../../mod/photos.php:817 +#: ../../mod/photos.php:686 msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: ../../mod/photos.php:860 ../../mod/photos.php:1279 +#: ../../mod/photos.php:729 ../../mod/photos.php:1148 msgid "View Photo" msgstr "Foto ansehen" -#: ../../mod/photos.php:906 +#: ../../mod/photos.php:775 msgid "Permission denied. Access to this item may be restricted." msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden." -#: ../../mod/photos.php:908 +#: ../../mod/photos.php:777 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:966 +#: ../../mod/photos.php:835 msgid "Use as profile photo" msgstr "Als Profilfoto verwenden" -#: ../../mod/photos.php:990 +#: ../../mod/photos.php:859 msgid "View Full Size" msgstr "In voller Größe anzeigen" -#: ../../mod/photos.php:1044 +#: ../../mod/photos.php:913 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1046 +#: ../../mod/photos.php:915 msgid "Rotate CW (right)" msgstr "Drehen US (rechts)" -#: ../../mod/photos.php:1047 +#: ../../mod/photos.php:916 msgid "Rotate CCW (left)" msgstr "Drehen EUS (links)" -#: ../../mod/photos.php:1049 +#: ../../mod/photos.php:918 msgid "New album name" msgstr "Name des neuen Albums:" -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:921 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1054 +#: ../../mod/photos.php:923 msgid "Add a Tag" msgstr "Schlagwort hinzufügen" -#: ../../mod/photos.php:1058 +#: ../../mod/photos.php:927 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1154 msgid "View Album" msgstr "Album ansehen" -#: ../../mod/photos.php:1294 +#: ../../mod/photos.php:1163 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -5191,19 +5184,19 @@ msgstr "Alter:" msgid "Gender: " msgstr "Geschlecht:" -#: ../../mod/directory.php:206 +#: ../../mod/directory.php:207 msgid "Finding:" msgstr "Ergebnisse:" -#: ../../mod/directory.php:214 +#: ../../mod/directory.php:215 msgid "next page" msgstr "nächste Seite" -#: ../../mod/directory.php:214 +#: ../../mod/directory.php:215 msgid "previous page" msgstr "vorige Seite" -#: ../../mod/directory.php:221 +#: ../../mod/directory.php:222 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge gefunden (einige könnten versteckt sein)." @@ -5310,7 +5303,7 @@ msgstr "Entfernte Authentifizierung" #: ../../mod/rmagic.php:57 msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "Deine Kanal-Adresse (z.B. channel@example.com)" +msgstr "Deine Kanal-Adresse (z. B. channel@example.com)" #: ../../mod/rmagic.php:58 msgid "Authenticate" @@ -5571,7 +5564,7 @@ msgstr "Kontaktinformation und soziale Netzwerke" #: ../../mod/profiles.php:551 msgid "My other channels" -msgstr "Meine anderen Channels" +msgstr "Meine anderen Kanäle" #: ../../mod/profiles.php:552 msgid "Musical interests" @@ -5621,7 +5614,7 @@ msgstr "binde begehrenswerte Dinge in dein Profil ein" #: ../../mod/new_channel.php:107 msgid "Add a Channel" -msgstr "Channel hinzufügen" +msgstr "Kanal hinzufügen" #: ../../mod/new_channel.php:108 msgid "" @@ -5717,7 +5710,7 @@ msgid "" "Password reset failed." msgstr "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen." -#: ../../mod/lostpass.php:85 ../../boot.php:1426 +#: ../../mod/lostpass.php:85 ../../boot.php:1431 msgid "Password Reset" msgstr "Zurücksetzen des Kennworts" @@ -5949,6 +5942,10 @@ msgstr "Einstellungen aktualisiert." msgid "Add application" msgstr "Anwendung hinzufügen" +#: ../../mod/settings.php:509 ../../mod/settings.php:535 +msgid "Name" +msgstr "Name" + #: ../../mod/settings.php:509 msgid "Name of application" msgstr "Name der Anwendung" @@ -6133,7 +6130,7 @@ msgstr "Deine Kanal-Adresse lautet" #: ../../mod/settings.php:901 msgid "Channel Settings" -msgstr "Channel-Einstellungen" +msgstr "Kanal-Einstellungen" #: ../../mod/settings.php:910 msgid "Basic Settings" @@ -6346,26 +6343,30 @@ msgstr "Antwort senden" msgid "Item not found" msgstr "Element nicht gefunden" -#: ../../mod/editlayout.php:68 +#: ../../mod/editlayout.php:72 msgid "Edit Layout" msgstr "Layout bearbeiten" -#: ../../mod/editlayout.php:105 ../../mod/editpost.php:102 -#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:119 +#: ../../mod/editlayout.php:82 +msgid "Delete layout?" +msgstr "Layout löschen?" + +#: ../../mod/editlayout.php:110 ../../mod/editpost.php:102 +#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124 msgid "Insert YouTube video" msgstr "YouTube-Video einfügen" -#: ../../mod/editlayout.php:106 ../../mod/editpost.php:103 -#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:120 +#: ../../mod/editlayout.php:111 ../../mod/editpost.php:103 +#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125 msgid "Insert Vorbis [.ogg] video" msgstr "Vorbis [.ogg]-Video einfügen" -#: ../../mod/editlayout.php:107 ../../mod/editpost.php:104 -#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:121 +#: ../../mod/editlayout.php:112 ../../mod/editpost.php:104 +#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126 msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg]-Audio einfügen" -#: ../../mod/editlayout.php:141 +#: ../../mod/editlayout.php:147 msgid "Delete Layout" msgstr "Layout löschen" @@ -6517,7 +6518,7 @@ msgstr "Wähle was du mit dem/r Empfänger/in tun willst" msgid "Make this post private" msgstr "Diesen Beitrag privat machen" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1068 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1075 msgid "Wall Photos" msgstr "Wall Fotos" @@ -6558,11 +6559,15 @@ msgstr "Kontakte Vorschlagen" msgid "Suggest a friend for %s" msgstr "Schlage %s einen Kontakt vor" -#: ../../mod/editblock.php:82 +#: ../../mod/editblock.php:86 msgid "Edit Block" msgstr "Block bearbeiten" -#: ../../mod/editblock.php:157 +#: ../../mod/editblock.php:96 +msgid "Delete block?" +msgstr "Block löschen?" + +#: ../../mod/editblock.php:163 msgid "Delete Block" msgstr "Block löschen" @@ -6776,31 +6781,31 @@ msgid "" msgstr "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk" #: ../../mod/removeme.php:53 -msgid "Remove My Account" -msgstr "Mein Konto entfernen" +msgid "Remove Channel" +msgstr "Kanal entfernen" #: ../../mod/item.php:145 msgid "Unable to locate original post." msgstr "Originalbeitrag kann nicht gefunden werden." -#: ../../mod/item.php:343 +#: ../../mod/item.php:346 msgid "Empty post discarded." msgstr "Leerer Beitrag verworfen." -#: ../../mod/item.php:385 +#: ../../mod/item.php:388 msgid "Executable content type not permitted to this channel." msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben." -#: ../../mod/item.php:812 +#: ../../mod/item.php:819 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag nicht gespeichert." -#: ../../mod/item.php:1148 +#: ../../mod/item.php:1155 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht." -#: ../../mod/item.php:1154 +#: ../../mod/item.php:1161 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht." @@ -6845,7 +6850,7 @@ msgstr "Wohnort:" msgid "About: " msgstr "Über:" -#: ../../mod/dirprofile.php:163 +#: ../../mod/dirprofile.php:164 msgid "Keywords: " msgstr "Schlüsselbegriffe:" @@ -7094,41 +7099,41 @@ msgstr "Titelbild" msgid "Header image only on profile pages" msgstr "Titelbild nur auf Profil-Seiten anzeigen" -#: ../../boot.php:1224 +#: ../../boot.php:1229 #, php-format msgid "Update %s failed. See error logs." msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen." -#: ../../boot.php:1227 +#: ../../boot.php:1232 #, php-format msgid "Update Error at %s" msgstr "Aktualisierungsfehler auf %s" -#: ../../boot.php:1391 +#: ../../boot.php:1396 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können." -#: ../../boot.php:1419 +#: ../../boot.php:1424 msgid "Password" msgstr "Kennwort" -#: ../../boot.php:1420 +#: ../../boot.php:1425 msgid "Remember me" msgstr "Angaben speichern" -#: ../../boot.php:1425 +#: ../../boot.php:1430 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1490 +#: ../../boot.php:1495 msgid "permission denied" msgstr "Zugriff verweigert" -#: ../../boot.php:1491 +#: ../../boot.php:1496 msgid "Got Zot?" msgstr "Haste schon Zot?" -#: ../../boot.php:1887 +#: ../../boot.php:1892 msgid "toggle mobile" msgstr "auf/von Mobile Ansicht wechseln" diff --git a/view/de/strings.php b/view/de/strings.php index 1dbbb36cc..0beec543e 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -71,45 +71,9 @@ $a->strings["Admin"] = "Admin"; $a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration"; $a->strings["Nothing new here"] = "Nichts Neues hier"; $a->strings["Please wait..."] = "Bitte warten..."; -$a->strings["Edit File properties"] = "Dateieigenschaften ändern"; $a->strings["Connect"] = "Verbinden"; $a->strings["New window"] = "Neues Fenster"; $a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"; -$a->strings["Categories"] = "Kategorien"; -$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken"; -$a->strings["Suggestions"] = "Vorschläge"; -$a->strings["See more..."] = "Mehr anzeigen..."; -$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."; -$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen"; -$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben"; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"; -$a->strings["Notes"] = "Notizen"; -$a->strings["Save"] = "Speichern"; -$a->strings["Remove term"] = "Eintrag löschen"; -$a->strings["Saved Searches"] = "Gesicherte Suchanfragen"; -$a->strings["add"] = "hinzufügen"; -$a->strings["Saved Folders"] = "Gesicherte Ordner"; -$a->strings["Everything"] = "Alles"; -$a->strings["Archives"] = "Archive"; -$a->strings["Refresh"] = "Aktualisieren"; -$a->strings["Me"] = "Ich"; -$a->strings["Best Friends"] = "Beste Freunde"; -$a->strings["Friends"] = "Freunde"; -$a->strings["Co-workers"] = "Kollegen"; -$a->strings["Former Friends"] = "ehem. Freunde"; -$a->strings["Acquaintances"] = "Bekanntschaften"; -$a->strings["Everybody"] = "Jeder"; -$a->strings["Account settings"] = "Konto-Einstellungen"; -$a->strings["Channel settings"] = "Kanal-Einstellungen"; -$a->strings["Additional features"] = "Zusätzliche Funktionen"; -$a->strings["Feature settings"] = "Funktions-Einstellungen"; -$a->strings["Display settings"] = "Anzeige-Einstellungen"; -$a->strings["Connected apps"] = "Verbundene Apps"; -$a->strings["Export channel"] = "Kanal exportieren"; -$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)"; -$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen"; -$a->strings["Channel Sources"] = "Kanal Quellen"; -$a->strings["Check Mail"] = "E-Mails abrufen"; $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; $a->strings["Block immediately"] = "Sofort blockieren"; $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; @@ -150,7 +114,7 @@ $a->strings["minutes"] = "Minuten"; $a->strings["second"] = "Sekunde"; $a->strings["seconds"] = "Sekunden"; $a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s"; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Information für den Datenbank Server '%s' nicht finden"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"; $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i"; $a->strings["Starts:"] = "Beginnt:"; $a->strings["Finishes:"] = "Endet:"; @@ -167,6 +131,7 @@ $a->strings["%d Connection"] = array( 1 => "%d Verbindungen", ); $a->strings["View Connections"] = "Zeige Verbindungen"; +$a->strings["Save"] = "Speichern"; $a->strings["poke"] = "anstupsen"; $a->strings["poked"] = "stupste"; $a->strings["ping"] = "anpingen"; @@ -238,14 +203,6 @@ $a->strings["Blocks"] = "Blöcke"; $a->strings["Menus"] = "Menüs"; $a->strings["Layouts"] = "Layouts"; $a->strings["Pages"] = "Seiten"; -$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."; -$a->strings["Default privacy group for new contacts"] = "Standard-Privatsphärengruppe für neue Kontakte"; -$a->strings["All Channels"] = "Alle Kanäle"; -$a->strings["edit"] = "Bearbeiten"; -$a->strings["Collections"] = "Sammlungen"; -$a->strings["Edit collection"] = "Bearbeite Sammlungen"; -$a->strings["Create a new collection"] = "Neue Sammlung erzeugen"; -$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind"; $a->strings["Delete this item?"] = "Dieses Element löschen?"; $a->strings["Comment"] = "Kommentar"; $a->strings["show more"] = "mehr zeigen"; @@ -278,6 +235,63 @@ $a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen."; $a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden."; $a->strings["Profile Photos"] = "Profilfotos"; $a->strings["view full size"] = "In Vollbildansicht anschauen"; +$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen"; +$a->strings["Empty name"] = "Namensfeld leer"; +$a->strings["Name too long"] = "Name ist zu lang"; +$a->strings["No account identifier"] = "Keine Account-Kennung"; +$a->strings["Nickname is required."] = "Spitzname ist erforderlich."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."; +$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen"; +$a->strings["Default Profile"] = "Standard-Profil"; +$a->strings["Friends"] = "Freunde"; +$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar."; +$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."; +$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar."; +$a->strings["Change profile photo"] = "Ändere das Profilfoto"; +$a->strings["Profiles"] = "Profile"; +$a->strings["Manage/edit profiles"] = "Verwalte/Bearbeite Profile"; +$a->strings["Create New Profile"] = "Neues Profil erstellen"; +$a->strings["Edit Profile"] = "Profile bearbeiten"; +$a->strings["Profile Image"] = "Profilfoto:"; +$a->strings["visible to everybody"] = "sichtbar für jeden"; +$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r"; +$a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[Heute]"; +$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen"; +$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:"; +$a->strings["[No description]"] = "[Keine Beschreibung]"; +$a->strings["Event Reminders"] = "Veranstaltungs- Erinnerungen"; +$a->strings["Events this week:"] = "Veranstaltungen in dieser Woche:"; +$a->strings["Profile"] = "Profil"; +$a->strings["Full Name:"] = "Voller Name:"; +$a->strings["j F, Y"] = "j F, Y"; +$a->strings["j F"] = "j F"; +$a->strings["Birthday:"] = "Geburtstag:"; +$a->strings["Age:"] = "Alter:"; +$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:"; +$a->strings["Hometown:"] = "Heimatstadt:"; +$a->strings["Tags:"] = "Schlagworte:"; +$a->strings["Political Views:"] = "Politische Ansichten:"; +$a->strings["Religion:"] = "Religion:"; +$a->strings["About:"] = "Über:"; +$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:"; +$a->strings["Likes:"] = "Gefällt-mir:"; +$a->strings["Dislikes:"] = "Gefällt-mir-nicht:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:"; +$a->strings["My other channels:"] = "Meine anderen Kanäle:"; +$a->strings["Musical interests:"] = "Musikalische Interessen:"; +$a->strings["Books, literature:"] = "Bücher, Literatur:"; +$a->strings["Television:"] = "Fernsehen:"; +$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:"; +$a->strings["Love/Romance:"] = "Liebe/Romantik:"; +$a->strings["Work/employment:"] = "Arbeit/Anstellung:"; +$a->strings["School/education:"] = "Schule/Ausbildung:"; +$a->strings["Edit File properties"] = "Dateieigenschaften ändern"; $a->strings["Image/photo"] = "Bild/Foto"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; $a->strings["QR code"] = "QR Code"; @@ -306,6 +320,7 @@ $a->strings["Richtext Editor"] = "Formatierungseditor"; $a->strings["Enable richtext editor"] = "Aktiviere Formatierungseditor"; $a->strings["Post Preview"] = "Voransicht"; $a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"; +$a->strings["Channel Sources"] = "Kanal Quellen"; $a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."; $a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung"; $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"; @@ -314,6 +329,7 @@ $a->strings["Search by Date"] = "Suche nach Datum"; $a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"; $a->strings["Collections Filter"] = "Filter für Sammlung"; $a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"; +$a->strings["Saved Searches"] = "Gesicherte Suchanfragen"; $a->strings["Save search terms for re-use"] = "Gesicherte Suchbegriffe zur Wiederverwendung"; $a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter"; $a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"; @@ -330,6 +346,7 @@ $a->strings["Tagging"] = "Verschlagworten"; $a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten"; $a->strings["Post Categories"] = "Beitrags-Kategorien"; $a->strings["Add categories to your posts"] = "Kategorien für Beiträge"; +$a->strings["Saved Folders"] = "Gesicherte Ordner"; $a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"; $a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge"; $a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"; @@ -337,107 +354,15 @@ $a->strings["Star Posts"] = "Beiträge mit Sternchen versehen"; $a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"; $a->strings["Tag Cloud"] = "Tag Wolke"; $a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"; -$a->strings["channel"] = "Kanal"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s"; -$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht"; -$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden"; -$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s"; -$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s"; -$a->strings["Select"] = "Auswählen"; -$a->strings["Delete"] = "Löschen"; -$a->strings["Message is verified"] = "Nachricht überprüft"; -$a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an."; -$a->strings["Categories:"] = "Kategorien:"; -$a->strings["Filed under:"] = "Gespeichert unter:"; -$a->strings[" from %s"] = "von %s"; -$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s"; -$a->strings["View in context"] = "Im Zusammenhang anschauen"; -$a->strings["Please wait"] = "Bitte warten"; -$a->strings["remove"] = "lösche"; -$a->strings["Loading..."] = "Lädt ..."; -$a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente"; -$a->strings["View Source"] = "Quelle anzeigen"; -$a->strings["Follow Thread"] = "Unterhaltung folgen"; -$a->strings["View Status"] = "Status ansehen"; -$a->strings["View Photos"] = "Fotos ansehen"; -$a->strings["Matrix Activity"] = "Matrix Aktivität"; -$a->strings["Edit Contact"] = "Kontakt bearbeiten"; -$a->strings["Send PM"] = "Sende PN"; -$a->strings["Poke"] = "Anstupsen"; -$a->strings["%s likes this."] = "%s gefällt das."; -$a->strings["%s doesn't like this."] = "%s gefällt das nicht."; -$a->strings["%2\$d people like this."] = array( - 0 => "%2\$d Person gefällt das.", - 1 => "%2\$d Leuten gefällt das.", -); -$a->strings["%2\$d people don't like this."] = array( - 0 => "%2\$d Person gefällt das nicht.", - 1 => "%2\$d Leuten gefällt das nicht.", -); -$a->strings["and"] = "und"; -$a->strings[", and %d other people"] = array( - 0 => "", - 1 => ", und %d andere", -); -$a->strings["%s like this."] = "%s gefällt das."; -$a->strings["%s don't like this."] = "%s gefällt das nicht."; -$a->strings["Visible to everybody"] = "Sichtbar für jeden"; -$a->strings["Please enter a link URL:"] = "Gib eine URL ein:"; -$a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:"; -$a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:"; -$a->strings["Tag term:"] = "Schlagwort:"; -$a->strings["Save to Folder:"] = "Speichern in Ordner:"; -$a->strings["Where are you right now?"] = "Wo bist du jetzt grade?"; -$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM"; -$a->strings["Preview"] = "Vorschau"; -$a->strings["Share"] = "Teilen"; -$a->strings["Page link title"] = "Seitentitel-Link"; -$a->strings["Upload photo"] = "Foto hochladen"; -$a->strings["upload photo"] = "Foto hochladen"; -$a->strings["Attach file"] = "Datei anhängen"; -$a->strings["attach file"] = "Datei anfügen"; -$a->strings["Insert web link"] = "Link einfügen"; -$a->strings["web link"] = "Web-Link"; -$a->strings["Insert video link"] = "Video-Link einfügen"; -$a->strings["video link"] = "Video-Link"; -$a->strings["Insert audio link"] = "Audio-Link einfügen"; -$a->strings["audio link"] = "Audio-Link"; -$a->strings["Set your location"] = "Standort"; -$a->strings["set location"] = "Standort"; -$a->strings["Clear browser location"] = "Browser-Standort löschen"; -$a->strings["clear location"] = "Standort löschen"; -$a->strings["Set title"] = "Titel"; -$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)"; -$a->strings["Permission settings"] = "Berechtigungs-Einstellungen"; -$a->strings["permissions"] = "Berechtigungen"; -$a->strings["Public post"] = "Öffentlicher Beitrag"; -$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com"; -$a->strings["Set expiration date"] = "Verfallsdatum"; -$a->strings["Encrypt text"] = "Text verschlüsseln"; -$a->strings["OK"] = "OK"; -$a->strings["Cancel"] = "Abbrechen"; -$a->strings["Commented Order"] = "Neueste Kommentare"; -$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert"; -$a->strings["Posted Order"] = "Neueste Beiträge"; -$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert"; -$a->strings["Personal"] = "Persönlich"; -$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um dich geht"; -$a->strings["New"] = "Neu"; -$a->strings["Activity Stream - by date"] = "Activity Stream - nach Datum sortiert"; -$a->strings["Starred"] = "Markiert"; -$a->strings["Favourite Posts"] = "Beiträge mit Sternchen"; -$a->strings["Spam"] = "Spam"; -$a->strings["Posts flagged as SPAM"] = "Nachrichten die als SPAM markiert wurden"; -$a->strings["Channel"] = "Kanal"; -$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; -$a->strings["About"] = "Über"; -$a->strings["Profile Details"] = "Profil-Details"; -$a->strings["Photo Albums"] = "Fotoalben"; -$a->strings["Files"] = "Dateien"; -$a->strings["Files and Storage"] = "Dateien und Speicher"; -$a->strings["Events and Calendar"] = "Veranstaltungen und Kalender"; -$a->strings["Webpages"] = "Webseiten"; -$a->strings["Manage Webpages"] = "Webseiten verwalten"; +$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."; +$a->strings["Default privacy group for new contacts"] = "Standard-Privatsphärengruppe für neue Kontakte"; +$a->strings["All Channels"] = "Alle Kanäle"; +$a->strings["edit"] = "Bearbeiten"; +$a->strings["Collections"] = "Sammlungen"; +$a->strings["Edit collection"] = "Bearbeite Sammlungen"; +$a->strings["Create a new collection"] = "Neue Sammlung erzeugen"; +$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind"; +$a->strings["add"] = "hinzufügen"; $a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt"; $a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert"; $a->strings["Permission denied."] = "Zugang verweigert"; @@ -445,6 +370,7 @@ $a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschrei $a->strings["Image file is empty."] = "Bilddatei ist leer."; $a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten"; $a->strings["Photo storage failed."] = "Foto speichern schlug fehl"; +$a->strings["Photo Albums"] = "Fotoalben"; $a->strings["Upload New Photos"] = "Lade neue Fotos hoch"; $a->strings["Male"] = "Männlich"; $a->strings["Female"] = "Weiblich"; @@ -527,6 +453,9 @@ $a->strings["like"] = "Gefällt-mir"; $a->strings["likes"] = "Gefällt-mir"; $a->strings["dislike"] = "Gefällt-mir-nicht"; $a->strings["dislikes"] = "Gefällt-mir-nicht"; +$a->strings["Logged out."] = "Ausgeloggt."; +$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen"; +$a->strings["Login failed."] = "Login fehlgeschlagen."; $a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse"; $a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"; $a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."; @@ -560,7 +489,7 @@ $a->strings["Please visit %s to view and/or reply to your private messages."] = $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert"; $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert"; $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen %4\$s[/zrl] kommentiert"; -$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notify] Kommentar in Unterhaltung #%1\$d von %2\$s"; +$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s"; $a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat ein Thema kommentiert, dem du folgst."; $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."; $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand"; @@ -572,7 +501,7 @@ $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3 $a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst"; $a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst"; $a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat dich angestupst[/zrl]."; -$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getagged"; +$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getaggt"; $a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat deinen Beitrag auf %3\$s getaggt"; $a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen Beitrag[/zrl] getaggt"; $a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten"; @@ -580,15 +509,41 @@ $a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "% $a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten."; $a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen"; $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen."; -$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Hinweis] Freundschaftsvorschlag erhalten"; +$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"; $a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du hast einen Freundschaftsvorschlag von „%2\$s“ auf %3\$s erhalten"; $a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du hast [zrl=%2\$s]einen Freundschaftvorschlag[/zrl] für %3\$s von %4\$s erhalten."; $a->strings["Name:"] = "Name:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."; -$a->strings["Logged out."] = "Ausgeloggt."; -$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen"; -$a->strings["Login failed."] = "Login fehlgeschlagen."; +$a->strings["Categories"] = "Kategorien"; +$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken"; +$a->strings["Suggestions"] = "Vorschläge"; +$a->strings["See more..."] = "Mehr anzeigen..."; +$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."; +$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen"; +$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben"; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"; +$a->strings["Notes"] = "Notizen"; +$a->strings["Remove term"] = "Eintrag löschen"; +$a->strings["Everything"] = "Alles"; +$a->strings["Archives"] = "Archive"; +$a->strings["Refresh"] = "Aktualisieren"; +$a->strings["Me"] = "Ich"; +$a->strings["Best Friends"] = "Beste Freunde"; +$a->strings["Co-workers"] = "Kollegen"; +$a->strings["Former Friends"] = "ehem. Freunde"; +$a->strings["Acquaintances"] = "Bekanntschaften"; +$a->strings["Everybody"] = "Jeder"; +$a->strings["Account settings"] = "Konto-Einstellungen"; +$a->strings["Channel settings"] = "Kanal-Einstellungen"; +$a->strings["Additional features"] = "Zusätzliche Funktionen"; +$a->strings["Feature settings"] = "Funktions-Einstellungen"; +$a->strings["Display settings"] = "Anzeige-Einstellungen"; +$a->strings["Connected apps"] = "Verbundene Apps"; +$a->strings["Export channel"] = "Kanal exportieren"; +$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)"; +$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen"; +$a->strings["Check Mail"] = "E-Mails abrufen"; $a->strings["%d invitation available"] = array( 0 => "%d Einladung verfügbar", 1 => "%d Einladungen verfügbar", @@ -639,60 +594,6 @@ $a->strings["Somewhat advanced - very useful in open communities"] = "Etwas Fort $a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren"; $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"; $a->strings["Default"] = "Standard"; -$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen"; -$a->strings["Empty name"] = "Namensfeld leer"; -$a->strings["Name too long"] = "Name ist zu lang"; -$a->strings["No account identifier"] = "Keine Account-Kennung"; -$a->strings["Nickname is required."] = "Spitzname ist erforderlich."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."; -$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen"; -$a->strings["Default Profile"] = "Standard-Profil"; -$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar."; -$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."; -$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar."; -$a->strings["Change profile photo"] = "Ändere das Profilfoto"; -$a->strings["Profiles"] = "Profile"; -$a->strings["Manage/edit profiles"] = "Verwalte/Bearbeite Profile"; -$a->strings["Create New Profile"] = "Neues Profil erstellen"; -$a->strings["Edit Profile"] = "Profile bearbeiten"; -$a->strings["Profile Image"] = "Profilfoto:"; -$a->strings["visible to everybody"] = "sichtbar für jeden"; -$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; -$a->strings["Gender:"] = "Geschlecht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepage:"; -$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r"; -$a->strings["F d"] = "d. F"; -$a->strings["[today]"] = "[Heute]"; -$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen"; -$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:"; -$a->strings["[No description]"] = "[Keine Beschreibung]"; -$a->strings["Event Reminders"] = "Veranstaltungs- Erinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen in dieser Woche:"; -$a->strings["Profile"] = "Profil"; -$a->strings["Full Name:"] = "Voller Name:"; -$a->strings["j F, Y"] = "j F, Y"; -$a->strings["j F"] = "j F"; -$a->strings["Birthday:"] = "Geburtstag:"; -$a->strings["Age:"] = "Alter:"; -$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:"; -$a->strings["Hometown:"] = "Heimatstadt:"; -$a->strings["Tags:"] = "Schlagworte:"; -$a->strings["Political Views:"] = "Politische Ansichten:"; -$a->strings["Religion:"] = "Religion:"; -$a->strings["About:"] = "Über:"; -$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:"; -$a->strings["Likes:"] = "Gefällt-mir:"; -$a->strings["Dislikes:"] = "Gefällt-mir-nicht:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:"; -$a->strings["Musical interests:"] = "Musikalische Interessen:"; -$a->strings["Books, literature:"] = "Bücher, Literatur:"; -$a->strings["Television:"] = "Fernsehen:"; -$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:"; -$a->strings["Love/Romance:"] = "Liebe/Romantik:"; -$a->strings["Work/employment:"] = "Arbeit/Anstellung:"; -$a->strings["School/education:"] = "Schule/Ausbildung:"; $a->strings["Permission denied"] = "Keine Berechtigung"; $a->strings["Item not found."] = "Element nicht gefunden."; $a->strings["Collection not found."] = "Sammlung nicht gefunden"; @@ -701,11 +602,14 @@ $a->strings["Collection: %s"] = "Sammlung: %s"; $a->strings["Connection: %s"] = "Verbindung: %s"; $a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden."; $a->strings["Private Message"] = "Private Nachricht"; +$a->strings["Delete"] = "Löschen"; +$a->strings["Select"] = "Auswählen"; $a->strings["save to folder"] = "In Ordner speichern"; $a->strings["add star"] = "markieren"; $a->strings["remove star"] = "Markierung entfernen"; $a->strings["toggle star status"] = "Stern-Status umschalten"; $a->strings["starred"] = "markiert"; +$a->strings["Message is verified"] = "Nachricht überprüft"; $a->strings["add tag"] = "Schlagwort hinzufügen"; $a->strings["I like this (toggle)"] = "Ich mag das (Umschalter)"; $a->strings["I don't like this (toggle)"] = "Ich mag das nicht (Umschalter)"; @@ -716,7 +620,10 @@ $a->strings["to"] = "zu"; $a->strings["via"] = "via"; $a->strings["Wall-to-Wall"] = "Wall-to-Wall"; $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; +$a->strings[" from %s"] = "von %s"; +$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s"; $a->strings["Expires: %s"] = "Verfällt: %s"; +$a->strings["Please wait"] = "Bitte warten"; $a->strings["%d comment"] = array( 0 => "%d Kommentar", 1 => "%d Kommentare", @@ -731,14 +638,108 @@ $a->strings["Code"] = "Code"; $a->strings["Image"] = "Bild"; $a->strings["Link"] = "Link"; $a->strings["Video"] = "Video"; +$a->strings["Preview"] = "Vorschau"; +$a->strings["Encrypt text"] = "Text verschlüsseln"; $a->strings["Welcome "] = "Willkommen"; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilfoto hoch."; $a->strings["Welcome back "] = "Willkommen zurück"; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; +$a->strings["channel"] = "Kanal"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s"; +$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht"; +$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden"; +$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s"; +$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s"; +$a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an."; +$a->strings["Categories:"] = "Kategorien:"; +$a->strings["Filed under:"] = "Gespeichert unter:"; +$a->strings["View in context"] = "Im Zusammenhang anschauen"; +$a->strings["remove"] = "lösche"; +$a->strings["Loading..."] = "Lädt ..."; +$a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente"; +$a->strings["View Source"] = "Quelle anzeigen"; +$a->strings["Follow Thread"] = "Unterhaltung folgen"; +$a->strings["View Status"] = "Status ansehen"; +$a->strings["View Photos"] = "Fotos ansehen"; +$a->strings["Matrix Activity"] = "Matrix Aktivität"; +$a->strings["Edit Contact"] = "Kontakt bearbeiten"; +$a->strings["Send PM"] = "Sende PN"; +$a->strings["Poke"] = "Anstupsen"; +$a->strings["%s likes this."] = "%s gefällt das."; +$a->strings["%s doesn't like this."] = "%s gefällt das nicht."; +$a->strings["%2\$d people like this."] = array( + 0 => "%2\$d Person gefällt das.", + 1 => "%2\$d Leuten gefällt das.", +); +$a->strings["%2\$d people don't like this."] = array( + 0 => "%2\$d Person gefällt das nicht.", + 1 => "%2\$d Leuten gefällt das nicht.", +); +$a->strings["and"] = "und"; +$a->strings[", and %d other people"] = array( + 0 => "", + 1 => ", und %d andere", +); +$a->strings["%s like this."] = "%s gefällt das."; +$a->strings["%s don't like this."] = "%s gefällt das nicht."; +$a->strings["Visible to everybody"] = "Sichtbar für jeden"; +$a->strings["Please enter a link URL:"] = "Gib eine URL ein:"; +$a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:"; +$a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:"; +$a->strings["Tag term:"] = "Schlagwort:"; +$a->strings["Save to Folder:"] = "Speichern in Ordner:"; +$a->strings["Where are you right now?"] = "Wo bist du jetzt grade?"; +$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM"; +$a->strings["Share"] = "Teilen"; +$a->strings["Page link title"] = "Seitentitel-Link"; +$a->strings["Upload photo"] = "Foto hochladen"; +$a->strings["upload photo"] = "Foto hochladen"; +$a->strings["Attach file"] = "Datei anhängen"; +$a->strings["attach file"] = "Datei anfügen"; +$a->strings["Insert web link"] = "Link einfügen"; +$a->strings["web link"] = "Web-Link"; +$a->strings["Insert video link"] = "Video-Link einfügen"; +$a->strings["video link"] = "Video-Link"; +$a->strings["Insert audio link"] = "Audio-Link einfügen"; +$a->strings["audio link"] = "Audio-Link"; +$a->strings["Set your location"] = "Standort"; +$a->strings["set location"] = "Standort"; +$a->strings["Clear browser location"] = "Browser-Standort löschen"; +$a->strings["clear location"] = "Standort löschen"; +$a->strings["Set title"] = "Titel"; +$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)"; +$a->strings["Permission settings"] = "Berechtigungs-Einstellungen"; +$a->strings["permissions"] = "Berechtigungen"; +$a->strings["Public post"] = "Öffentlicher Beitrag"; +$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com"; +$a->strings["Set expiration date"] = "Verfallsdatum"; +$a->strings["OK"] = "OK"; +$a->strings["Cancel"] = "Abbrechen"; +$a->strings["Commented Order"] = "Neueste Kommentare"; +$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert"; +$a->strings["Posted Order"] = "Neueste Beiträge"; +$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert"; +$a->strings["Personal"] = "Persönlich"; +$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung deinerseits"; +$a->strings["New"] = "Neu"; +$a->strings["Activity Stream - by date"] = "Activity Stream - nach Datum sortiert"; +$a->strings["Starred"] = "Markiert"; +$a->strings["Favourite Posts"] = "Beiträge mit Sternchen"; +$a->strings["Spam"] = "Spam"; +$a->strings["Posts flagged as SPAM"] = "Nachrichten die als SPAM markiert wurden"; +$a->strings["Channel"] = "Kanal"; +$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; +$a->strings["About"] = "Über"; +$a->strings["Profile Details"] = "Profil-Details"; +$a->strings["Files"] = "Dateien"; +$a->strings["Files and Storage"] = "Dateien und Speicher"; +$a->strings["Events and Calendar"] = "Veranstaltungen und Kalender"; +$a->strings["Webpages"] = "Webseiten"; +$a->strings["Manage Webpages"] = "Webseiten verwalten"; $a->strings["Invalid data packet"] = "Ungültiges Datenpaket"; $a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren"; $a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren"; -$a->strings["No channel."] = "Kein Channel."; +$a->strings["No channel."] = "Kein Kanal."; $a->strings["Common connections"] = "Gemeinsame Verbindungen"; $a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen."; $a->strings["Event title and start time are required."] = "Veranstaltungs- Titel und Startzeit sind erforderlich."; @@ -773,7 +774,7 @@ $a->strings["URL for photo of thing (optional)"] = "URL eines Fotos von dem Ding $a->strings["Add Thing to your Profile"] = "Das Ding deinem Profil hinzufügen"; $a->strings["Total invitation limit exceeded."] = "Limit der maximalen Einladungen überschritten."; $a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse."; -$a->strings["Please join us on Red"] = "Bitte schließe Dich uns an und werde Teil der Red Matrix"; +$a->strings["Please join us on Red"] = "Schließe Dich uns an und werde Teil der Red-Matrix"; $a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator deiner Seite."; $a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden."; $a->strings["%d message sent."] = array( @@ -790,6 +791,7 @@ $a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf"; $a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:"; $a->strings["Click the [Register] link on the following page to join."] = "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden."; $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an"; +$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"; $a->strings["Could not access contact record."] = "Konnte auf den Kontakteintrag nicht zugreifen."; $a->strings["Could not locate selected profile."] = "Konnte das gewählte Profil nicht finden."; $a->strings["Connection updated."] = "Verbindung aktualisiert."; @@ -870,7 +872,7 @@ $a->strings["View"] = "Ansicht"; $a->strings["Authorize application connection"] = "Zugriff der Anwendung authorizieren"; $a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode bei der Anwendung ein:"; $a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen."; -$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du der Anwendung erlauben deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"; +$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"; $a->strings["Yes"] = "Ja"; $a->strings["No"] = "Nein"; $a->strings["No installed applications."] = "Keine installierten Applikationen"; @@ -990,7 +992,7 @@ $a->strings["New Source"] = "Neue Quelle"; $a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."; $a->strings["Only import content with these words (one per line)"] = "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten"; $a->strings["Leave blank to import all public content"] = "Leer lassen um alle öffentlichen Beiträge zu importieren"; -$a->strings["Channel Name"] = "Channel-Name"; +$a->strings["Channel Name"] = "Name des Kanals"; $a->strings["Source not found."] = "Quelle nicht gefunden."; $a->strings["Edit Source"] = "Quelle bearbeiten"; $a->strings["Delete Source"] = "Quelle löschen"; @@ -1095,7 +1097,6 @@ $a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert"; $a->strings["select all"] = "Alle auswählen"; $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten"; $a->strings["Request date"] = "Antragsdatum"; -$a->strings["Name"] = "Name"; $a->strings["No registrations."] = "Keine Registrierungen."; $a->strings["Approve"] = "Genehmigen"; $a->strings["Deny"] = "Verweigern"; @@ -1162,14 +1163,12 @@ $a->strings["Collection removed."] = "Sammlung gelöscht."; $a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich."; $a->strings["Collection Editor"] = "Sammlung-Editor"; $a->strings["Members"] = "Mitglieder"; -$a->strings["All Connected Channels"] = "Alle verbundene Channels"; +$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle"; $a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus."; $a->strings["Page owner information could not be retrieved."] = "Informationen über den Betreiber der Seite konnten nicht gefunden werden."; $a->strings["Album not found."] = "Album nicht gefunden."; $a->strings["Delete Album"] = "Album löschen"; $a->strings["Delete Photo"] = "Foto löschen"; -$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde auf %2\$s von %3\$s getaggt"; -$a->strings["a photo"] = "Foto"; $a->strings["No photos selected"] = "Keine Fotos ausgewählt"; $a->strings["Access to this item is restricted."] = "Zugriff auf dieses Foto wurde eingeschränkt."; $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers."; @@ -1249,7 +1248,7 @@ $a->strings["Layout Name"] = "Layout Name"; $a->strings["Help:"] = "Hilfe:"; $a->strings["Not Found"] = "Nicht gefunden"; $a->strings["Remote Authentication"] = "Entfernte Authentifizierung"; -$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z.B. channel@example.com)"; +$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)"; $a->strings["Authenticate"] = "Authentifizieren"; $a->strings["No such group"] = "Gruppe existiert nicht"; $a->strings["Search Results For:"] = "Suchergebnisse für:"; @@ -1313,7 +1312,7 @@ $a->strings["Used in directory listings"] = "Wird in Verzeichnis Auflistungen ve $a->strings["Tell us about yourself..."] = "Erzähl uns ein wenig von Dir..."; $a->strings["Hobbies/Interests"] = "Hobbys/Interessen"; $a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke"; -$a->strings["My other channels"] = "Meine anderen Channels"; +$a->strings["My other channels"] = "Meine anderen Kanäle"; $a->strings["Musical interests"] = "Musikalische Interessen"; $a->strings["Books, literature"] = "Bücher, Literatur"; $a->strings["Television"] = "Fernsehen"; @@ -1325,7 +1324,7 @@ $a->strings["This is your public profile.
        It maystrings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Add profile things"] = "Profil-Dinge hinzufügen"; $a->strings["Include desirable objects in your profile"] = "binde begehrenswerte Dinge in dein Profil ein"; -$a->strings["Add a Channel"] = "Channel hinzufügen"; +$a->strings["Add a Channel"] = "Kanal hinzufügen"; $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt."; $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "; $a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznahmen"; @@ -1401,6 +1400,7 @@ $a->strings["Protected email address. Cannot change to that email."] = "Geschüt $a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."; $a->strings["Settings updated."] = "Einstellungen aktualisiert."; $a->strings["Add application"] = "Anwendung hinzufügen"; +$a->strings["Name"] = "Name"; $a->strings["Name of application"] = "Name der Anwendung"; $a->strings["Consumer Key"] = "Consumer Key"; $a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"; @@ -1446,7 +1446,7 @@ $a->strings["Publish your default profile in the network directory"] = "Veröffe $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"; $a->strings["or"] = "oder"; $a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet"; -$a->strings["Channel Settings"] = "Channel-Einstellungen"; +$a->strings["Channel Settings"] = "Kanal-Einstellungen"; $a->strings["Basic Settings"] = "Grundeinstellungen"; $a->strings["Your Timezone:"] = "Ihre Zeitzone:"; $a->strings["Default Post Location:"] = "Standardstandort:"; @@ -1500,6 +1500,7 @@ $a->strings["No secure communications available. You may be abl $a->strings["Send Reply"] = "Antwort senden"; $a->strings["Item not found"] = "Element nicht gefunden"; $a->strings["Edit Layout"] = "Layout bearbeiten"; +$a->strings["Delete layout?"] = "Layout löschen?"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen"; @@ -1551,6 +1552,7 @@ $a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden."; $a->strings["Suggest Friends"] = "Kontakte Vorschlagen"; $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; $a->strings["Edit Block"] = "Block bearbeiten"; +$a->strings["Delete block?"] = "Block löschen?"; $a->strings["Delete Block"] = "Block löschen"; $a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator"; $a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor"; @@ -1598,7 +1600,7 @@ $a->strings["This will completely remove this channel from the network. Once thi $a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung dein Passwort ein:"; $a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"; $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk"; -$a->strings["Remove My Account"] = "Mein Konto entfernen"; +$a->strings["Remove Channel"] = "Kanal entfernen"; $a->strings["Unable to locate original post."] = "Originalbeitrag kann nicht gefunden werden."; $a->strings["Empty post discarded."] = "Leerer Beitrag verworfen."; $a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."; -- cgit v1.2.3 From 4b66a399e4a43d615372cd6a818bafe70bea8bb0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 25 Jan 2014 02:53:31 -0800 Subject: get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden --- library/bootstrap/css/bootstrap.min.css | 2 +- version.inc | 2 +- view/theme/redbasic/css/style.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/library/bootstrap/css/bootstrap.min.css b/library/bootstrap/css/bootstrap.min.css index c547283bb..ec1cbd6fb 100644 --- a/library/bootstrap/css/bootstrap.min.css +++ b/library/bootstrap/css/bootstrap.min.css @@ -4,4 +4,4 @@ * Licensed under http://www.apache.org/licenses/LICENSE-2.0 */ -/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small,h1 .small,h2 .small,h3 .small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small,h4 .small,h5 .small,h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-primary:hover{color:#3071a9}.text-warning{color:#8a6d3b}.text-warning:hover{color:#66512c}.text-danger{color:#a94442}.text-danger:hover{color:#843534}.text-success{color:#3c763d}.text-success:hover{color:#2b542c}.text-info{color:#31708f}.text-info:hover{color:#245269}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}.list-inline>li:first-child{padding-left:0}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small,blockquote .small{display:block;line-height:1.428571429;color:#999}blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small,blockquote.pull-right .small{text-align:right}blockquote.pull-right small:before,blockquote.pull-right .small:before{content:''}blockquote.pull-right small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.428571429}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}@media(min-width:768px){.container{width:750px}}@media(min-width:992px){.container{width:970px}}@media(min-width:1200px){.container{width:1170px}}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666666666666%}.col-xs-10{width:83.33333333333334%}.col-xs-9{width:75%}.col-xs-8{width:66.66666666666666%}.col-xs-7{width:58.333333333333336%}.col-xs-6{width:50%}.col-xs-5{width:41.66666666666667%}.col-xs-4{width:33.33333333333333%}.col-xs-3{width:25%}.col-xs-2{width:16.666666666666664%}.col-xs-1{width:8.333333333333332%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666666666666%}.col-xs-pull-10{right:83.33333333333334%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666666666666%}.col-xs-pull-7{right:58.333333333333336%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666666666667%}.col-xs-pull-4{right:33.33333333333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.666666666666664%}.col-xs-pull-1{right:8.333333333333332%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666666666666%}.col-xs-push-10{left:83.33333333333334%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666666666666%}.col-xs-push-7{left:58.333333333333336%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666666666667%}.col-xs-push-4{left:33.33333333333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.666666666666664%}.col-xs-push-1{left:8.333333333333332%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666666666666%}.col-xs-offset-10{margin-left:83.33333333333334%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666666666666%}.col-xs-offset-7{margin-left:58.333333333333336%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666666666667%}.col-xs-offset-4{margin-left:33.33333333333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.666666666666664%}.col-xs-offset-1{margin-left:8.333333333333332%}.col-xs-offset-0{margin-left:0}@media(min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666666666666%}.col-sm-10{width:83.33333333333334%}.col-sm-9{width:75%}.col-sm-8{width:66.66666666666666%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-4{width:33.33333333333333%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666666666666%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666666666666%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-0{margin-left:0}}@media(min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666666666666%}.col-md-10{width:83.33333333333334%}.col-md-9{width:75%}.col-md-8{width:66.66666666666666%}.col-md-7{width:58.333333333333336%}.col-md-6{width:50%}.col-md-5{width:41.66666666666667%}.col-md-4{width:33.33333333333333%}.col-md-3{width:25%}.col-md-2{width:16.666666666666664%}.col-md-1{width:8.333333333333332%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666666666666%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666666666666%}.col-md-push-10{left:83.33333333333334%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666666666666%}.col-md-push-7{left:58.333333333333336%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666666666667%}.col-md-push-4{left:33.33333333333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.666666666666664%}.col-md-push-1{left:8.333333333333332%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666666666666%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-0{margin-left:0}}@media(min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666666666666%}.col-lg-10{width:83.33333333333334%}.col-lg-9{width:75%}.col-lg-8{width:66.66666666666666%}.col-lg-7{width:58.333333333333336%}.col-lg-6{width:50%}.col-lg-5{width:41.66666666666667%}.col-lg-4{width:33.33333333333333%}.col-lg-3{width:25%}.col-lg-2{width:16.666666666666664%}.col-lg-1{width:8.333333333333332%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666666666666%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666666666666%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>.active,.table>tbody>tr>.active,.table>tfoot>tr>.active,.table>thead>.active>td,.table>tbody>.active>td,.table>tfoot>.active>td,.table>thead>.active>th,.table>tbody>.active>th,.table>tfoot>.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8}.table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8}.table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6}.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:#f2dede}.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:#ebcccc}.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:#faf2cc}@media(max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline select.form-control{width:auto}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-control-static{padding-top:7px}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#fff}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1;-moz-osx-font-smoothing:grayscale}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn:first-child>.btn{margin-right:-1px}.input-group-btn:last-child>.btn{margin-left:-1px}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-right:0;padding-left:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form select.form-control{width:auto}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{display:block;height:auto;max-width:100%;margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child th,.panel>.table>tbody:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:last-child>th,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:last-child>td,.panel>.table-responsive>.table-bordered>thead>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;z-index:1050;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;outline:0;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicons-chevron-left,.carousel-control .glyphicons-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,tr.visible-xs,th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}table.visible-xs.visible-sm{display:table}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}table.visible-xs.visible-md{display:table}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}table.visible-xs.visible-lg{display:table}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm,tr.visible-sm,th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}table.visible-sm.visible-xs{display:table}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}table.visible-sm.visible-md{display:table}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}table.visible-sm.visible-lg{display:table}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md,tr.visible-md,th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}table.visible-md.visible-xs{display:table}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}table.visible-md.visible-sm{display:table}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}table.visible-md.visible-lg{display:table}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg,tr.visible-lg,th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}table.visible-lg.visible-xs{display:table}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}table.visible-lg.visible-sm{display:table}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}table.visible-lg.visible-md{display:table}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}table.hidden-xs{display:table}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs,tr.hidden-xs,th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md,tr.hidden-xs.hidden-md,th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}table.hidden-sm{display:table}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm,tr.hidden-sm,th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md,tr.hidden-sm.hidden-md,th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}table.hidden-md{display:table}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs,tr.hidden-md.hidden-xs,th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,tr.hidden-md.hidden-sm,th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md,tr.hidden-md,th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg,tr.hidden-md.hidden-lg,th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}table.hidden-lg{display:table}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md,tr.hidden-lg.hidden-md,th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg,tr.hidden-lg,th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print,tr.visible-print,th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print,tr.hidden-print,th.hidden-print,td.hidden-print{display:none!important}} \ No newline at end of file +/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small,h1 .small,h2 .small,h3 .small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small,h4 .small,h5 .small,h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-primary:hover{color:#3071a9}.text-warning{color:#8a6d3b}.text-warning:hover{color:#66512c}.text-danger{color:#a94442}.text-danger:hover{color:#843534}.text-success{color:#3c763d}.text-success:hover{color:#2b542c}.text-info{color:#31708f}.text-info:hover{color:#245269}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}.list-inline>li:first-child{padding-left:0}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small,blockquote .small{display:block;line-height:1.428571429;color:#999}blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small,blockquote.pull-right .small{text-align:right}blockquote.pull-right small:before,blockquote.pull-right .small:before{content:''}blockquote.pull-right small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.428571429}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}@media(min-width:768px){.container{width:750px}}@media(min-width:992px){.container{width:970px}}@media(min-width:1200px){.container{width:1170px}}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666666666666%}.col-xs-10{width:83.33333333333334%}.col-xs-9{width:75%}.col-xs-8{width:66.66666666666666%}.col-xs-7{width:58.333333333333336%}.col-xs-6{width:50%}.col-xs-5{width:41.66666666666667%}.col-xs-4{width:33.33333333333333%}.col-xs-3{width:25%}.col-xs-2{width:16.666666666666664%}.col-xs-1{width:8.333333333333332%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666666666666%}.col-xs-pull-10{right:83.33333333333334%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666666666666%}.col-xs-pull-7{right:58.333333333333336%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666666666667%}.col-xs-pull-4{right:33.33333333333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.666666666666664%}.col-xs-pull-1{right:8.333333333333332%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666666666666%}.col-xs-push-10{left:83.33333333333334%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666666666666%}.col-xs-push-7{left:58.333333333333336%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666666666667%}.col-xs-push-4{left:33.33333333333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.666666666666664%}.col-xs-push-1{left:8.333333333333332%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666666666666%}.col-xs-offset-10{margin-left:83.33333333333334%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666666666666%}.col-xs-offset-7{margin-left:58.333333333333336%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666666666667%}.col-xs-offset-4{margin-left:33.33333333333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.666666666666664%}.col-xs-offset-1{margin-left:8.333333333333332%}.col-xs-offset-0{margin-left:0}@media(min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666666666666%}.col-sm-10{width:83.33333333333334%}.col-sm-9{width:75%}.col-sm-8{width:66.66666666666666%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-4{width:33.33333333333333%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666666666666%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666666666666%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-0{margin-left:0}}@media(min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666666666666%}.col-md-10{width:83.33333333333334%}.col-md-9{width:75%}.col-md-8{width:66.66666666666666%}.col-md-7{width:58.333333333333336%}.col-md-6{width:50%}.col-md-5{width:41.66666666666667%}.col-md-4{width:33.33333333333333%}.col-md-3{width:25%}.col-md-2{width:16.666666666666664%}.col-md-1{width:8.333333333333332%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666666666666%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666666666666%}.col-md-push-10{left:83.33333333333334%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666666666666%}.col-md-push-7{left:58.333333333333336%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666666666667%}.col-md-push-4{left:33.33333333333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.666666666666664%}.col-md-push-1{left:8.333333333333332%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666666666666%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-0{margin-left:0}}@media(min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666666666666%}.col-lg-10{width:83.33333333333334%}.col-lg-9{width:75%}.col-lg-8{width:66.66666666666666%}.col-lg-7{width:58.333333333333336%}.col-lg-6{width:50%}.col-lg-5{width:41.66666666666667%}.col-lg-4{width:33.33333333333333%}.col-lg-3{width:25%}.col-lg-2{width:16.666666666666664%}.col-lg-1{width:8.333333333333332%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666666666666%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666666666666%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>.active,.table>tbody>tr>.active,.table>tfoot>tr>.active,.table>thead>.active>td,.table>tbody>.active>td,.table>tfoot>.active>td,.table>thead>.active>th,.table>tbody>.active>th,.table>tfoot>.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8}.table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8}.table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6}.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:#f2dede}.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:#ebcccc}.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:#faf2cc}@media(max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline select.form-control{width:auto}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-control-static{padding-top:7px}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#fff}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1;-moz-osx-font-smoothing:grayscale}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn:first-child>.btn{margin-right:-1px}.input-group-btn:last-child>.btn{margin-left:-1px}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-right:0;padding-left:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form select.form-control{width:auto}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{display:block;height:auto;max-width:100%;margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child th,.panel>.table>tbody:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:last-child>th,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:last-child>td,.panel>.table-responsive>.table-bordered>thead>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;z-index:1050;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;outline:0;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicons-chevron-left,.carousel-control .glyphicons-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,tr.visible-xs,th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}table.visible-xs.visible-sm{display:table}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}table.visible-xs.visible-md{display:table}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}table.visible-xs.visible-lg{display:table}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm,tr.visible-sm,th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}table.visible-sm.visible-xs{display:table}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}table.visible-sm.visible-md{display:table}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}table.visible-sm.visible-lg{display:table}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md,tr.visible-md,th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}table.visible-md.visible-xs{display:table}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}table.visible-md.visible-sm{display:table}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}table.visible-md.visible-lg{display:table}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg,tr.visible-lg,th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}table.visible-lg.visible-xs{display:table}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}table.visible-lg.visible-sm{display:table}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}table.visible-lg.visible-md{display:table}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}table.hidden-xs{display:table}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs,tr.hidden-xs,th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md,tr.hidden-xs.hidden-md,th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}table.hidden-sm{display:table}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm,tr.hidden-sm,th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md,tr.hidden-sm.hidden-md,th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}table.hidden-md{display:table}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs,tr.hidden-md.hidden-xs,th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,tr.hidden-md.hidden-sm,th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md,tr.hidden-md,th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg,tr.hidden-md.hidden-lg,th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}table.hidden-lg{display:table}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md,tr.hidden-lg.hidden-md,th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg,tr.hidden-lg,th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print,tr.visible-print,th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print,tr.hidden-print,th.hidden-print,td.hidden-print{display:none!important}} \ No newline at end of file diff --git a/version.inc b/version.inc index d9b792b26..f55fb683d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-24.567 +2014-01-25.568 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f039b7374..b2f90cbc1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -91,6 +91,7 @@ blockquote { border-left: 4px solid #dae4ee; padding: 0.4em; color: #000; + margin-left: 20px; } .ccollapse-wrapper { -- cgit v1.2.3 From b71e855c5b8abc782c6890d4865ea62e2f72a804 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 25 Jan 2014 13:44:31 +0100 Subject: remove wall restriction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit original didn’t have that --- include/api.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/api.php b/include/api.php index 8cb2c3152..3ab0aad27 100644 --- a/include/api.php +++ b/include/api.php @@ -1269,8 +1269,7 @@ require_once('include/items.php'); 'cid' => $user_info['id'], 'since_id' => $since_id, 'start' => $start, - 'records' => $count, - 'wall' => 1)); + 'records' => $count)); $ret = api_format_items($r,$user_info); -- cgit v1.2.3 From ed00301bb641d716e43876572be640f8252b9b05 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 25 Jan 2014 14:50:05 +0100 Subject: disable feature setting for collections and make feature settings for personal and new tab working. --- include/conversation.php | 14 ++++++++------ include/features.php | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index cec5993b6..b6ee08e1f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1388,21 +1388,23 @@ function network_tabs() { 'sel'=>$postord_active, 'title' => t('Sort by Post Date'), ), + ); - array( + if(feature_enabled(local_user(),'personal_tab')) + $tabs[] = array( 'label' => t('Personal'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), - ), - array( + ); + + if(feature_enabled(local_user(),'new_tab')) + $tabs[] = array( 'label' => t('New'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), - ), - - ); + ); if(feature_enabled(local_user(),'star_posts')) $tabs[] = array( diff --git a/include/features.php b/include/features.php index 1f83eb319..efdf6dc3a 100644 --- a/include/features.php +++ b/include/features.php @@ -46,7 +46,8 @@ function get_features() { 'net_module' => array( t('Network and Stream Filtering'), array('archives', t('Search by Date'), t('Ability to select posts by date ranges')), - array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), + // Disabled until a solution for default feature settings is found. + // array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use')), array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), -- cgit v1.2.3 From a25b8c951ba7c1f2f43c56b136bcea9731c6ab32 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 25 Jan 2014 22:56:15 +0100 Subject: Check user_info['self] in api user_timeline --- include/api.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/include/api.php b/include/api.php index 3ab0aad27..8ceae7787 100644 --- a/include/api.php +++ b/include/api.php @@ -1263,15 +1263,24 @@ require_once('include/items.php'); // intval($since_id), // intval($start), intval($count) // ); - + if ($user_info['self']==1) { $r = items_fetch(array( 'uid' => api_user(), 'cid' => $user_info['id'], 'since_id' => $since_id, 'start' => $start, - 'records' => $count)); - - + 'records' => $count, + 'wall' => 1)); + } + else { + $r = items_fetch(array( + 'uid' => api_user(), + 'cid' => $user_info['id'], + 'since_id' => $since_id, + 'start' => $start, + 'records' => $count)); + } + $ret = api_format_items($r,$user_info); -- cgit v1.2.3 From e68c01cc483eee6b9b04e208f75868f1fef91633 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 25 Jan 2014 14:39:09 -0800 Subject: set session['my_address'] to current site in change channel, not primary hub location. Also remove all the old Friendica-style authentication code. --- include/security.php | 86 +--------------------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/include/security.php b/include/security.php index 9943cf88d..b2c613108 100644 --- a/include/security.php +++ b/include/security.php @@ -31,90 +31,6 @@ function authenticate_success($user_record, $login_initial = false, $interactive } } - else { - $_SESSION['uid'] = $user_record['uid']; - $_SESSION['theme'] = $user_record['theme']; - $_SESSION['mobile_theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme'); - $_SESSION['authenticated'] = 1; - $_SESSION['page_flags'] = $user_record['page-flags']; - $_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $user_record['nickname']; - $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3); - - $a->user = $user_record; - - if($interactive) { - if($a->user['login_date'] === '0000-00-00 00:00:00') { - $_SESSION['return_url'] = 'profile_photo/new'; - $a->module = 'profile_photo'; - info( t("Welcome ") . $a->user['username'] . EOL); - info( t('Please upload a profile photo.') . EOL); - } - else - info( t("Welcome back ") . $a->user['username'] . EOL); - } - - $member_since = strtotime($a->user['register_date']); - if(time() < ($member_since + ( 60 * 60 * 24 * 14))) - $_SESSION['new_member'] = true; - else - $_SESSION['new_member'] = false; - if(strlen($a->user['timezone'])) { - date_default_timezone_set($a->user['timezone']); - $a->timezone = $a->user['timezone']; - } - - $master_record = $a->user; - - if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { - $r = q("select * from user where uid = %d limit 1", - intval($_SESSION['submanage']) - ); - if(count($r)) - $master_record = $r[0]; - } - - $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s'", - dbesc($master_record['password']), - dbesc($master_record['email']) - ); - if($r && count($r)) - $a->identities = $r; - else - $a->identities = array(); - - $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname` - from manage left join user on manage.mid = user.uid - where `manage`.`uid` = %d", - intval($master_record['uid']) - ); - if($r && count($r)) - $a->identities = array_merge($a->identities,$r); - - if($login_initial) - logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG); - - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", - intval($_SESSION['uid'])); - if(count($r)) { - $a->contact = $r[0]; - $a->cid = $r[0]['id']; - $_SESSION['cid'] = $a->cid; - } - - header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); - - if($login_initial) { - $l = get_browser_language(); - - q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1", - dbesc(datetime_convert()), - dbesc($l), - intval($_SESSION['uid']) - ); - - - } - } if($login_initial) call_hooks('logged_in', $user_record); @@ -158,7 +74,7 @@ function change_channel($change_channel) { ); if($x) { $_SESSION['my_url'] = $x[0]['xchan_url']; - $_SESSION['my_address'] = $x[0]['xchan_addr']; + $_SESSION['my_address'] = $x[0]['channel_address'] . '@' . substr(get_app()->get_baseurl(),strpos(get_app()->get_baseurl(),'://')+3); get_app()->set_observer($x[0]); get_app()->set_perms(get_all_perms(local_user(),$hash)); -- cgit v1.2.3 From 8b399b2fb8f2f063eaa159b2c9f26b9a3912f5da Mon Sep 17 00:00:00 2001 From: root Date: Sat, 25 Jan 2014 23:06:44 +0000 Subject: Typo --- include/security.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/security.php b/include/security.php index b2c613108..4a15e52af 100644 --- a/include/security.php +++ b/include/security.php @@ -60,7 +60,8 @@ function change_channel($change_channel) { intval(get_account_id()), intval(PAGE_REMOVED) ); - if($r) { + + if($r) { $hash = $r[0]['channel_hash']; $_SESSION['uid'] = intval($r[0]['channel_id']); get_app()->set_channel($r[0]); @@ -74,7 +75,7 @@ function change_channel($change_channel) { ); if($x) { $_SESSION['my_url'] = $x[0]['xchan_url']; - $_SESSION['my_address'] = $x[0]['channel_address'] . '@' . substr(get_app()->get_baseurl(),strpos(get_app()->get_baseurl(),'://')+3); + $_SESSION['my_address'] = $r[0]['channel_address'] . '@' . substr(get_app()->get_baseurl(),strpos(get_app()->get_baseurl(),'://')+3); get_app()->set_observer($x[0]); get_app()->set_perms(get_all_perms(local_user(),$hash)); -- cgit v1.2.3 From 339a0f69c194d098333ed4d81b86cbc12f1339f3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 25 Jan 2014 15:51:10 -0800 Subject: some tweaks to items_fetch for the api --- include/api.php | 33 ++++++++++++++++----------------- include/items.php | 7 +++++-- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/include/api.php b/include/api.php index 45deb15d7..dc270167b 100644 --- a/include/api.php +++ b/include/api.php @@ -1243,6 +1243,8 @@ require_once('include/items.php'); $sql_extra = ''; if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 "; + +//FIXME - this isn't yet implemented if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; // $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, @@ -1263,23 +1265,20 @@ require_once('include/items.php'); // intval($since_id), // intval($start), intval($count) // ); - if ($user_info['self']==1) { - $r = items_fetch(array( - 'uid' => api_user(), - 'cid' => $user_info['id'], - 'since_id' => $since_id, - 'start' => $start, - 'records' => $count, - 'wall' => 1)); - } - else { - $r = items_fetch(array( - 'uid' => api_user(), - 'cid' => $user_info['id'], - 'since_id' => $since_id, - 'start' => $start, - 'records' => $count)); - } + + $arr = array( + 'uid' => api_user(), + 'since_id' => $since_id, + 'start' => $start, + 'records' => $count); + + if ($user_info['self']==1) + $arr['wall'] = 1; + else + $arr['cid'] = $user_info['id']; + + + $r = items_fetch($arr,get_app()->get_channel(),get_observer_hash()); $ret = api_format_items($r,$user_info); diff --git a/include/items.php b/include/items.php index 364ff9f3f..2fe923303 100755 --- a/include/items.php +++ b/include/items.php @@ -3818,6 +3818,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C ); } + if(($client_mode & CLIENT_MODE_UPDATE) && (! ($client_mode & CLIENT_MODE_LOAD))) { // only setup pagination on initial page view @@ -3830,6 +3831,8 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $pager_sql = sprintf(" LIMIT %d, %d ",intval(get_app()->pager['start']), intval(get_app()->pager['itemspage'])); } + if(isset($arr['start']) && isset($arr['records'])) + $pager_sql = sprintf(" LIMIT %d, %d ",intval($arr['start']), intval($arr['records'])); if(($arr['cmin'] != 0) || ($arr['cmax'] != 99)) { @@ -3864,7 +3867,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $item_restrict = " AND item_restrict = 0 "; - if($arr['nouveau'] && ($client_mode & CLIENT_MODELOAD) && $channel) { + if($arr['nouveau'] && ($client_mode & CLIENT_MODE_LOAD) && $channel) { // "New Item View" - show all items unthreaded in reverse created date order $items = q("SELECT item.*, item.id AS item_id FROM item @@ -3889,7 +3892,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C else $ordering = "commented"; - if(($client_mode & CLIENT_MODE_LOAD) || ($client_mode & CLIENT_MODE_NORMAL)) { + if(($client_mode & CLIENT_MODE_LOAD) || ($client_mode == CLIENT_MODE_NORMAL)) { // Fetch a page full of parent items for this page -- cgit v1.2.3 From f90b3b60cb04b63386c9d16eb8dcb6530df979a0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 26 Jan 2014 02:58:03 -0800 Subject: don't prompt guests for a password if they're accessing an embedded public file. --- include/security.php | 2 +- mod/cloud.php | 24 ++++++++++++++++++++++-- version.inc | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/include/security.php b/include/security.php index 4a15e52af..5e86cf790 100644 --- a/include/security.php +++ b/include/security.php @@ -61,7 +61,7 @@ function change_channel($change_channel) { intval(PAGE_REMOVED) ); - if($r) { + if($r) { $hash = $r[0]['channel_hash']; $_SESSION['uid'] = intval($r[0]['channel_id']); get_app()->set_channel($r[0]); diff --git a/mod/cloud.php b/mod/cloud.php index de42249fe..f6ea059ce 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -74,7 +74,6 @@ function cloud_init(&$a) { $_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']); - $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); $lockBackend = new DAV\Locks\Backend\File('store/[data]/locks'); @@ -82,8 +81,29 @@ function cloud_init(&$a) { $server->addPlugin($lockPlugin); + // The next section of code allows us to bypass prompting for http-auth if a FILE is being accessed anonymously and permissions + // allow this. This way one can create hotlinks to public media files in their cloud and anonymous viewers won't get asked to login. + // If a DIRECTORY is accessed or there are permission issues accessing the file and we aren't previously authenticated via zot, + // prompt for HTTP-auth. This will be the default case for mounting a DAV directory. + + // FIXME - we may require one more hack here; to allow an unauthenticated guest to view your file collection (e.g. a DIRECTORY) from + // the web browser interface without prompting for password, but still requiring one for unauthenticated folks using DAV. We may be + // able to do this with a special $_GET request var and a cookie. + + $isapublic_file = false; + + if((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) { + try { + $x = RedFileData('/' . $a->cmd,$auth); + if($x instanceof RedFile) + $isapublic_file = true; + } + catch ( Exception $e ) { + $isapublic_file = false; + } + } - if(! $auth->observer) { + if((! $auth->observer) && (! $isapublic_file)) { try { $auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++')); } diff --git a/version.inc b/version.inc index f55fb683d..d85ee0ed2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-25.568 +2014-01-26.569 -- cgit v1.2.3 From 0948c3c3ca5aa3621247c7a77a05ac5acd085459 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 26 Jan 2014 03:27:36 -0800 Subject: allow site defaults for enabled features --- include/features.php | 2 ++ mod/settings.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/features.php b/include/features.php index 1f83eb319..cc8d457bc 100644 --- a/include/features.php +++ b/include/features.php @@ -7,6 +7,8 @@ function feature_enabled($uid,$feature) { $x = get_pconfig($uid,'feature',$feature); + if($x === false) + $x = get_config('feature',$feature); $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x); call_hooks('feature_enabled',$arr); return($arr['enabled']); diff --git a/mod/settings.php b/mod/settings.php index 5aa018cc2..ee6ef45de 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -635,7 +635,7 @@ function settings_content(&$a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach(array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); } } -- cgit v1.2.3 From 4ce6335364a5c86cac97bcc43af0dc6bfa38d114 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 26 Jan 2014 14:44:55 +0100 Subject: Revert "disable feature setting for collections and make feature settings for personal and new tab working." This reverts commit ed00301bb641d716e43876572be640f8252b9b05. --- include/conversation.php | 14 ++++++-------- include/features.php | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index b6ee08e1f..cec5993b6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1388,23 +1388,21 @@ function network_tabs() { 'sel'=>$postord_active, 'title' => t('Sort by Post Date'), ), - ); - if(feature_enabled(local_user(),'personal_tab')) - $tabs[] = array( + array( 'label' => t('Personal'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), - ); - - if(feature_enabled(local_user(),'new_tab')) - $tabs[] = array( + ), + array( 'label' => t('New'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), - ); + ), + + ); if(feature_enabled(local_user(),'star_posts')) $tabs[] = array( diff --git a/include/features.php b/include/features.php index 973fe9fe7..cc8d457bc 100644 --- a/include/features.php +++ b/include/features.php @@ -48,8 +48,7 @@ function get_features() { 'net_module' => array( t('Network and Stream Filtering'), array('archives', t('Search by Date'), t('Ability to select posts by date ranges')), - // Disabled until a solution for default feature settings is found. - // array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), + array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use')), array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), -- cgit v1.2.3 From d296b02b0e522dbbd30ad7926e9f80f3c8c04328 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 26 Jan 2014 14:15:57 -0800 Subject: The final piece of the DAV authentication puzzle. Provide a directory view to an un-auth'd person (without asking for a password) by adding a query parameter 'davguest=1'. This is a bit of a hack, but there was no response on the official forum about how to do this correctly so it will have to do. On the downside, if permission is denied, it won't ask for a password - but we're talking about unauthenticated folks who didn't go through magic auth so chances are even if they authenticate, permission will still be denied. --- include/conversation.php | 2 +- mod/cloud.php | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index cec5993b6..34d661004 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1481,7 +1481,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ if($p['view_storage']) { $tabs[] = array( 'label' => t('Files'), - 'url' => $a->get_baseurl() . '/cloud/' . $nickname, + 'url' => $a->get_baseurl() . '/cloud/' . $nickname . ((get_observer_hash()) ? '' : '?f=&davguest=1'), 'sel' => ((argv(0) == 'cloud') ? 'active' : ''), 'title' => t('Files and Storage'), 'id' => 'files-tab', diff --git a/mod/cloud.php b/mod/cloud.php index f6ea059ce..18b61f941 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -67,12 +67,18 @@ function cloud_init(&$a) { $auth->observer = $ob_hash; } + if($_GET['davguest']) + $_SESSION['davguest'] = true; + + $_SERVER['QUERY_STRING'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['QUERY_STRING']); $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']); + $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']); $_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']); + $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']); $rootDirectory = new RedDirectory('/',$auth); $server = new DAV\Server($rootDirectory); @@ -85,12 +91,10 @@ function cloud_init(&$a) { // allow this. This way one can create hotlinks to public media files in their cloud and anonymous viewers won't get asked to login. // If a DIRECTORY is accessed or there are permission issues accessing the file and we aren't previously authenticated via zot, // prompt for HTTP-auth. This will be the default case for mounting a DAV directory. - - // FIXME - we may require one more hack here; to allow an unauthenticated guest to view your file collection (e.g. a DIRECTORY) from - // the web browser interface without prompting for password, but still requiring one for unauthenticated folks using DAV. We may be - // able to do this with a special $_GET request var and a cookie. + // In order to avoid prompting for passwords for viewing a DIRECTORY, add the URL query parameter 'davguest=1' $isapublic_file = false; + $davguest = ((x($_SESSION,'davguest')) ? true : false); if((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) { try { @@ -103,7 +107,7 @@ function cloud_init(&$a) { } } - if((! $auth->observer) && (! $isapublic_file)) { + if((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { $auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++')); } -- cgit v1.2.3 From d67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 26 Jan 2014 14:41:43 -0800 Subject: add davguest param to cut/paste link for directories in mod/filestorage --- mod/filestorage.php | 3 +-- view/tpl/attach_edit.tpl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mod/filestorage.php b/mod/filestorage.php index 18760dd45..3e53a1e93 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -69,7 +69,6 @@ function filestorage_content(&$a) { return; } - // TODO This will also need to check for files on disk and delete them from there as well as the DB. if(argc() > 3 && argv(3) === 'delete') { if(! $perms['write_storage']) { @@ -110,7 +109,7 @@ function filestorage_content(&$a) { $channel = $a->get_channel(); - $cloudpath = get_cloudpath($f); + $cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : ''); $aclselect_e = populate_acl($f); $is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false); diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index f9c6e96ce..77f32b5bc 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -23,12 +23,11 @@ {{else}}
        {{$cpdesc}}

        +{{/if}}
        {{$cpldesc}}

        -{{/if}} -
        {{$aclselect}}
        -- cgit v1.2.3 From 904db593df914d2932d9c2f018b00987052461d7 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Mon, 27 Jan 2014 12:01:53 +0100 Subject: add a temporary logger command at remote server side --- mod/post.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/post.php b/mod/post.php index 965ba09a3..d01f61a5c 100644 --- a/mod/post.php +++ b/mod/post.php @@ -490,6 +490,7 @@ function post_post(&$a) { // Useful to get a health check on a remote site. // This will let us know if any important communication details // that we may have stored are no longer valid, regardless of xchan details. + logger('POST: got ping send pong now back: ' . z_root() , LOGGER_DEBUG ); $ret['success'] = true; $ret['site'] = array(); -- cgit v1.2.3 From d6a9497e4a3839d9fb4dba4634167f006bb3fe87 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 27 Jan 2014 14:46:39 -0800 Subject: cleanup include/menu in preparation for the next phase of bookmarking --- include/menu.php | 50 +++++++++---------------------------------------- version.inc | 2 +- view/php/theme_init.php | 1 + 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/include/menu.php b/include/menu.php index 515f47758..d69c5d0d3 100644 --- a/include/menu.php +++ b/include/menu.php @@ -23,29 +23,6 @@ function menu_fetch($name,$uid,$observer_xchan) { return null; } -function bookmarks_menu_fetch($uid,$observer_xchan,$flags = MENU_BOOKMARK) { - - $sel_option = (($flags) ? ' and menu_flags = ' . intval($menu_flags) . ' ' : ''); - - $sql_options = permissions_sql($uid); - - $r = q("select * from menu where menu_channel_id = %d $sel_option limit 1", - intval($uid) - ); - if($r) { - $x = q("select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d - $sql_options - order by mitem_order asc, mitem_desc asc", - intval($r[0]['menu_id']), - intval($uid) - ); - return array('menu' => $r[0], 'items' => $x ); - } - - return null; -} - - function menu_render($menu) { if(! $menu) return ''; @@ -95,7 +72,7 @@ function menu_create($arr) { $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_flags = %d limit 1", + $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", dbesc($menu_name), intval($menu_channel_id), intval($menu_flags) @@ -124,8 +101,11 @@ function menu_create($arr) { } -function menu_list($channel_id) { - $r = q("select * from menu where menu_channel_id = %d order by menu_name", +function menu_list($channel_id, $flags = 0) { + + $sel_options = (($flags) ? " and ( menu_flags & " . intval($flags) . " ) " : ''); + + $r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_name", intval($channel_id) ); return $r; @@ -153,9 +133,8 @@ function menu_edit($arr) { $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select menu_id from menu where menu_name = '%s' and menu_flags = %d and menu_channel_id = %d limit 1", + $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", dbesc($menu_name), - intval($menu_flags), intval($menu_channel_id) ); if(($r) && ($r[0]['menu_id'] != $menu_id)) { @@ -173,22 +152,11 @@ function menu_edit($arr) { return false; } - - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_desc = '%s' and menu_flags = %d limit 1", - dbesc($menu_name), - intval($menu_channel_id), - dbesc($menu_desc), - intval($menu_flags) - ); - - if($r) - return false; - - - return q("update menu set menu_name = '%s', menu_desc = '%s', + return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, where menu_id = %d and menu_channel_id = %d limit 1", dbesc($menu_name), dbesc($menu_desc), + intval($menu_flags), intval($menu_id), intval($menu_channel_id) ); diff --git a/version.inc b/version.inc index d85ee0ed2..d1638dd7d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-26.569 +2014-01-27.570 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0e473f728..b6aa5de0f 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -44,6 +44,7 @@ head_add_js('docready.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); head_add_js('library/bootstrap-datetimepicker/js/moment.js'); head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); + /** * Those who require this feature will know what to do with it. * Those who don't, won't. -- cgit v1.2.3 From 24bac92acdf04a49eb65fc947f25fafb2b2044fa Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 27 Jan 2014 15:25:04 -0800 Subject: after rposting - if there's no remote_return, go to your matrix page rather than leave you on a blank rpost page. --- mod/rpost.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/rpost.php b/mod/rpost.php index 8e01ef5d4..852a57d78 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -65,8 +65,10 @@ function rpost_content(&$a) { if($_REQUEST['remote_return']) { $_SESSION['remote_return'] = $_REQUEST['remote_return']; } - if(argc() > 1 && argv(1) === 'return' && $_SESSION['remote_return']) { - goaway($_SESSION['remote_return']); + if(argc() > 1 && argv(1) === 'return') { + if($_SESSION['remote_return']) + goaway($_SESSION['remote_return']); + goaway(z_root() . '/network'); } $plaintext = true; -- cgit v1.2.3 From d9794b981d56c0e0f6e23d33a421e64378fd78a6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 27 Jan 2014 15:55:08 -0800 Subject: In order to provide ajax chat accessible by remote visitors (xchans), we need to remove any core assumptions that userID is an int (which is a common centralised site assumption). Additionally we won't be able to provide guest logins, as this also assumes integer ID's; so that ability needs to be disabled by configuration. --- library/ajaxchat/chat/lib/class/AJAXChat.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/ajaxchat/chat/lib/class/AJAXChat.php b/library/ajaxchat/chat/lib/class/AJAXChat.php index 2cf7aa11f..215b2c4e1 100644 --- a/library/ajaxchat/chat/lib/class/AJAXChat.php +++ b/library/ajaxchat/chat/lib/class/AJAXChat.php @@ -60,12 +60,12 @@ class AJAXChat { function initRequestVars() { $this->_requestVars = array(); $this->_requestVars['ajax'] = isset($_REQUEST['ajax']) ? true : false; - $this->_requestVars['userID'] = isset($_REQUEST['userID']) ? (int)$_REQUEST['userID'] : null; + $this->_requestVars['userID'] = isset($_REQUEST['userID']) ? $_REQUEST['userID'] : null; $this->_requestVars['userName'] = isset($_REQUEST['userName']) ? $_REQUEST['userName'] : null; - $this->_requestVars['channelID'] = isset($_REQUEST['channelID']) ? (int)$_REQUEST['channelID'] : null; + $this->_requestVars['channelID'] = isset($_REQUEST['channelID']) ? $_REQUEST['channelID'] : null; $this->_requestVars['channelName'] = isset($_REQUEST['channelName']) ? $_REQUEST['channelName'] : null; $this->_requestVars['text'] = isset($_POST['text']) ? $_POST['text'] : null; - $this->_requestVars['lastID'] = isset($_REQUEST['lastID']) ? (int)$_REQUEST['lastID'] : 0; + $this->_requestVars['lastID'] = isset($_REQUEST['lastID']) ? $_REQUEST['lastID'] : ''; $this->_requestVars['login'] = isset($_REQUEST['login']) ? true : false; $this->_requestVars['logout'] = isset($_REQUEST['logout']) ? true : false; $this->_requestVars['password'] = isset($_REQUEST['password']) ? $_REQUEST['password'] : null; @@ -3052,14 +3052,14 @@ class AJAXChat { if($userID === null) { $userID = $this->getUserID(); } - return $userID + $this->getConfig('privateChannelDiff'); + return $userID . '.' . $this->getConfig('privateChannelDiff'); } function getPrivateMessageID($userID=null) { if($userID === null) { $userID = $this->getUserID(); } - return $userID + $this->getConfig('privateMessageDiff'); + return $userID . '.' . $this->getConfig('privateMessageDiff'); } function isAllowedToSendPrivateMessage() { -- cgit v1.2.3 From 3100b5d93e9f440a17b99d2856ee022b29d73f80 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 27 Jan 2014 18:06:09 -0800 Subject: photo tagging still broken - but at least don't create a new linked item every time a photo is edited. --- library/ajaxchat/chat/lib/class/CustomAJAXChat.php | 2 ++ mod/photos.php | 4 ++++ view/tpl/photo_view.tpl | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/library/ajaxchat/chat/lib/class/CustomAJAXChat.php b/library/ajaxchat/chat/lib/class/CustomAJAXChat.php index a18e64069..9fff6ada9 100644 --- a/library/ajaxchat/chat/lib/class/CustomAJAXChat.php +++ b/library/ajaxchat/chat/lib/class/CustomAJAXChat.php @@ -13,6 +13,8 @@ class CustomAJAXChat extends AJAXChat { // Returns null if login is invalid function getValidLoginUserData() { + + $customUsers = $this->getCustomUsers(); if($this->getRequestVar('password')) { diff --git a/mod/photos.php b/mod/photos.php index 23733e121..c299fe778 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -778,6 +778,8 @@ function photos_content(&$a) { return; } + + $prevlink = ''; $nextlink = ''; @@ -898,6 +900,8 @@ function photos_content(&$a) { } } +// logger('mod_photo: link_item' . print_r($link_item,true)); + // FIXME - remove this when we move to conversation module $r = $r[0]['children']; diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index e56fd5b57..93e9abfa5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -24,7 +24,7 @@ '; - if(userID === this.userID) { - this.userNodeString = str; - } - return str; - } - }, - - toggleUserMenu: function(menuID, userName, userID) { - // If the menu is empty, fill it with user node menu items before toggling it. - var isInline = false; - if (menuID.indexOf('ium') >= 0 ) { - isInline = true; - } - if(!document.getElementById(menuID).firstChild) { - this.updateDOM( - menuID, - this.getUserNodeStringItems( - this.encodeText(this.addSlashes(this.getScriptLinkValue(userName))), - userID, - isInline - ), - false, - true - ) - } - this.showHide(menuID); - this.dom['chatList'].scrollTop = this.dom['chatList'].scrollHeight; - }, - - getUserNodeStringItems: function(encodedUserName, userID, isInline) { - var menu; - if(encodedUserName !== this.encodedUserName) { - menu = '
      37. ' - + this.lang['userMenuSendPrivateMessage'] - + '
        38. ' - + '
      38. ' - + this.lang['userMenuDescribe'] - + '
        39. ' - + '
      39. ' - + this.lang['userMenuOpenPrivateChannel'] - + '
        40. ' - + '
      40. ' - + this.lang['userMenuClosePrivateChannel'] - + '
        41. ' - + '
      41. ' - + this.lang['userMenuIgnore'] - + '
        42. '; - if (isInline) { - menu += '
      42. ' - + this.lang['userMenuInvite'] - + '
        43. ' - + '
      43. ' - + this.lang['userMenuUninvite'] - + '
        44. ' - + '
      44. ' - + this.lang['userMenuWhereis'] - + '
        45. '; - } - if(this.userRole === '2' || this.userRole === '3') { - menu += '
      45. ' - + this.lang['userMenuKick'] - + '
        46. ' - + '
      46. ' - + this.lang['userMenuWhois'] - + '
        47. '; - } - } else { - menu = '
      47. ' - + this.lang['userMenuLogout'] - + '
        48. ' - + '
      48. ' - + this.lang['userMenuWho'] - + '
        49. ' - + '
      49. ' - + this.lang['userMenuIgnoreList'] - + '
        50. ' - + '
      50. ' - + this.lang['userMenuList'] - + '
        51. ' - + '
      51. ' - + this.lang['userMenuAction'] - + '
        52. ' - + '
      52. ' - + this.lang['userMenuRoll'] - + '
        53. ' - + '
      53. ' - + this.lang['userMenuNick'] - + '
        54. '; - if(this.userRole === '1' || this.userRole === '2' || this.userRole === '3') { - menu += '
      54. ' - + this.lang['userMenuEnterPrivateRoom'] - + '
        55. '; - if(this.userRole === '2' || this.userRole === '3') { - menu += '
      55. ' - + this.lang['userMenuBans'] - + '
        56. '; - } - } - } - menu += this.getCustomUserMenuItems(encodedUserName, userID); - return menu; - }, - - setOnlineListRowClasses: function() { - if(this.dom['onlineList']) { - var node = this.dom['onlineList'].firstChild; - var rowEven = false; - while(node) { - this.setClass(node, (rowEven ? 'rowEven' : 'rowOdd')); - node = node.nextSibling; - rowEven = !rowEven; - } - } - }, - - clearChatList: function() { - while(this.dom['chatList'].hasChildNodes()) { - this.dom['chatList'].removeChild(this.dom['chatList'].firstChild); - } - }, - - clearOnlineUsersList: function() { - this.usersList = []; - this.userNamesList = []; - if(this.dom['onlineList']) { - while(this.dom['onlineList'].hasChildNodes()) { - this.dom['onlineList'].removeChild(this.dom['onlineList'].firstChild); - } - } - }, - - getEncodedChatBotName: function() { - if(typeof arguments.callee.encodedChatBotName === 'undefined') { - arguments.callee.encodedChatBotName = this.encodeSpecialChars(this.chatBotName); - } - return arguments.callee.encodedChatBotName; - }, - - addChatBotMessageToChatList: function(messageText) { - this.addMessageToChatList( - new Date(), - this.chatBotID, - this.getEncodedChatBotName(), - 4, - null, - messageText, - null - ); - }, - - addMessageToChatList: function(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip) { - // Prevent adding the same message twice: - if(this.getMessageNode(messageID)) { - return; - } - if(!this.onNewMessage(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip)) { - return; - } - this.DOMbufferRowClass = this.DOMbufferRowClass === 'rowEven' ? 'rowOdd' : 'rowEven'; - this.DOMbuffer = this.DOMbuffer + - this.getChatListMessageString( - dateObject, userID, userName, userRole, messageID, messageText, channelID, ip - ); - if(!this.DOMbuffering){ - this.updateDOM('chatList', this.DOMbuffer); - this.DOMbuffer = ""; - } - }, - - getChatListMessageString: function(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip) { - var rowClass = this.DOMbufferRowClass; - var userClass = this.getRoleClass(userRole); - var colon; - if(messageText.indexOf('/action') === 0 || messageText.indexOf('/me') === 0 || messageText.indexOf('/privaction') === 0) { - userClass += ' action'; - colon = ' '; - } else { - colon = ': '; - } - var dateTime = this.settings['dateFormat'] ? '' - + this.formatDate(this.settings['dateFormat'], dateObject) + ' ' : ''; - return '
        ' - + this.getDeletionLink(messageID, userID, userRole, channelID) - + dateTime - + '' - + userName - + '' - + colon - + this.replaceText(messageText) - + '
        '; - }, - - getChatListUserNameTitle: function(userID, userName, userRole, ip) { - return (ip !== null) ? ' title="IP: ' + ip + '"' : ''; - }, - - getMessageDocumentID: function(messageID) { - return ((messageID === null) ? 'ajaxChat_lm_'+(this.localID++) : 'ajaxChat_m_'+messageID); - }, - - getMessageNode: function(messageID) { - return ((messageID === null) ? null : document.getElementById(this.getMessageDocumentID(messageID))); - }, - - getUserDocumentID: function(userID) { - return 'ajaxChat_u_'+userID; - }, - - getUserNode: function(userID) { - return document.getElementById(this.getUserDocumentID(userID)); - }, - - getUserMenuDocumentID: function(userID) { - return 'ajaxChat_um_'+userID; - }, - - getInlineUserMenuDocumentID: function(menuID, index) { - return 'ajaxChat_ium_'+menuID+'_'+index; - }, - - getDeletionLink: function(messageID, userID, userRole, channelID) { - if(messageID !== null && this.isAllowedToDeleteMessage(messageID, userID, userRole, channelID)) { - if(!arguments.callee.deleteMessage) { - arguments.callee.deleteMessage = this.encodeSpecialChars(this.lang['deleteMessage']); - } - return ' '; // Adding a space - without any content Opera messes up the chatlist display - } - return ''; - }, - - isAllowedToDeleteMessage: function(messageID, userID, userRole, channelID) { - if((((this.userRole === '1' && this.allowUserMessageDelete && (userID === this.userID || - parseInt(channelID) === parseInt(this.userID)+this.privateMessageDiff || - parseInt(channelID) === parseInt(this.userID)+this.privateChannelDiff)) || - this.userRole === '2') && userRole !== '3' && userRole !== '4') || this.userRole === '3') { - return true; - } - return false; - }, - - onNewMessage: function(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip) { - if(!this.customOnNewMessage(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip)) { - return false; - } - if(this.ignoreMessage(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip)) { - return false; - } - if(this.parseDeleteMessageCommand(messageText)) { - return false; - } - this.blinkOnNewMessage(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip); - this.playSoundOnNewMessage(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip); - return true; - }, - - parseDeleteMessageCommand: function(messageText) { - if(messageText.indexOf('/delete') === 0) { - var messageID = messageText.substr(8); - var messageNode = this.getMessageNode(messageID); - if(messageNode) { - var nextSibling = messageNode.nextSibling; - try { - this.dom['chatList'].removeChild(messageNode); - if(nextSibling) { - this.updateChatListRowClasses(nextSibling); - } - } catch(e) { - } - } - return true; - } - return false; - }, - - blinkOnNewMessage: function(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip) { - if(this.settings['blink'] && this.lastID && !this.channelSwitch && userID !== this.userID) { - clearInterval(this.blinkInterval); - this.blinkInterval = setInterval( - 'ajaxChat.blinkUpdate(\''+this.addSlashes(this.decodeSpecialChars(userName))+'\')', - this.settings['blinkInterval'] - ); - } - }, - - blinkUpdate: function(blinkStr) { - if(!this.originalDocumentTitle) { - this.originalDocumentTitle = document.title; - } - if(!arguments.callee.blink) { - document.title = '[@ ] '+blinkStr+' - '+this.originalDocumentTitle; - arguments.callee.blink = 1; - } else if(arguments.callee.blink > this.settings['blinkIntervalNumber']) { - clearInterval(this.blinkInterval); - document.title = this.originalDocumentTitle; - arguments.callee.blink = 0; - } else { - if(arguments.callee.blink % 2 !== 0) { - document.title = '[@ ] '+blinkStr+' - '+this.originalDocumentTitle; - } else { - document.title = '[ @] '+blinkStr+' - '+this.originalDocumentTitle; - } - arguments.callee.blink++; - } - }, - - updateChatlistView: function() { - if(this.dom['chatList'].childNodes && this.settings['maxMessages']) { - while(this.dom['chatList'].childNodes.length > this.settings['maxMessages']) { - this.dom['chatList'].removeChild(this.dom['chatList'].firstChild); - } - } - - if(this.settings['autoScroll']) { - this.dom['chatList'].scrollTop = this.dom['chatList'].scrollHeight; - } - }, - - encodeText: function(text) { - return encodeURIComponent(text); - }, - - decodeText: function(text) { - return decodeURIComponent(text); - }, - - utf8Encode: function(plainText) { - var utf8Text = ''; - for(var i=0; i127) && (c<2048)) { - utf8Text += String.fromCharCode((c>>6)|192); - utf8Text += String.fromCharCode((c&63)|128); - } else { - utf8Text += String.fromCharCode((c>>12)|224); - utf8Text += String.fromCharCode(((c>>6)&63)|128); - utf8Text += String.fromCharCode((c&63)|128); - } - } - return utf8Text; - }, - - utf8Decode: function(utf8Text) { - var plainText = ''; - var c,c2,c3; - var i=0; - while(i191) && (c<224)) { - c2 = utf8Text.charCodeAt(i+1); - plainText += String.fromCharCode(((c&31)<<6) | (c2&63)); - i+=2; - } else { - c2 = utf8Text.charCodeAt(i+1); - c3 = utf8Text.charCodeAt(i+2); - plainText += String.fromCharCode(((c&15)<<12) | ((c2&63)<<6) | (c3&63)); - i+=3; - } - } - return plainText; - }, - - encodeSpecialChars: function(text) { - return text.replace( - /[&<>'"]/g, - this.encodeSpecialCharsCallback - ); - }, - - encodeSpecialCharsCallback: function(str) { - switch(str) { - case '&': - return '&'; - case '<': - return '<'; - case '>': - return '>'; - case '\'': - // As ' is not supported by IE, we use ' as replacement for ('): - return '''; - case '"': - return '"'; - default: - return str; - } - }, - - decodeSpecialChars: function(text) { - var regExp = new RegExp('(&)|(<)|(>)|(')|(")', 'g'); - - return text.replace( - regExp, - this.decodeSpecialCharsCallback - ); - }, - - decodeSpecialCharsCallback: function(str) { - switch(str) { - case '&': - return '&'; - case '<': - return '<'; - case '>': - return '>'; - case ''': - return '\''; - case '"': - return '"'; - default: - return str; - } - }, - - inArray: function(haystack, needle) { - var i = haystack.length; - while(i--) { - if(haystack[i] === needle) { - return true; - } - } - return false; - }, - - arraySearch: function(needle, haystack) { - var i = haystack.length; - while(i--) { - if(haystack[i] === needle) { - return i; - } - } - return false; - }, - - stripTags: function(str) { - if (!arguments.callee.regExp) { - arguments.callee.regExp = new RegExp('<\\/?[^>]+?>', 'g'); - } - - return str.replace(arguments.callee.regExp, ''); - }, - - stripBBCodeTags: function(str) { - if (!arguments.callee.regExp) { - arguments.callee.regExp = new RegExp('\\[\\/?[^\\]]+?\\]', 'g'); - } - - return str.replace(arguments.callee.regExp, ''); - }, - - escapeRegExp: function(text) { - if (!arguments.callee.regExp) { - var specials = new Array( - '^', '$', '*', '+', '?', '.', '|', '/', - '(', ')', '[', ']', '{', '}', '\\' - ); - arguments.callee.regExp = new RegExp( - '(\\' + specials.join('|\\') + ')', 'g' - ); - } - return text.replace(arguments.callee.regExp, '\\$1'); - }, - - addSlashes: function(text) { - // Adding slashes in front of apostrophs and backslashes to ensure a valid JavaScript expression: - return text.replace(/\\/g, '\\\\').replace(/\'/g, '\\\''); - }, - - removeSlashes: function(text) { - // Removing slashes added by calling addSlashes(text) previously: - return text.replace(/\\\\/g, '\\').replace(/\\\'/g, '\''); - }, - - formatDate: function(format, date) { - date = (date == null) ? new date() : date; - - return format - .replace(/%Y/g, date.getFullYear()) - .replace(/%m/g, this.addLeadingZero(date.getMonth()+1)) - .replace(/%d/g, this.addLeadingZero(date.getDate())) - .replace(/%H/g, this.addLeadingZero(date.getHours())) - .replace(/%i/g, this.addLeadingZero(date.getMinutes())) - .replace(/%s/g, this.addLeadingZero(date.getSeconds())); - }, - - addLeadingZero: function(number) { - number = number.toString(); - if(number.length < 2) { - number = '0'+number; - } - return number; - }, - - getUserIDFromUserName: function(userName) { - var index = this.arraySearch(userName, this.userNamesList); - if(index !== false) { - return this.usersList[index]; - } - return null; - }, - - getUserNameFromUserID: function(userID) { - var index = this.arraySearch(userID, this.usersList); - if(index !== false) { - return this.userNamesList[index]; - } - return null; - }, - - getRoleClass: function(roleID) { - switch(parseInt(roleID)) { - case 0: - return 'guest'; - case 1: - return 'user'; - case 2: - return 'moderator'; - case 3: - return 'admin'; - case 4: - return 'chatBot'; - default: - return 'default'; - } - }, - - handleInputFieldKeyPress: function(event) { - if(event.keyCode === 13 && !event.shiftKey) { - this.sendMessage(); - try { - event.preventDefault(); - } catch(e) { - event.returnValue = false; // IE - } - return false; - } - return true; - }, - - handleInputFieldKeyUp: function(event) { - this.updateMessageLengthCounter(); - }, - - updateMessageLengthCounter: function() { - if(this.dom['messageLengthCounter']) { - this.updateDOM( - 'messageLengthCounter', - this.dom['inputField'].value.length + '/' + this.messageTextMaxLength, - false, - true - ); - } - }, - - sendMessage: function(text) { - text = text ? text : this.dom['inputField'].value; - if(!text) { - return; - } - text = this.parseInputMessage(text); - if(text) { - clearTimeout(this.timer); - var message = 'lastID=' - + this.lastID - + '&text=' - + this.encodeText(text); - this.makeRequest(this.ajaxURL,'POST',message); - } - this.dom['inputField'].value = ''; - this.dom['inputField'].focus(); - this.updateMessageLengthCounter(); - }, - - parseInputMessage: function(text) { - var textParts; - if(text.charAt(0) === '/') { - textParts = text.split(' '); - switch(textParts[0]) { - case '/ignore': - text = this.parseIgnoreInputCommand(text, textParts); - break; - case '/clear': - this.clearChatList(); - return false; - break; - default: - text = this.parseCustomInputCommand(text, textParts); - } - if(text && this.settings['persistFontColor'] && this.settings['fontColor']) { - text = this.assignFontColorToCommandMessage(text, textParts); - } - } else { - text = this.parseCustomInputMessage(text); - if(text && this.settings['persistFontColor'] && this.settings['fontColor']) { - text = this.assignFontColorToMessage(text); - } - } - return text; - }, - - assignFontColorToMessage: function(text) { - return '[color='+this.settings['fontColor']+']'+text+'[/color]'; - }, - - assignFontColorToCommandMessage: function(text, textParts) { - switch(textParts[0]) { - case '/msg': - case '/describe': - if(textParts.length > 2) { - return textParts[0]+' '+textParts[1]+' ' - + '[color='+this.settings['fontColor']+']' - + textParts.slice(2).join(' ') - + '[/color]'; - } - break; - case '/me': - case '/action': - if(textParts.length > 1) { - return textParts[0]+' ' - + '[color='+this.settings['fontColor']+']' - + textParts.slice(1).join(' ') - + '[/color]'; - } - break; - } - return text; - }, - - parseIgnoreInputCommand: function(text, textParts) { - var userName, ignoredUserNames = this.getIgnoredUserNames(), i; - if(textParts.length > 1) { - userName = this.encodeSpecialChars(textParts[1]); - // Prevent adding the chatBot or current user to the list: - if(userName === this.userName || userName === this.getEncodedChatBotName()) { - // Display the list of ignored users instead: - return this.parseIgnoreInputCommand(null, new Array('/ignore')); - } - if(ignoredUserNames.length > 0) { - i = ignoredUserNames.length; - while(i--) { - if(ignoredUserNames[i] === userName) { - ignoredUserNames.splice(i,1); - this.addChatBotMessageToChatList('/ignoreRemoved '+userName); - this.setIgnoredUserNames(ignoredUserNames); - this.updateChatlistView(); - return null; - } - } - } - ignoredUserNames.push(userName); - this.addChatBotMessageToChatList('/ignoreAdded '+userName); - this.setIgnoredUserNames(ignoredUserNames); - } else { - if(ignoredUserNames.length === 0) { - this.addChatBotMessageToChatList('/ignoreListEmpty -'); - } else { - this.addChatBotMessageToChatList('/ignoreList '+ignoredUserNames.join(' ')); - } - } - this.updateChatlistView(); - return null; - }, - - getIgnoredUserNames: function() { - var ignoredUserNamesString; - if(!this.ignoredUserNames) { - ignoredUserNamesString = this.getSetting('ignoredUserNames'); - if(ignoredUserNamesString) { - this.ignoredUserNames = ignoredUserNamesString.split(' '); - } else { - this.ignoredUserNames = []; - } - } - return this.ignoredUserNames; - }, - - setIgnoredUserNames: function(ignoredUserNames) { - this.ignoredUserNames = ignoredUserNames; - this.setSetting('ignoredUserNames', ignoredUserNames.join(' ')); - }, - - ignoreMessage: function(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip) { - var textParts; - if(userID === this.chatBotID && messageText.charAt(0) === '/') { - textParts = messageText.split(' '); - if(textParts.length > 1) { - switch(textParts[0]) { - case '/invite': - case '/uninvite': - case '/roll': - userName = textParts[1]; - break; - } - } - } - if(this.inArray(this.getIgnoredUserNames(), userName)) { - return true; - } - return false; - }, - - deleteMessage: function(messageID) { - var messageNode = this.getMessageNode(messageID), originalClass, nextSibling; - if(messageNode) { - originalClass = this.getClass(messageNode); - this.setClass(messageNode, originalClass+' deleteSelected'); - if(confirm(this.lang['deleteMessageConfirm'])) { - nextSibling = messageNode.nextSibling; - try { - this.dom['chatList'].removeChild(messageNode); - if(nextSibling) { - this.updateChatListRowClasses(nextSibling); - } - this.updateChat('&delete='+messageID); - } catch(e) { - this.setClass(messageNode, originalClass); - } - } else { - this.setClass(messageNode, originalClass); - } - } - }, - - updateChatListRowClasses: function(node) { - var previousNode, rowEven; - if(!node) { - node = this.dom['chatList'].firstChild; - } - if(node) { - previousNode = node.previousSibling; - rowEven = (previousNode && this.getClass(previousNode) === 'rowOdd') ? true : false; - while(node) { - this.setClass(node, (rowEven ? 'rowEven' : 'rowOdd')); - node = node.nextSibling; - rowEven = !rowEven; - } - } - }, - - getClass: function(node) { - if(typeof node.className !== 'undefined') { - return node.className; // IE - } else { - return node.getAttribute('class'); - } - }, - - setClass: function(node, className) { - if(typeof node.className !== 'undefined') { - node.className = className; // IE - } else { - node.setAttribute('class', className); - } - }, - - scriptLinkEncode: function(text) { - return this.encodeText(this.addSlashes(this.decodeSpecialChars(text))); - }, - - scriptLinkDecode: function(text) { - return this.encodeSpecialChars(this.removeSlashes(this.decodeText(text))); - }, - - getScriptLinkValue: function(value) { - // This method returns plainText encoded values from javascript links - // The value has to be utf8Decoded for MSIE and Opera: - if(typeof arguments.callee.utf8Decode === 'undefined') { - switch(navigator.appName) { - case 'Microsoft Internet Explorer': - case 'Opera': - arguments.callee.utf8Decode = true; - return this.utf8Decode(value); - default: - arguments.callee.utf8Decode = false; - return value; - } - } else if(arguments.callee.utf8Decode) { - return this.utf8Decode(value); - } else { - return value; - } - }, - - sendMessageWrapper: function(text) { - this.sendMessage(this.getScriptLinkValue(text)); - }, - - insertMessageWrapper: function(text) { - this.insertText(this.getScriptLinkValue(text), true); - }, - - switchChannel: function(channel) { - if(!this.chatStarted) { - this.clearChatList(); - this.channelSwitch = true; - this.loginChannelID = null; - this.loginChannelName = channel; - this.requestTeaserContent(); - return; - } - clearTimeout(this.timer); - var message = 'lastID=' - + this.lastID - + '&channelName=' - + this.encodeText(channel); - this.makeRequest(this.ajaxURL,'POST',message); - if(this.dom['inputField'] && this.settings['autoFocus']) { - this.dom['inputField'].focus(); - } - }, - - logout: function() { - clearTimeout(this.timer); - var message = 'logout=true'; - this.makeRequest(this.ajaxURL,'POST',message); - }, - - handleLogout: function(url) { - window.location.href = url; - }, - - toggleSetting: function(setting, buttonID) { - this.setSetting(setting, !this.getSetting(setting)); - if(buttonID) { - this.updateButton(setting, buttonID); - } - }, - - updateButton: function(setting, buttonID) { - var node = document.getElementById(buttonID); - if(node) { - this.setClass(node, (this.getSetting(setting) ? 'button' : 'button off')); - } - }, - - showHide: function(id, styleDisplay, displayInline) { - var node = document.getElementById(id); - if(node) { - if(styleDisplay) { - node.style.display = styleDisplay; - } else { - if(node.style.display === 'none') { - node.style.display = (displayInline ? 'inline' : 'block'); - } else { - node.style.display = 'none'; - } - } - } - }, - - setPersistFontColor: function(bool) { - this.settings['persistFontColor'] = bool; - if(!this.settings['persistFontColor']) { - this.settings['fontColor'] = null; - if(this.dom['inputField']) { - this.dom['inputField'].style.color = ''; - } - } - }, - - setFontColor: function(color) { - if(this.settings['persistFontColor']) { - this.settings['fontColor'] = color; - if(this.dom['inputField']) { - this.dom['inputField'].style.color = color; - } - if(this.dom['colorCodesContainer']) { - this.dom['colorCodesContainer'].style.display = 'none'; - if(this.dom['inputField']) { - this.dom['inputField'].focus(); - } - } - } else { - this.insert('[color=' + color + ']', '[/color]'); - } - }, - - insertText: function(text, clearInputField) { - if(clearInputField) { - this.dom['inputField'].value = ''; - } - this.insert(text, ''); - }, - - insertBBCode: function(bbCode) { - switch(bbCode) { - case 'url': - var url = prompt(this.lang['urlDialog'], 'http://'); - if(url) - this.insert('[url=' + url + ']', '[/url]'); - else - this.dom['inputField'].focus(); - break; - default: - this.insert('[' + bbCode + ']', '[/' + bbCode + ']'); - } - }, - - insert: function(startTag, endTag) { - this.dom['inputField'].focus(); - // Internet Explorer: - if(typeof document.selection !== 'undefined') { - // Insert the tags: - var range = document.selection.createRange(); - var insText = range.text; - range.text = startTag + insText + endTag; - // Adjust the cursor position: - range = document.selection.createRange(); - if (insText.length === 0) { - range.move('character', -endTag.length); - } else { - range.moveStart('character', startTag.length + insText.length + endTag.length); - } - range.select(); - } - // Firefox, etc. (Gecko based browsers): - else if(typeof this.dom['inputField'].selectionStart !== 'undefined') { - // Insert the tags: - var start = this.dom['inputField'].selectionStart; - var end = this.dom['inputField'].selectionEnd; - var insText = this.dom['inputField'].value.substring(start, end); - this.dom['inputField'].value = this.dom['inputField'].value.substr(0, start) - + startTag - + insText - + endTag - + this.dom['inputField'].value.substr(end); - // Adjust the cursor position: - var pos; - if (insText.length === 0) { - pos = start + startTag.length; - } else { - pos = start + startTag.length + insText.length + endTag.length; - } - this.dom['inputField'].selectionStart = pos; - this.dom['inputField'].selectionEnd = pos; - } - // Other browsers: - else { - var pos = this.dom['inputField'].value.length; - this.dom['inputField'].value = this.dom['inputField'].value.substr(0, pos) - + startTag - + endTag - + this.dom['inputField'].value.substr(pos); - } - }, - - replaceText: function(text) { - try{ - text = this.replaceLineBreaks(text); - if(text.charAt(0) === '/') { - text = this.replaceCommands(text); - } else { - text = this.replaceBBCode(text); - text = this.replaceHyperLinks(text); - text = this.replaceEmoticons(text); - } - text = this.breakLongWords(text); - text = this.replaceCustomText(text); - } catch(e){ - //alert(e); - } - return text; - }, - - replaceCommands: function(text) { - try { - if(text.charAt(0) !== '/') { - return text; - } - var textParts = text.split(' '); - switch(textParts[0]) { - case '/login': - return this.replaceCommandLogin(textParts); - case '/logout': - return this.replaceCommandLogout(textParts); - case '/channelEnter': - return this.replaceCommandChannelEnter(textParts); - case '/channelLeave': - return this.replaceCommandChannelLeave(textParts); - case '/privmsg': - return this.replaceCommandPrivMsg(textParts); - case '/privmsgto': - return this.replaceCommandPrivMsgTo(textParts); - case '/privaction': - return this.replaceCommandPrivAction(textParts); - case '/privactionto': - return this.replaceCommandPrivActionTo(textParts); - case '/me': - case '/action': - return this.replaceCommandAction(textParts); - case '/invite': - return this.replaceCommandInvite(textParts); - case '/inviteto': - return this.replaceCommandInviteTo(textParts); - case '/uninvite': - return this.replaceCommandUninvite(textParts); - case '/uninviteto': - return this.replaceCommandUninviteTo(textParts); - case '/queryOpen': - return this.replaceCommandQueryOpen(textParts); - case '/queryClose': - return this.replaceCommandQueryClose(textParts); - case '/ignoreAdded': - return this.replaceCommandIgnoreAdded(textParts); - case '/ignoreRemoved': - return this.replaceCommandIgnoreRemoved(textParts); - case '/ignoreList': - return this.replaceCommandIgnoreList(textParts); - case '/ignoreListEmpty': - return this.replaceCommandIgnoreListEmpty(textParts); - case '/kick': - return this.replaceCommandKick(textParts); - case '/who': - return this.replaceCommandWho(textParts); - case '/whoChannel': - return this.replaceCommandWhoChannel(textParts); - case '/whoEmpty': - return this.replaceCommandWhoEmpty(textParts); - case '/list': - return this.replaceCommandList(textParts); - case '/bans': - return this.replaceCommandBans(textParts); - case '/bansEmpty': - return this.replaceCommandBansEmpty(textParts); - case '/unban': - return this.replaceCommandUnban(textParts); - case '/whois': - return this.replaceCommandWhois(textParts); - case '/whereis': - return this.replaceCommandWhereis(textParts); - case '/roll': - return this.replaceCommandRoll(textParts); - case '/nick': - return this.replaceCommandNick(textParts); - case '/error': - return this.replaceCommandError(textParts); - default: - return this.replaceCustomCommands(text, textParts); - } - } catch(e) { - //alert(e); - } - return text; - }, - - replaceCommandLogin: function(textParts) { - return '' - + this.lang['login'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandLogout: function(textParts) { - var type = ''; - if(textParts.length === 3) - type = textParts[2]; - return '' - + this.lang['logout' + type].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandChannelEnter: function(textParts) { - return '' - + this.lang['channelEnter'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandChannelLeave: function(textParts) { - return '' - + this.lang['channelLeave'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandPrivMsg: function(textParts) { - var privMsgText = textParts.slice(1).join(' '); - privMsgText = this.replaceBBCode(privMsgText); - privMsgText = this.replaceHyperLinks(privMsgText); - privMsgText = this.replaceEmoticons(privMsgText); - return '' - + this.lang['privmsg'] - + ' ' - + privMsgText; - }, - - replaceCommandPrivMsgTo: function(textParts) { - var privMsgText = textParts.slice(2).join(' '); - privMsgText = this.replaceBBCode(privMsgText); - privMsgText = this.replaceHyperLinks(privMsgText); - privMsgText = this.replaceEmoticons(privMsgText); - return '' - + this.lang['privmsgto'].replace(/%s/, textParts[1]) - + ' ' - + privMsgText; - }, - - replaceCommandPrivAction: function(textParts) { - var privActionText = textParts.slice(1).join(' '); - privActionText = this.replaceBBCode(privActionText); - privActionText = this.replaceHyperLinks(privActionText); - privActionText = this.replaceEmoticons(privActionText); - return '' - + privActionText - + ' ' - + this.lang['privmsg'] - + ' '; - }, - - replaceCommandPrivActionTo: function(textParts) { - var privActionText = textParts.slice(2).join(' '); - privActionText = this.replaceBBCode(privActionText); - privActionText = this.replaceHyperLinks(privActionText); - privActionText = this.replaceEmoticons(privActionText); - return '' - + privActionText - + ' ' - + this.lang['privmsgto'].replace(/%s/, textParts[1]) - + ' '; - }, - - replaceCommandAction: function(textParts) { - var actionText = textParts.slice(1).join(' '); - actionText = this.replaceBBCode(actionText); - actionText = this.replaceHyperLinks(actionText); - actionText = this.replaceEmoticons(actionText); - return '' - + actionText - + ''; - }, - - replaceCommandInvite: function(textParts) { - var inviteText = this.lang['invite'] - .replace(/%s/, textParts[1]) - .replace( - /%s/, - '' - + textParts[2] - + '' - ); - return '' - + inviteText - + ''; - }, - - replaceCommandInviteTo: function(textParts) { - var inviteText = this.lang['inviteto'] - .replace(/%s/, textParts[1]) - .replace(/%s/, textParts[2]); - return '' - + inviteText - + ''; - }, - - replaceCommandUninvite: function(textParts) { - var uninviteText = this.lang['uninvite'] - .replace(/%s/, textParts[1]) - .replace(/%s/, textParts[2]); - return '' - + uninviteText - + ''; - }, - - replaceCommandUninviteTo: function(textParts) { - var uninviteText = this.lang['uninviteto'] - .replace(/%s/, textParts[1]) - .replace(/%s/, textParts[2]); - return '' - + uninviteText - + ''; - }, - - replaceCommandQueryOpen: function(textParts) { - return '' - + this.lang['queryOpen'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandQueryClose: function(textParts) { - return '' - + this.lang['queryClose'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandIgnoreAdded: function(textParts) { - return '' - + this.lang['ignoreAdded'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandIgnoreRemoved: function(textParts) { - return '' - + this.lang['ignoreRemoved'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandIgnoreList: function(textParts) { - return '' - + this.lang['ignoreList'] + ' ' - + this.getInlineUserMenu(textParts.slice(1)) - + ''; - }, - - replaceCommandIgnoreListEmpty: function(textParts) { - return '' - + this.lang['ignoreListEmpty'] - + ''; - }, - - replaceCommandKick: function(textParts) { - return '' - + this.lang['logoutKicked'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandWho: function(textParts) { - return '' - + this.lang['who'] + ' ' - + this.getInlineUserMenu(textParts.slice(1)) - + ''; - }, - - replaceCommandWhoChannel: function(textParts) { - return '' - + this.lang['whoChannel'].replace(/%s/, textParts[1]) + ' ' - + this.getInlineUserMenu(textParts.slice(2)) - + ''; - }, - - replaceCommandWhoEmpty: function(textParts) { - return '' - + this.lang['whoEmpty'] - + ''; - }, - - replaceCommandList: function(textParts) { - var channels = textParts.slice(1); - var listChannels = []; - var channelName; - for(var i=0; i'+channels[i]+'' : channels[i]; - listChannels.push( - '' - + channelName - + '' - ); - } - return '' - + this.lang['list'] + ' ' - + listChannels.join(', ') - + ''; - }, - - replaceCommandBans: function(textParts) { - var users = textParts.slice(1); - var listUsers = []; - for(var i=0; i' - + users[i] - + '' - ); - } - return '' - + this.lang['bans'] + ' ' - + listUsers.join(', ') - + ''; - }, - - replaceCommandBansEmpty: function(textParts) { - return '' - + this.lang['bansEmpty'] - + ''; - }, - - replaceCommandUnban: function(textParts) { - return '' - + this.lang['unban'].replace(/%s/, textParts[1]) - + ''; - }, - - replaceCommandWhois: function(textParts) { - return '' - + this.lang['whois'].replace(/%s/, textParts[1]) + ' ' - + textParts[2] - + ''; - }, - - replaceCommandWhereis: function(textParts) { - return '' - + this.lang['whereis'].replace(/%s/, textParts[1]).replace( - /%s/, - '' - + textParts[2] - + '' - ) - + ''; - }, - - replaceCommandRoll: function(textParts) { - var rollText = this.lang['roll'].replace(/%s/, textParts[1]); - rollText = rollText.replace(/%s/, textParts[2]); - rollText = rollText.replace(/%s/, textParts[3]); - return '' - + rollText - + ''; - }, - - replaceCommandNick: function(textParts) { - return '' - + this.lang['nick'].replace(/%s/, textParts[1]).replace(/%s/, textParts[2]) - + ''; - }, - - replaceCommandError: function(textParts) { - var errorMessage = this.lang['error'+textParts[1]]; - if(!errorMessage) { - errorMessage = 'Error: Unknown.'; - } else if(textParts.length > 2) { - errorMessage = errorMessage.replace(/%s/, textParts.slice(2).join(' ')); - } - return '' - + errorMessage - + ''; - }, - - getInlineUserMenu: function(users) { - var menu = ''; - for(var i=0; i0) { - menu += ', '; - } - menu += '' - + ((users[i] === this.userName) ? ''+users[i]+'' : users[i]) - + '' - + ''; - } - this.userMenuCounter++; - return menu; - }, - - containsUnclosedTags: function(str) { - var openTags, closeTags, - regExpOpenTags = /<[^>\/]+?>/gm, - regExpCloseTags = /<\/[^>]+?>/gm; - - openTags = str.match(regExpOpenTags); - closeTags = str.match(regExpCloseTags); - // Return true if the number of tags doesn't match: - if((!openTags && closeTags) || - (openTags && !closeTags) || - (openTags && closeTags && (openTags.length !== closeTags.length))) { - return true; - } - return false; - }, - - breakLongWords: function(text) { - var newText, charCounter, currentChar, withinTag, withinEntity, i; - - if(!this.settings['wordWrap']) - return text; - - newText = ''; - charCounter = 0; - - for(i=0; i): - if(i>5 && text.substr(i-5,4) === '
        0 && text.charAt(i-1) === '>') { - withinTag = false; - // Reset the charCounter after newline tags (
        ): - if(i>4 && text.substr(i-5,4) === '
        0 && text.charAt(i-1) === ';') { - withinEntity = false; - // We only increase the charCounter once for the whole entiy: - charCounter++; - } - - if(!withinTag && !withinEntity) { - // Reset the charCounter if we encounter a word boundary: - if(currentChar === ' ' || currentChar === '\n' || currentChar === '\t') { - charCounter = 0; - } else { - // We are not within a tag or entity, increase the charCounter: - charCounter++; - } - if(charCounter > this.settings['maxWordLength']) { - // maxWordLength has been reached, break here and reset the charCounter: - newText += '​'; - charCounter = 0; - } - } - // Add the current char to the text: - newText += currentChar; - } - - return newText; - }, - - replaceBBCode: function(text) { - if(!this.settings['bbCode']) { - // If BBCode is disabled, just strip the text from BBCode tags: - return text.replace(/\[(?:\/)?(\w+)(?:=([^<>]*?))?\]/, ''); - } - // Remove the BBCode tags: - return text.replace( - /\[(\w+)(?:=([^<>]*?))?\](.+?)\[\/\1\]/gm, - this.replaceBBCodeCallback - ); - }, - - replaceBBCodeCallback: function(str, p1, p2, p3) { - // Only replace predefined BBCode tags: - if(!ajaxChat.inArray(ajaxChat.bbCodeTags, p1)) { - return str; - } - // Avoid invalid XHTML (unclosed tags): - if(ajaxChat.containsUnclosedTags(p3)) { - return str; - } - switch(p1) { - case 'color': - return ajaxChat.replaceBBCodeColor(p3, p2); - case 'url': - return ajaxChat.replaceBBCodeUrl(p3, p2); - case 'img': - return ajaxChat.replaceBBCodeImage(p3); - case 'quote': - return ajaxChat.replaceBBCodeQuote(p3, p2); - case 'code': - return ajaxChat.replaceBBCodeCode(p3); - case 'u': - return ajaxChat.replaceBBCodeUnderline(p3); - default: - return ajaxChat.replaceCustomBBCode(p1, p2, p3); - } - }, - - replaceBBCodeColor: function(content, attribute) { - if(this.settings['bbCodeColors']) { - // Only allow predefined color codes: - if(!attribute || !this.inArray(ajaxChat.colorCodes, attribute)) - return content; - return '' - + this.replaceBBCode(content) - + ''; - } - return content; - }, - - replaceBBCodeUrl: function(content, attribute) { - var url, regExpUrl; - if(attribute) - url = attribute.replace(/\s/gm, this.encodeText(' ')); - else - url = this.stripBBCodeTags(content.replace(/\s/gm, this.encodeText(' '))); - regExpUrl = new RegExp( - '^(?:(?:http)|(?:https)|(?:ftp)|(?:irc)):\\/\\/', - '' - ); - if(!url || !url.match(regExpUrl)) - return content; - return '' - + this.replaceBBCode(content) - + ''; - }, - - replaceBBCodeImage: function(url) { - var regExpUrl, maxWidth, maxHeight; - if(this.settings['bbCodeImages']) { - regExpUrl = new RegExp( - this.regExpMediaUrl, - '' - ); - if(!url || !url.match(regExpUrl)) - return url; - url = url.replace(/\s/gm, this.encodeText(' ')); - maxWidth = this.dom['chatList'].offsetWidth-50; - maxHeight = this.dom['chatList'].offsetHeight-50; - return '' - +''; - } - return url; - }, - - replaceBBCodeQuote: function(content, attribute) { - if(attribute) - return '' - + this.lang['cite'].replace(/%s/, attribute) - + '' - + this.replaceBBCode(content) - + ''; - return '' - + this.replaceBBCode(content) - + ''; - }, - - replaceBBCodeCode: function(content) { - // Replace vertical tabs and multiple spaces with two non-breaking space characters: - return '' - + this.replaceBBCode(content.replace(/\t|(?: )/gm, '  ')) - + ''; - }, - - replaceBBCodeUnderline: function(content) { - return '' - + this.replaceBBCode(content) - + ''; - }, - - replaceHyperLinks: function(text) { - var regExp; - if(!this.settings['hyperLinks']) { - return text; - } - regExp = new RegExp( - '(^|\\s|>)((?:(?:http)|(?:https)|(?:ftp)|(?:irc)):\\/\\/[^\\s<>]+)(<\\/a>)?', - 'gm' - ); - return text.replace( - regExp, - // Specifying an anonymous function as second parameter: - function(str, p1, p2, p3) { - // Do not replace URL's inside URL's: - if(p3) { - return str; - } - return p1 - + '' - + p2 - + ''; - } - ); - }, - - replaceLineBreaks: function(text) { - var regExp = new RegExp('\\n', 'g'); - - if(!this.settings['lineBreaks']) { - return text.replace(regExp, ' '); - } else { - return text.replace(regExp, '
        '); - } - }, - - replaceEmoticons: function(text) { - if(!this.settings['emoticons']) { - return text; - } - if(!arguments.callee.regExp) { - var regExpStr = '^(.*)('; - for(var i=0; i' - + ajaxChat.replaceEmoticons(p3); - } - return str; - }, - - getActiveStyle: function() { - var cookie = this.readCookie(this.sessionName + '_style'); - var style = cookie ? cookie : this.getPreferredStyleSheet(); - return style; - }, - - initStyle: function() { - this.styleInitiated = true; - this.setActiveStyleSheet(this.getActiveStyle()); - }, - - persistStyle: function() { - if(this.styleInitiated) { - this.createCookie(this.sessionName + '_style', this.getActiveStyleSheet(), this.cookieExpiration); - } - }, - - setSelectedStyle: function() { - if(this.dom['styleSelection']) { - var style = this.getActiveStyle(); - var styleOptions = this.dom['styleSelection'].getElementsByTagName('option'); - for(var i=0; imenuItem ) - // encodedUserName contains the userName ready to be used for javascript links - // userID is only available for the online users menu - not for the inline user menu - // use (encodedUserName == this.encodedUserName) to check for the current user - getCustomUserMenuItems: function(encodedUserName, userID) { - return ''; - }, - - // Override to parse custom input messages: - // Return replaced text - // text contains the whole message - parseCustomInputMessage: function(text) { - return text; - }, - - // Override to parse custom input commands: - // Return parsed text - // text contains the whole message, textParts the message split up as words array - parseCustomInputCommand: function(text, textParts) { - return text; - }, - - // Override to replace custom text: - // Return replaced text - // text contains the whole message - replaceCustomText: function(text) { - return text; - }, - - // Override to replace custom commands: - // Return replaced text for custom commands - // text contains the whole message, textParts the message split up as words array - replaceCustomCommands: function(text, textParts) { - return text; - }, - - // Override to replace custom BBCodes: - // Return replaced text and call replaceBBCode recursively for the content text - // tag contains the BBCode tag, attribute the BBCode attribute and content the content text - // This method is only called for BBCode tags which are in the bbCodeTags list - replaceCustomBBCode: function(tag, attribute, content) { - return '<' + tag + '>' + this.replaceBBCode(content) + ''; - }, - - // Override to perform custom actions on new messages: - // Return true if message is to be added to the chatList, else false - customOnNewMessage: function(dateObject, userID, userName, userRole, messageID, messageText, channelID, ip) { - return true; - } - -}; \ No newline at end of file diff --git a/library/ajaxchat/chat/js/config.js b/library/ajaxchat/chat/js/config.js deleted file mode 100644 index a4d3c3f75..000000000 --- a/library/ajaxchat/chat/js/config.js +++ /dev/null @@ -1,261 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat config parameters: -var ajaxChatConfig = { - - // The channelID of the channel to enter on login (the loginChannelName is used if set to null): - loginChannelID: null, - // The channelName of the channel to enter on login (the default channel is used if set to null): - loginChannelName: null, - - // The time in ms between update calls to retrieve new chat messages: - timerRate: 2000, - - // The URL to retrieve the XML chat messages (must at least contain one parameter): - ajaxURL: './?ajax=true', - // The base URL of the chat directory, used to retrieve media files (images, sound files, etc.): - baseURL: './', - - // A regular expression for allowed source URL's for media content (e.g. images displayed inline); - regExpMediaUrl: '^((http)|(https)):\\/\\/', - - // If set to false the chat update is delayed until the event defined in ajaxChat.setStartChatHandler(): - startChatOnLoad: true, - - // Defines the IDs of DOM nodes accessed by the chat: - domIDs: { - // The ID of the chat messages list: - chatList: 'chatList', - // The ID of the online users list: - onlineList: 'onlineList', - // The ID of the message text input field: - inputField: 'inputField', - // The ID of the message text length counter: - messageLengthCounter: 'messageLengthCounter', - // The ID of the channel selection: - channelSelection: 'channelSelection', - // The ID of the style selection: - styleSelection: 'styleSelection', - // The ID of the emoticons container: - emoticonsContainer: 'emoticonsContainer', - // The ID of the color codes container: - colorCodesContainer: 'colorCodesContainer', - // The ID of the flash interface container: - flashInterfaceContainer: 'flashInterfaceContainer' - }, - - // Defines the settings which can be modified by users: - settings: { - // Defines if BBCode tags are replaced with the associated HTML code tags: - bbCode: true, - // Defines if image BBCode is replaced with the associated image HTML code: - bbCodeImages: true, - // Defines if color BBCode is replaced with the associated color HTML code: - bbCodeColors: true, - // Defines if hyperlinks are made clickable: - hyperLinks: true, - // Defines if line breaks are enabled: - lineBreaks: true, - // Defines if emoticon codes are replaced with their associated images: - emoticons: true, - - // Defines if the focus is automatically set to the input field on chat load or channel switch: - autoFocus: true, - // Defines if the chat list scrolls automatically to display the latest messages: - autoScroll: true, - // The maximum count of messages displayed in the chat list (will be ignored if set to 0): - maxMessages: 0, - - // Defines if long words are wrapped to avoid vertical scrolling: - wordWrap: true, - // Defines the maximum length before a word gets wrapped: - maxWordLength: 32, - - // Defines the format of the date and time displayed for each chat message: - dateFormat: '(%H:%i:%s)', - - // Defines if font colors persist without the need to assign them to each message: - persistFontColor: false, - // The default font color, uses the page default font color if set to null: - fontColor: null, - - // Defines if sounds are played: - audio: true, - // Defines the sound volume (0.0 = mute, 1.0 = max): - audioVolume: 1.0, - - // Defines the sound that is played when normal messages are reveived: - soundReceive: 'sound_1', - // Defines the sound that is played on sending normal messages: - soundSend: 'sound_2', - // Defines the sound that is played on channel enter or login: - soundEnter: 'sound_3', - // Defines the sound that is played on channel leave or logout: - soundLeave: 'sound_4', - // Defines the sound that is played on chatBot messages: - soundChatBot: 'sound_5', - // Defines the sound that is played on error messages: - soundError: 'sound_6', - - // Defines if the document title blinks on new messages: - blink: true, - // Defines the blink interval in ms: - blinkInterval: 500, - // Defines the number of blink intervals: - blinkIntervalNumber: 10 - }, - - // Defines a list of settings which are not to be stored in a session cookie: - nonPersistentSettings: [], - - // Defines the list of allowed BBCodes: - bbCodeTags:[ - 'b', - 'i', - 'u', - 'quote', - 'code', - 'color', - 'url', - 'img' - ], - - // Defines the list of allowed color codes: - colorCodes: [ - 'gray', - 'silver', - 'white', - 'yellow', - 'orange', - 'red', - 'fuchsia', - 'purple', - 'navy', - 'blue', - 'aqua', - 'teal', - 'green', - 'lime', - 'olive', - 'maroon', - 'black' - ], - - // Defines the list of allowed emoticon codes: - emoticonCodes: [ - ':)', - ':(', - ';)', - ':P', - ':D', - ':|', - ':O', - ':?', - '8)', - '8o', - 'B)', - ':-)', - ':-(', - ':-*', - 'O:-D', - '>:-D', - ':o)', - ':idea:', - ':important:', - ':help:', - ':error:', - ':warning:', - ':favorite:' - ], - - // Defines the list of emoticon files associated with the emoticon codes: - emoticonFiles: [ - 'smile.png', - 'sad.png', - 'wink.png', - 'razz.png', - 'grin.png', - 'plain.png', - 'surprise.png', - 'confused.png', - 'glasses.png', - 'eek.png', - 'cool.png', - 'smile-big.png', - 'crying.png', - 'kiss.png', - 'angel.png', - 'devilish.png', - 'monkey.png', - 'idea.png', - 'important.png', - 'help.png', - 'error.png', - 'warning.png', - 'favorite.png' - ], - - // Defines the available sounds loaded on chat start: - soundFiles: { - sound_1: 'sound_1.mp3', - sound_2: 'sound_2.mp3', - sound_3: 'sound_3.mp3', - sound_4: 'sound_4.mp3', - sound_5: 'sound_5.mp3', - sound_6: 'sound_6.mp3' - }, - - - // Once users have been logged in, the following values are overridden by those in config.php. - // You should set these to be the same as the ones in config.php to avoid confusion. - - // Session identification, used for style and setting cookies: - sessionName: 'ajax_chat', - - // The time in days until the style and setting cookies expire: - cookieExpiration: 365, - // The path of the cookies, '/' allows to read the cookies from all directories: - cookiePath: '/', - // The domain of the cookies, defaults to the hostname of the server if set to null: - cookieDomain: null, - // If enabled, cookies must be sent over secure (SSL/TLS encrypted) connections: - cookieSecure: null, - - // The name of the chat bot: - chatBotName: 'ChatBot', - // The userID of the chat bot: - chatBotID: 2147483647, - - // Allow/Disallow registered users to delete their own messages: - allowUserMessageDelete: true, - - // Minutes until a user is declared inactive (last status update) - the minimum is 2 minutes: - inactiveTimeout: 2, - - // UserID plus this value are private channels (this is also the max userID and max channelID): - privateChannelDiff: 500000000, - // UserID plus this value are used for private messages: - privateMessageDiff: 1000000000, - - // Defines if login/logout and channel enter/leave are displayed: - showChannelMessages: true, - - // Max messageText length: - messageTextMaxLength: 1040, - - // Defines if the socket server is enabled: - socketServerEnabled: false, - // Defines the hostname of the socket server used to connect from client side: - socketServerHost: 'localhost', - // Defines the port of the socket server: - socketServerPort: 1935, - // This ID can be used to distinguish between different chat installations using the same socket server: - socketServerChatID: 0 - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/custom.js b/library/ajaxchat/chat/js/custom.js deleted file mode 100644 index 6d801534e..000000000 --- a/library/ajaxchat/chat/js/custom.js +++ /dev/null @@ -1,16 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Overriding client side functionality: - -/* -// Example - Overriding the replaceCustomCommands method: -ajaxChat.replaceCustomCommands = function(text, textParts) { - return text; -} - */ \ No newline at end of file diff --git a/library/ajaxchat/chat/js/index.html b/library/ajaxchat/chat/js/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/library/ajaxchat/chat/js/lang/ar.js b/library/ajaxchat/chat/js/lang/ar.js deleted file mode 100644 index 7fd18db10..000000000 --- a/library/ajaxchat/chat/js/lang/ar.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author pepotiger (www.dd4bb.com) - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s دخول.', - logout: '%s خروج.', - logoutTimeout: '%s تم تسجيل الخروج (Timeout).', - logoutIP: '%s تم تسجيل الخروج (Invalid IP address).', - logoutKicked: '%s تم تسجيل الخروج (Kicked).', - channelEnter: '%s دخول المحطة.', - channelLeave: '%s خروج.', - privmsg: '(رسالة خاصة)', - privmsgto: '(رسالة خاصة الى %s)', - invite: '%s يدعوك الى %s.', - inviteto: 'دعوتك لـ %s للإنضمام الى %s تم ارسالها.', - uninvite: '%s الغاء دعوتك من %s.', - uninviteto: 'الغاء الدعوة من %s للـ %s تم ارسالها.', - queryOpen: 'تم فتح نافذة خاصة مع %s.', - queryClose: 'النافذة الخاصة مع %s تم غلقها.', - ignoreAdded: 'اضيف %s الى قائمة التجاهل.', - ignoreRemoved: 'حذف %s من قائمة التجاهل.', - ignoreList: 'اعضاء متجاهلين:', - ignoreListEmpty: 'لا يوجد اعضاء تم تجاهلهم.', - who: 'المستخدمين المتواجدين:', - whoChannel: 'Online Users in channel %s:', - whoEmpty: 'لا يوجد اعضاء بهذه المحطة.', - list: 'المحطات المتوفرة:', - bans: 'اعضاء محجوبين:', - bansEmpty: 'لا يوجد اعضاء محجوبين.', - unban: 'حظر العضو %s تم الغائه.', - whois: 'الأى بى للعضو %s:', - whereis: 'User %s is in channel %s.', - roll: '%s rolls %s and gets %s.', - nick: '%s is now known as %s.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Logout', - userMenuWho: 'List online users', - userMenuList: 'List available channels', - userMenuAction: 'Describe action', - userMenuRoll: 'Roll dice', - userMenuNick: 'Change username', - userMenuEnterPrivateRoom: 'Enter private room', - userMenuSendPrivateMessage: 'Send private message', - userMenuDescribe: 'Send private action', - userMenuOpenPrivateChannel: 'Open private channel', - userMenuClosePrivateChannel: 'Close private channel', - userMenuInvite: 'Invite', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignore/Accept', - userMenuIgnoreList: 'List ignored users', - userMenuWhereis: 'Display channel', - userMenuKick: 'Kick/Ban', - userMenuBans: 'List banned users', - userMenuWhois: 'Display IP', - unbanUser: 'Revoke ban of user %s', - joinChannel: 'الإنضمام للمحطة %s', - cite: '%s كتب:', - urlDialog: 'من فضلك ادخل الرابط (URL) لعنوان الأنترنت:', - deleteMessage: 'Delete this chat message', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'الكوكييز مطلوبة لهذا الشات.', - errorUserNameNotFound: 'خطأ: العضو %s لم يتم العثور عليه.', - errorMissingText: 'خطأ: نص الرسالة مفقود.', - errorMissingUserName: 'خطأ: اسم المستخدم مفقود.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'خطأ: اسم المحطة مفقود.', - errorInvalidChannelName: 'خطأ: اسم المحطة غير صحيح: %s', - errorPrivateMessageNotAllowed: 'خطأ: غير مسموح بالرسائل الخاصة.', - errorInviteNotAllowed: 'خطأ: غير مسموح بدعوة الأخرين.', - errorUninviteNotAllowed: 'خطأ: غير مسموح بإلغاء دعوات الأخرين.', - errorNoOpenQuery: 'خطأ: لم يتم فتح اى نوافذ خاصة.', - errorKickNotAllowed: 'خطأ: غير مسموح لك بطرد احد %s.', - errorCommandNotAllowed: 'خطأ: غير مسموح بالأمر: %s', - errorUnknownCommand: 'خطأ: امر غير معروف: %s', - errorMaxMessageRate: 'Error: You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'خطأ: وقت الأتصال استنفذ. من فضلك حاول مرة اخرى.', - errorConnectionStatus: 'خطأ: حالة الأتصال: %s', - errorSoundIO: 'Error: Failed to load sound file (Flash IO Error).', - errorSocketIO: 'Error: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/bg.js b/library/ajaxchat/chat/js/lang/bg.js deleted file mode 100644 index c1e1886ad..000000000 --- a/library/ajaxchat/chat/js/lang/bg.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Borislav Manolov - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s влезе в чата.', - logout: '%s излезе от чата.', - logoutTimeout: '%s излезе автоматично от чата (Изтичане на времето).', - logoutIP: '%s излезе автоматично от чата (Грешен айпи адрес).', - logoutKicked: '%s излезе автоматично от чата (Изритване).', - channelEnter: '%s влезе в канала.', - channelLeave: '%s напусна канала.', - privmsg: '(прошепва)', - privmsgto: '(прошепва на %s)', - invite: '%s ви кани да се присъедините към %s.', - inviteto: 'Поканата ви към %s да се присъедини към канала %s беше изпратена.', - uninvite: '%s отмени поканата ви за канала %s.', - uninviteto: 'Отмяната на поканата ви към %s за канала %s беше изпратена.', - queryOpen: 'Отворен е личен канал за %s.', - queryClose: 'Затворен е личен канал за %s.', - ignoreAdded: '%s беше добавен към списъка с пренебрегнатите.', - ignoreRemoved: '%s беше изваден от списъка с пренебрегнатите.', - ignoreList: 'Пренебрегнати потребители:', - ignoreListEmpty: 'Няма пренебрегнати потребители.', - who: 'Потребители на линия:', - whoChannel: 'Потребители на линия в канала %s:', - whoEmpty: 'В дадения канал няма потребители на линия.', - list: 'Налични канали:', - bans: 'Изгонени потребители:', - bansEmpty: 'Няма изгонени потребители.', - unban: 'Изгонването на потребителя %s е отменено.', - whois: 'Потребител %s — айпи адрес:', - whereis: 'Потребителят %s е в канала %s.', - roll: '%s хвърли %s и получи %s.', - nick: '%s вече се казва %s.', - toggleUserMenu: 'Показване/скриване на потребителското меню за %s', - userMenuLogout: 'Изход', - userMenuWho: 'Потребители на линия', - userMenuList: 'Налични канали', - userMenuAction: 'Описване на действие', - userMenuRoll: 'Хвърляне на зар', - userMenuNick: 'Смяна на името', - userMenuEnterPrivateRoom: 'Влизане в личната стая', - userMenuSendPrivateMessage: 'Изпращане на лично съобщение', - userMenuDescribe: 'Изпращане на лично действие', - userMenuOpenPrivateChannel: 'Отваряне на личен канал', - userMenuClosePrivateChannel: 'Затваряне на личен канал', - userMenuInvite: 'Покана', - userMenuUninvite: 'Отмяна на покана', - userMenuIgnore: 'Пренебрегване/Приемане', - userMenuIgnoreList: 'Пренебрегнати потребители', - userMenuWhereis: 'Преглед на канал', - userMenuKick: 'Изритване/Изгонване', - userMenuBans: 'Изгонени потребители', - userMenuWhois: 'Преглед на айпи адреса', - unbanUser: 'Отмяна на изгонването на %s', - joinChannel: 'Присъединяване към канала %s', - cite: '%s каза:', - urlDialog: 'Моля, въведете адреса (URL) на страницата:', - deleteMessage: 'Изтриване на съобщението', - deleteMessageConfirm: 'Наистина ли желаете да изтриете съобщението?', - errorCookiesRequired: 'За чата се изискват бисквитки (cookies).', - errorUserNameNotFound: 'Грешка: Не е намерен потребител %s.', - errorMissingText: 'Грешка: Липсва текст на съобщението.', - errorMissingUserName: 'Грешка: Липсва потребителско име.', - errorInvalidUserName: 'Грешка: Невалидно потребителско име.', - errorUserNameInUse: 'Грешка: Това потребителско име вече се използва.', - errorMissingChannelName: 'Грешка: Липсва име на канал.', - errorInvalidChannelName: 'Грешка: Невалидно име на канал: %s', - errorPrivateMessageNotAllowed: 'Грешка: Личните съобщения не са позволени.', - errorInviteNotAllowed: 'Грешка: Не ви е позволено да каните потребители в този канал.', - errorUninviteNotAllowed: 'Грешка: Не ви е позволено да отменяте покани в този канал.', - errorNoOpenQuery: 'Грешка: Не е отворен личен канал.', - errorKickNotAllowed: 'Грешка: Не ви е позволено да изритвате %s.', - errorCommandNotAllowed: 'Грешка: Командата не е позволена: %s', - errorUnknownCommand: 'Грешка: Непозната команда: %s', - errorMaxMessageRate: 'Грешка: Превишихте допустимия брой съобщения в минута.', - errorConnectionTimeout: 'Грешка: Изтичане на времето за връзка. Моля, опитайте отново!', - errorConnectionStatus: 'Грешка: Състояние на връзката: %s', - errorSoundIO: 'Грешка: Неуспешно зареждане на звуковия файл (Входно-изходна грешка при Флаш).', - errorSocketIO: 'Грешка: Неуспешна връзка към сокетния сървър (Входно-изходна грешка при Флаш).', - errorSocketSecurity: 'Грешка: Неуспешна връзка към сокетния сървър (Грешка в сигурността при Флаш).', - errorDOMSyntax: 'Грешка: Неправилен синтаксис при DOM (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/ca.js b/library/ajaxchat/chat/js/lang/ca.js deleted file mode 100644 index 83eab4df5..000000000 --- a/library/ajaxchat/chat/js/lang/ca.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Manu Quintans - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - login: '%s ha entrat al xat.', - logout: '%s ha sortit del xat.', - logoutTimeout: '%s s\'ha desconnectat (Temps d\'espera esgotat).', - logoutIP: '%s s\'ha desconnectat (Adreça IP no vàlida).', - logoutKicked: '%s s\'ha desconnectat (Patejat).', - channelEnter: '%s entra al canal.', - channelLeave: '%s se\'n va del canal.', - privmsg: '(xiuxiueigs)', - privmsgto: '(xiuxiueigs a %s)', - invite: '%s et convida a unir-te a %s.', - inviteto: 'El teu convit a %s per a unir-se a %s ha estat enviat.', - uninvite: '%s no et convida a %s.', - uninviteto: 'El teu no convit a %s per al canal %s ha estat enviat', - queryOpen: 'Canal privat obert %s.', - queryClose: 'Canal privat tancat %s tancat', - ignoreAdded: 'Agregat %s a la llista de usuaris ignorats.', - ignoreRemoved: 'Eliminant %s de la llista de usuaris ignorats.', - ignoreList: 'Usuaris ignorats', - ignoreListEmpty: 'Llista d\'usuaris no ignorats.', - who: 'Usuaris connectats:', - whoChannel: 'Usuaris en línia al canal %s:', - whoEmpty: 'No hi ha usuaris connectats ara.', - list: 'Canals disponibles:', - bans: 'Usuaris Bannejats:', - bansEmpty: 'No s\'han registrat usuaris bannejats.', - unban: 'Ban de l\'usuari %s revocat.', - whois: 'Usuari %s - Adreça IP:', - whereis: 'L\'usuari %s és al canal %s.', - roll: '%s tirà els daus %s i aconsegueix %s.', - nick: '%s es fa dir ara %s.', - toggleUserMenu: 'Tanca menu de l\'usuari per a %s', - userMenuLogout: 'Tancar sessió', - userMenuWho: 'Llista d\'usuaris en línia', - userMenuList: 'Llista de canals disponibles', - userMenuAction: 'Descriure una acció', - userMenuRoll: 'Tirar daus', - userMenuNick: 'Canviar el nom de l\'usuari', - userMenuEnterPrivateRoom: 'Entrar en un lloc privat', - userMenuSendPrivateMessage: 'Enviar un missatge privat', - userMenuDescribe: 'Enviar una acció privada', - userMenuOpenPrivateChannel: 'Obrir un canal privat', - userMenuClosePrivateChannel: 'Tancar un canal privat', - userMenuInvite: 'Convidar', - userMenuUninvite: 'Desconvidar', - userMenuIgnore: 'Ignorar/Acceptar', - userMenuIgnoreList: 'Llista d\'usuaris ignorats', - userMenuWhereis: 'Visualitzar el canal', - userMenuKick: 'Pateig/Banneig', - userMenuBans: 'Llista d\'usuaris banejats', - userMenuWhois: 'Mostrar IP', - unbanUser: 'Cancel·lar banejament de usuari %s', - joinChannel: 'Unir-se al canal %s', - cite: '%s va dir:', - urlDialog: 'Si us plau, introdueix la adreça (URL) de la pàgina web:', - deleteMessage: 'Esborra aquest missatge', - deleteMessageConfirm: 'Realment vols esborrar el missatge seleccionat?', - errorCookiesRequired: 'Les galetes són necessaries per aquest xat .', - errorUserNameNotFound: 'Error: usuari %s no s\'ha trobat.', - errorMissingText: 'Error: Missatge perdut.', - errorMissingUserName: 'Error: Usuari no trobat.', - errorInvalidUserName: 'Error: Nom d\'usuari no vàlid.', - errorUserNameInUse: 'Error: El nom d\'usuari ja està en ús.', - errorMissingChannelName: 'Error: No es troba el canal.', - errorInvalidChannelName: 'Error: nombre del canal invàlid: %s', - errorPrivateMessageNotAllowed: 'Error: Els missatges privats no t\'estan permesos.', - errorInviteNotAllowed: 'Error: No t\'està permés convidar a ningú a aquest canal.', - errorUninviteNotAllowed: 'Error: No t\'està permés desconvidar ningú d\'aquest canal.', - errorNoOpenQuery: 'Error: Cap canal privat obert.', - errorKickNotAllowed: 'Error: No t\'està permés expulsar a ningú %s.', - errorCommandNotAllowed: 'Error: Ordre desconeguda: %s', - errorUnknownCommand: 'Error: Ordre desconeguda: %s', - errorMaxMessageRate: 'Error: has excedit el màxim nombre de missatges per minut.', - errorConnectionTimeout: 'Error: Temps d\'espera de la connexió expirat. Reintenta-ho de nou.', - errorConnectionStatus: 'Error: Estat de la connexió: %s', - errorSoundIO: 'Error: No ha estat possible carregar el so (Flash IO Error).', - errorSocketIO: 'Error: La connexió al servidor ha fallat (Flash IO Error).', - errorSocketSecurity: 'Error: La connexió al servidor ha fallat (Flash Security Error).', - errorDOMSyntax: 'Error: Sintaxi DOM invàlida (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/cy.js b/library/ajaxchat/chat/js/lang/cy.js deleted file mode 100644 index fd63aea95..000000000 --- a/library/ajaxchat/chat/js/lang/cy.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - * @translation Alan Davies, ardavies@tiscali.co.uk - * @language: Welsh (Cymraeg) - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: 'Mae %s wedi mewngofnodi.', - logout: 'Allgofnododd %s.', - logoutTimeout: 'Allgofnodwyd %s (Terfyn amser).', - logoutIP: 'Allgofnodwyd %s (Cyfeiriad IP annilys).', - logoutKicked: 'Allgofnodwyd %s (Cic).', - channelEnter: 'Mae %s wedi ymuno \'r sianel.', - channelLeave: 'Mae %s wedi gadael y sianel.', - privmsg: '(sibrwd)', - privmsgto: '(sibrwd i %s)', - invite: 'Mae %s yn eich gwahodd i ymuno %s.', - inviteto: 'Mae eich gwahoddiad i %s i ymuno sianel %s wedi\'i anfon.', - uninvite: 'Mae %s yn tynnu\'r gwahoddiad i sianel %s yn l.', - uninviteto: 'Mae\'r neges yn tynnu\'r gwahoddiad i sianel %s yn l wedi\'i hanfon.', - queryOpen: 'Agorwyd sianel breifat i %s.', - queryClose: 'Ceuwyd sianel breifat i %s.', - ignoreAdded: 'Ychwanegwyd %s i\'r anwybyddion.', - ignoreRemoved: 'Tynnwyd %s bant o\'r anwybyddion.', - ignoreList: 'Anwybyddion:', - ignoreListEmpty: 'Dim anwybyddion wedi\'u rhestru.', - who: 'Defnyddwyr Ar-lein:', - whoChannel: 'Defnyddwyr Ar-lein ar sianel %s:', - whoEmpty: 'Dim defnyddwyr ar-lein ar y sianel hon.', - list: 'Sianeli ar gael:', - bans: 'Gwaharddogion:', - bansEmpty: 'Dim gwaharddogion wedi\'u rhestru.', - unban: 'Diddymwyd gwaharddiad %s.', - whois: 'Defnyddiwr %s - cyfeiriad IP:', - whereis: 'Mae defnyddiwr %s yn y sianel %s.', - roll: 'Mae %s yn rholio %s a chael %s.', - nick: 'Enw %s nawr yw %s.', - toggleUserMenu: 'Togl dewislen defnyddiwr ar gyfer %s', - userMenuLogout: 'Allgofnodi', - userMenuWho: 'Rhestr ddefnyddwyr ar-lein', - userMenuList: 'Rhestr sianeli ar gael', - userMenuAction: 'Disgrifio gweithred', - userMenuRoll: 'Rholio dis', - userMenuNick: 'Newid enw', - userMenuEnterPrivateRoom: 'Myned i mewn i ystafell breifat', - userMenuSendPrivateMessage: 'Anfon neges breifat', - userMenuDescribe: 'Anfon gweithred breifat', - userMenuOpenPrivateChannel: 'Agor sianel breifat', - userMenuClosePrivateChannel: 'Cau sianel breifat', - userMenuInvite: 'Gwahodd', - userMenuUninvite: 'Tynnu gwahoddiad', - userMenuIgnore: 'Anwybyddu/Derbyn', - userMenuIgnoreList: 'Rhestr anwybyddion', - userMenuWhereis: 'Dangos sianel', - userMenuKick: 'Cic/Gwahardd', - userMenuBans: 'Rhestr waharddogion', - userMenuWhois: 'Dangos IP', - unbanUser: 'Diddynu gwaharddiad %s', - joinChannel: 'Ymuno sianel %s', - cite: 'Dywedodd %s:', - urlDialog: 'Rhowch gyfeiriad (URL) y wefan:', - deleteMessage: 'Dilwch y neges hon', - deleteMessageConfirm: 'Ydych wir am ddileu\'r neges hon?', - errorCookiesRequired: 'Mae nagen cwcis ar gyfer y sgwrs hon.', - errorUserNameNotFound: 'Gwall: Heb ffeindio %s.', - errorMissingText: 'Gwall: testun neges ar goll.', - errorMissingUserName: 'Gwall: Enw ar goll.', - errorInvalidUserName: 'Gwall: Enw annilys.', - errorUserNameInUse: 'Gwall: Enw\'n bodoli eisoes.', - errorMissingChannelName: 'Gwall: Enw sianel ar goll.', - errorInvalidChannelName: 'Gwall: Enw sianel annilys: %s', - errorPrivateMessageNotAllowed: 'Gwall: Ni chaniateir negesuon preifat.', - errorInviteNotAllowed: 'Gwall: Nid oes hawl gwahodd rhywun i\'r sianel hon.', - errorUninviteNotAllowed: 'Gwall: Nid oes hawl tynnu gwahaoddiad yn l o\'r sianel hon.', - errorNoOpenQuery: 'Gwall: Dim sianel breifat ar agor.', - errorKickNotAllowed: 'Gwall: Nid oes hawl cicio %s.', - errorCommandNotAllowed: 'Gwall: Nid oes hawl defnyddio\'r gorchymyn: %s', - errorUnknownCommand: 'Gwall: Gorchymyn anhysbys: %s', - errorMaxMessageRate: 'Gwall: Rydych wedi myn dros y nifer o negeseuon sydd hawl gennych anfon pob munud.', - errorConnectionTimeout: 'Gwall: Terfyn amser cysylltiad. Ceisiwch eto.', - errorConnectionStatus: 'Gwall: Statws cysylltiad: %s', - errorSoundIO: 'Gwall: Methu llwytho ffeil sain (Gwall Flash IO).', - errorSocketIO: 'Gwall: Cysylltiad i\'r gweinyddwr soced wedi methu (Gwall Flash IO).', - errorSocketSecurity: 'Gwall: Cysylltiad i\'r gweinyddwr soced wedi methu (Gwall Diogelwch Flash).', - errorDOMSyntax: 'Gwall: Cystrawen DOM Annilys (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/cz.js b/library/ajaxchat/chat/js/lang/cz.js deleted file mode 100644 index 4a0a7b8b2..000000000 --- a/library/ajaxchat/chat/js/lang/cz.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s se přihlásil.', - logout: '%s se odhlásil.', - logoutTimeout: '%s byl odhlášen (překročen timeout).', - logoutIP: '%s byl odhlášen (neplatná IP adresa).', - logoutKicked: '%s byl vyhozen.', - channelEnter: '%s vstoupil do místnosti.', - channelLeave: '%s odešel z místnosti.', - privmsg: '(šeptá)', - privmsgto: '(šeptá %s)', - invite: '%s tě zve do místnosti %s.', - inviteto: 'Tvoje pozvání %s do místnosti %s bylo odesláno.', - uninvite: '%s odmítl pozvání do pokoje %s.', - uninviteto: 'Tvoje pozvání %s do pokoje %s bylo odmítnuto.', - queryOpen: 'Soukromý rozhovor s %s byl započat.', - queryClose: 'Soukromý rozhovor s %s byl ukončen.', - ignoreAdded: '%s byl přidán do seznamu ignorovaných.', - ignoreRemoved: '%s byl odebrán ze seznamu ignorovaných.', - ignoreList: 'Seznam ignorovaných:', - ignoreListEmpty: 'Seznam je prázdný...', - who: 'Přihlášení uživatelé:', - whoChannel: 'Uživatelé, přihlášení v místnosti %s:', - whoEmpty: 'Tady nikdo není...', - list: 'Dostupné místnosti:', - bans: 'Vyhození uživatelé:', - bansEmpty: 'Seznam je prázdný...', - unban: 'Uživatel %s byl omilostněn.', - whois: 'Uživatel %s - IP adresa:', - whereis: 'Uživatel %s je v místnosti %s.', - roll: '%s hodil %s a vyhrává %s.', - nick: '%s se nyní jmenuje %s.', - toggleUserMenu: 'Vyvolej/zhasni uživatelskou nabídku pro %s', - userMenuLogout: 'Odhlásit', - userMenuWho: 'Seznam přihlášených uživatelů', - userMenuList: 'Seznam místností', - userMenuAction: 'Co právě dělám', - userMenuRoll: 'Hodit kostkou', - userMenuNick: 'Změnit jméno uživatele', - userMenuEnterPrivateRoom: 'Vstoupit do soukromé místnosti', - userMenuSendPrivateMessage: 'Poslat soukromou zprávu', - userMenuDescribe: 'Co právě dělám (soukromě)', - userMenuOpenPrivateChannel: 'Zahájit soukromý rozhovor', - userMenuClosePrivateChannel: 'Ukončit soukromý rozhovor', - userMenuInvite: 'Pozvat', - userMenuUninvite: 'Odmítnout pozvání', - userMenuIgnore: 'Ignorovat/Přijmout', - userMenuIgnoreList: 'Seznam ignorovaných uživatelů', - userMenuWhereis: 'Zobrazit místnost', - userMenuKick: 'Vyhodit/Zablokovat', - userMenuBans: 'Seznam vyhozených uživatelů', - userMenuWhois: 'Zobrazit IP adresu', - unbanUser: 'Omilostnit uživatele %s', - joinChannel: 'Vstoupit do místnosti %s', - cite: '%s prohlásil:', - urlDialog: 'Zadej, prosím adresu (URL) stránky:', - deleteMessage: 'Vymazat zprávu', - deleteMessageConfirm: 'Opravdu vymazat tuto zprávu ?', - errorCookiesRequired: 'Pro tento chat je nutno povolit Cookies.', - errorUserNameNotFound: 'Chyba: Uživatel %s nebyl nalezen.', - errorMissingText: 'Chyba: Schází text zprávy.', - errorMissingUserName: 'Chyba: Schází jméno uživatele.', - errorInvalidUserName: 'Chyba: Neplatné jméno uživatele.', - errorUserNameInUse: 'Chyba: Jméno uživatele už je používáno.', - errorMissingChannelName: 'Chyba: Schází název místnosti.', - errorInvalidChannelName: 'Chyba: Neplatný název místnosti: %s', - errorPrivateMessageNotAllowed: 'Chyba: Soukromé zprávy nejsou povoleny.', - errorInviteNotAllowed: 'Chyba: Nejsi oprávněn zvát do této místnosti.', - errorUninviteNotAllowed: 'Chyba: Nejsi oprávněn odmítat pozvání z této místnosti.', - errorNoOpenQuery: 'Chyba: Nebyl zahájen žádný soukromý rozhovor.', - errorKickNotAllowed: 'Chyba: Nemáš právo vyhodit %s.', - errorCommandNotAllowed: 'Chyba: Tento příkaz není povolen: %s', - errorUnknownCommand: 'Chyba: Neznámý příkaz: %s', - errorMaxMessageRate: 'Chyba: Překročil jsi maximální počet zpráv za minutu.', - errorConnectionTimeout: 'Chyba: Čas připojení vypršel. Připoj se znovu.', - errorConnectionStatus: 'Chyba: Stav připojení: %s', - errorSoundIO: 'Chyba: Nepodařilo se přehrát zvukový soubor (Flash IO Error).', - errorSocketIO: 'Chyba: Nepodařilo se připojení k serveru (Flash IO Error).', - errorSocketSecurity: 'Chyba: Připojení k serveru selhalo (Flash Security Error).', - errorDOMSyntax: 'Chyba: Neplatná syntaxe DOM (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/da.js b/library/ajaxchat/chat/js/lang/da.js deleted file mode 100644 index c6e537aad..000000000 --- a/library/ajaxchat/chat/js/lang/da.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s Logger dig ind.', - logout: '%s Logger dig ud.', - logoutTimeout: '%s Er logget ud (Timeout).', - logoutIP: '%s er logget ud (ugyldig IP addresse).', - logoutKicked: '%s er logget ud (Kicked).', - channelEnter: '%s kom ind i kanalen.', - channelLeave: '%s forlod kanalen.', - privmsg: '(hvisker)', - privmsgto: '(hvisker til %s)', - invite: '%s inviterede dig til at joine %s.', - inviteto: 'Din invitation %s til at joine kanal %s er blevet sendt.', - uninvite: '%s Du er nu ikke længere inviteret til %s.', - uninviteto: 'Anullere invitation for %s på kanal %s.', - queryOpen: 'Privat kanal åben for %s.', - queryClose: 'Privat kanal for %s lukket.', - ignoreAdded: 'Tilføjede %s til ignorerings listen.', - ignoreRemoved: 'fjernede %s fra ignorerings listen.', - ignoreList: 'Ignorerede brugere:', - ignoreListEmpty: 'Ingen ignorerede brugere.', - who: 'Online brugere:', - whoChannel: 'Online brugere på kanal %s:', - whoEmpty: 'ingen online brugere på den angivne kanal.', - list: 'Tilgængelige kanaler:', - bans: 'Banlyste brugere:', - bansEmpty: 'Ingen banlyste brugere på listen.', - unban: 'Banlysning af %s ophævet.', - whois: 'bruger %s - IP addresse:', - whereis: 'brugeren %s er på kanal %s.', - roll: '%s Kastede terninger %s og fik %s.', - nick: '%s Er nu kendt som %s.', - toggleUserMenu: 'skift bruger menu for %s', - userMenuLogout: 'Log ud', - userMenuWho: 'Vis online brugere', - userMenuList: 'Vis tilgængelige kanaler', - userMenuAction: 'Beskrivende handling', - userMenuRoll: 'Kast terninger', - userMenuNick: 'Skift brugernavn', - userMenuEnterPrivateRoom: 'Gå ind i privat rum.', - userMenuSendPrivateMessage: 'Send privat besked', - userMenuDescribe: 'Send privat handling', - userMenuOpenPrivateChannel: 'Åben privat kanal', - userMenuClosePrivateChannel: 'Luk privat kanal', - userMenuInvite: 'Inviter', - userMenuUninvite: 'Anuller invitation', - userMenuIgnore: 'Ignorer/Accepter', - userMenuIgnoreList: 'Vis ignorerede brugere', - userMenuWhereis: 'vis kanal', - userMenuKick: 'Spark ud/Banlys', - userMenuBans: 'Vis banlyste brugere', - userMenuWhois: 'Vis IP adresse', - unbanUser: 'Fjernede banlysning af brugere %s', - joinChannel: 'Deltag i en kanal %s', - cite: '%s sagde:', - urlDialog: 'Venligst indsæt adressen (URL) for den pågældende hjemmeside:', - deleteMessage: 'Fjern denne chat besked', - deleteMessageConfirm: 'Vil du virkelig fjerne denne besked?', - errorCookiesRequired: 'Cookies er nødvændige for denne chat', - errorUserNameNotFound: 'FEJL: bruger %s ikke fundet.', - errorMissingText: 'FEJL: Manglende besked.', - errorMissingUserName: 'FEJL: Manglende brugernavn.', - errorInvalidUserName: 'FEJL: Ugyldigt brugernavn.', - errorUserNameInUse: 'FEJL: Brugernavnet er allerede i brug.', - errorMissingChannelName: 'FEJL: Manglende kanal navn.', - errorInvalidChannelName: 'FEJL: Ugyldigt kanal navn: %s', - errorPrivateMessageNotAllowed: 'FEJL: Privat beskeder er ikke tilladt.', - errorInviteNotAllowed: 'FEJL: Du har ikke tilstrækkelige rettigheder til at invitere til denne kanal.', - errorUninviteNotAllowed: 'FEJL: Du har ikke tilstrækkelige rettigheder til at anullere invitationer for denne kanal.', - errorNoOpenQuery: 'FEJL: Ingen privat kanal åben.', - errorKickNotAllowed: 'FEJL: Du har ikke tilstrækkelige rettigheder til at sparke. %s.', - errorCommandNotAllowed: 'FEJL: Kommando ikke tillad: %s', - errorUnknownCommand: 'FEJL: Ukendt kommando: %s', - errorMaxMessageRate: 'FEJL: Du har overskredet max antal beskeder per minut.', - errorConnectionTimeout: 'FEJL: Forbindelses timeout. Prøv venligst igen.', - errorConnectionStatus: 'FEJL: Status for forbindelse. %s', - errorSoundIO: 'FEJL: Kunne ikke indlæse lydfil (Flash IO Fejl).', - errorSocketIO: 'FEJL: Connection to socket server failed (Flash IO fejl).', - errorSocketSecurity: 'FEJL: forbindelse til til socket server fejlede (Flash sikkerheds fejl).', - errorDOMSyntax: 'FEJL: Ugyldig DOM Syntaks(DOM ID: %s).' - -} diff --git a/library/ajaxchat/chat/js/lang/de.js b/library/ajaxchat/chat/js/lang/de.js deleted file mode 100644 index b46b3f323..000000000 --- a/library/ajaxchat/chat/js/lang/de.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s betritt den Chat.', - logout: '%s verlässt den Chat.', - logoutTimeout: '%s wurde ausgeloggt (Timeout).', - logoutIP: '%s wurde ausgeloggt (Ungültige IP-Adresse).', - logoutKicked: '%s wurde ausgeloggt (Ausschluss).', - channelEnter: '%s betritt den Raum.', - channelLeave: '%s verlässt den Raum.', - privmsg: '(flüstert)', - privmsgto: '(flüstert zu %s)', - invite: '%s lädt dich ein den Raum %s zu betreten.', - inviteto: 'Deine Einladung an %s den Raum %s zu betreten wurde versendet.', - uninvite: '%s hat dich wieder ausgeladen den Raum %s zu betreten.', - uninviteto: 'Deine Ausladung an %s den Raum %s zu betreten wurde versendet.', - queryOpen: 'Privater Kanal zu %s geöffnet.', - queryClose: 'Privater Kanal zu %s geschlossen.', - ignoreAdded: '%s wurde auf die Ignorier-Liste gesetzt.', - ignoreRemoved: '%s wurde von der Ignorier-Liste entfernt.', - ignoreList: 'Ignorierte Benutzer:', - ignoreListEmpty: 'Keine Benutzer werden ignoriert.', - who: 'Benutzer online:', - whoChannel: 'Benutzer online im Raum %s:', - whoEmpty: 'Keine Benutzer online im angegebenen Kanal.', - list: 'Verfügbare Räume:', - bans: 'Ausgeschlossene Nutzer:', - bansEmpty: 'Keine ausgeschlossenen Nutzer vorhanden.', - unban: 'Ausschluss des Benutzers %s aufgehoben.', - whois: 'Benutzer %s - IP-Adresse:', - whereis: 'Benutzer %s ist im Raum %s.', - roll: '%s würfelt %s und erhält %s.', - nick: '%s heißt jetzt %s.', - toggleUserMenu: 'Benutzer-Menü für %s anzeigen/ausblenden', - userMenuLogout: 'Logout', - userMenuWho: 'Online Benutzer auflisten', - userMenuList: 'Verfügbare Räume auflisten', - userMenuAction: 'Aktion beschreiben', - userMenuRoll: 'Würfeln', - userMenuNick: 'Benutzernamen ändern', - userMenuEnterPrivateRoom: 'Privaten Raum betreten', - userMenuSendPrivateMessage: 'Private Nachricht schicken', - userMenuDescribe: 'Private Aktion schicken', - userMenuOpenPrivateChannel: 'Privaten Kanal öffnen', - userMenuClosePrivateChannel: 'Privaten Kanal schließen', - userMenuInvite: 'Einladen', - userMenuUninvite: 'Ausladen', - userMenuIgnore: 'Ignorieren / Akzeptieren', - userMenuIgnoreList: 'Ignorierte Benutzer auflisten', - userMenuWhereis: 'Raum anzeigen', - userMenuKick: 'Ausschließen / Verbannen', - userMenuBans: 'Ausgeschlossene Benutzer auflisten', - userMenuWhois: 'IP anzeigen', - unbanUser: 'Ausschluss von %s aufheben', - joinChannel: 'Raum %s betreten', - cite: '%s sagte:', - urlDialog: 'Bitte die Adresse (URL) der Webseite eingeben:', - deleteMessage: 'Diese Chat-Nachricht löschen', - deleteMessageConfirm: 'Die ausgewählte Chat-Nachricht wirklich löschen?', - errorCookiesRequired: 'Cookies werden für diesen Chat benötigt.', - errorUserNameNotFound: 'Fehler: Benutzer %s wurde nicht gefunden.', - errorMissingText: 'Fehler: Nachrichtentext fehlt.', - errorMissingUserName: 'Fehler: Benutzername fehlt.', - errorInvalidUserName: 'Fehler: Ungültiger Benutzername.', - errorUserNameInUse: 'Fehler: Benutzername schon vergeben.', - errorMissingChannelName: 'Fehler: Raumname fehlt.', - errorInvalidChannelName: 'Fehler: Ungültiger Raumname: %s', - errorPrivateMessageNotAllowed: 'Fehler: Private Nachrichten sind nicht erlaubt.', - errorInviteNotAllowed: 'Fehler: Du kannst niemanden zu diesem Raum Einladen.', - errorUninviteNotAllowed: 'Fehler: Du kannst niemanden von diesem Raum Ausladen.', - errorNoOpenQuery: 'Fehler: Kein privater Kanal offen.', - errorKickNotAllowed: 'Fehler: Du kannst %s nicht ausschließen.', - errorCommandNotAllowed: 'Fehler: Befehl nicht erlaubt: %s', - errorUnknownCommand: 'Fehler: Unbekannter Befehl: %s', - errorMaxMessageRate: 'Fehler: Du hast die maximale Anzahl an Nachrichten pro Minute überschritten.', - errorConnectionTimeout: 'Fehler: Verbindungsabbruch. Bitte erneut versuchen.', - errorConnectionStatus: 'Fehler: Verbindungsstatus: %s', - errorSoundIO: 'Fehler: Laden einer Sound-Datei fehlgeschlagen (Flash IO Error).', - errorSocketIO: 'Fehler: Verbindung zum Socket Server fehlgeschlagen (Flash IO Error).', - errorSocketSecurity: 'Fehler: Verbindung zum Socket Server fehlgeschlagen (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/el.js b/library/ajaxchat/chat/js/lang/el.js deleted file mode 100644 index 2864c3a76..000000000 --- a/library/ajaxchat/chat/js/lang/el.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author panas - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s μπήκε στο Chat.', - logout: '%s βγήκε από το Chat.', - logoutTimeout: '%s βγήκε από το Chat (Ανενεργό).', - logoutIP: '%s βγήκε από το Chat (Λανθασμένη IP).', - logoutKicked: '%s βγήκε από το Chat (Kicked).', - channelEnter: '%s μπήκε στο κανάλι.', - channelLeave: '%s βγήκε από το κανάλι.', - privmsg: '(ψιθυρίζει)', - privmsgto: '( ψιθυρίζει σε %s)', - invite: '%s σας καλεί να συμμετάσχετε στο %s.', - inviteto: 'Η πρόσκληση σας σε %s να συμμετάσχει στο κανάλι %s έχει σταλεί.', - uninvite: '%s τερματίζει την πρόσκληση σας για το κανάλι %s.', - uninviteto: 'Η πρόσκληση σας σε %s για το κανάλι %s έχει σταλεί.', - queryOpen: 'Άνοιξε πρίβε κανάλι σε %s.', - queryClose: ' Το πρίβε κανάλι %s έκλεισε.', - ignoreAdded: '%s προστέθηκε στη λίστα αγνόησης.', - ignoreRemoved: ' %s αφαιρέθηκε από τη λίστα αγνόησης .', - ignoreList: 'Αγνοήμενοι χρήστες:', - ignoreListEmpty: 'Δεν υπάρχουν αγνοημένοι χρήστες.', - who: 'Χρήστες παρόν:', - whoChannel: 'Χρήστες συνδεδεμένοι στο κανάλι %s:', - whoEmpty: 'Δεν υπάρχουν χρήστες στο συγκεκριμένο κανάλι.', - list: 'Διαθέσιμα κανάλια:', - bans: 'Αποκλεισμένοι χρήστες:', - bansEmpty: 'Δεν υπάρχουν αποκλεισμένοι χρήστες.', - unban: 'Ο αποκλεισμός %s αφαιρέθηκε.', - whois: ' %s - IP διεύθυνση:', - whereis: 'Χρήστης %s είναι στο κανάλι %s.', - roll: '%s ρίχνει %s και φέρνει %s.', - nick: '%s άλλαξε το όνομα σε %s.', - toggleUserMenu: 'Αλλαγή μενού χρήστη για %s', - userMenuLogout: 'Αποσύνδεση', - userMenuWho: 'Εμφάνιση λίστας συνδεδεμένων', - userMenuList: 'Εμφάνιση λίστας διαθέσιμων καναλιών', - userMenuAction: 'Περιγραφή ενέργειας', - userMenuRoll: 'Ρίξιμο ζαριών', - userMenuNick: 'Αλλαγή ονόματος', - userMenuEnterPrivateRoom: 'Εισαγωγή σε πριβέ δωμάτιο', - userMenuSendPrivateMessage: 'Αποστολή προσωπικού μηνύματος', - userMenuDescribe: 'Αποστολή προσωπικής ενέργειας', - userMenuOpenPrivateChannel: 'Άνοιγμα πριβέ καναλιού', - userMenuClosePrivateChannel: 'Κλείσιμο πριβέ καναλιού', - userMenuInvite: 'Πρόσκληση', - userMenuUninvite: 'Ακύρωση πρόσκλησης', - userMenuIgnore: 'Αγνόηση/Αποδοχή', - userMenuIgnoreList: 'Εμφάνιση λίστας αγνοημένων', - userMenuWhereis: 'Εμφάνιση καναλιού', - userMenuKick: 'Kick/Ban', - userMenuBans: 'Εμφάνιση λίστας αποκλεισμένων', - userMenuWhois: 'Εμφάνιση IP', - unbanUser: 'Επαναφορά αποκλεισμού για %s', - joinChannel: 'Μπαίνει στο κανάλι %s', - cite: '%s είπε:', - urlDialog: 'παρακαλούμε εισάγετε την διεύθυνση (URL) της ιστοσελίδας:', - deleteMessage: 'Διαγραφή αυτού του μηνύματος', - deleteMessageConfirm: 'Θέλετε να διαγράψετε το επιλεγμένο μήνυμα?', - errorCookiesRequired: 'Τα cookies είναι απαραίτητα για το chat.', - errorUserNameNotFound: 'Σφάλμα: Ο χρήστης %s δεν βρέθηκε.', - errorMissingText: 'Σφάλμα: Λείπει το μήνυμα.', - errorMissingUserName: ': Λείπει ο χρήστης.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Σφάλμα: Λείπει το όνομα του καναλιού.', - errorInvalidChannelName: 'Σφάλμα: Ακατάλληλο όνομα καναλιού: %s', - errorPrivateMessageNotAllowed: 'Σφάλμα: Τα προσωπικά μηνύματα δεν επιτρέπονται.', - errorInviteNotAllowed: 'Σφάλμα: Δεν σας επιτρέπετε να καλέσετε άλλούς στο κανάλι.', - errorUninviteNotAllowed: 'Σφάλμα: Δεν σας επιτρέπετε να τερματίσετε την πρόσκληση άλλων από το κανάλι.', - errorNoOpenQuery: ': Δεν ανοίχθηκε πρίβε κανάλι.', - errorKickNotAllowed: 'Δεν σας επιτρέπετε να πετάξετε %s.', - errorCommandNotAllowed: 'Σφάλμα: Δεν επιτρέπετε η εντολή: %s', - errorUnknownCommand: 'Σφάλμα: Άγνωστη εντολή: %s', - errorMaxMessageRate: 'Σφάλμα: Υπερβήκατε τον μέγιστο αριθμό μηνυμάτων ανά λεπτό.', - errorConnectionTimeout: 'Σφάλμα: Έληξε ο χρόνος σύνδεσης. Προσπαθήστε ξανά.', - errorConnectionStatus: 'Σφάλμα: Κατάσταση σύνδεσης: %s', - errorSoundIO: 'Σφάλμα: Απέτυχε η φόρτωση του αρχείου ήχου (Flash IO Σφάλμα).', - errorSocketIO: 'Σφάλμα: Η σύνδεση στο socket του διακομιστή απέτυχε (Flash IO Σφάλμα).', - errorSocketSecurity: 'Σφάλμα:Η σύνδεση στο socket του διακομιστή απέτυχε (Σφάλμα ασφαλείας του Flash ).', - errorDOMSyntax: 'Σφάλμα: Άκυρη DOM σύνταξη (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/en.js b/library/ajaxchat/chat/js/lang/en.js deleted file mode 100644 index 16b4ab472..000000000 --- a/library/ajaxchat/chat/js/lang/en.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s logs into the Chat.', - logout: '%s logs out of the Chat.', - logoutTimeout: '%s has been logged out (Timeout).', - logoutIP: '%s has been logged out (Invalid IP address).', - logoutKicked: '%s has been logged out (Kicked).', - channelEnter: '%s enters the channel.', - channelLeave: '%s leaves the channel.', - privmsg: '(whispers)', - privmsgto: '(whispers to %s)', - invite: '%s invites you to join %s.', - inviteto: 'Your invitation to %s to join channel %s has been sent.', - uninvite: '%s uninvites you from channel %s.', - uninviteto: 'Your uninvitation to %s for channel %s has been sent.', - queryOpen: 'Private channel opened to %s.', - queryClose: 'Private channel to %s closed.', - ignoreAdded: 'Added %s to the ignore list.', - ignoreRemoved: 'Removed %s from the ignore list.', - ignoreList: 'Ignored Users:', - ignoreListEmpty: 'No ignored Users listed.', - who: 'Online Users:', - whoChannel: 'Online Users in channel %s:', - whoEmpty: 'No online users in the given channel.', - list: 'Available channels:', - bans: 'Banned Users:', - bansEmpty: 'No banned Users listed.', - unban: 'Ban of user %s revoked.', - whois: 'User %s - IP address:', - whereis: 'User %s is in channel %s.', - roll: '%s rolls %s and gets %s.', - nick: '%s is now known as %s.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Logout', - userMenuWho: 'List online users', - userMenuList: 'List available channels', - userMenuAction: 'Describe action', - userMenuRoll: 'Roll dice', - userMenuNick: 'Change username', - userMenuEnterPrivateRoom: 'Enter private room', - userMenuSendPrivateMessage: 'Send private message', - userMenuDescribe: 'Send private action', - userMenuOpenPrivateChannel: 'Open private channel', - userMenuClosePrivateChannel: 'Close private channel', - userMenuInvite: 'Invite', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignore/Accept', - userMenuIgnoreList: 'List ignored users', - userMenuWhereis: 'Display channel', - userMenuKick: 'Kick/Ban', - userMenuBans: 'List banned users', - userMenuWhois: 'Display IP', - unbanUser: 'Revoke ban of user %s', - joinChannel: 'Join channel %s', - cite: '%s said:', - urlDialog: 'Please enter the address (URL) of the webpage:', - deleteMessage: 'Delete this chat message', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'Cookies are required for this chat.', - errorUserNameNotFound: 'Error: User %s not found.', - errorMissingText: 'Error: Missing message text.', - errorMissingUserName: 'Error: Missing username.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Error: Missing channel name.', - errorInvalidChannelName: 'Error: Invalid channel name: %s', - errorPrivateMessageNotAllowed: 'Error: Private messages are not allowed.', - errorInviteNotAllowed: 'Error: You are not allowed to invite someone to this channel.', - errorUninviteNotAllowed: 'Error: You are not allowed to uninvite someone from this channel.', - errorNoOpenQuery: 'Error: No private channel open.', - errorKickNotAllowed: 'Error: You are not allowed to kick %s.', - errorCommandNotAllowed: 'Error: Command not allowed: %s', - errorUnknownCommand: 'Error: Unknown command: %s', - errorMaxMessageRate: 'Error: You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'Error: Connection timeout. Please try again.', - errorConnectionStatus: 'Error: Connection status: %s', - errorSoundIO: 'Error: Failed to load sound file (Flash IO Error).', - errorSocketIO: 'Error: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/es.js b/library/ajaxchat/chat/js/lang/es.js deleted file mode 100644 index 393467a8c..000000000 --- a/library/ajaxchat/chat/js/lang/es.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Manu Quintans / KeScI [www.e-nologia.com] - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s entra al Chat.', - logout: '%s sale del Chat.', - logoutTimeout: '%s se ha desconectado (Tiempo de espera agotado).', - logoutIP: '%s se ha desconectado (Direccion IP no valida).', - logoutKicked: '%s se ha desconectado (Pateado).', - channelEnter: '%s entra en el canal.', - channelLeave: '%s se va del canal.', - privmsg: '(susurra)', - privmsgto: '(susurra a %s)', - invite: '%s te invita a unirte a %s.', - inviteto: 'Su invitación a %s para unirse al canal %s se ha enviado.', - uninvite: '%s le retira la invitación del canal %s.', - uninviteto: 'Su retirada de invitación a %s para el canal %s se ha enviado.', - queryOpen: 'Privado abierto a %s.', - queryClose: 'Privado cerrado a %s.', - ignoreAdded: 'Agregado %s a la lista de usuarios ignorados.', - ignoreRemoved: 'Eliminado %s de la lista de usuarios ignorados.', - ignoreList: 'Usuarios ignorados', - ignoreListEmpty: 'Lista de usuarios no ignorados.', - who: 'Usuarios conectados:', - whoChannel: 'Usuarios conectados en el canal %s:', - whoEmpty: 'No hay usuarios conectados en este momento.', - list: 'Canales disponibles:', - bans: 'Usuarios Baneados:', - bansEmpty: 'No se han listado usuarios baneados.', - unban: 'Ban del usuario %s retirado.', - whois: 'Usuario %s - Direccion IP:', - whereis: 'Usuario %s está en el canal %s.', - roll: '%s lanza %s y obtiene un %s.', - nick: '%s es ahora %s.', - toggleUserMenu: 'Abrir/Cerrar menú del usuario %s', - userMenuLogout: 'Desconectar', - userMenuWho: 'Mostrar usuarios conectados', - userMenuList: 'Mostrar canales disponibles', - userMenuAction: 'Describir acción', - userMenuRoll: 'Tirar dado', - userMenuNick: 'Cambiar Nombre de Usuario', - userMenuEnterPrivateRoom: 'Entrar en canal privado', - userMenuSendPrivateMessage: 'Enviar mensaje privado', - userMenuDescribe: 'Enviar acción privada', - userMenuOpenPrivateChannel: 'Abrir canal privado', - userMenuClosePrivateChannel: 'Cerrar canal privado', - userMenuInvite: 'Invitar', - userMenuUninvite: 'Quitar invitación', - userMenuIgnore: 'Ignorar/Aceptar', - userMenuIgnoreList: 'Mostrar usuarios ignorados', - userMenuWhereis: 'Mostrar canal', - userMenuKick: 'Patada/Ban', - userMenuBans: 'Mostrar usuarios baneados', - userMenuWhois: 'Mostrar la IP', - unbanUser: 'Quitar el ban al usuario %s', - joinChannel: 'Entrar al canal %s', - cite: '%s dijo:', - urlDialog: 'Por favor intruduzca la dirección (URL) de la página web:', - deleteMessage: 'Borrar este mensaje del chat', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'Se necesitan las Cookies para este chat.', - errorUserNameNotFound: 'Error: usuario %s no se ha encontrado.', - errorMissingText: 'Error: Mensaje perdido.', - errorMissingUserName: 'Error: Usuario no encontrado.', - errorInvalidUserName: 'Error: Nombre de usuario no válido.', - errorUserNameInUse: 'Error: Nombre de usuario está en uso.', - errorMissingChannelName: 'Error: No se encuentra el canal.', - errorInvalidChannelName: 'Error: Nombre invalido del canal: %s', - errorPrivateMessageNotAllowed: 'Error: No se permiten mensajes privados.', - errorInviteNotAllowed: 'Error: No está autorizado a invitar a alguien a este canal.', - errorUninviteNotAllowed: 'Error: No está autorizado a quitar la invitación a alguien de este canal.', - errorNoOpenQuery: 'Error: Ningún privado abierto.', - errorKickNotAllowed: 'Error: No está autorizado a patear a %s.', - errorCommandNotAllowed: 'Error: Comando no permitido: %s', - errorUnknownCommand: 'Error: Comando desconocido: %s', - errorMaxMessageRate: 'Error: Ha sobrepasado el número máximo de mensajes por minuto.', - errorConnectionTimeout: 'Error: Connection timeout. Please try again.', - errorConnectionStatus: 'Error: Estado de la conexión: %s', - errorSoundIO: 'Error: No se ha podido cargar el fichero de sonido (Error IO Flash).', - errorSocketIO: 'Error: No se ha podido conectar al servidor socket (Error IO Flash).', - errorSocketSecurity: 'Error: No se ha podido conectar al servidor socket (Error Seguridad Flash).', - errorDOMSyntax: 'Error: Sintaxis DOM No Válida (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/et.js b/library/ajaxchat/chat/js/lang/et.js deleted file mode 100644 index e83c986b9..000000000 --- a/library/ajaxchat/chat/js/lang/et.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s logis jutukasse.', - logout: '%s logis jutukast välja.', - logoutTimeout: '%s logiti jutukast välja (Aeg otsas).', - logoutIP: '%s logiti jutukast välja (Vigane IP aadress).', - logoutKicked: '%s logiti jutukast välja (Välja heidetud).', - channelEnter: '%s sisenes kanalisse.', - channelLeave: '%s lahkus kanalist.', - privmsg: '(sosinad)', - privmsgto: '(sosinad %s -le)', - invite: '%s kutsub sind %s.', - inviteto: 'Sinu kutse %s -le ühineda kanaliga %s saadeti ära.', - uninvite: '%s palub sul lahkuda kanalist %s.', - uninviteto: 'Sinu palve %s -le lahkuda kanalist %s saadeti ära.', - queryOpen: 'Privaat kanal avati %s -le.', - queryClose: 'Privaat kanal %s -le suleti.', - ignoreAdded: ' %s -t ignoreeritakse.', - ignoreRemoved: ' %s ignoreerimine tühistati.', - ignoreList: 'Ignoreeritud kasutajad:', - ignoreListEmpty: 'Ignoreeritud kasutajad puuduvad.', - who: 'Sisse loginud kasutajad:', - whoChannel: 'Sisse loginud kasutajad kanalis %s:', - whoEmpty: 'Antud kanalis sisse loginud kasutajaid ei ole.', - list: 'Vabad kanalid:', - bans: 'Kasutajate must nimekiri:', - bansEmpty: 'Mustas nimekirjas kasutajaid ei ole.', - unban: 'Kasutaja %s eemaldati mustast nimekirjast.', - whois: 'Kasutaja %s - IP aadress:', - whereis: 'Kasutaja %s on kanalis %s.', - roll: '%s veeretas %s ja sai %s.', - nick: '%s nimetas end ümber: %s.', - toggleUserMenu: 'Näita/ära näita kasutaja menüüd', - userMenuLogout: 'Lahku', - userMenuWho: 'Näita sisse loginud kasutajaid', - userMenuList: 'Näita vabad kanalid', - userMenuAction: 'Kirjelda tegevust', - userMenuRoll: 'Veereta täringut', - userMenuNick: 'Muuda kasutajanimi', - userMenuEnterPrivateRoom: 'Sisene privaat-ruumi', - userMenuSendPrivateMessage: 'Saada privaat-sõnum', - userMenuDescribe: 'Saada privaat-tegevus', - userMenuOpenPrivateChannel: 'Ava privaat-kanal', - userMenuClosePrivateChannel: 'Sulge privaat-kanal', - userMenuInvite: 'Kutsu', - userMenuUninvite: 'Palu lahkuda', - userMenuIgnore: 'Ignoreeri/Tunnusta', - userMenuIgnoreList: 'Ignoreeritud kasutajad', - userMenuWhereis: 'Asukoha kanal', - userMenuKick: 'Viska välja/Lisa musta nimekirja', - userMenuBans: 'Musta nimekirja kasutajad', - userMenuWhois: 'Näita IP-d', - unbanUser: 'Eemalda %s mustast nimekirjast', - joinChannel: 'Liitu kanaliga %s', - cite: '%s ütles:', - urlDialog: 'Palun sisesta oma veebilehe (URL):', - deleteMessage: 'Kustuta see jutuka teade', - deleteMessageConfirm: 'Kas tahad tõesti kustutada seda sõnumit??', - errorCookiesRequired: 'Luba "küpsised", et kasutada seda jutukat.', - errorUserNameNotFound: 'Viga: Kasutajat nimega %s ei leitud.', - errorMissingText: 'Viga: Sõnumi tekst kadunud.', - errorMissingUserName: 'Viga: Kasutajanimi puuduv.', - errorInvalidUserName: 'Viga: Vigane kasutajanimi.', - errorUserNameInUse: 'Viga: Kasutajanimi on juba võetud.', - errorMissingChannelName: 'Viga: Kanali nimi on kadunud.', - errorInvalidChannelName: 'Viga: Vigane kanali nimi: %s', - errorPrivateMessageNotAllowed: 'Viga: Privaat-sõnumid ei ole lubatud.', - errorInviteNotAllowed: 'Viga: Sul ei ole lubatud kutsuda kedagi siia kanalisse.', - errorUninviteNotAllowed: 'Viga: Sul ei ole lubatud kedagi sellest kanalist lahkuma paluda.', - errorNoOpenQuery: 'Viga: htegi privaat-kanalit pole avatud.', - errorKickNotAllowed: 'Viga: Sul ei ole lubatud välja visata %s.', - errorCommandNotAllowed: 'Viga: Korraldus pole lubatud: %s', - errorUnknownCommand: 'Viga: Tundmatu korraldus: %s', - errorMaxMessageRate: 'Viga: Sinu maksimum sõnumite hulk, minuti vältel, on ületatud.', - errorConnectionTimeout: 'Viga: hendus aegus. Please proovi uuesti.', - errorConnectionStatus: 'Viga: henduse olek: %s', - errorSoundIO: 'Viga: Helifaili ei õnnestunud laadida (Flash IO Viga).', - errorSocketIO: 'Viga: hendus socket serveriga ebaõnnestus (Flash IO Viga).', - errorSocketSecurity: 'Viga: hendus socket serveriga ebaõnnestus (Flash Turvalisuse Viga).', - errorDOMSyntax: 'Viga: Vigane DOM Süntaks (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/fi.js b/library/ajaxchat/chat/js/lang/fi.js deleted file mode 100644 index 68a536c73..000000000 --- a/library/ajaxchat/chat/js/lang/fi.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Asmo Soinio - * @author Saku Laukkanen - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s kirjautui sisään.', - logout: '%s kirjautui ulos.', - logoutTimeout: '%s kirjautui ulos (Aikakatkaisu).', - logoutIP: '%s kirjautui ulos (virheellinen IP-osoite).', - logoutKicked: '%s kirjautui ulos (Potkut).', - channelEnter: '%s liittyi kanavalle.', - channelLeave: '%s poistui kanavalta.', - privmsg: '(kuiskaa)', - privmsgto: '(kuiskaa käyttäjälle %s)', - invite: '%s kutsuu sinut liittymään kanavalle %s.', - inviteto: 'Sinun kutsusi käyttäjälle %s, liittymisestä kanavalle %s, on lähetetty.', - uninvite: '%s peruu kutsun kanavalle %s.', - uninviteto: 'Kutsusi peruminen käyttäjälle %s kanavaa %s varten, on lähetetty.', - queryOpen: 'Yksityinen kanava käyttäjälle %s on avattu.', - queryClose: 'Yksityinen kanava käyttäjälle %s on suljettu.', - ignoreAdded: 'Käyttäjä %s on lisätty huomiotta jätettäviin.', - ignoreRemoved: 'Käyttäjä %s on poistettu huomiotta jätettävistä.', - ignoreList: 'Huomiotta jätettävät käyttäjät:', - ignoreListEmpty: 'Ei huomiotta jätettäviä käyttäjiä.', - who: 'Paikallaolijat:', - whoChannel: 'Paikallaolijat kanavalla %s:', - whoEmpty: 'Ei käyttäjiä annetulla kanavalla.', - list: 'Käytettävät kanavat:', - bans: 'Potkitut käyttäjät:', - bansEmpty: 'Ei potkittuja käyttäjiä.', - unban: 'Käyttäjän %s potkut on poistettu.', - whois: 'Käyttäjän %s IP osoite:', - whereis: 'Käyttäjä %s on kanavalla %s.', - roll: '%s heittää %s ja saa %s.', - nick: '%s on nyt %s.', - toggleUserMenu: 'Näytä/piilota valikko käyttäjälle %s', - userMenuLogout: 'Poistu', - userMenuWho: 'Listaa paikallaolijat', - userMenuList: 'Listaa käytettävissä olevat kanavat', - userMenuAction: 'Määrittele toiminta', - userMenuRoll: 'Heitä noppaa', - userMenuNick: 'Vaihda käyttäjätunnusta', - userMenuEnterPrivateRoom: 'Mene yksityiseen kanavaasi', - userMenuSendPrivateMessage: 'Lähetä yksityinen viesti', - userMenuDescribe: 'Lähetä yksityinen toiminto', - userMenuOpenPrivateChannel: 'Avaa yksityinen kanava', - userMenuClosePrivateChannel: 'Sulje yksityinen kanava', - userMenuInvite: 'Kutsu', - userMenuUninvite: 'Peru kutsu', - userMenuIgnore: 'Ohita/Hyväksy', - userMenuIgnoreList: 'Listaa huomiota jätettävät käyttäjät', - userMenuWhereis: 'Näytä kanavat', - userMenuKick: 'Poista/Porttikielto', - userMenuBans: 'Listaa käyttäjät, joilla porttikielto', - userMenuWhois: 'Näytä IP-osoite', - unbanUser: 'Poista käyttäjän %s porttikielto', - joinChannel: 'Liity kanavalle %s', - cite: '%s sanoi:', - urlDialog: 'Lisää nettisivujen osoite (URL):', - deleteMessage: 'Poista tämä viesti', - deleteMessageConfirm: 'Poistetaanko viesti?', - errorCookiesRequired: 'Evästeiden pitää olla sallituja käyttääksesi tätä keskustelua.', - errorUserNameNotFound: 'Virhe: Käyttäjää %s ei löydetty.', - errorMissingText: 'Virhe: Puuttuva viestin teksti.', - errorMissingUserName: 'Virhe: Puuttuva käyttäjänimi.', - errorInvalidUserName: 'Virhe: Virheellinen käyttäjätunnus.', - errorUserNameInUse: 'Virhe: Käyttäjätunnus on jo käytössä.', - errorMissingChannelName: 'Virhe: Puuttuva kanavan nimi.', - errorInvalidChannelName: 'Virhe: Virheellinen kanavan nimi: %s', - errorPrivateMessageNotAllowed: 'Virhe: Yksityisviestit eivät ole sallittuja.', - errorInviteNotAllowed: 'Virhe: Sinulla ei ole oikeutta kutsua ketään kanavalle.', - errorUninviteNotAllowed: 'Virhe: Sinulla ei ole oikeutta perua kutsua tälle kanavalle.', - errorNoOpenQuery: 'Virhe: Ei yksityistä kanavaa auki.', - errorKickNotAllowed: 'Virhe: Sinulla ei ole oikeutta potkia käyttäjää %s.', - errorCommandNotAllowed: 'Virhe: Komento ei ole sallittu: %s', - errorUnknownCommand: 'Virhe: Tuntematon komento: %s', - errorMaxMessageRate: 'Virhe: Liikaa viestejä minuutissa.', - errorConnectionTimeout: 'Virhe: Yhteyden aikakatkaisu, olkaa hyvä ja yrittäkää uudelleen.', - errorConnectionStatus: 'Virhe: Yhteyden tila: %s', - errorSoundIO: 'Virhe: Äänitiedoston lataus epäonnistui (Flash IO-virhe).', - errorSocketIO: 'Virhe: Yhteys socket palvelimeen epäonnistui (Flash IO-virhe).', - errorSocketSecurity: 'Virhe: Yhteys socket palvelimeen epäonnistui (Flash-turvallisuus virhe).', - errorDOMSyntax: 'Virhe: Virheellinen DOM-syntaksi (DOM-tunniste: %s).' - -} diff --git a/library/ajaxchat/chat/js/lang/fr.js b/library/ajaxchat/chat/js/lang/fr.js deleted file mode 100644 index 35846f95e..000000000 --- a/library/ajaxchat/chat/js/lang/fr.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @contributors Ettelcar, Massimiliano Tiraboschi, Xytovl - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s se connecte au Chat.', - logout: '%s se déconnecte du Chat.', - logoutTimeout: '%s a été déconnecté (Temps écoulé).', - logoutIP: '%s a été déconnecté (Adresse IP invalide).', - logoutKicked: '%s a été déconnecté (Éjecté).', - channelEnter: '%s entre dans le salon.', - channelLeave: '%s sort du salon.', - privmsg: '(murmure)', - privmsgto: '(murmure à l’oreille de %s)', - invite: '%s vous invite à rejoindre %s.', - inviteto: 'Votre invation pour %s à rejoindre le salon %s a bien été envoyée.', - uninvite: '%s annule son invitation pour le salon %s.', - uninviteto: 'Votre annulaton d’invitation pour %s au salon %s a bien été envoyée.', - queryOpen: 'Salon privé ouvert sous le titre %s.', - queryClose: 'Le salon privé %s a été fermé.', - ignoreAdded: '%s a été ajouté à la liste des personnes ignorées.', - ignoreRemoved: '%s a été enlevé de la liste des personnes ignorées.', - ignoreList: 'Utilisateurs ignorés:', - ignoreListEmpty: 'Aucun utilisateur ignoré référencé.', - who: 'Utilisateurs en ligne:', - whoChannel: 'Utilisateurs en ligne dans le salon %s :', - whoEmpty: 'Aucun utilisateur en ligne dans le salon concerné.', - list: 'Salons disponibles :', - bans: 'Utilisateurs bannis :', - bansEmpty: 'Aucun utilisateur banni référencé.', - unban: 'Le ban de l’utilisateur %s a été levé.', - whois: 'Utilisateur %s - Adresse IP:', - whereis: 'L’utilisateur %s est dans le salon %s.', - roll: '%s jette %s et obtient %s.', - nick: '%s est maintenant %s.', - toggleUserMenu: 'Montrer/cacher menu pour %s', - userMenuLogout: 'Déconnexion', - userMenuWho: 'Liste membres en ligne', - userMenuList: 'Liste salons disponibles', - userMenuAction: 'Décrire une action', - userMenuRoll: 'Jeter un dé', - userMenuNick: 'Changer nom', - userMenuEnterPrivateRoom: 'Rejoindre un salon privé', - userMenuSendPrivateMessage: 'Envoyer un message privé', - userMenuDescribe: 'Envoyer une action privé', - userMenuOpenPrivateChannel: 'Ouvrir un salon privé', - userMenuClosePrivateChannel: 'Fermer un salon privé', - userMenuInvite: 'Inviter', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignorer/Accepter', - userMenuIgnoreList: 'Liste utilisateurs ignorés', - userMenuWhereis: 'Montrer les salons', - userMenuKick: 'Éjecter/bannir', - userMenuBans: 'Liste utilisateurs bannis', - userMenuWhois: 'Display IP', - unbanUser: 'Revoke ban of user %s', - joinChannel: 'Rejoindre le salon %s', - cite: '%s a dit:', - urlDialog: 'Veuillez entrer l’addresse (URL) de la page web:', - deleteMessage: 'Effacer ce message', - deleteMessageConfirm: 'Effacer le message selectionné ?', - errorCookiesRequired: 'Ce Chat requiert l’acceptation des cookies.', - errorUserNameNotFound: 'Erreur : Utilisateur %s introuvable.', - errorMissingText: 'Erreur : Texte du message manquant.', - errorMissingUserName: 'Erreur : Nom d’utilisateur manquant.', - errorMissingChannelName: 'Erreur : Nom de salon manquant.', - errorInvalidChannelName: 'Erreur : Mauvais nom de salon: %s', - errorPrivateMessageNotAllowed: 'Erreur : Les messages privés sont interdits.', - errorInviteNotAllowed: 'Erreur : Vous n’êtes pas autorisé à inviter quelqu’un à ce salon.', - errorUninviteNotAllowed: 'Erreur : Vous n’êtes pas autorisé à annuler une invitation à ce salon.', - errorNoOpenQuery: 'Erreur : Aucun salon privé ouvert.', - errorKickNotAllowed: 'Erreur : Vous n’êtes pas autorisé à éjecter %s.', - errorCommandNotAllowed: 'Erreur : Commande interdite: %s', - errorUnknownCommand: 'Erreur : Commande inconnue: %s', - errorMaxMessageRate: 'Error : You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'Erreur : Temps de connexion écoulé. Veuillez réessayer.', - errorConnectionStatus: 'Erreur : Statut de connexion: %s', - errorSoundIO: 'Erreur : Impossible de charger le fichier son (Erreur E/S Flash).', - errorSocketIO: 'Erreur : Connexion au serveur échouée (Erreur E/S Flash).', - errorSocketSecurity: 'Erreur : Connexion au serveur échouée (Erreur de sécurité Flash).', - errorDOMSyntax: 'Erreur : Syntaxe DOM invalide (ID DOM : %s).' - -} - - diff --git a/library/ajaxchat/chat/js/lang/gl.js b/library/ajaxchat/chat/js/lang/gl.js deleted file mode 100644 index 314e226f8..000000000 --- a/library/ajaxchat/chat/js/lang/gl.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Manu Quintans - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s logs dentro de Chat.', - logout: '%s logs fora del Chat.', - logoutTimeout: '%s desconectouse(Tempo de espera esgotado).', - logoutIP: '%s desconectouse (Dirección IP non válida ).', - logoutKicked: '%s desconectouse (Pateado).', - channelEnter: '%s Entra no chat.', - channelLeave: '%s Vaise do chat.', - privmsg: '(whispers)', - privmsgto: '(whispers to %s)', - invite: '%s invítache a unirte a %s.', - inviteto: 'A túa invitación a %s para unirse a %s foi enviada.', - uninvite: '%s rechazado en %s.', - uninviteto: 'O teu rechazo a %s para %s foi enviado.', - queryOpen: 'Chat privado aberto %s.', - queryClose: 'Chat privado pechado %s pechado.', - ignoreAdded: 'Engadido %s a lista de usuarios ignorados.', - ignoreRemoved: 'Eliminado %s da lista de usuarios ignorados.', - ignoreList: 'Usuarios ignorados', - ignoreListEmpty: 'Lista de usuarios non ignorados.', - who: 'Usuarios conectados:', - whoChannel: 'Usuarios en liña na canle %s:', - whoEmpty: 'Non hai usuarios conectados neste momento.', - list: 'Chats disponibles:', - bans: 'Usuarios Baneados:', - bansEmpty: 'Non hai usuarios baneados.', - unban: 'Baneo do usuario %s revocado.', - whois: 'Usuario %s - Direccion IP:', - whereis: 'Usuario %s en chat %s.', - roll: '%s rolls %s e toma %s.', - nick: '%s agora como %s.', - toggleUserMenu: 'Cambiar menu de usuario para %s', - userMenuLogout: 'Sair', - userMenuWho: 'Listar usuarios en liña', - userMenuList: 'Canles disponibles', - userMenuAction: 'Describe acción', - userMenuRoll: 'Roll di', - userMenuNick: 'Cambiar nome de usuario', - userMenuEnterPrivateRoom: 'Entrar nun privado', - userMenuSendPrivateMessage: 'Enviar mensaxe privada', - userMenuDescribe: 'Enviar accion en privado', - userMenuOpenPrivateChannel: 'Abrir privado', - userMenuClosePrivateChannel: 'Pechar privado', - userMenuInvite: 'Invitar', - userMenuUninvite: 'Rechazar invitado', - userMenuIgnore: 'Ignorar/Aceptar', - userMenuIgnoreList: 'Lista usuarios ignorados', - userMenuWhereis: 'Amosar canle', - userMenuKick: 'Banear', - userMenuBans: 'Lista usuarios baneados', - userMenuWhois: 'Amosar IP', - unbanUser: 'Eliminar baneo de %s', - joinChannel: 'Unirte a %s', - cite: '%s dixo:', - urlDialog: 'Por favor, introduce a URL da paxina web:', - deleteMessage: 'Eliminar mensaxe', - deleteMessageConfirm: 'Queres borra-la mensaxe?', - errorCookiesRequired: 'As Cookies son necesarias para o chat.', - errorUserNameNotFound: 'Error: usuario %s non encontrado.', - errorMissingText: 'Error: mensaxe perdida.', - errorMissingUserName: 'Error: Usuario non encontrado.', - errorInvalidUserName: 'Error: Nome de usuario non valido.', - errorUserNameInUse: 'Error: Usuario en uso.', - errorMissingChannelName: 'Error: No se atopa a canle.', - errorInvalidChannelName: 'Error: Nome inválido de canle: %s', - errorPrivateMessageNotAllowed: 'Error: mensaxes privadas non permitidas.', - errorInviteNotAllowed: 'Error: Non se che permite invitar nesta canle.', - errorUninviteNotAllowed: 'Error: Non se che permite rechazar invitados nesta canle.', - errorNoOpenQuery: 'Error: Ningunha canle privado aberto.', - errorKickNotAllowed: 'Error: Non podes banear %s.', - errorCommandNotAllowed: 'Error: Comando non permitido: %s', - errorUnknownCommand: 'Error: Comando descoñecido: %s', - errorMaxMessageRate: 'Error: Excedes o numero maximo de mensaxes por minuto.', - errorConnectionTimeout: 'Error: Tempo superado. Téntao de novo.', - errorConnectionStatus: 'Error: Estado de conexión: %s', - errorSoundIO: 'Error: Error o reproducir son(Flash IO Error).', - errorSocketIO: 'Error: Conexión co servidor fallida (Flash IO Error).', - errorSocketSecurity: 'Error: Conexión co servidor fallida(Flash Security Error).', - errorDOMSyntax: 'Error: Sintaxis DOM Inválida(DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/he.js b/library/ajaxchat/chat/js/lang/he.js deleted file mode 100644 index 94bbdc5e1..000000000 --- a/library/ajaxchat/chat/js/lang/he.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Smiley Barry - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s נכנס לתוך הצאט.', - logout: '%s יוצא מהצאט.', - logoutTimeout: '%s הוצא מהצאט (היה לא זמין).', - logoutIP: '%s הוצא מהצאט (כתובת מחשב בלתי חוקית).', - logoutKicked: '%s הוצא מהצאט (הועף/נבעט).', - channelEnter: '%s נכנס לתוך הערוץ.', - channelLeave: '%s יוצא מהערוץ.', - privmsg: '(לוחש)', - privmsgto: '(לוחש ל%s)', - invite: '%s מזמין אותך להצטרף לערוץ %s.', - inviteto: 'ההזמנה שלך עבור %s להצטרף לערוץ %s נשלחה.', - uninvite: '%s ביטל את הזמנתו לערוץ %s.', - uninviteto: 'ביטול ההזמנה שלך עבור %s להצטרף לערוץ %s נשלח.', - queryOpen: 'ערוץ פרטי עבור %s נפתח.', - queryClose: 'ערוץ פרטי עבור %s נסגר.', - ignoreAdded: 'המשתמש %s נוסף לרשימת ההתעלמות.', - ignoreRemoved: 'המשתמש %s נמחק מרשימת ההתעלמות.', - ignoreList: 'משתמשים אשר אתה מתעלם מהם:', - ignoreListEmpty: 'אין משתמשים ברשימה.', - who: 'משתמשים מחוברים:', - whoChannel: 'Online Users in channel %s:', - whoEmpty: 'אין משתמשים מחוברים בערוץ.', - list: 'ערוצים פתוחים:', - bans: 'משתמשים חסומים:', - bansEmpty: 'אין משתמשים חסומים.', - unban: 'בוטלה החסימה נגד המשתמש %s.', - whois: 'כתובת המחשב של המשתמש %s:', - whereis: 'User %s is in channel %s.', - roll: '%s מגלגל %s ומקבל %s.', - nick: '%s is now known as %s.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Logout', - userMenuWho: 'List online users', - userMenuList: 'List available channels', - userMenuAction: 'Describe action', - userMenuRoll: 'Roll dice', - userMenuNick: 'Change username', - userMenuEnterPrivateRoom: 'Enter private room', - userMenuSendPrivateMessage: 'Send private message', - userMenuDescribe: 'Send private action', - userMenuOpenPrivateChannel: 'Open private channel', - userMenuClosePrivateChannel: 'Close private channel', - userMenuInvite: 'Invite', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignore/Accept', - userMenuIgnoreList: 'List ignored users', - userMenuWhereis: 'Display channel', - userMenuKick: 'Kick/Ban', - userMenuBans: 'List banned users', - userMenuWhois: 'Display IP', - unbanUser: 'Revoke ban of user %s', - joinChannel: 'הצטרף לערוץ %s', - cite: '%s אמר:', - urlDialog: 'אנא הכנס את כתובת האינטרנט (URL) של הדף:', - deleteMessage: 'Delete this chat message', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'הצאט מבקש עוגיות כדי לפעול. אנא רד לחנות לקנות.', - errorUserNameNotFound: 'שגיאה: המשתמש %s לא נמצא.', - errorMissingText: 'שגיאה: חסר טקסט בהודעה.', - errorMissingUserName: 'שגיאה: חסר שם משתמש.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'שגיאה: חסר שם ערוץ.', - errorInvalidChannelName: 'שגיאה: שם ערוץ לא חוקי: %s', - errorPrivateMessageNotAllowed: 'שגיאה: הודעות פרטיות אסורות לשימוש.', - errorInviteNotAllowed: 'שגיאה: אסור לך להזמין אנשים לערוץ זה.', - errorUninviteNotAllowed: 'שגיאה: אסור לך לבטל הזמנות של אנשים לערוץ זה.', - errorNoOpenQuery: 'שגיאה: ערוץ פרטי לא פתוח.', - errorKickNotAllowed: 'שגיאה: אסור לך להעיף את %s.', - errorCommandNotAllowed: 'שגיאה: פקודה אסורה: %s', - errorUnknownCommand: 'שגיאה: פקודה לא ידועה: %s', - errorMaxMessageRate: 'Error: You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'שגיאה: זמן חיבור פג. אנא נסה שנית.', - errorConnectionStatus: 'שגיאת חיבור: %s', - errorSoundIO: 'Error: Failed to load sound file (Flash IO Error).', - errorSocketIO: 'Error: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/hr.js b/library/ajaxchat/chat/js/lang/hr.js deleted file mode 100644 index 6f72e64de..000000000 --- a/library/ajaxchat/chat/js/lang/hr.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: 'Korisnik %s prijavio se u brbljanje.', - logout: 'Korisnik %s odjavio se iz brbljanja.', - logoutTimeout: 'Korisnik %s je odjavljen (neaktivnost).', - logoutIP: 'Korisnik %s je odjavljen (nepravilna IP adresa).', - logoutKicked: 'Korisnik %s je odjavljen (prognan).', - channelEnter: 'Korisnik %s pristupa kanalu.', - channelLeave: 'Korisnik %s napušta kanal.', - privmsg: '(šapuće)', - privmsgto: '(šapuće korisniku %s)', - invite: 'Korisnik %s poziva vas da se pridružite kanalu %s.', - inviteto: 'Vaš poziv korisniku %s da se pridruži kanalu %s je poslan.', - uninvite: 'Korisnik %s povukao je svoj poziv za kanal %s.', - uninviteto: 'Vaš opoziv korisniku %s za pridruživanje kanalu %s je poslan.', - queryOpen: 'Otvoren je privatni kanal za %s.', - queryClose: 'Privatni kanal za %s je zatvoren.', - ignoreAdded: 'Korisnik %s je dodan na popis ignoriranih.', - ignoreRemoved: 'Korisnik %s je uklonjen s popisa ignoriranih.', - ignoreList: 'Ignorirani korisnici:', - ignoreListEmpty: 'Nema ignoriranih korisnika.', - who: 'Prisutni korisnici:', - whoChannel: 'Prisutni korisnici u kanalu %s.', - whoEmpty: 'U odabranom kanalu nema prisutnih korisnika.', - list: 'Dostupni kanali:', - bans: 'Zabranjeni korisnici:', - bansEmpty: 'Nema zabranjenih korisnika.', - unban: 'Opozvana je zabrana korisnika %s.', - whois: 'Korisnik %s - IP adresa:', - whereis: 'Korisnik %s je u kanalu %s.', - roll: 'Korisnik %s baca %s i dobiva %s.', - nick: 'Korisnik %s je sad poznat kao %s.', - toggleUserMenu: 'Prebaci korisnički zbornik za %s', - userMenuLogout: 'Odjava', - userMenuWho: 'Ispiši prisutne korisnike', - userMenuList: 'Ispiši dostupne kanale', - userMenuAction: 'Aktivnost', - userMenuRoll: 'Baci kocku', - userMenuNick: 'Promijeni korisničko ime', - userMenuEnterPrivateRoom: 'Pristupi privatnoj sobi', - userMenuSendPrivateMessage: 'Pošalji privatnu poruku', - userMenuDescribe: 'Pošalji privatnu aktivnost', - userMenuOpenPrivateChannel: 'Otvori privatni kanal', - userMenuClosePrivateChannel: 'Zatvori privatni kanal', - userMenuInvite: 'Pozovi', - userMenuUninvite: 'Opozovi', - userMenuIgnore: 'Ignoriraj / Prihvati', - userMenuIgnoreList: 'Ispiši ignorirane korisnike', - userMenuWhereis: 'Prikaži kanal', - userMenuKick: 'Prognaj / Zabrani', - userMenuBans: 'Ispiši zabranjene korisnike', - userMenuWhois: 'Prikaži IP', - unbanUser: 'Opozovi zabranu korisnika %s.', - joinChannel: 'Pridruži se kanalu %s', - cite: 'Korisnik %s je rekao:', - urlDialog: 'Unesite URL adresu web-stranice:', - deleteMessage: 'Izbriši ovu poruku', - deleteMessageConfirm: 'Želite li zaista izbrisati ovu poruku?', - errorCookiesRequired: 'Ovo brbljanje zahtjeva omogućene kolačiće.', - errorUserNameNotFound: 'Pogreška: Korisnik %s nije pronađen.', - errorMissingText: 'Pogreška: Nedostaje tekst poruke.', - errorMissingUserName: 'Pogreška: Nedostaje korisničko ime.', - errorInvalidUserName: 'Pogreška: Nepravilno korisničko ime.', - errorUserNameInUse: 'Pogreška: Korisničko ime već je u upotrebi.', - errorMissingChannelName: 'Pogreška: Nedostaje naziv kanala.', - errorInvalidChannelName: 'Pogreška: Nepravilan naziv kanala: %s', - errorPrivateMessageNotAllowed: 'Pogreška: Privatne poruke nisu dopuštene.', - errorInviteNotAllowed: 'Pogreška: Nemate dopuštenja za pozivanje drugih osoba u ovaj kanal.', - errorUninviteNotAllowed: 'Pogreška: Nemate dopuštenja za opozivanje drugih osoba u ovom kanalu.', - errorNoOpenQuery: 'Pogreška: Nema otvorenog privatnog kanala.', - errorKickNotAllowed: 'Pogreška: Nemate dopuštenja za progon korisnika %s.', - errorCommandNotAllowed: 'Pogreška: Naredba nije dopuštena: %s', - errorUnknownCommand: 'Pogreška: Nepoznata naredba: %s', - errorMaxMessageRate: 'Pogreška: Premašili ste najveći dopušteni broj poruka u minuti.', - errorConnectionTimeout: 'Pogreška: Neaktivna veza. Pokušajte ponovo.', - errorConnectionStatus: 'Pogreška: Stanje veze: %s', - errorSoundIO: 'Pogreška: Učitavanje datoteke zvuka nije uspjelo (Flash IO pogreška).', - errorSocketIO: 'Pogreška: Povezivanje s priključkom poslužitelja nije uspjelo (Flash IO pogreška).', - errorSocketSecurity: 'Pogreška: Povezivanje s priključkom poslužitelja nije uspjelo (Flash sigurnosna pogreška).', - errorDOMSyntax: 'Pogreška: Nepravilna DOM sintaksa (DOM ID: %s).' - -} diff --git a/library/ajaxchat/chat/js/lang/hu.js b/library/ajaxchat/chat/js/lang/hu.js deleted file mode 100644 index ec2a45e14..000000000 --- a/library/ajaxchat/chat/js/lang/hu.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s belépett a chatre.', - logout: '%s kilépett a chatről.', - logoutTimeout: '%s kilépett a chatről (Időtúllépés).', - logoutIP: '%s kilépett a chatről (Hamis IP cím).', - logoutKicked: '%s ki lett rúgva a chatről.', - channelEnter: '%s belépett a szobába.', - channelLeave: '%s kilépett a szobából.', - privmsg: '(suttog)', - privmsgto: '(suttog %s felhasználónak)', - invite: '%s meghívott a következő szobába: %s.', - inviteto: 'A meghívása %s részére a(z) %s szobába elküldve.', - uninvite: '%s hívatlan vendégnek tart a(z) %s szobában.', - uninviteto: 'Hívatlan vendég jelzője %s számára elküldve a(z) %s szobában.', - queryOpen: 'Privát szoba megnyitva %s felhasználónak.', - queryClose: 'Privát szoba bezárva %s felhasználóval.', - ignoreAdded: '%s hozzáadva a figyelmen kívül hagyottakhoz.', - ignoreRemoved: '%s eltávolítva a figyelmen kívül hagyottak közül.', - ignoreList: 'Figyelmen kívül hagyott felhasználók:', - ignoreListEmpty: 'Nincsenek figyelmen kívül hagyott felhasználók.', - who: 'Jelenlévők:', - whoChannel: 'Jelenlévők a(z) %s szobában:', - whoEmpty: 'Senki nincs a megadott szobában.', - list: 'Szobák:', - bans: 'Kitiltott felhasználók:', - bansEmpty: 'Nincs kitiltott felhasználó.', - unban: '%s tiltása törölve.', - whois: '%s IP címe:', - whereis: '%s a következő szobákban van: %s.', - roll: '%s rolls %s and gets %s.', - nick: '%s új nickje %s.', - toggleUserMenu: '%s - felhasználói menüjének mutatása', - userMenuLogout: 'Kilépés', - userMenuWho: 'Jelenlévők listája', - userMenuList: 'Szobák listája', - userMenuAction: 'Akció küldése', - userMenuRoll: 'Dobókocka játék', - userMenuNick: 'Nick cseréje', - userMenuEnterPrivateRoom: 'Privát szobába lépés', - userMenuSendPrivateMessage: 'Privát üzenet küldése', - userMenuDescribe: 'Privát akció küldése', - userMenuOpenPrivateChannel: 'Privát szoba nyitása', - userMenuClosePrivateChannel: 'Privát szoba bezárása', - userMenuInvite: 'Meghívás', - userMenuUninvite: 'Hívatlan vendég', - userMenuIgnore: 'Figyelmen kívül hagy/engedélyez', - userMenuIgnoreList: 'Figyelmen kívül hagyottak', - userMenuWhereis: 'Szobák mutatása, ahol jelen van', - userMenuKick: 'Kirúgás/kitiltás', - userMenuBans: 'Kitiltottak listája', - userMenuWhois: 'IP megjelenítése', - unbanUser: '%s kitiltásának feloldása', - joinChannel: 'Belépés a szobába %s', - cite: '%s azt mondja:', - urlDialog: 'Kérem írja be a honlap URL-jét:', - deleteMessage: 'Chat üzenet törlése', - deleteMessageConfirm: 'Valóban törölni akarja az üzenetet?', - errorCookiesRequired: 'A cookiek engedélyezése szükséges a chat használatához.', - errorUserNameNotFound: 'Hiba: A %s felhasználó nem található.', - errorMissingText: 'Hiba: hiányzó üzenet.', - errorMissingUserName: 'Hiba: hiányzó felhasználónév.', - errorInvalidUserName: 'Hiba: hamis felhasználónév.', - errorUserNameInUse: 'Hiba: a név már használatban van.', - errorMissingChannelName: 'Hiba: hiányzó szoba név.', - errorInvalidChannelName: 'Hiba: hamis szoba név: %s', - errorPrivateMessageNotAllowed: 'Hiba: a privát üzenetek nem engedélyezettek.', - errorInviteNotAllowed: 'Hiba: nem vagy jogosult felhasználókat meghívni a szobába.', - errorUninviteNotAllowed: 'Hiba: nem vagy jogosult hívatlan vendégnek titulálni bárkit a szobában.', - errorNoOpenQuery: 'Hiba: nincs jogod szobát nyitni.', - errorKickNotAllowed: 'Hiba: nincs jogod kirúgni %s-t.', - errorCommandNotAllowed: 'Hiba: a parancs nem engedélyezett: %s', - errorUnknownCommand: 'Hiba: ismeretlen parancs: %s', - errorMaxMessageRate: 'Hiba: elérted a percenként küldhető maximális üzenet számot.', - errorConnectionTimeout: 'Hiba: időtúllépés! Próbáld újra!.', - errorConnectionStatus: 'Hiba: a kapcsolat állapota: %s', - errorSoundIO: 'Hiba: a hangfájl betöltése sikertelen. (I/O)', - errorSocketIO: 'Hiba: kapcsolódás a socket szerverhez sikertelen. (I/O)', - errorSocketSecurity: 'Hiba: kapcsolódás a socket szerverhez sikertelen. (Biztonsági hiba!)', - errorDOMSyntax: 'Hiba: Hibás DOM szintaxis (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/in.js b/library/ajaxchat/chat/js/lang/in.js deleted file mode 100644 index 582b9703b..000000000 --- a/library/ajaxchat/chat/js/lang/in.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s masuk ke chat.', - logout: '%s keluar dari chat.', - logoutTimeout: '%s telah keluar dari saluran (Timeout).', - logoutIP: '%s elah keluar dari saluran (Invalid IP address).', - logoutKicked: '%s elah keluar dari saluran (Kicked).', - channelEnter: '%s masuk saluran.', - channelLeave: '%s meninggalkan.', - privmsg: '(berbisik)', - privmsgto: '(berbisik ke %s)', - invite: '%s mengundang anda untuk gabung ke %s.', - inviteto: 'Undangan anda ke %s untuk gabung saluran %s telah dikirim.', - uninvite: '%s membatalkan untuk mengundang anda dari saluran %s.', - uninviteto: 'Pembatalan undangan anda ke %s untuk salura %s telah dikirim.', - queryOpen: 'Saluran Privasi telah dibuka untuk %s.', - queryClose: 'Saluran Privasi untuk %s telah ditutup.', - ignoreAdded: 'Menambah %s ke daftar yang diacuhkan.', - ignoreRemoved: 'Mencabut %s dari daftar yang diacuhkan.', - ignoreList: 'Acuhkan pengguna:', - ignoreListEmpty: 'Tidak ada nama dalam daftar yang diacuhkan.', - who: 'Pengguna online:', - whoChannel: 'Pengguna-2 yang online di saluran %s:', - whoEmpty: 'Tidak ada pengguna yang online di saluran tersebut.', - list: 'Saluran yang tersedia:', - bans: 'Pengguna yang diblok:', - bansEmpty: 'Tidak ada pengguna yang diblok.', - unban: 'Pembatalan Blok pengguna %s .', - whois: 'Alamat IP Pengguna %s :', - whereis: 'Pengguna %s ada di saluran %s.', - roll: '%s melempar %s dan mendapatkan %s.', - nick: '%s sekarang dikenal sebagai %s.', - toggleUserMenu: 'Tombol menu pengguna untuk %s', - userMenuLogout: 'Keluar', - userMenuWho: 'Daftar pengguna yang online', - userMenuList: 'Daftar saluran-saluran yang tersedia', - userMenuAction: 'Menjelaskan tindakan', - userMenuRoll: 'Melempar Dadu', - userMenuNick: 'Mengganti Nama', - userMenuEnterPrivateRoom: 'Memasuki ruang privasi', - userMenuSendPrivateMessage: 'Kirim pesan pribadi', - userMenuDescribe: 'Kirim tindakan pribadi', - userMenuOpenPrivateChannel: 'Buka Saluran Privasi', - userMenuClosePrivateChannel: 'Tutup Saluran Privasi', - userMenuInvite: 'Mengundang', - userMenuUninvite: 'Tidak Mengundang', - userMenuIgnore: 'Acuhkan/Terima', - userMenuIgnoreList: 'Daftar Pengguna yang diacuhkan', - userMenuWhereis: 'Tampilkan Saluran', - userMenuKick: 'Tendang/Blok', - userMenuBans: 'Daftar Pengguna yang diblok', - userMenuWhois: 'Tampilkan IP', - unbanUser: 'Batalkan blok pengguna %s', - joinChannel: 'Gabung Saluran %s', - cite: '%s berkata:', - urlDialog: 'Mohon masukan alamat (URL) of the web:', - deleteMessage: 'Hapus pesan chat ini', - deleteMessageConfirm: 'Yakin akan menghapus pesan chat yang dipilih?', - errorCookiesRequired: 'Cookies diperlukan untuk chat.', - errorUserNameNotFound: 'Error: Pengguna %s tidak ada.', - errorMissingText: 'Error: Teks pesan tidak ada.', - errorMissingUserName: 'Error: Nama tidak ada.', - errorInvalidUserName: 'Error: Kesalahan pada Nama.', - errorUserNameInUse: 'Error: Nama telah dipakai.', - errorMissingChannelName: 'Error: Nama saluran belum ada.', - errorInvalidChannelName: 'Error: Kesalahan pada nama saluran: %s', - errorPrivateMessageNotAllowed: 'Error: Pesan pribadi tidak diijinkan.', - errorInviteNotAllowed: 'Error: Anda tidak diijinkan untuk mengundang orang lain ke saluran ini.', - errorUninviteNotAllowed: 'Error: Anda tidak diijinkan untuk tidak mengundang seseorang ke saluran ini.', - errorNoOpenQuery: 'Error: Tidak ada saluran privasi yang dibuka.', - errorKickNotAllowed: 'Error: Anda tidak diijinkan untuk menendang %s.', - errorCommandNotAllowed: 'Error: Perintah tidak diijinkan: %s', - errorUnknownCommand: 'Error: Perintah tidak diketahui: %s', - errorMaxMessageRate: 'Error: Anda telah melampaui batas pesan maksimum per menitnya.', - errorConnectionTimeout: 'Error: Koneksi putus. Mohon dicoba kembali.', - errorConnectionStatus: 'Error: Status koneksi: %s', - errorSoundIO: 'Error: Gagal mengeluarkan suara (Flash IO Error).', - errorSocketIO: 'Error: Gagal mengadakan koneksi ke server (Flash IO Error).', - errorSocketSecurity: 'Error: Gagal mengadakan koneksi ke server (Flash Security Error).', - errorDOMSyntax: 'Error: Sintaks DOM yang tidak dikenal(DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/index.html b/library/ajaxchat/chat/js/lang/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/library/ajaxchat/chat/js/lang/it.js b/library/ajaxchat/chat/js/lang/it.js deleted file mode 100644 index a84c47ff9..000000000 --- a/library/ajaxchat/chat/js/lang/it.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author s8s8 - * @author Massimiliano Tiraboschi - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s entra in Chat.', - logout: '%s esce dalla Chat.', - logoutTimeout: '%s esce (TimeOut).', - logoutIP: '%s esce (IP non valido).', - logoutKicked: '%s esce (Kicked).', - channelEnter: '%s entra nel canale.', - channelLeave: '%s lascia il canale.', - privmsg: '(privato)', - privmsgto: '(privato a %s)', - invite: '%s ti invita a entrare in %s.', - inviteto: 'Il tuo invito ad entrare nel canale %s è stato inviato a %s.', - uninvite: '%s ha rimosso il tuo invito per %s.', - uninviteto: 'Rimosso invito per %s per il canale %s.', - queryOpen: 'Canale privato aperto con %s.', - queryClose: 'Canale privato con %s chiuso.', - ignoreAdded: '%s aggiunto agli ingorati.', - ignoreRemoved: '%s rimosso dagli ignorati.', - ignoreList: 'Utenti Ignorati:', - ignoreListEmpty: 'Utenti permessi.', - who: 'Utenti Online:', - whoChannel: 'Utenti Online nel canale %s:', - whoEmpty: 'Nessun utente in linea nel canale.', - list: 'Canali disponibili:', - bans: 'Utenti Bannati:', - bansEmpty: 'Nessun utente bannato in lista.', - unban: 'Ban di %s rimosso.', - whois: '%s - IP:', - whereis: 'User %s is in channel %s.', - roll: '%s lancia %s e fa %s.', - nick: '%s è conosciuto ora come %s.', - toggleUserMenu: 'Mostra/Nascondi menu per %s', - userMenuLogout: 'Esci', - userMenuWho: 'Lista utenti online', - userMenuList: 'Lista canali disponibili', - userMenuAction: 'Descrivi azione', - userMenuRoll: 'Getta dadi', - userMenuNick: 'Cambia username', - userMenuEnterPrivateRoom: 'Entra canale privato', - userMenuSendPrivateMessage: 'Invia messaggio privato', - userMenuDescribe: 'Invia azione privata', - userMenuOpenPrivateChannel: 'Apri canale privato', - userMenuClosePrivateChannel: 'Chiudi canale privato', - userMenuInvite: 'Invita', - userMenuUninvite: 'Disinvita', - userMenuIgnore: 'Ignora/Accetta', - userMenuIgnoreList: 'Lista utenti ignorati', - userMenuWhereis: 'Mostra canale', - userMenuKick: 'Butta fuori/Banna', - userMenuBans: 'Lista utenti bannati', - userMenuWhois: 'Mostra IP', - unbanUser: 'Revoca il ban per l\'utente %s', - joinChannel: 'Entra nel canale %s', - cite: '%s dice:', - urlDialog: 'Inserire indirizzo (URL) della pagina Web:', - deleteMessage: 'Cancella questo messaggio', - deleteMessageConfirm: 'Sicuro di cancellare il messaggio selezionato ?', - errorCookiesRequired: 'I Cookies sono richiesti per questa chat.', - errorUserNameNotFound: 'Errore: Utente %s non trovato.', - errorMissingText: 'Errore: Messaggio di testo non trovato.', - errorMissingUserName: 'Errore: Nome Utente non trovato.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Errore: Canale non trovato.', - errorInvalidChannelName: 'Errore: Nome canale non valido: %s', - errorPrivateMessageNotAllowed: 'Errore: Messaggi privati non permessi.', - errorInviteNotAllowed: 'Errore: Non hai il permesso di invitare in questo canale.', - errorUninviteNotAllowed: 'Errore: Non hai il permesso di rimuovere inviti per queso canale.', - errorNoOpenQuery: 'Errore: Nessun canale privato aperto.', - errorKickNotAllowed: 'Errore: Non sei abilitato a Kikkare %s.', - errorCommandNotAllowed: 'Errore: Comando non permesso: %s', - errorUnknownCommand: 'Errore: Comando sconosciuto: %s', - errorMaxMessageRate: 'Errore: Hai superato il numero massimo di messaggi per minuto.', - errorConnectionTimeout: 'Errore: Connessione persa. Riprovare.', - errorConnectionStatus: 'Errore: Stato di Connessione: %s', - errorSoundIO: 'Errore: Caricamento files suono fallito (Flash IO Error).', - errorSocketIO: 'Errore: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/ja.js b/library/ajaxchat/chat/js/lang/ja.js deleted file mode 100644 index 5d87d2eea..000000000 --- a/library/ajaxchat/chat/js/lang/ja.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s さんがログインしました', - logout: '%s さんがログアウトしました', - logoutTimeout: '%s さんが強制的にログアウトされました (タイムアウト)', - logoutIP: '%s さんが強制的にログアウトされました (不正な IPアドレス)', - logoutKicked: '%s さんが強制的にログアウトされました (キック).', - channelEnter: '%s さんが入室しました', - channelLeave: '%s さんが退室しました', - privmsg: '(プライベートメッセージ)', - privmsgto: '(%s さんへプライベートメッセージ)', - invite: '%s さんから チャンネル %s への招待 が届いています', - inviteto: '%s さんへ チャンネル %s への招待 を送りました', - uninvite: '%s さんから チャンネル %s への招待 を取り消されました', - uninviteto: '%s さんの チャンネル %s への招待 を取り消しました', - queryOpen: '二人きりモードを %s さんと開始しました', - queryClose: '%s さんとの二人きりモードを終了しました', - ignoreAdded: '%s さんを無視ユーザーリストに追加しました', - ignoreRemoved: '%s さんを無理ユーザーリストから削除しました', - ignoreList: '無視ユーザーリスト :', - ignoreListEmpty: 'あなたはどのユーザーも無視していません', - who: 'オンラインユーザー :', - whoChannel: 'チャンネル %s に入室中のユーザー :', - whoEmpty: 'そのチャンネルに入室中のユーザーは一人もいません', - list: '入室可能なチャンネル :', - bans: 'アクセス禁止ユーザーリスト :', - bansEmpty: 'アクセス禁止されたユーザーは一人もいません', - unban: 'ユーザー %s のアクセス禁止を取り消しました', - whois: 'ユーザー %s の IPアドレス :', - whereis: 'ユーザー　%s はチャンネル %s にいます', - roll: '%s さんがサイコロを振りました。 %s - 結果 %s', - nick: '%s さんのニックネームは以降 %s です', - toggleUserMenu: '%s さんのユーザーメニューを表示する/表示しない', - userMenuLogout: 'ログアウト', - userMenuWho: 'オンラインユーザーリスト', - userMenuList: '入室可能なチャンネルのリスト', - userMenuAction: '感情を表現する', - userMenuRoll: 'サイコロを振る', - userMenuNick: 'ニックネーム', - userMenuEnterPrivateRoom: 'プライベートルームへ移動する', - userMenuSendPrivateMessage: 'プライベートメッセージを送る', - userMenuDescribe: '感情を表現する', - userMenuOpenPrivateChannel: '二人きりモードを開始する', - userMenuClosePrivateChannel: '二人きりモードを終了する', - userMenuInvite: '招待する', - userMenuUninvite: '招待を取り消す', - userMenuIgnore: '無視する/無視しない', - userMenuIgnoreList: '無視ユーザーリスト', - userMenuWhereis: 'ユーザーの居場所', - userMenuKick: 'キック/アクセス禁止', - userMenuBans: 'アクセス禁止ユーザーリスト', - userMenuWhois: 'IPアドレス', - unbanUser: 'ユーザー %s のアクセス禁止を取り消す', - joinChannel: 'チャンネル %s へ移動する', - cite: '%s さんが言いました :', - urlDialog: 'サイトのアドレス (URL) を入力してください :', - deleteMessage: 'このチャットメッセージを削除する', - deleteMessageConfirm: 'チャットメッセージを本当に削除してもよろしいですか？', - errorCookiesRequired: 'このチャットシステムを利用するには Cookie を有効にしておく必要があります', - errorUserNameNotFound: 'エラー : ユーザー %s が見つかりませんでした', - errorMissingText: 'エラー : メッセージが未入力です', - errorMissingUserName: 'エラー : ユーザー名が未入力です', - errorInvalidUserName: 'エラー : ユーザー名が正しくありません', - errorUserNameInUse: 'エラー : そのユーザー名は既に使われています', - errorMissingChannelName: 'エラー : チャンネル名が未入力です', - errorInvalidChannelName: 'エラー : チャンネル名が正しくありません : %s', - errorPrivateMessageNotAllowed: 'エラー : プライベートメッセージが許可されていません', - errorInviteNotAllowed: 'エラー : あなたはこのチャンネルで誰かを招待することを許可されていません', - errorUninviteNotAllowed: 'エラー : あなたはこのチャンネルで誰かの招待を取り消すことを許可されていません', - errorNoOpenQuery: 'エラー : 二人きりモードが開始されていません', - errorKickNotAllowed: 'エラー : あなたは %s さんをキックすることを許可されていません', - errorCommandNotAllowed: 'エラー : コマンドが許可されていません : %s', - errorUnknownCommand: 'エラー : コマンドが不正です : %s', - errorMaxMessageRate: 'エラー : １分あたりに発言できる最大文字数を超えています', - errorConnectionTimeout: 'エラー : 接続がタイムアウトしました。再度試してください。', - errorConnectionStatus: 'エラー : 接続ステータス : %s', - errorSoundIO: 'エラー : サウンドファイルの読み込みに失敗しました (Flash IO Error)', - errorSocketIO: 'エラー : ソケットサーバへの接続に失敗しました (Flash IO Error)', - errorSocketSecurity: 'エラー : ソケットサーバへの接続に失敗しました (Flash Security Error)', - errorDOMSyntax: 'エラー : DOM の文法が不正です (DOM ID: %s)' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/ka.js b/library/ajaxchat/chat/js/lang/ka.js deleted file mode 100644 index 6f0a24d72..000000000 --- a/library/ajaxchat/chat/js/lang/ka.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s ჩატში შემოვიდა.', - logout: '%s ჩატიდან გავიდა.', - logoutTimeout: '%s ჩატი დატოვა (დრო ამოიწურა).', - logoutIP: '%s ჩატი დატოვა (არასწორი IP მისამართი).', - logoutKicked: '%s ჩატი დატოვა (ამოარტყეს).', - channelEnter: '%s უერთდება არხს.', - channelLeave: '%s ტოვებს არხს.', - privmsg: '(ჩურჩულებს)', - privmsgto: '(%s-ს უჩურჩულებს)', - invite: '%s გეპაიჟებათ შეუერთდეთ %s-ს.', - inviteto: '%s-თვის შექმნილი მოსაწვევი, რათა შეუერთდეს არხ %s-ს, გაგზავნილია.', - uninvite: '%s თავის დაპატიჟებას არხ %s-თვის აუქმებს.', - uninviteto: '%s-თვის დაწერილი, %s არხის მოსაწვევის გაუქმება გაგხავნილია.', - queryOpen: 'პირადი არხი %s-სთან გასხნილია.', - queryClose: 'პირადი არხი %s-სთან დახურულია.', - ignoreAdded: '%s იგნორირების სიას დაემატა.', - ignoreRemoved: '%s იგნორირების სიიდან ამოღებულია.', - ignoreList: 'იგნორირებულები:', - ignoreListEmpty: 'იგნორირებული წევრები არაა.', - who: 'ხაზზე არიან:', - whoChannel: 'არხ %s-ში ხაზზე არიან:', - whoEmpty: 'მოცემულ არხში ხაზზე არავინაა.', - list: 'ხელმისაწვდომი არხები:', - bans: 'დაბლოკილი წევრები:', - bansEmpty: 'დაბლოკილი წევრები არაა.', - unban: '%s წევრის ბლოკი მოხსნილია.', - whois: '%s წევრის - IP მისამართი:', - whereis: 'წევრი %s იმყოფება %s არხში.', - roll: '%s აგდებს %s-ს და იღებს %s-ს.', - nick: '%s ახლა ცნობილია როგორც %s.', - toggleUserMenu: 'წევრის მენიუს %s-თვის ჩართვა/გათიშვა', - userMenuLogout: 'გასვლა', - userMenuWho: 'ჩამოწერე ხაზზე ვინაა', - userMenuList: 'ჩამოწერე ხელმისაწვდომი არხები', - userMenuAction: 'აღწერე ქმედება', - userMenuRoll: 'კამათლების გაგორება', - userMenuNick: 'მეტსახელის შეცვლა', - userMenuEnterPrivateRoom: 'პირად ოთახში შესვლა', - userMenuSendPrivateMessage: 'პირადი მიმოწერა', - userMenuDescribe: 'პირადი ქმედების გაგზავნა', - userMenuOpenPrivateChannel: 'გახსენი პირადი არხი', - userMenuClosePrivateChannel: 'დახურე პირადი არხი', - userMenuInvite: 'დაპატიჟება', - userMenuUninvite: 'დაპატიჟების გაუქმება', - userMenuIgnore: 'იგნორირება/მიღება', - userMenuIgnoreList: 'ჩამოწერე იგნორირებულები', - userMenuWhereis: 'მაჩვენე არხი', - userMenuKick: 'ამორტყმა/დაბლოკვა', - userMenuBans: 'დაბლოკილების ჩამოწერა', - userMenuWhois: 'IP-ს ჩვენება', - unbanUser: '%s წევრის ბლოკის მოხსნა', - joinChannel: '%s არხში შესვლა', - cite: '%s თქვა:', - urlDialog: 'გთხოვთ შეიყვანოთ ვებ-გვერდის მისამართი (URL):', - deleteMessage: 'გზავნილის წაშლა', - deleteMessageConfirm: 'მართლა წავშალოთ ეს გზავნილი?', - errorCookiesRequired: 'ჩატისთვის cookies არიან საჭირო.', - errorUserNameNotFound: 'შეცდომა: წევრი %s არ მოიძებნა.', - errorMissingText: 'შეცდომა: გზავნილის ტექსტი აკლია.', - errorMissingUserName: 'შეცდომა: აკლია მეტსახელი.', - errorInvalidUserName: 'შეცდომა: არასწორი მეტსახელი.', - errorUserNameInUse: 'შეცდომა: მეტსახელი დაკავებულია.', - errorMissingChannelName: 'შეცდომა: აკლია არხის სახელი.', - errorInvalidChannelName: 'შეცდომა: არხის სახელი - %s - არასწორია', - errorPrivateMessageNotAllowed: 'შეცდომა: პირადი მიმოწერა აკრზალულია.', - errorInviteNotAllowed: 'შეცდომა: უფლება არ გაქვთ მიმდინარე არხში ვინმე მოიწვიოთ.', - errorUninviteNotAllowed: 'შეცდომა: უფლება არ გაქავთ მინდინარე არხიდან ვინმესი გაგდება.', - errorNoOpenQuery: 'შეცდომა: პირადი არხები გახსნილი არაა.', - errorKickNotAllowed: 'შეცდომა: უფლება არ გაგჩნიათ %s-ს ამოარტყათ.', - errorCommandNotAllowed: 'შეცდომა: ბრზანება - %s - აკრძალულია', - errorUnknownCommand: 'შეცდომა: ბრძანება - %s - უცნობია', - errorMaxMessageRate: 'შეცდომა: თქვენ მიაღწიეთ წუთში მაქსიმალურ შესაძლებელ გზავნილების რიცხვს.', - errorConnectionTimeout: 'შეცდომა: კავშირს ვადა გაუვიდა. გთხოვთ, კიდევ სცადეთ.', - errorConnectionStatus: 'შეცდომა: კავშირის სტატუსი: %s', - errorSoundIO: 'შეცდომა: ხმის ფაილი ვერ ჩაიტვირთა (Flash IO Error).', - errorSocketIO: 'შეცდომა: სერვერის სოკეტთან დაკავშირება ჩაიშალა (Flash IO Error).', - errorSocketSecurity: 'შეცდომა: სერვერის სოკეტთან დაკავშირება ჩაიშალა (Flash Security Error).', - errorDOMSyntax: 'შეცდომა: არასწორი DOM სინტაქსი (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/kr.js b/library/ajaxchat/chat/js/lang/kr.js deleted file mode 100644 index 27ef9196d..000000000 --- a/library/ajaxchat/chat/js/lang/kr.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s께서 접속하였습니다.', - logout: '%s님께서 접속을 종료하였습니다.', - logoutTimeout: '%s님께서 시간초과로 나가셨습니다.', - logoutIP: '%s님께서 IP주소문제로 나가셨습니다.', - logoutKicked: '%s님께서 추방되었습니다.', - channelEnter: '%s님께서 들어오셨습니다.', - channelLeave: '%s님께서 나가셨습니다.', - privmsg: '(귓속말)', - privmsgto: '(%s에게 귓속말)', - invite: '%s님께서 %s채널에서 초대하셨습니다.', - inviteto: '%s을 %s채널로 초대하는 메시지를 보냈습니다..', - uninvite: '%s님께서 %s채널로의 초대를 취소하였습니다.', - uninviteto: '%s님께 %s채널로의 초대를 취소하는 메시지를 보냈습니다', - queryOpen: '%s님의 개인채널이 열렸습니다.', - queryClose: '%s님의 개인채널이 닫혔습니다.', - ignoreAdded: '%s님을 대화차단 목록에 추가하였습니다.', - ignoreRemoved: '%s님을 대화차단 목록에서 삭제하였습니다.', - ignoreList: '차단된 사용자:', - ignoreListEmpty: '차단된 사용자가 없습니다.', - who: '접속중인 사용자:', - whoChannel: '%s채널에 접속중인 사용자:', - whoEmpty: '해당 채널에 접속중인 사용자가 없습니다.', - list: '사용가능한 채널:', - bans: '추방된 사용자:', - bansEmpty: '추방된 사용자가 없습니다.', - unban: '%s을 다시 복구하였습니다.', - whois: '%s - IP주소:', - whereis: '%s님은 %s 채널에 계십니다.', - roll: '%s 롤 %s 및 도착 %s.', - nick: '%s님의 닉네임은 %s입니다.', - toggleUserMenu: '에 대한 전환 사용자 메뉴 %s', - userMenuLogout: '로그아웃', - userMenuWho: '접속중인 사용자', - userMenuList: '채널목록', - userMenuAction: '작업을 설명', - userMenuRoll: '주사위', - userMenuNick: '대화명 변경', - userMenuEnterPrivateRoom: '개인 대화방 입장', - userMenuSendPrivateMessage: '귓속말 전송', - userMenuDescribe: '개인 작업을 보내기', - userMenuOpenPrivateChannel: '개인 채널 개설', - userMenuClosePrivateChannel: '개인 채널 닫기', - userMenuInvite: '초대', - userMenuUninvite: '초대 취소', - userMenuIgnore: '차단/수락', - userMenuIgnoreList: '대화차단 목록', - userMenuWhereis: '채널확인', - userMenuKick: '추방', - userMenuBans: '추방된 사용자 목록', - userMenuWhois: '접속주소 확인', - unbanUser: '%s 사용자를 추방취소', - joinChannel: '%s 채널에 접속', - cite: '%s님의 말:', - urlDialog: '웹페이지의 주소를 입력하세요:', - deleteMessage: '이 메시지 삭제', - deleteMessageConfirm: '선택한 메시지를 삭제하시겠습니까?', - errorCookiesRequired: '쿠키 사용으로 설정하세요.', - errorUserNameNotFound: '오류: %s님을 찾을 수 없습니다.', - errorMissingText: '오류: 메시지를 찾을 수 없습니다.', - errorMissingUserName: '오류: 대화명을 찾을 수 없습니다.', - errorInvalidUserName: '오류: 잘못된 대화명입니다.', - errorUserNameInUse: '오류: 이미 사용중인 대화명입니다.', - errorMissingChannelName: '오류: 채널명을 찾을 수 없습니다.', - errorInvalidChannelName: '오류: %s 채널이 없습니다.', - errorPrivateMessageNotAllowed: '오류: 귓속말을 사용할 수 없습니다.', - errorInviteNotAllowed: '오류: 이 채널로 다른 사용자를 초대하는 권한이 없습니다.', - errorUninviteNotAllowed: '오류: 다른 사용자의 초대를 취소할 권한이 없습니다.', - errorNoOpenQuery: '오류: 열려있는 개인 채널이 없습니다..', - errorKickNotAllowed: '오류: %s를 추방할 수 있는 권한이 없습니다.', - errorCommandNotAllowed: '오류: %s 명령을 사용할 수 없습니다.', - errorUnknownCommand: '오류: %s은 없는 명령어입니다.', - errorMaxMessageRate: '오류: 1분동안 연속해서 입력할 수 있는 메시지 수를 초과하였습니다.', - errorConnectionTimeout: '오류: 접속시간을 초과하였습니다.', - errorConnectionStatus: '오류: 접속 상태: %s', - errorSoundIO: '오류: 입출력 실패로 소리파일을 불러오는데 실패하였습니다.', - errorSocketIO: '오류: 입출력 실패로 서버에 접속하는데 실패하였습니다.', - errorSocketSecurity: '오류: 보안문제로 서버에 접속하는데 실패하였습니다.', - errorDOMSyntax: '오류: DOM 문법이 잘못되었습니다. (DOM ID: %s).' - -} diff --git a/library/ajaxchat/chat/js/lang/mk.js b/library/ajaxchat/chat/js/lang/mk.js deleted file mode 100644 index 8ca441112..000000000 --- a/library/ajaxchat/chat/js/lang/mk.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Nebojsa Ilijoski - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ -var ajaxChatLang={login:"%s се приклучи на четот.",logout:"%s излезе од четот.",logoutTimeout:"%s излезе автоматски од четот (Истече времето).",logoutIP:"%s излезе автоматски од четот (Погрешна IP адреса).",logoutKicked:"%s излезе автоматски од четот (Злоупотреба).",channelEnter:"%s се прилкучи на каналот.",channelLeave:"%s го напушти канала.",privmsg:"(шепоти)",privmsgto:"(шепоти на %s)",invite:"%s ве кани да се приклучите со него %s.",inviteto:"Поканата за %s да се приклучи на каналот %s беше испратена.",uninvite:"%s е отпоканет на поканата за каналот %s.",uninviteto:"Отпоканата на поканата до %s за каналот %s беше испратена.",queryOpen:"Отворен е приватен канал за %s.",queryClose:"Затворен е приватен канал за %s.",ignoreAdded:"%s е ставен на списокот на игнорирани.",ignoreRemoved:"%s беше отстранет од списокот на игнорирани.",ignoreList:"Игнорирани корисници:",ignoreListEmpty:"Нема игнорирани корисници.",who:"Оnline корисници:",whoChannel:"Online корисници на каналот %s:",whoEmpty:"На дадениот канал нема online корисници.",list:"Приватни канали:",bans:"Блокирани корисници:",bansEmpty:"Нема блокирани корисници.",unban:"Блокирањето на корисникот %s е завршено.",whois:"Корисникот %s — IP адреса:",whereis:"Корисникот %s е на канал %s.",roll:"%s фрли %s и доби %s.",nick:"%s веќе се нарекува %s.",toggleUserMenu:"Прикажување/скривање на корисничкото мени за %s",userMenuLogout:"Излези",userMenuWho:"Online корисници",userMenuList:"Приватни канали",userMenuAction:"Опис на дејство",userMenuRoll:"Фрлање на коцка",userMenuNick:"Промена на името",userMenuEnterPrivateRoom:"Влез во приватна соба",userMenuSendPrivateMessage:"Испраќање на приватна порака",userMenuDescribe:"Испраќање на приватно дејство",userMenuOpenPrivateChannel:"Отварање на приватен канал",userMenuClosePrivateChannel:"Затварање на приватен канал",userMenuInvite:"Покана",userMenuUninvite:"Одговор на покана",userMenuIgnore:"Одбивање/прифаќање",userMenuIgnoreList:"Игнорирани корисници",userMenuWhereis:"Преглед на канал",userMenuKick:"Прифаќање/Блокирање",userMenuBans:"Блокирани корисници",userMenuWhois:"Преглед на IP адреса",unbanUser:"Одблокирање на %s",joinChannel:"Присоединување кон каналот %s",cite:"%s рече:",urlDialog:"Ве молам, внесете адреса (URL) на страницата:",deleteMessage:"Бришење на пораката",deleteMessageConfirm:"Дали сте сигурни дека сакате да е избришете пораката?",errorCookiesRequired:"За четот е потребно да се активни cookies.",errorUserNameNotFound:"Грешка: Корисникот %s не е пронајден.",errorMissingText:"Грешка: Недостасува текст од пораката.",errorMissingUserName:"Грешка: Недостасува корисничкото име.",errorInvalidUserName:"Грешка: Погрешно корисничко име.",errorUserNameInUse:"Грешка: Корисничкото име веќе е во употреба.",errorMissingChannelName:"Грешка: Недостасува името на каналот.",errorInvalidChannelName:"Грешка: Името на каналот не е валидно: %s",errorPrivateMessageNotAllowed:"Грешка: Лични пораки не се дозволени.",errorInviteNotAllowed:"Грешка: Не ви е позволено да каните корисници на овој канал.",errorUninviteNotAllowed:"Грешка: Не ви е дозволено да отпоканување на овој канал.",errorNoOpenQuery:"Грешка: Не е отворен приватен канал.",errorKickNotAllowed:"Грешка: Не ви е дозволено да исфрлате %s.",errorCommandNotAllowed:"Грешка: Командата не е дозволена: %s",errorUnknownCommand:"Грешка: Непозната команда: %s",errorMaxMessageRate:"Грешка: Го надминавте максималниот број пораки во минута.",errorConnectionTimeout:"Грешка: Истече на времето на врската. Ве молам обидете се повторно!",errorConnectionStatus:"Грешка: Состојба на врската: %s",errorSoundIO:"Грешка: Неуспешно поставување на звукот (Влезно-излезна грешка на Флешот).",errorSocketIO:"Грешка: Неуспешна врска кон сокетниот сервер (Влезно-излезна грешка на Флешот).",errorSocketSecurity:"Грешка: Неуспешна врска кон сокетниот сервер (Грешка во сигурноста на Флашот).",errorDOMSyntax:"Грешка: Погрешна синтакса на DOM (DOM ID: %s)."}; \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/nl-be.js b/library/ajaxchat/chat/js/lang/nl-be.js deleted file mode 100644 index 4184ce7c9..000000000 --- a/library/ajaxchat/chat/js/lang/nl-be.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Nic Mertens - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s komt in het chatkanaal.', - logout: '%s verlaat het chatkanaal.', - logoutTimeout: '%s verlaat het chatkanaal (Timeout).', - logoutIP: '%s is afgemeld (Ongeldig IP address).', - logoutKicked: '%s is afgemeld (Kick door admin of moderator).', - channelEnter: '%s komt het kanaal binnen.', - channelLeave: '%s verlaat het kanaal.', - privmsg: '(fluistert)', - privmsgto: '(fluistert naar %s)', - invite: '%s nodigt je uit om naar %s te komen.', - inviteto: 'Je uitnodiging naar %s om het kanaal %s te bezoeken, werd verstuurd.', - uninvite: '%s annuleert de uitnodiging van kanaal %s.', - uninviteto: 'De annulatie van je uitnodiging aan %s voor het kanaal %s werd verstuurd.', - queryOpen: 'Privékanaal geopend naar %s.', - queryClose: 'Privékanaal naar %s wordt gesloten.', - ignoreAdded: '%s is toegevoegd aan de negeer lijst.', - ignoreRemoved: '%s werd verwijderd van de negeerlijst.', - ignoreList: 'Genegeerde gebruikers:', - ignoreListEmpty: 'Er zijn geen genegeerde gebruikers.', - who: 'Online gebruikers:', - whoChannel: 'Online gebruikers in channel %s:', - whoEmpty: 'Er zijn geen gebruikers in het gekozen kanaal.', - list: 'Beschikbare kanalen:', - bans: 'Gebande gebruikers:', - bansEmpty: 'Er zijn geen gebande gebruikers.', - unban: 'Ban van gebruiker %s opgeheven.', - whois: 'Gebruiker %s - IP adres:', - whereis: 'User %s is in channel %s.', - roll: '%s smijt %s en krijgt %s.', - nick: '%s heet nu %s.', - toggleUserMenu: 'Open menu voor gebruiker %s', - userMenuLogout: 'Afmelden', - userMenuWho: 'Lijst online gebruikers', - userMenuList: 'Lijst beschikbaare kanalen', - userMenuAction: 'Beschrijf actie', - userMenuRoll: 'Rol dobbelsteen', - userMenuNick: 'Wijzig gebruikersnaam', - userMenuEnterPrivateRoom: 'Ga privékanaal binnen', - userMenuSendPrivateMessage: 'Stuur privé bericht', - userMenuDescribe: 'Stuur privé actie', - userMenuOpenPrivateChannel: 'Open privé kanaal', - userMenuClosePrivateChannel: 'Sluit privé kanaal', - userMenuInvite: 'Nodig uit', - userMenuUninvite: 'Uitnodiging intrekken', - userMenuIgnore: 'Negeren/aanvaarden', - userMenuIgnoreList: 'Lijst genegeerde gebruikers', - userMenuWhereis: 'Toon kanaal', - userMenuKick: 'Verwijderen/Verbannen', - userMenuBans: 'Lijst verbande gebruikers', - userMenuWhois: 'Toon IP', - unbanUser: 'Gebande gebruiker %s terug toelaten', - joinChannel: 'Betreedt kanaal %s', - cite: '%s zei:', - urlDialog: 'Gelieve het (URL) adres van de webpagina in te geven:', - deleteMessage: 'Verwijder dit chat bericht', - deleteMessageConfirm: 'Bent u zeker dat u dit bericht wil verwijderen?', - errorCookiesRequired: 'Cookies moeten aangeschakeld zijn voor deze chat.', - errorUserNameNotFound: 'Fout: Gebruiker %s werd niet gevonden.', - errorMissingText: 'Fout: Ontbrekende berichttekst.', - errorMissingUserName: 'Fout: Ontbrekende Gebruikersnaam.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Gebruikersnaam wordt al gebruikt', - errorMissingChannelName: 'Fout: Ontbrekende kanaalnaam.', - errorInvalidChannelName: 'Fout: Ongeldige kanaalnaam: %s', - errorPrivateMessageNotAllowed: 'Error: Private berichten zijn niet toegestaan.', - errorInviteNotAllowed: 'Fout: Je bent niet geautoriseerd om iemand uit te nodigen naar dit kanaal.', - errorUninviteNotAllowed: 'Fout: Je bent niet geautoriseerd om een uitnodiging naar iemand te annuleren op dit kanaal.', - errorNoOpenQuery: 'Fout: Er is geen privékanaal geopend.', - errorKickNotAllowed: 'Fout: Je ben niet geautoriseerd om %s te kicken.', - errorCommandNotAllowed: 'Fout: Opdracht is niet toegestaan: %s', - errorUnknownCommand: 'Fout: Onbekende opdracht: %s', - errorMaxMessageRate: 'Error: Je hebt de limiet voor het aantal berichten per minuut overschreven.', - errorConnectionTimeout: 'Fout: Connection timeout. Gelieve opnieuw te proberen.', - errorConnectionStatus: 'Fout: Verbindingsstatus: %s', - errorSoundIO: 'Error: Geluidsbestand kon niet geladen worden (Flash IO Error).', - errorSocketIO: 'Error: Verbinding met Socket server is verloren (Flash IO Error).', - errorSocketSecurity: 'Error: Verbinding met Socket server is verloren (Flash Security Error).', - errorDOMSyntax: 'Error: Ongeldige DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/nl.js b/library/ajaxchat/chat/js/lang/nl.js deleted file mode 100644 index 179d0e703..000000000 --- a/library/ajaxchat/chat/js/lang/nl.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Dutch localisation: Patrick Donker - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s betreedt het chatkanaal.', - logout: '%s verlaat het chatkanaal.', - logoutTimeout: '%s verlaat het chatkanaal (Timeout).', - logoutIP: '%s is afgemeld (Ongeldig IP address).', - logoutKicked: '%s is afgemeld (Verbannen door admin of moderator).', - channelEnter: '%s betreedt het kanaal.', - channelLeave: '%s verlaat het kanaal.', - privmsg: '(fluistert)', - privmsgto: '(fluistert naar %s)', - invite: '%s nodigt je uit om naar %s te komen.', - inviteto: 'Je uitnodiging naar %s om het kanaal %s te bezoeken, is verzonden.', - uninvite: '%s annuleert de uitnodiging van kanaal %s.', - uninviteto: 'De annulering van je uitnodiging aan %s voor het kanaal %s is verzonden.', - queryOpen: 'Privékanaal geopend voor %s.', - queryClose: 'Privékanaal naar %s wordt gesloten.', - ignoreAdded: '%s is toegevoegd aan de negeer lijst.', - ignoreRemoved: '%s is verwijderd van de negeerlijst.', - ignoreList: 'Genegeerde gebruikers:', - ignoreListEmpty: 'Er zijn geen genegeerde gebruikers.', - who: 'Aanwezige gebruikers:', - whoChannel: 'aanwezige gebruikers in channel %s:', - whoEmpty: 'Het gekozen kanaal is leeg.', - list: 'Beschikbare kanalen:', - bans: 'Verbannen gebruikers:', - bansEmpty: 'Er zijn geen gebruikers verbannen.', - unban: 'Ban van gebruiker %s opgeheven.', - whois: 'Gebruiker %s - IP adres:', - whereis: 'Gebruiker %s is in kanaal %s.', - roll: '%s gooit %s en krijgt %s.', - nick: '%s heet nu %s.', - toggleUserMenu: 'Open gebuikersmenu %s', - userMenuLogout: 'Afmelden', - userMenuWho: 'Lijst aanwezige gebruikers', - userMenuList: 'Lijst beschikbare kanalen', - userMenuAction: 'Beschrijf actie', - userMenuRoll: 'Rol dobbelsteen', - userMenuNick: 'Wijzig gebruikersnaam', - userMenuEnterPrivateRoom: 'Betreed privékanaal', - userMenuSendPrivateMessage: 'Stuur privé bericht', - userMenuDescribe: 'Stuur privé actie', - userMenuOpenPrivateChannel: 'Open privé kanaal', - userMenuClosePrivateChannel: 'Sluit privé kanaal', - userMenuInvite: 'Nodig uit', - userMenuUninvite: 'Uitnodiging intrekken', - userMenuIgnore: 'Negeren/aanvaarden', - userMenuIgnoreList: 'Lijst genegeerde gebruikers', - userMenuWhereis: 'Toon kanaal', - userMenuKick: 'Verwijderen/Verbannen', - userMenuBans: 'Lijst verbannen gebruikers', - userMenuWhois: 'Toon IP adres', - unbanUser: 'Verbannen gebruiker %s weer toelaten', - joinChannel: 'Betreed kanaal %s', - cite: '%s zei:', - urlDialog: 'Geef het adres (URL) van de webpagina op:', - deleteMessage: 'Verwijder dit bericht', - deleteMessageConfirm: 'Weet u zeker dat u dit bericht wilt verwijderen?', - errorCookiesRequired: 'Cookies moeten ingeschakeld zijn voor deze chat.', - errorUserNameNotFound: 'Fout: Gebruiker %s is niet gevonden.', - errorMissingText: 'Fout: Ontbrekende berichttekst.', - errorMissingUserName: 'Fout: Ontbrekende gebruikersnaam.', - errorInvalidUserName: 'Error: Ongeldige gebruikersnaam.', - errorUserNameInUse: 'Error: Gebruikersnaam is in gebruik.', - errorMissingChannelName: 'Fout: Ontbrekende kanaalnaam.', - errorInvalidChannelName: 'Fout: Ongeldige kanaalnaam: %s', - errorPrivateMessageNotAllowed: 'Fout: Privéberichten zijn niet toegestaan.', - errorInviteNotAllowed: 'Fout: U bent niet geautoriseerd uitnodigingen te versturen voor dit kanaal.', - errorUninviteNotAllowed: 'Fout: U bent niet geautoriseerd uitnodigingen te annuleren voor dit kanaal.', - errorNoOpenQuery: 'Fout: Geen privékanaal beschikbaar.', - errorKickNotAllowed: 'Fout: U ben niet geautoriseerd om %s te verbannen.', - errorCommandNotAllowed: 'Fout: Opdracht niet toegestaan: %s', - errorUnknownCommand: 'Fout: Onbekende opdracht: %s', - errorMaxMessageRate: 'Error: U hebt het maximaal aantal berichten per minuut bereikt.', - errorConnectionTimeout: 'Fout: Connection timeout. Probeer opnieuw.', - errorConnectionStatus: 'Fout: Verbindingsstatus: %s', - errorSoundIO: 'Error: Geluidsbestand kan worden geladen (Flash IO Error).', - errorSocketIO: 'Error: Verbinding met Socket server is verbroken (Flash IO Error).', - errorSocketSecurity: 'Error: Verbinding met Socket server is verbroken (Flash Security Error).', - errorDOMSyntax: 'Error: Ongeldige DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/no.js b/library/ajaxchat/chat/js/lang/no.js deleted file mode 100644 index 4a9a5ac3f..000000000 --- a/library/ajaxchat/chat/js/lang/no.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author DagArneKirkerod - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s logger inn på Chat.', - logout: '%s logger ut av Chat.', - logoutTimeout: '%s har blitt utlogget (Tidsbegrensning).', - logoutIP: '%s har blitt logget ut (Ugyldig IP Adresse).', - logoutKicked: '%s har blitt logget ut (sparket ut).', - channelEnter: '%s kommer inn på kanalen.', - channelLeave: '%s forlater kanalen.', - privmsg: '(hviskere)', - privmsgto: '(hvisker til %s)', - invite: '%s inviterer deg til å delta %s.', - inviteto: 'Din invitasjon til %s å delta på kanal %s er sendt.', - uninvite: '%s trekker din invitasjon fra kanal %s.', - uninviteto: 'Din tilbaketrekkning av invitasjon til %s for kanal %s er sendt.', - queryOpen: 'Privat kanal åpnet til %s.', - queryClose: 'Privat kanal til %s er stengt.', - ignoreAdded: 'Lagt %s til listen over ignorerte brukere.', - ignoreRemoved: 'Fjernet %s fra liste over ignorerte brukere.', - ignoreList: 'Ignorerte Brukere:', - ignoreListEmpty: 'Ingen ignorerte brukere på lista.', - who: 'Påloggede Brukere:', - whoChannel: 'Online Brukere i kanal %s:', - whoEmpty: 'Ingen påloggede brukere på valgt kanal.', - list: 'Tilgjenglige kanaler:', - bans: 'Utsparkede Brukere:', - bansEmpty: 'Ingen utsparkede brukere på lista.', - unban: 'Bruker %s fjernet fra liste over utsparkede brukere.', - whois: 'Bruker %s - IP adresse:', - whereis: 'User %s is in channel %s.', - roll: '%s triller %s og får %s.', - nick: '%s is now known as %s.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Logout', - userMenuWho: 'List online users', - userMenuList: 'List available channels', - userMenuAction: 'Describe action', - userMenuRoll: 'Roll dice', - userMenuNick: 'Endre brukernavn', - userMenuEnterPrivateRoom: 'Skriv privat rom', - userMenuSendPrivateMessage: 'Send en privat melding', - userMenuDescribe: 'Send privat handling', - userMenuOpenPrivateChannel: 'Åpne privat kanal', - userMenuClosePrivateChannel: 'Lukk privat kanal', - userMenuInvite: 'Invite', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignore/Accept', - userMenuIgnoreList: 'Liste med ignorerte brukere', - userMenuWhereis: 'Vise kanal', - userMenuKick: 'Kick/Ban', - userMenuBans: 'Liste sperrede brukere', - userMenuWhois: 'Vise IP', - unbanUser: 'Tilbakekalle forbud av brukeren %s', - joinChannel: 'Delta på kanal %s', - cite: '%s sa:', - urlDialog: 'Skriv inn adressen (URL) på web siden:', - deleteMessage: 'Slett denne chat-melding', - deleteMessageConfirm: 'Vil du virkelig slette den valgte chat-melding?', - errorCookiesRequired: 'Cookies er påkrevet på denne chatten.', - errorUserNameNotFound: 'Feil: Bruker %s ble ikke funnet.', - errorMissingText: 'Feil: Mangler meldingstekst.', - errorMissingUserName: 'Feil: Mangler Brukernavn.', - errorInvalidUserName: 'Feil: Ugyldig brukernavn.', - errorUserNameInUse: 'Feil: Brukernavnet er allerede i bruk.', - errorMissingChannelName: 'Feil: Mangler navn på kanal.', - errorInvalidChannelName: 'Feil: Feil navn på kanal: %s', - errorPrivateMessageNotAllowed: 'Feil: Private meldinger ikke tillatt.', - errorInviteNotAllowed: 'Feil: Du har ikke lov til å invitere noen til denne kanalen.', - errorUninviteNotAllowed: 'Feil: Du har ikke lov til å fjerne invitasjon til noen brukere på denne kanalen.', - errorNoOpenQuery: 'Feil: Ingen private kanaler er åpne.', - errorKickNotAllowed: 'Feil: Du har ikke lov til å sparke ut %s.', - errorCommandNotAllowed: 'Feil: Kommando ikke tillatt: %s', - errorUnknownCommand: 'Feil: Ukjent kommando: %s', - errorMaxMessageRate: 'Feil: Du overskredet maksimalt antall meldinger per minutt.', - errorConnectionTimeout: 'Feil: Oppkoblingstid utgått. Forsøk forsøk igjen.', - errorConnectionStatus: 'Feil: Oppkoblingsstatus: %s', - errorSoundIO: 'Feil: Kunne ikke laste lydfil (Flash IO Error).', - errorSocketIO: 'Feil: Tilkobling til stikkontakt server mislyktes (Flash IO Error).', - errorSocketSecurity: 'Feil: Tilkobling til stikkontakt server mislyktes (Flash Security Error).', - errorDOMSyntax: 'Feil: Ugyldig DOM Syntaks (DOM ID: %s).' - -} diff --git a/library/ajaxchat/chat/js/lang/pl.js b/library/ajaxchat/chat/js/lang/pl.js deleted file mode 100644 index 3353d1bdd..000000000 --- a/library/ajaxchat/chat/js/lang/pl.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Tomasz Topa, http://tomasz.topa.pl/ - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s wszedł na czat.', - logout: '%s wyszedł na czat.', - logoutTimeout: '%s został rozłączony (Przekroczony czas połączenia).', - logoutIP: '%s został rozłączony (Nieprawidłowy adres IP).', - logoutKicked: '%s został wyrzucony.', - channelEnter: '%s wszedł do pokoju.', - channelLeave: '%s wyszedł z pokoju.', - privmsg: '(szept)', - privmsgto: '(szept do %s)', - invite: '%s zaprasza Cię do pokoju %s.', - inviteto: 'Twoje zaprosznie dla %s do wejścia do pokoju %s zostało wysłane.', - uninvite: '%s cofa zaproszenie do pokoju %s.', - uninviteto: 'Twoje zaproszenie dla %s do wejścia do pokoju %s zostało wycofane.', - queryOpen: 'Prywatna rozmowa z %s rozpoczęta.', - queryClose: 'Prywatna rozmowa z %s zakończona.', - ignoreAdded: '%s dodany do listy ignorowanych.', - ignoreRemoved: '%s usunięty z listy ignorowanych.', - ignoreList: 'Ignorowani użytkownicy:', - ignoreListEmpty: 'Brak ignorowanych użytkowników.', - who: 'Użytkownicy online:', - whoChannel: 'Użytkownicy online w pokoju %s:', - whoEmpty: 'W wybranym pokoju nikogo obecnie nie ma.', - list: 'Dostępne pokoje:', - bans: 'Zablokowani użytkownicy:', - bansEmpty: 'Brak zablokowanych użytkowników', - unban: 'Blokada dla %s zdjęta.', - whois: 'Adres IP użytkownika %s:', - whereis: 'Użytkownik %s jest w pokoju %s.', - roll: '%s rzuca kostką %s i uzyskuje wynik(i): %s.', - nick: '%s zmienia nick na %s.', - toggleUserMenu: 'Włącz/wyłącz menu użytkownika %s', - userMenuLogout: 'Wyloguj', - userMenuWho: 'Użytkownicy online', - userMenuList: 'Dostępne pokoje', - userMenuAction: 'Napisz co teraz robisz', - userMenuRoll: 'Rzuć kostką', - userMenuNick: 'Zmień nick', - userMenuEnterPrivateRoom: 'Wejdź do prywatnego pokoju', - userMenuSendPrivateMessage: 'Wyślij prywatną wiadomość', - userMenuDescribe: 'Napisz prywatnie co teraz robisz', - userMenuOpenPrivateChannel: 'Rozpocznij prywatną rozmowę', - userMenuClosePrivateChannel: 'Zakończ prywatną rozmowę', - userMenuInvite: 'Zaproś', - userMenuUninvite: 'Wycofaj zaproszenie', - userMenuIgnore: 'Ignoruj/akceptuj', - userMenuIgnoreList: 'Lista ignorowanych użytkowników', - userMenuWhereis: 'Pokaż pokój', - userMenuKick: 'Wyrzuć/Zablokuj', - userMenuBans: 'Lista zablokowanych użytkowników', - userMenuWhois: 'Pokaż IP', - unbanUser: 'Zdejmij blokadę dla użytkownika %s', - joinChannel: 'Wejdź do pokoju %s', - cite: '%s powiedział:', - urlDialog: 'Podaj adres (URL) strony:', - deleteMessage: 'Usuń tę wiadomość', - deleteMessageConfirm: 'Na pewno usunać tę wiadomość?', - errorCookiesRequired: 'Do poprawnego działania czat wymaga obsługi Cookies.', - errorUserNameNotFound: 'Błąd: Użytkownik %s nie został znaleziony.', - errorMissingText: 'Błąd: Nie wpisano tekstu.', - errorMissingUserName: 'Błąd: Nie wpisano nicka.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Błąd: Nie wpisano nazwy pokoju.', - errorInvalidChannelName: 'Błąd: Nieprawidłowa nazwa pokoju: %s', - errorPrivateMessageNotAllowed: 'Błąd: Prywatne wiadomości zostały zablokowane.', - errorInviteNotAllowed: 'Błąd: Nie możesz wysyłać zaproszeń do tego pokoju.', - errorUninviteNotAllowed: 'Błąd: Nie możesz cofać zaproszeń z tego pokoju.', - errorNoOpenQuery: 'Błąd: Brak prywatnych rozmów.', - errorKickNotAllowed: 'Błąd: Nie możesz wyrzucić użytkownika %s.', - errorCommandNotAllowed: 'Błąd: Nieprawidłowe polecenie: %s', - errorUnknownCommand: 'Błąd: Nieznane polecenie: %s', - errorMaxMessageRate: 'Błąd: Przekroczyłeś maksymalną liczbę wiadomości wysyłanych w ciągu minuty. Poczekaj chwilę...', - errorConnectionTimeout: 'Błąd: Czas połączenia przekroczony. Spróbuj ponownie.', - errorConnectionStatus: 'Błąd: Stan połączenia: %s', - errorSoundIO: 'Błąd: nie można pobrać pliku dźwiękowego (Flash IO Error).', - errorSocketIO: 'Bład: nie można połączyć się z serwerem (Flash IO Error).', - errorSocketSecurity: 'Błąd: Połączenie z serwerem nie powiodło się (Flash Security Error).', - errorDOMSyntax: 'Błąd: Nieprawidłowa składnia DOM (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/pt-br.js b/library/ajaxchat/chat/js/lang/pt-br.js deleted file mode 100644 index eebfce0df..000000000 --- a/library/ajaxchat/chat/js/lang/pt-br.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author vitoalvaro - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s acaba de entrar no Chat.', - logout: '%s acaba de sair no Chat.', - logoutTimeout: '%s desconectou (Tempo esgotado).', - logoutIP: '%s desconectou (Endereço de IP inválido).', - logoutKicked: '%s desconectou (Expulso do canal).', - channelEnter: '%s entrou no canal.', - channelLeave: '%s saiu do canal.', - privmsg: '(sussurra)', - privmsgto: '(Sussurrar para %s)', - invite: '%s convida você para participar %s.', - inviteto: 'O seu convite para se juntar ao %s do canal %s foi enviado.', - uninvite: '%s desconvidou você do canal %s.', - uninviteto: 'Seu desconvidamento %s do canal %s foi enviada.', - queryOpen: 'Canal privado aberto para %s.', - queryClose: 'Canal privado para %s fechado.', - ignoreAdded: 'Adicionar %s para a lista do igrnorado.', - ignoreRemoved: 'Remover %s da lista do ignorado.', - ignoreList: 'Usuários ignorados:', - ignoreListEmpty: 'Nenhuma lista usuários ignorados.', - who: 'Usuários Online:', - whoChannel: 'Usuários online no canal %s:', - whoEmpty: 'Nenhum usuários online na determinado canal.', - list: 'Os canais disponíveis:', - bans: 'Usuários banidos:', - bansEmpty: 'Nenhuma lista usuários banidos.', - unban: 'Usuário de banido %s revogado.', - whois: 'Usuário %s - enderenço IP:', - whereis: 'Usuário %s está no canal %s.', - roll: '%s rolas %s e começa %s.', - nick: '%s é agora conhecido como %s.', - toggleUserMenu: 'Alternar usuário menu de %s', - userMenuLogout: 'Deslogar', - userMenuWho: 'Lista usuários online', - userMenuList: 'Lista os canais disponíveis', - userMenuAction: 'Descreva ação', - userMenuRoll: 'Jogar dados', - userMenuNick: 'Trocar usuário', - userMenuEnterPrivateRoom: 'Entrar sala privada', - userMenuSendPrivateMessage: 'Enviar mensagem privada', - userMenuDescribe: 'Enviar ação privada', - userMenuOpenPrivateChannel: 'Abrir canal privada', - userMenuClosePrivateChannel: 'Fechar canal privada', - userMenuInvite: 'Convidar', - userMenuUninvite: 'Desconvidar', - userMenuIgnore: 'Ignorar/Aceitar', - userMenuIgnoreList: 'Lista usuários banidos', - userMenuWhereis: 'Exibir canais', - userMenuKick: 'Kickar/Banir', - userMenuBans: 'Lista usuários banidos', - userMenuWhois: 'Exibir IP', - unbanUser: 'Revogar usuário de banido %s', - joinChannel: 'Entrar canal %s', - cite: '%s cita:', - urlDialog: 'Digite o endereço (URL) da página:', - deleteMessage: 'Excluir esta mensagem', - deleteMessageConfirm: 'Realmente apagar a mensagem selecionada chat?', - errorCookiesRequired: 'Os cookies são requeridas para este Chat.', - errorUserNameNotFound: 'Erro: Usuário %s não encontrado.', - errorMissingText: 'Erro: Faltando mensagem texto.', - errorMissingUserName: 'Erro: Usuário faltando.', - errorInvalidUserName: 'Erro: Usuário inválido.', - errorUserNameInUse: 'Erro: Usuário já em uso.', - errorMissingChannelName: 'Erro: Faltando nome do canal.', - errorInvalidChannelName: 'Erro: Inválido nome do canal: %s', - errorPrivateMessageNotAllowed: 'Erro: Mensagens privadas não são permitidos.', - errorInviteNotAllowed: 'Erro: Você não tem permissão para convidar alguém para este canal.', - errorUninviteNotAllowed: 'Erro: Você não está autorizado a desconvidar alguém deste canal.', - errorNoOpenQuery: 'Erro: Nenhum canal privado aberto.', - errorKickNotAllowed: 'Erro: Você não está autorizado a kickar %s.', - errorCommandNotAllowed: 'Erro: Comando não permitido: %s', - errorUnknownCommand: 'Erro: Comando desconhecido: %s', - errorMaxMessageRate: 'Erro: Você excedeu o número máximo de mensagens por minuto.', - errorConnectionTimeout: 'Erro: Intervalo de parada da conexão. Por favor, tente novamente..', - errorConnectionStatus: 'Erro: Status da conexão: %s', - errorSoundIO: 'Erro: Falha ao carregar som arquivo (Flash IO Error).', - errorSocketIO: 'Erro: Conexão para socket servidor falhou (Flash IO Error).', - errorSocketSecurity: 'Erro: Conexão para socket servidor falhou (Flash Security Error).', - errorDOMSyntax: 'Erro: Inválido DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/pt-pt.js b/library/ajaxchat/chat/js/lang/pt-pt.js deleted file mode 100644 index fd6a0cbd5..000000000 --- a/library/ajaxchat/chat/js/lang/pt-pt.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author of translate Carlos Rocha (aka Broas@) - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s acaba de entrar no chat.', - logout: '%s acaba de sair no chat.', - logoutTimeout: '%s desligou-se (Tempo esgotado).', - logoutIP: '%s desligou-se (Endereço de IP inválido).', - logoutKicked: '%s desligou-se (Expulso da sala).', - channelEnter: '%s entrou na sala.', - channelLeave: '%s saiu da sala.', - privmsg: '(Mensagem privada)', - privmsgto: '(Mensagem privada enviada para %s)', - invite: '%s convidou-te para entrar na sala %s.', - inviteto: 'O teu convite para %s se juntar à sala %s foi enviado.', - uninvite: '%s cancelou o convite para entrares na sala %s.', - uninviteto: 'O cancelamento do convite para %s entrar na sala %s foi enviado.', - queryOpen: 'Sala privada aberta para %s.', - queryClose: 'A sala privada para %s está fechada.', - ignoreAdded: 'Adicionaste %s à a lista do ignorados.', - ignoreRemoved: 'Removeste %s da lista de ignorados.', - ignoreList: 'Utilizadores ignorados:', - ignoreListEmpty: 'Ninguém está ignorado.', - who: 'Utilizadores online:', - whoChannel: 'Utilizadores online na sala %s:', - whoEmpty: 'Nenhum utilizador online na determinada sala.', - list: 'Salas disponíveis:', - bans: 'Utilizadores banidos:', - bansEmpty: 'Ninguém está banido.', - unban: 'O utilizador %s foi desbanido.', - whois: 'Endereço IP do utilizador %s:', - whereis: 'O utilizador %s está na sala %s.', - roll: '%s rola %s e começa com %s.', - nick: '%s mudou o nick para %s.', - toggleUserMenu: 'Menu de alternância de %s', - userMenuLogout: 'Logout', - userMenuWho: 'Lista de utilizadores online', - userMenuList: 'Lista de salas disponíveis', - userMenuAction: 'Acção administrativa', - userMenuRoll: 'Jogar dados', - userMenuNick: 'Trocar de nick', - userMenuEnterPrivateRoom: 'Entrar na sala privada', - userMenuSendPrivateMessage: 'Enviar mensagem privada', - userMenuDescribe: 'Enviar acção administrativa em privado', - userMenuOpenPrivateChannel: 'Abrir sala privada', - userMenuClosePrivateChannel: 'Fechar sala privada', - userMenuInvite: 'Convidar', - userMenuUninvite: 'Cancelar convite', - userMenuIgnore: 'Recusar/Aceitar', - userMenuIgnoreList: 'Lista utilizadores ignorados', - userMenuWhereis: 'Mostrar salas', - userMenuKick: 'Kickar/Banir', - userMenuBans: 'Lista de utilizadores banidos', - userMenuWhois: 'Mostrar IP', - unbanUser: 'Desbanir %s', - joinChannel: 'Entrar na sala %s', - cite: '%s cita:', - urlDialog: 'Digita o endereço (URL) da página:', - deleteMessage: 'Eliminar esta mensagem', - deleteMessageConfirm: 'Tens a certeza que queres eliminar a mensagem selecionada do chat?', - errorCookiesRequired: 'Os cookies são requeridos para utilizar o chat.', - errorUserNameNotFound: 'Erro: O utilizador %s não foi encontrado.', - errorMissingText: 'Erro: Falta o texto.', - errorMissingUserName: 'Erro: Falta o utilizador.', - errorInvalidUserName: 'Erro: Utilizador inválido.', - errorUserNameInUse: 'Erro: Utilizador em uso.', - errorMissingChannelName: 'Erro: Falta o nome da sala.', - errorInvalidChannelName: 'Erro: O nome da sala é inválido: %s', - errorPrivateMessageNotAllowed: 'Erro: Não são premitidas mensagens privadas.', - errorInviteNotAllowed: 'Erro: Não tens permissão para convidar alguém para uma sala.', - errorUninviteNotAllowed: 'Erro: Não estás autorizado a cancelar algum convite.', - errorNoOpenQuery: 'Erro: Nenhuma sala privada aberta.', - errorKickNotAllowed: 'Erro: Não tens permissão para kickar %s.', - errorCommandNotAllowed: 'Erro: O comando %s não é permitido.', - errorUnknownCommand: 'Erro: Comando desconhecido: %s', - errorMaxMessageRate: 'Erro: Excedeste o número máximo de mensagens permitidas por minuto.', - errorConnectionTimeout: 'Erro: O tempo de limite para a conexão esgotou. Por favor, tenta novamente..', - errorConnectionStatus: 'Erro: Estado da conexão: %s', - errorSoundIO: 'Erro: Falha ao carregar o ficheiro de som (Erro Flash IO).', - errorSocketIO: 'Erro: A conexão socket para o servidor falhou (Erro Flash IO).', - errorSocketSecurity: 'Erro: A conexão socket para o servidor falhou (Erro de segurança Flash).', - errorDOMSyntax: 'Erro: Síntese DOM inválida (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/ro.js b/library/ajaxchat/chat/js/lang/ro.js deleted file mode 100644 index 7a03947aa..000000000 --- a/library/ajaxchat/chat/js/lang/ro.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author K.Z. - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s se autentifică pe Chat.', - logout: '%s iese de pe Chat.', - logoutTimeout: '%s a fost scos de pe Chat (Timeout).', - logoutIP: '%s a fost scos de pe Chat (Adresă IP incorectă).', - logoutKicked: '%s a fost scos de pe Chat (Dat afară).', - channelEnter: '%s se alătură canalului.', - channelLeave: '%s părăseşte canalul.', - privmsg: '(şopteşte)', - privmsgto: '(şopteşte lui %s)', - invite: '%s vă invită să vă alăturaţi %s.', - inviteto: 'Invitaţia trimisă de dumneavoastră către %s de a se alătura canalului %s a fost trimisă.', - uninvite: '%s vă cere să paraşiţi canalul %s.', - uninviteto: 'Cererea dumnevoastră către %s de a părăsi canalul %s a fost trimisă.', - queryOpen: 'Canal privat deschis către %s.', - queryClose: 'Canalul privat către %s s-a închis.', - ignoreAdded: 'Am adăugat utilizatorul %s la lista de utilizatori ignoraţi.', - ignoreRemoved: 'Am şters utilizatorul %s din lista de utilizatori ignoraţi.', - ignoreList: 'Utilizatori ignoraţi:', - ignoreListEmpty: 'Nu a fost listat nici-un utilizator ignorat.', - who: 'Utilizatori activi:', - whoChannel: 'Online Users in channel %s:', - whoEmpty: 'Nici-un utilzator activ in canalul respectiv.', - list: 'Canale disponibile:', - bans: 'Utilizatori care au accesul interzis la chat:', - bansEmpty: 'Nu a fost listat nici-un utilizator care are accesul interzis.', - unban: 'Interzicerea accesului pentru utilizatorul %s a fost revocată.', - whois: 'Utilizatorul %s - adresă IP:', - whereis: 'User %s is in channel %s.', - roll: '%s aruncă %s si îi cade %s.', - nick: '%s is now known as %s.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Logout', - userMenuWho: 'List online users', - userMenuList: 'List available channels', - userMenuAction: 'Describe action', - userMenuRoll: 'Roll dice', - userMenuNick: 'Change username', - userMenuEnterPrivateRoom: 'Enter private room', - userMenuSendPrivateMessage: 'Send private message', - userMenuDescribe: 'Send private action', - userMenuOpenPrivateChannel: 'Open private channel', - userMenuClosePrivateChannel: 'Close private channel', - userMenuInvite: 'Invite', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignore/Accept', - userMenuIgnoreList: 'List ignored users', - userMenuWhereis: 'Display channel', - userMenuKick: 'Kick/Ban', - userMenuBans: 'List banned users', - userMenuWhois: 'Display IP', - unbanUser: 'Revoke ban of user %s', - joinChannel: 'Alăturăte canalului %s', - cite: '%s a spus:', - urlDialog: 'Vă rugăm introduceţi adresa (URL) al paginii web:', - deleteMessage: 'Delete this chat message', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'Aveţi nevoie de cookies activate pentru acest chat.', - errorUserNameNotFound: 'Eroare: Utilizatorul %s nu a fost găsit.', - errorMissingText: 'Eroare: Nu aţi introdus nici-un text.', - errorMissingUserName: 'Eroare: Nu aţi introdus nici-un nume de utilizator.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Eroare: Nu aţi introdus nici-un canal.', - errorInvalidChannelName: 'Eroare: Nume de canal incorect: %s', - errorPrivateMessageNotAllowed: 'Eroare: Mesajele private sunt interzise.', - errorInviteNotAllowed: 'Eroare: Nu aveţi voie să invitaţi pe nimeni pe acest canal.', - errorUninviteNotAllowed: 'Eroare: Nu aveţi voie sa cereţi cuiva de pe acest canal să părăsesca canalul.', - errorNoOpenQuery: 'Eroare: Nici-un canal privat deschis.', - errorKickNotAllowed: 'Eroare: Nu aveţi voie să dati afară pe %s.', - errorCommandNotAllowed: 'Eroare: Comanda interzisă: %s', - errorUnknownCommand: 'Eroare: Comanda necunoscută: %s', - errorMaxMessageRate: 'Error: You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'Eroare: Connection timeout. Please try again.', - errorConnectionStatus: 'Eroare: Statusul conexiunii: %s', - errorSoundIO: 'Error: Failed to load sound file (Flash IO Error).', - errorSocketIO: 'Error: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/ru.js b/library/ajaxchat/chat/js/lang/ru.js deleted file mode 100644 index 847fdb82c..000000000 --- a/library/ajaxchat/chat/js/lang/ru.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author SkyKnight - * @author Dmitry Plyonkin - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s входит в чат.', - logout: '%s выходит из чата.', - logoutTimeout: '%s вышел из чата по таймоуту.', - logoutIP: '%s вышел из чата (неверный IP адрес).', - logoutKicked: '%s был вышвырнут из чата (Kicked).', - channelEnter: '%s присоединяется к каналу.', - channelLeave: '%s покидает канал.', - privmsg: '(приватное сообщение)', - privmsgto: '(приватное сообщение %s)', - invite: '%s приглашает Вас присоединиться к %s.', - inviteto: 'Ваше приглашение %s присоедениться к каналу %s было успешно отправлено.', - uninvite: '%s отзывает Ваше приглашение из канала %s.', - uninviteto: 'Вы отозвали приглашение пользователю %s для канала %s.', - queryOpen: 'Приватный канал открыт к %s.', - queryClose: 'Приватный канал к %s закрыт.', - ignoreAdded: '%s добавлен в игнорлист.', - ignoreRemoved: '%s удален из игнорлиста.', - ignoreList: 'Игнорируемые пользователи:', - ignoreListEmpty: 'Игнорируемых пользователей не найдено.', - who: 'Пользователи:', - whoChannel: 'Пользователи в канале %s:', - whoEmpty: 'В данном канале нет пользователей.', - list: 'Доступные каналы:', - bans: 'Забаненные пользователи:', - bansEmpty: 'Нет забаненных пользователей.', - unban: 'Пользователь %s разбанен.', - whois: 'Пользователь %s - IP адрес:', - whereis: 'Пользователь %s находится в канале %s.', - roll: '%s кинул кубики %s. Результат %s.', - nick: '%s сменил имя на %s.', - toggleUserMenu: 'Меню пользователя %s', - userMenuLogout: 'Выйти', - userMenuWho: 'Список пользователей', - userMenuList: 'Список каналов', - userMenuAction: 'Действие', - userMenuRoll: 'Бросить кубик', - userMenuNick: 'Сменить имя', - userMenuEnterPrivateRoom: 'Войти в комнату', - userMenuSendPrivateMessage: 'Отправить приватное сообщение', - userMenuDescribe: 'Приватное действие', - userMenuOpenPrivateChannel: 'Открыть приватный канал', - userMenuClosePrivateChannel: 'Закрыть приватный канал', - userMenuInvite: 'Пригласить', - userMenuUninvite: 'Отменить приглашение', - userMenuIgnore: 'Игнорировать/Принять', - userMenuIgnoreList: 'Список игнорируемых', - userMenuWhereis: 'В каком канале?', - userMenuKick: 'Выкинуть/Забанить', - userMenuBans: 'Список забаненных', - userMenuWhois: 'Показать IP', - unbanUser: 'Отменить бан пользователя %s', - joinChannel: ' %s присоединился к каналу', - cite: '%s сказал:', - urlDialog: 'Пожалуйста введите адрес (URL) Web-страницы:', - deleteMessage: 'Удалить сообщение', - deleteMessageConfirm: 'Вы действительно хотите удалить это сообщение?', - errorCookiesRequired: 'Необходимо включить Cookies.', - errorUserNameNotFound: 'Ошибка: Пользователь %s не найдет.', - errorMissingText: 'Ошибка: Отсутствует текст сообщения.', - errorMissingUserName: 'Ошибка: Отсутствует имя.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Ошибка: Отсутствует имя канала.', - errorInvalidChannelName: 'Ошибка: Не верное имя канала: %s', - errorPrivateMessageNotAllowed: 'Ошибка: Приватные сообщения не разрешены.', - errorInviteNotAllowed: 'Ошибка: У Вас нет прав приглашать кого-либо в этот канал.', - errorUninviteNotAllowed: 'Ошибка: У Вас нет прав отозвать приглашение из этого канала.', - errorNoOpenQuery: 'Ошибка: Приватный канал не открыт.', - errorKickNotAllowed: 'Ошибка: У Вас нет прав забанить %s.', - errorCommandNotAllowed: 'Ошибка: Команда недоступна: %s', - errorUnknownCommand: 'Ошибка: Неизвестная команда: %s', - errorMaxMessageRate: 'Ошибка: Вы превысили ограничение на количество сообщений, отправленных за минуту.', - errorConnectionTimeout: 'Ошибка: Соединение не установлено. Пожалуйста, попробуйте еще раз.', - errorConnectionStatus: 'Ошибка: Статус соединения: %s', - errorSoundIO: 'Ошибка: Не получается загрузить звуковой файл (Flash IO Error).', - errorSocketIO: 'Ошибка: Не удалось открыть сокет (Flash IO Error).', - errorSocketSecurity: 'Ошибка: Не удалость открыть сокет (Flash Security Error).', - errorDOMSyntax: 'Ошибка: Некорректный синтаксис DOM (DOM ID: %s).' - -} diff --git a/library/ajaxchat/chat/js/lang/sk.js b/library/ajaxchat/chat/js/lang/sk.js deleted file mode 100644 index 3b9b06945..000000000 --- a/library/ajaxchat/chat/js/lang/sk.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Peter - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s sa prihlásil do chatu.', - logout: '%s sa odhlásil z chatu.', - logoutTimeout: '%s bol odhlásený pre neaktivitu.', - logoutIP: '%s bol odhlásený (nesprávna IP adresa).', - logoutKicked: '%s bol odhlásený (vylúčený).', - channelEnter: '%s vstúpil do kanálu.', - channelLeave: '%s opustil kanál.', - privmsg: '(súkromný hovor)', - privmsgto: '(súkromne hovorí s %s)', - invite: '%s vás pozýva na rozhovor %s.', - inviteto: 'Vaša pozvánka na rozhovor s %s v kanáli %s dola odoslaná.', - uninvite: '%s neprijal Vaše pozvanie z kanálu %s.', - uninviteto: 'Vaše pozvanie pre %s v kanáli %s bolo poslané.', - queryOpen: 'Súkromný kanál s %s otvorený.', - queryClose: 'Súkromný kanál s %s zatvorený.', - ignoreAdded: '%s je pridaný do zoznamu zamietnutých.', - ignoreRemoved: '%s je odstránený zo zoznamu zamietnutých.', - ignoreList: 'Zamietnutí užívatelia:', - ignoreListEmpty: 'Zoznam zamietnutých užívateľov je prázdny.', - who: 'Pripojení užívatelia:', - whoChannel: 'Online Users in channel %s:', - whoEmpty: 'Žiadni pripojení užívatelia na danom kanáli.', - list: 'Dostupné kanály:', - bans: 'Vylúčení užívatelia:', - bansEmpty: 'Zoznam vylúčených užívateľov je prázdny.', - unban: 'Vylúčenie užívateľa %s je zrušené.', - whois: 'Užívateľová %s - IP adresa:', - whereis: 'User %s is in channel %s.', - roll: '%s hodil %s a padlo mu číslo %s.', - nick: '%s is now known as %s.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Logout', - userMenuWho: 'List online users', - userMenuList: 'List available channels', - userMenuAction: 'Describe action', - userMenuRoll: 'Roll dice', - userMenuNick: 'Change username', - userMenuEnterPrivateRoom: 'Enter private room', - userMenuSendPrivateMessage: 'Send private message', - userMenuDescribe: 'Send private action', - userMenuOpenPrivateChannel: 'Open private channel', - userMenuClosePrivateChannel: 'Close private channel', - userMenuInvite: 'Invite', - userMenuUninvite: 'Uninvite', - userMenuIgnore: 'Ignore/Accept', - userMenuIgnoreList: 'List ignored users', - userMenuWhereis: 'Display channel', - userMenuKick: 'Kick/Ban', - userMenuBans: 'List banned users', - userMenuWhois: 'Display IP', - unbanUser: 'Revoke ban of user %s', - joinChannel: 'Pripojiť kanál %s', - cite: '%s povedal:', - urlDialog: 'Prosím, vložte adresu (URL) webstránky:', - deleteMessage: 'Delete this chat message', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'Tento chat vyžaduje mať povolené Cookies.', - errorUserNameNotFound: 'Chyba: Užívateľ %s nenájdený.', - errorMissingText: 'Chyba: Chýba text správy.', - errorMissingUserName: 'Chyba: Chýba meno užívateľa.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Chyba: Chýba meno kanálu.', - errorInvalidChannelName: 'Chyba: Nesprávne meno kanálu: %s', - errorPrivateMessageNotAllowed: 'Chyba: Súkromné správy nie sú povolené.', - errorInviteNotAllowed: 'Chyba: Nemáte povolenie pozívať užívateľov do tohoto kanálu.', - errorUninviteNotAllowed: 'Chyba: Nemáte povolenie zamietnuť pozvanie užívateľov z tohoto kanálu.', - errorNoOpenQuery: 'Chyba: Súkromný kanál nie je otvorený.', - errorKickNotAllowed: 'Chyba: Nie ste oprávnený vylúčiť %s.', - errorCommandNotAllowed: 'Chyba: Príkaz nie je povolený: %s', - errorUnknownCommand: 'Chyba: Neznámy príkaz: %s', - errorMaxMessageRate: 'Error: You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'Chyba: Vypršal časový limit pripojenia. Skúste prosím znovu.', - errorConnectionStatus: 'Chyba: Stav pripojenia: %s', - errorSoundIO: 'Error: Failed to load sound file (Flash IO Error).', - errorSocketIO: 'Error: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/sl.js b/library/ajaxchat/chat/js/lang/sl.js deleted file mode 100644 index 9b9b4b4ae..000000000 --- a/library/ajaxchat/chat/js/lang/sl.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Valter Pepelkoˇ - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s prijavljen-a na Klepetu.', - logout: '%s odjavljen-a iz Klepeta.', - logoutTimeout: '%s je prijava potekla (Timeout).', - logoutIP: '%s je prijava potekla (Nepopolna IP adresa).', - logoutKicked: '%s je prijava potekla (Kicked).', - channelEnter: '%s je vstopil-a v sobo.', - channelLeave: '%s odšel-a iz sobe.', - privmsg: '(privatno sporoÄŤilo)', - privmsgto: '(se privatno pogovarja z %s)', - invite: '%s vas vabi na razgovor v %s.', - inviteto: 'Vaše vabilo za razgovor z %s v sobi %s je poslano.', - uninvite: '%s se ne Ĺľeli odzvati vašemu vabilu v sobi %s.', - uninviteto: 'Vaš preklic vabila za %s v sobi %s je poslano.', - queryOpen: 'Privatna soba za %s je odprta.', - queryClose: 'Privatna soba za %s je zaprta.', - ignoreAdded: '%s je dodan na seznam ignoriranih.', - ignoreRemoved: '%s je odstranjen iz seznama ignoriranih.', - ignoreList: 'Ignorirani uporabniki:', - ignoreListEmpty: 'Seznam ignoriranih uporabnikov je prazen.', - who: 'Prisotni:', - whoChannel: 'Prisotni v sobi %s:', - whoEmpty: 'V tej sobi ni uporabnikov.', - list: 'Dostopne sobe:', - bans: 'Uporabniki s prepovedjo dostopa:', - bansEmpty: 'Seznam uporabnikov s prepovedjo dostopa je prazen.', - unban: 'Prepoved dostopa uporabniku je preklicana.', - whois: 'Uporabnik %s - IP adresa:', - whereis: 'Uporabnik %s je v sobi %s.', - roll: '%s je vrgel %s Rezultat je: %s.', - nick: '%s sedaj uporablja nick %s.', - toggleUserMenu: 'Preklopi uporabniški meni za %s', - userMenuLogout: 'Odjava', - userMenuWho: 'Seznam prisotnih uporabnikov', - userMenuList: 'Seznam dostopnih sob', - userMenuAction: 'Opiši akcijo', - userMenuRoll: 'Vrzi kocko', - userMenuNick: 'Zamenjaj uporabniško ime', - userMenuEnterPrivateRoom: 'Vstopi v privatno sobo', - userMenuSendPrivateMessage: 'Pošlji privatno sporoÄŤilo', - userMenuDescribe: 'Pošlji privatno akcijo', - userMenuOpenPrivateChannel: 'Odpri privatno sobo', - userMenuClosePrivateChannel: 'Zapri privatno sobo', - userMenuInvite: 'Poklicati', - userMenuUninvite: 'Preklicati', - userMenuIgnore: 'Ignoriraj/Sprejemi', - userMenuIgnoreList: 'Seznam ignoriranih uporabnikov', - userMenuWhereis: 'PrikaĹľi sobo', - userMenuKick: 'IzvrĹľeen/Prepovedan', - userMenuBans: 'Seznam prepovedanih uporabnikov', - userMenuWhois: 'PrikaĹľi IP adreso', - unbanUser: 'Preklicati prepoved uporabniku %s', - joinChannel: 'Vstopi v sobo %s', - cite: '%s pravi:', - urlDialog: 'Prosimo vas, vnesite naslov (URL) web strani:', - deleteMessage: 'Izbriši to sporoÄŤilo', - deleteMessageConfirm: 'Ali res izbrišem izbrano sporoÄŤilo?', - errorCookiesRequired: 'Pozor: uporaba piškotkov (cookies) je nujna za to klepetalnico!', - errorUserNameNotFound: 'Napaka: uporabnik %s ni najden!', - errorMissingText: 'Napaka: manjka besedilo sporoÄŤila!', - errorMissingUserName: 'Napaka: manjka uporabniško ime!', - errorInvalidUserName: 'Napaka: Nepravilno uporabniško ime!', - errorUserNameInUse: 'Napaka: uporabniško ime je Ĺľe v uporabi!', - errorMissingChannelName: 'Napaka: ni imena sobe!', - errorInvalidChannelName: 'Napaka: napaÄŤno ime sobe: %s', - errorPrivateMessageNotAllowed: 'Napaka: privatna sporoÄŤila niso dovoljena!', - errorInviteNotAllowed: 'Napaka: Nimate dovoljenja, da lahko druge vabite v to sobo!', - errorUninviteNotAllowed: 'Napaka: Nimate dovoljenja, da lahko druge vrĹľete iz te sobe!', - errorNoOpenQuery: 'Napaka: Privatna soba ni odprta!', - errorKickNotAllowed: 'NApaka: Nimate dovoljenja, da lahko vrĹľete %s', - errorCommandNotAllowed: 'Napaka: Ukaz ni dozvoljen: %s', - errorUnknownCommand: 'Napaka: Neznan ukaz: %s', - errorMaxMessageRate: 'NApaka: Presegli ste najveÄŤje dovoljeno število sporoÄŤil na minuto!.', - errorConnectionTimeout: 'Napaka: ÄŤas povezave se je iztekel. Poskusite znova!', - errorConnectionStatus: 'Napaka: Status povezave: %s', - errorSoundIO: 'Napaka: ZvoÄŤne datoteke ni bilo mogoÄŤe naloĹľiti (Napaka Flash IO)!', - errorSocketIO: 'Napaka: Povezava na server ni uspela (Napaka Flash IO)!', - errorSocketSecurity: 'Napaka: Povezava na server ni uspela (Napaka Flash Security)!', - errorDOMSyntax: 'Napaka: Nepopolna DOM Syntaxa (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/sr.js b/library/ajaxchat/chat/js/lang/sr.js deleted file mode 100644 index b5367b1e2..000000000 --- a/library/ajaxchat/chat/js/lang/sr.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Saša Stojanović - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s prijavljen-a na Chat.', - logout: '%s odjavljen-a sa Chata.', - logoutTimeout: '%s je prijava istekla (Timeout).', - logoutIP: '%s je prijava istekla (Invalid IP address).', - logoutKicked: '%s je prijava istekla (Kicked).', - channelEnter: '%s je ušao-la u sobu.', - channelLeave: '%s izašao-la iz sobe.', - privmsg: '(privatna poruka)', - privmsgto: '(privatno razgovara sa %s)', - invite: '%s vas poziva na razgovor u %s.', - inviteto: 'Vaš poziv za razgovor sa %s u sobu %s je poslat.', - uninvite: '%s vam otkazuje pozivnicu u sobi %s.', - uninviteto: 'Vaše otkazivanje pozivnice za %s u sobi %s je poslato.', - queryOpen: 'Privatna soba za %s je otvorena.', - queryClose: 'Privatna soba za %s je zatvorena.', - ignoreAdded: '%s je dodat u listu ignorisanih.', - ignoreRemoved: '%s je uklonjen iz liste ignorisanih.', - ignoreList: 'Ignorisani korisnici:', - ignoreListEmpty: 'Lista ignorisanih korisnika je prazna.', - who: 'Prisutni korisnici:', - whoChannel: 'Prisutni korisnici u sobi %s:', - whoEmpty: 'Nema prisutnih korisnika u toj sobi.', - list: 'Dostupne sobe:', - bans: 'Zabranjeni korisnici:', - bansEmpty: 'Lista zabranjenih korisnika je prazna.', - unban: 'Zabrana korisnika %s je povučena.', - whois: 'Korisnik %s - IP adresa:', - whereis: 'Korisnik %s je u sobi %s.', - roll: '%s je bacio %s Rezultat %s.', - nick: '%s je sada poznat kao %s.', - toggleUserMenu: 'Preklopi korisnički meni za %s', - userMenuLogout: 'Odjavljivanje', - userMenuWho: 'Lista prisutnih korisnika', - userMenuList: 'Lista dostupnih soba', - userMenuAction: 'Opiši akciju', - userMenuRoll: 'Baci kocku', - userMenuNick: 'Promeni korisničko ime', - userMenuEnterPrivateRoom: 'Uđi u privatnu sobu', - userMenuSendPrivateMessage: 'Pošalji privatnu poruku', - userMenuDescribe: 'Pošalji privatnu akciju', - userMenuOpenPrivateChannel: 'Otvori privatnu sobu', - userMenuClosePrivateChannel: 'Zatvori privatnu sobu', - userMenuInvite: 'Pozvati', - userMenuUninvite: 'Opozvati', - userMenuIgnore: 'Ignorisati/Prihvatiti', - userMenuIgnoreList: 'Lista ignorisanih korisnika', - userMenuWhereis: 'Prikaži sobu', - userMenuKick: 'Izbačen/Zabranjen', - userMenuBans: 'Lista zabranjenih korisnika', - userMenuWhois: 'Prikaži IP', - unbanUser: 'Opozvati zabranu korisnika %s', - joinChannel: 'Pristupi sobi %s', - cite: '%s reče:', - urlDialog: 'Molimo vas, unesite adresu (URL) web stranice:', - deleteMessage: 'Delete this chat message', - deleteMessageConfirm: 'Really delete the selected chat message?', - errorCookiesRequired: 'Pažnja: kolačići su neophodni za ovaj Chat.', - errorUserNameNotFound: 'Greška: korisnik %s nije pronađen.', - errorMissingText: 'Greška: nedostaje tekst poruke.', - errorMissingUserName: 'Greška: nedostaje korisničko ime.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Greška: nedostaje ime sobe.', - errorInvalidChannelName: 'Greška: pogrešno ime sobe: %s', - errorPrivateMessageNotAllowed: 'Greška: privatne poruke nisu dozvoljene.', - errorInviteNotAllowed: 'Greška: Nije vam dozvoljeno da pozivate nekoga u ovu sobu.', - errorUninviteNotAllowed: 'Greška: Nije vam dozvoljeno da nekoga opozovete iz ove sobe.', - errorNoOpenQuery: 'Greška: Privatna soba nije otvorena.', - errorKickNotAllowed: 'Greška: Nije vam dozvoljeno da izbacite %s.', - errorCommandNotAllowed: 'Greška: Komanda nije dozvoljena: %s', - errorUnknownCommand: 'Greška: Nepoznata komanda: %s', - errorMaxMessageRate: 'Error: You exceeded the maximum number of messages per minute.', - errorConnectionTimeout: 'Greška: Vreme konekcije je isteklo. Molimo vas pokušajte ponovo.', - errorConnectionStatus: 'Greška: Status konekcije: %s', - errorSoundIO: 'Error: Failed to load sound file (Flash IO Error).', - errorSocketIO: 'Error: Connection to socket server failed (Flash IO Error).', - errorSocketSecurity: 'Error: Connection to socket server failed (Flash Security Error).', - errorDOMSyntax: 'Error: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/sv.js b/library/ajaxchat/chat/js/lang/sv.js deleted file mode 100644 index 6c8ded6cc..000000000 --- a/library/ajaxchat/chat/js/lang/sv.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Eric [June 7,2008] - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s loggade in på Chatten.', - logout: '%s loggade ut från Chatten.', - logoutTimeout: '%s loggades ut (Timeout).', - logoutIP: '%s loggades ut (Felaktig IPadress).', - logoutKicked: '%s har loggats ut (Utsparkad).', - channelEnter: '%s ansluter till kanalen.', - channelLeave: '%s lämnade kanalen.', - privmsg: '(Viskning)', - privmsgto: '(Viskar till %s)', - invite: '%s bjuder in dig att ansluta till %s.', - inviteto: 'Din inbjudan till %s att ansluta till kanalen %s har skickats.', - uninvite: '%s upphävde inbjudan till dig från kanalen %s.', - uninviteto: 'Din uphävning av inbjudan till %s för kanalen %s har skickats.', - queryOpen: 'Privat kanal öppnad för %s.', - queryClose: 'Privat kanal för %s är stängd.', - ignoreAdded: '%s blev inlagd i ignoreringslistan.', - ignoreRemoved: 'Ta bort %s från ignoreringslistan.', - ignoreList: 'Ignorerade användare:', - ignoreListEmpty: 'Inga ignorerade Användare.', - who: 'Användare OnLine:', - whoChannel: 'Användare OnLine i kanalen %s:', - whoEmpty: 'Inga användare OnLine i kanalen.', - list: 'Tillgängliga kanaler:', - bans: 'Bannade Användare:', - bansEmpty: 'Inga bannade Användare.', - unban: 'Banningen av %s är upphävd.', - whois: '%s - IPadress:', - whereis: '%s är i kanalen %s.', - roll: '%s rullar %s och får %s.', - nick: '%s har bytt namn till %s.', - toggleUserMenu: 'Skifta användarmeny för %s', - userMenuLogout: 'Logga Ut', - userMenuWho: 'Lista användare OnLine', - userMenuList: 'Lista tillgängliga kanaler', - userMenuAction: 'Beskriv händelse', - userMenuRoll: 'Rulla tärningar', - userMenuNick: 'Ändra användarnamn', - userMenuEnterPrivateRoom: 'Gå in i privat rum', - userMenuSendPrivateMessage: 'Skicka privat meddelande', - userMenuDescribe: 'Skicka privat händelse', - userMenuOpenPrivateChannel: 'Öppna privat kanal', - userMenuClosePrivateChannel: 'Stäng privat kanal', - userMenuInvite: 'Bjud in', - userMenuUninvite: 'Upphäv inbjudan', - userMenuIgnore: 'Ignorera/Acceptera', - userMenuIgnoreList: 'Lista ignorerade användare', - userMenuWhereis: 'Visa kanal', - userMenuKick: 'Sparka ut/Banna', - userMenuBans: 'Lista bannade användare', - userMenuWhois: 'Visa IP', - unbanUser: 'Upphäv banningen av %s', - joinChannel: 'Anslut till kanalen %s', - cite: '%s sa:', - urlDialog: 'Skriv in adressen (URL) till websidan:', - deleteMessage: 'Radera detta meddelande', - deleteMessageConfirm: 'Vill du radera det valda meddelandet?', - errorCookiesRequired: 'Cookies[kakor] krävs för denna Chat.', - errorUserNameNotFound: 'Error: Användaren %s hittades inte.', - errorMissingText: 'Error: Meddelandetext saknas.', - errorMissingUserName: 'Error: Användarnamn saknas.', - errorInvalidUserName: 'Error: Ogiltigt användarnamn.', - errorUserNameInUse: 'Error: Användarnamnet används redan.', - errorMissingChannelName: 'Error: Kanalnamn saknas.', - errorInvalidChannelName: 'Error: Felaktigt kanalnamn: %s', - errorPrivateMessageNotAllowed: 'Error: Privata meddelanden är inte tillåtna.', - errorInviteNotAllowed: 'Error: Du saknar rättighet att bjuda in någon till denna kanalen.', - errorUninviteNotAllowed: 'Error: Du saknar rättighet att upphäva en inbjudan till någon i denna kanalen.', - errorNoOpenQuery: 'Error: Ingen privat kanal öppen.', - errorKickNotAllowed: 'Error: Du saknar rättighet att sparka %s.', - errorCommandNotAllowed: 'Error: Otillåtet kommando: %s', - errorUnknownCommand: 'Error: Okänt kommando: %s', - errorMaxMessageRate: 'Error: Du överskred det maxiamala antalet meddelanden per minut.', - errorConnectionTimeout: 'Error: Anslutningen fick "timeout". Var vänlig och prova igen.', - errorConnectionStatus: 'Error: Anslutningens status: %s', - errorSoundIO: 'Error: Misslyckades att ladda ljudfil (Flash IO Error).', - errorSocketIO: 'Error: Anslutningen till "socket server" misslyckades (Flash IO Error).', - errorSocketSecurity: 'Error: Anslutningen till "socket server" misslyckades (Flash Security Error).', - errorDOMSyntax: 'Error: Ogiltig DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/th.js b/library/ajaxchat/chat/js/lang/th.js deleted file mode 100644 index 35c60a51b..000000000 --- a/library/ajaxchat/chat/js/lang/th.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - * @Translate by Charge01 @ http://www.thaira2lovers.co.cc - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s เข้าสู่ห้องแชท', - logout: '%s ออกจากห้องแชท', - logoutTimeout: '%s ออกจากห้องแชทแล้ว (Timeout).', - logoutIP: '%s ออกจากระบบแล้ว (IP address ไม่ถูกต้อง).', - logoutKicked: '%s ออกจากระบบแล้ว (ถูกไล่).', - channelEnter: '%s เข้าห้องมา', - channelLeave: '%s ออกห้องไป', - privmsg: '(กระซิบ)', - privmsgto: '(กระซิบไป %s)', - invite: '%s เชิญให้ %s เข้าร่วม', - inviteto: 'การเชิญ %s เพื่อเข้าสู่ห้อง %s ถูกส่งแล้ว', - uninvite: '%s ถอนคำเชิญออกจากห้อง %s.', - uninviteto: 'การเชิญ %s สำหรับห้อง %s ถูกส่งแล้ว', - queryOpen: 'ห้องส่วนตัวถูกเปิดที่ %s', - queryClose: 'ห้องส่วนตัว %s ถูกปิด', - ignoreAdded: 'เพิ่ม %s สู่รายการไม่สนใจ', - ignoreRemoved: 'ลบ %s ออกจากรายการไม่สนใจ', - ignoreList: 'ผู้ใช้ที่ถูกไม่สนใจ:', - ignoreListEmpty: 'ไม่มีผู้ใช้ที่ไม่สนใจ', - who: 'ผู้ใช้ออนไลนอยู่:', - whoChannel: 'ผู้ใช้ออนไลน์ในห้อง %s:', - whoEmpty: 'ไม่มีผู้ใช้ออนไลน์อยู่ในห้อง', - list: 'ห้องแชทที่มีอยู่:', - bans: 'ผู้ใช้ถูกแบน:', - bansEmpty: 'ไม่มีผู้ใช้ที่ถูกแบน', - unban: 'การแบนของ %s ถูกยกเลิก', - whois: 'ผู้ใช้ %s - IP address:', - whereis: 'ผู้ใช้ %s อยู่ในห้อง %s.', - roll: '%s rolls %s and gets %s.', - nick: '%s ตอนนี้เปลี่ยนชื่อเป็น %s.', - toggleUserMenu: 'เปิดเมนูสำหรับ %s', - userMenuLogout: 'ออกจากระบบ', - userMenuWho: 'รายชื่อผู้ใช้', - userMenuList: 'รายชื่อห้องที่ปรากฎ', - userMenuAction: 'บอกกล่าวการกระทำ', - userMenuRoll: 'ทอยลูกเต๋า', - userMenuNick: 'เปลี่ยนชื่อ', - userMenuEnterPrivateRoom: 'เข้้าห้องส่วนตัว', - userMenuSendPrivateMessage: 'ส่งข้อความส่วนตัว', - userMenuDescribe: 'ส่งการกระทำส่วนตัว', - userMenuOpenPrivateChannel: 'เปิดห้องแชทส่วนตัว', - userMenuClosePrivateChannel: 'ปิดห้องแชทส่วนตัว', - userMenuInvite: 'เชิญ', - userMenuUninvite: 'ถอนคำเชิญ', - userMenuIgnore: 'ไม่สนใจ/ยอมรับ', - userMenuIgnoreList: 'รายชื่อผู้ใช้ที่ไม่สนใจ', - userMenuWhereis: 'แสดงห้องแชท', - userMenuKick: 'ไล่/แบน', - userMenuBans: 'รายชื่อที่ถูกแบน', - userMenuWhois: 'แสดง IP', - unbanUser: 'ปลดการแบนของผู้ใช้ %s', - joinChannel: 'ร่วมห้อง %s', - cite: '%s พูด:', - urlDialog: 'กรุณาใส่ที่อยู่เว็บ (URL):', - deleteMessage: 'ลบข้อความแชทนี้', - deleteMessageConfirm: 'แน่ใจว่าจะลบข้อความที่เลือกนี้?', - errorCookiesRequired: 'ห้องแชทนี้ต้องการใช้งานคุกกี้', - errorUserNameNotFound: 'Error: ไม่พบผู้ใช้ %s', - errorMissingText: 'Error: ข้อความหายไป', - errorMissingUserName: 'Error: ผู้ใช้หายไป', - errorInvalidUserName: 'Error: ผู้ใช้ไม่ถูกต้อง', - errorUserNameInUse: 'Error: ผู้ใช้นี้ถูกใช้งานอยู่', - errorMissingChannelName: 'Error: ชื่อห้องแชทหายไป', - errorInvalidChannelName: 'Error: ชื่อห้องแชทไม่ถูกต้อง: %s', - errorPrivateMessageNotAllowed: 'Error: ไม่อนุญาตข้อความส่วนตัว', - errorInviteNotAllowed: 'Error: ไม่อนุญาตให้คุณเชิญใครในห้องนี้', - errorUninviteNotAllowed: 'Error: ไม่อนุญาตให้คุณถอดการเชิญในห้องนี้', - errorNoOpenQuery: 'Error: ไม่เปิดห้องส่วนตัว', - errorKickNotAllowed: 'Error: ไม่อนุญาตให้คุณไล่ %s.', - errorCommandNotAllowed: 'Error: ไม่อนุญาตคำสั่ง : %s', - errorUnknownCommand: 'Error: คำสั่งอะไรเนีย: %s', - errorMaxMessageRate: 'Error: ส่งข้อความเกินกำหนดใน 1 นาที', - errorConnectionTimeout: 'Error: การเชื่อมต่อหมดเวลา กรุณาลองอีกครั้ง', - errorConnectionStatus: 'Error: สถานะการเชื่อมต่อ: %s', - errorSoundIO: 'Error: โหลดไฟล์เสียงผิดพลาด (อาจเกิดจาก Flash IO Error, โปรแกรมช่วยดาวน์โหลด).', - errorSocketIO: 'Error: การเชื่อมต่อถึง socket เซิร์ฟเวอร์ผิดพลาด (อาจเกิดจาก Flash IO Error).', - errorSocketSecurity: 'Error: การเชื่อมต่อถึง socket เซิร์ฟเวอร์ผิดพลาด (Flash Security Error).', - errorDOMSyntax: 'Error: DOM Syntax ไม่ถูกต้อง (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/tr.js b/library/ajaxchat/chat/js/lang/tr.js deleted file mode 100644 index 63d9b5aee..000000000 --- a/library/ajaxchat/chat/js/lang/tr.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Cydonian - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s sohbet odasına girdi.', - logout: '%s sohbet odasından çıktı.', - logoutTimeout: '%s sohbetten çıkarıldı (Bağlantı Gecikmesi).', - logoutIP: '%s sohbetten çıkarıldı (Geçersiz IP adresi).', - logoutKicked: '%s sohbetten çıkarıldı (Atıldı).', - channelEnter: '%s kanala girdi.', - channelLeave: '%s kanaldan çıktı.', - privmsg: '(fısıldıyor)', - privmsgto: '(%s size fısıldıyor)', - invite: '%s sizi %s odasına davet ediyor.', - inviteto: '%s kanalı için davetiniz %s e gönderildi.', - uninvite: '%s sizi %s kanalından çıkmaya çağırıyor.', - uninviteto: '%s kanalından çıkma davetiniz %s e gönderildi', - queryOpen: '%s e özel kanal açıldı.', - queryClose: '%s e özel kanal kapatıldı.', - ignoreAdded: '%s blok listesine eklendi.', - ignoreRemoved: '%s blok listesinden çıkarıldı.', - ignoreList: 'Blok edilen üyeler:', - ignoreListEmpty: 'Blok Listesi boş.', - who: 'Çevrimiçi üyeler:', - whoChannel: '%s kanalındaki çevrimiçi üyeler:', - whoEmpty: 'Kanalda çevrimiçi üye yoktur.', - list: 'Açık Odalar:', - bans: 'Yasaklanan Üyeler:', - bansEmpty: 'Yasaklı Listesi boş.', - unban: '%s adlı üyenin yasağı kaldırıldı.', - whois: 'Üye %s - IP adresi:', - whereis: '%s adlı üye %s kanalında.', - roll: '%s sallar %s ve alır %s.', - nick: '%s rumuzunu %s yaptı.', - toggleUserMenu: 'Toggle user menu for %s', - userMenuLogout: 'Çıkış', - userMenuWho: 'Çevrimiçi üyeleri göster', - userMenuList: 'Uygun odaları göster', - userMenuAction: 'Aksiyon:', - userMenuRoll: 'Zarları at', - userMenuNick: 'Rumuz değiştir', - userMenuEnterPrivateRoom: 'Özel odaya gir', - userMenuSendPrivateMessage: 'Özel mesaj gönder', - userMenuDescribe: 'Özel aksiyon gönder', - userMenuOpenPrivateChannel: 'Özel kanal aç', - userMenuClosePrivateChannel: 'Özel kanalı kapat', - userMenuInvite: 'Davet et', - userMenuUninvite: 'Davet etme', - userMenuIgnore: 'İptal/Kabul', - userMenuIgnoreList: 'Bloklanmış üyeleri göster', - userMenuWhereis: 'Kanalı göster', - userMenuKick: 'At/Yasakla', - userMenuBans: 'Yasaklanmış üyeleri göster', - userMenuWhois: 'IP göster', - unbanUser: 'Üye %s nin yasağını kaldır', - joinChannel: '%s kanalına Gir', - cite: '%s :', - urlDialog: 'Web sayfasının adresini (URL) giriniz:', - deleteMessage: 'Bu mesajı sil', - deleteMessageConfirm: 'İşaretli mesajı gerçekten silmek istiyor musunuz?', - errorCookiesRequired: 'Bu sohbet için Cookies açık olmalıdır.', - errorUserNameNotFound: 'Hata: %s adlı üye bulunamadı.', - errorMissingText: 'Hata: Mesaj yazısı yok.', - errorMissingUserName: 'Hata: Üye adı yok.', - errorInvalidUserName: 'Hata: Geçersiz üye adı.', - errorUserNameInUse: 'Hata: Üye adı kullanımda.', - errorMissingChannelName: 'Hata: Kanal adı yok.', - errorInvalidChannelName: 'Hata: Geçersiz kanal adı: %s', - errorPrivateMessageNotAllowed: 'Hata: Özel mesajlara izin verilmiyor.', - errorInviteNotAllowed: 'Hata: Başka bir üyeyi bu kanala davet etme izniniz yok.', - errorUninviteNotAllowed: 'Hata: Başka bir üyeyi bu kanaldan dışarı davete izniniz yok.', - errorNoOpenQuery: 'Hata: Açık özel kanal yok.', - errorKickNotAllowed: 'Hata: %s adlı üyeyi atma yetkiniz yok.', - errorCommandNotAllowed: 'Hata: Bu komuta izin yok: %s', - errorUnknownCommand: 'Hata: Bilinmeyen komut: %s', - errorMaxMessageRate: 'Hata: Bir dakika içinde atılabilecek maksimum mesaj sayısına ulaştınız.', - errorConnectionTimeout: 'Hata: Bağlantı süresi aşımı. Lütfen tekrar deneyin.', - errorConnectionStatus: 'Hata: Bağlantı durumu: %s', - errorSoundIO: 'Hata: Ses dosyası yüklenemedi (Flash IO Hatası).', - errorSocketIO: 'Hata: Socket server bağlantısı yapılamadı (Flash IO Hatası).', - errorSocketSecurity: 'Hata: Socket server bağlantısı yapılamadı(Flash Güvenlik Hatası).', - errorDOMSyntax: 'Hata: Geçersiz DOM Sözdizimi (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/uk.js b/library/ajaxchat/chat/js/lang/uk.js deleted file mode 100644 index 42f61804e..000000000 --- a/library/ajaxchat/chat/js/lang/uk.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author Yuriy Smetana (yura@stryi.com.ua, http://joomla.org.ua) - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s заходить до Чату.', - logout: '%s виходить з Чату.', - logoutTimeout: '%s залишає чат (був неактивний).', - logoutIP: '%s залишає чат (неправильна IP адреса).', - logoutKicked: '%s залишає чат (примусово).', - channelEnter: '%s заходить до кімнати.', - channelLeave: '%s залишає кімнату.', - privmsg: '(пошепки)', - privmsgto: '(пошепки до %s)', - invite: '%s запрошує відвідати кімнату %s.', - inviteto: 'Запрошення до %s відвідати кімнату %s надіслано.', - uninvite: '%s відмовив в запрошенні до кімнати %s.', - uninviteto: 'Відміну запрошення %s до кімнати %s було надіслано.', - queryOpen: 'Створено приватну кімнату з %s.', - queryClose: 'Приватну кімнату з %s зачинено.', - ignoreAdded: '%s додано до переліку ігнорованих осіб.', - ignoreRemoved: '%s вилучено з переліку ігнорованих осіб.', - ignoreList: 'Ігроновані особи:', - ignoreListEmpty: 'Ігнорованих осіб немає.', - who: 'Зараз в Чаті:', - whoChannel: 'Зараз в кімнаті %s такі користувачі:', - whoEmpty: 'Ця кімната порожня.', - list: 'Інші кімнати:', - bans: 'Заблоковані користувачі:', - bansEmpty: 'Немає заблокованих користувачів.', - unban: 'Блокування користувача %s відмінено.', - whois: 'Користувач %s - IP адреса:', - whereis: 'Користувач %s в кімнаті %s.', - roll: 'Користувачем %s кинуто %s, випало %s.', - nick: 'Користувач %s відтепер буде називатись %s.', - toggleUserMenu: 'Меню користувача %s', - userMenuLogout: 'Вийти', - userMenuWho: 'Показати присутніх', - userMenuList: 'Показати кімнати', - userMenuAction: 'Описати чим зараз займаєтесь', - userMenuRoll: 'Кинути кості', - userMenuNick: 'Змінити собі ім\'я', - userMenuEnterPrivateRoom: 'Увійти до приватної кімнати', - userMenuSendPrivateMessage: 'Надіслати особисте повідомлення', - userMenuDescribe: 'Описати чим займаєтесь (приватно)', - userMenuOpenPrivateChannel: 'Створити приватну кімнату', - userMenuClosePrivateChannel: 'Закрити приватну кімнату', - userMenuInvite: 'Запросити', - userMenuUninvite: 'Відмовити', - userMenuIgnore: 'Ігнорувати/Приймати', - userMenuIgnoreList: 'Перелік ігнорованих', - userMenuWhereis: 'Показати кімнати', - userMenuKick: 'Викинути/Заблокувати', - userMenuBans: 'Перелік заблокованих користувачів', - userMenuWhois: 'Показати IP', - unbanUser: 'Відмінити блокування користувача %s', - joinChannel: 'Зайти в кімнату %s', - cite: '%s пише:', - urlDialog: 'Будь-ласка, введіть адресу веб-сторінки:', - deleteMessage: 'Видалити це повідомлення', - deleteMessageConfirm: 'Справді видалити це повідомлення?', - errorCookiesRequired: 'Для Чату необхідно дозволити Cookies.', - errorUserNameNotFound: 'Помилка: користувач %s не існує.', - errorMissingText: 'Помилка: повідомлення відсутнє.', - errorMissingUserName: 'Помилка: відсутнє ім\'я користувача.', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: 'Помилка: відсутня назва кімнати.', - errorInvalidChannelName: 'Помилка: хибна назва кімнати: %s', - errorPrivateMessageNotAllowed: 'Помилка: приватні повідомлення заборонені.', - errorInviteNotAllowed: 'Помилка: Вам заборонено запрошувати до цієї кімнати.', - errorUninviteNotAllowed: 'Помилка: Вам заборонено відмовляти в запрошенні до цієї кімнати.', - errorNoOpenQuery: 'Помилка: не існує приватних кімнат.', - errorKickNotAllowed: 'Помилка: Вам недозволено викидати користувачів %s.', - errorCommandNotAllowed: 'Помилка: недозволена команда: %s', - errorUnknownCommand: 'Помилка: хибна команда: %s', - errorMaxMessageRate: 'Помилка: Ви досягли максимальної кількості повідомлень за хвилину.', - errorConnectionTimeout: 'Помилка: час очікування минув. Будь-ласка, спробуйте знову.', - errorConnectionStatus: 'Помилка: стан з\'єднання: %s', - errorSoundIO: 'Помилка: Неможливо відкрити звуковий файл (Flash IO Error).', - errorSocketIO: 'Помилка: З\'єднання з сервером невдалося (Flash IO Error).', - errorSocketSecurity: 'Помилка: З\'єднання з сервером невдалося (Flash Security Error).', - errorDOMSyntax: 'Помилка: Invalid DOM Syntax (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/zh-tw.js b/library/ajaxchat/chat/js/lang/zh-tw.js deleted file mode 100644 index c6b971953..000000000 --- a/library/ajaxchat/chat/js/lang/zh-tw.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s已登入', - logout: '%s已登出', - logoutTimeout: '%s已登出（連線逾時）', - logoutIP: '%s已登出（無效的IP address）', - logoutKicked: '%s已登出（被踢掉了）', - channelEnter: '%s已進入', - channelLeave: '%s已離開', - privmsg: '（悄悄話）', - privmsgto: '（給 %s 的悄悄話）', - invite: '%s 邀請您進入 %s .', - inviteto: '請 %s 進入 %s 的邀請函已發送', - uninvite: '%s 於 %s 收回了邀請函', - uninviteto: '請 %s 進入 %s 的邀請函已收回', - queryOpen: '允許 %s 進入私人房', - queryClose: '已不允許 %s 進入私人房', - ignoreAdded: '增加 %s 至忽略清單', - ignoreRemoved: '移除 %s 自忽略清單', - ignoreList: '已忽略來自以下人士的訊息：', - ignoreListEmpty: '忽略清單是空的。', - who: '已上線會員：', - whoChannel: '在 %s 的已上線會員：', - whoEmpty: '沒有人在那裡。', - list: '可進入的房間：', - bans: '被禁止使用的人：', - bansEmpty: '沒有被禁止使用的人。', - unban: '開放之前被禁的使用者 %s ：', - whois: '使用者 %s - IP address:', - whereis: '使用者 %s 正在 %s 。', - roll: '%s 擲了 %s 得到了 %s 。', - nick: '%s 現在暱稱改為 %s', - toggleUserMenu: '開啟為 %s 特製的功能表', - userMenuLogout: '登出', - userMenuWho: '顯示已上線會員', - userMenuList: '顯示可進入的房間', - userMenuAction: '描述動作', - userMenuRoll: '擲骰子', - userMenuNick: '換暱稱', - userMenuEnterPrivateRoom: '進入私人房', - userMenuSendPrivateMessage: '傳送悄悄話', - userMenuDescribe: '傳送私人動作', - userMenuOpenPrivateChannel: '允許進入私人房', - userMenuClosePrivateChannel: '不允許進入私人房', - userMenuInvite: '邀請某人（進入自己的私人房）', - userMenuUninvite: '收回邀請', - userMenuIgnore: '忽略／接受某人的訊息', - userMenuIgnoreList: '顯示忽略清單', - userMenuWhereis: '顯示所在地', - userMenuKick: '踢掉／禁人', - userMenuBans: '顯示被禁的使用者', - userMenuWhois: '顯示 IP', - unbanUser: '開放之前被禁的使用者 %s ', - joinChannel: '進入 %s', - cite: '%s 說：', - urlDialog: '請輸入網址（URL）：', - deleteMessage: '刪除這條訊息', - deleteMessageConfirm: '真的要刪除這條訊息嗎？', - errorCookiesRequired: '請打開Cookies！', - errorUserNameNotFound: '錯誤：沒有使用者 %s ……', - errorMissingText: '錯誤：未輸入訊息……', - errorMissingUserName: '錯誤：未輸入使用者帳號……', - errorInvalidUserName: '錯誤：帳號錯誤……', - errorUserNameInUse: '錯誤：帳號使用中……', - errorMissingChannelName: '錯誤：不存在的房間……', - errorInvalidChannelName: '錯誤：不存在的房間： %s ……', - errorPrivateMessageNotAllowed: '錯誤：不允許使用悄悄話功能……', - errorInviteNotAllowed: '錯誤：不允許邀請別人來這裡……', - errorUninviteNotAllowed: '錯誤：不允許收回邀請……', - errorNoOpenQuery: '錯誤：沒有私人房是開放的……', - errorKickNotAllowed: '錯誤：你不能把 %s 踢掉！', - errorCommandNotAllowed: '錯誤：不允許使用的指令： %s ……', - errorUnknownCommand: '錯誤：無法辨識的命令： %s ……', - errorMaxMessageRate: '錯誤：已達到一分鐘所能發送的最大訊息數量……', - errorConnectionTimeout: '錯誤：連線逾時，請再連一次……', - errorConnectionStatus: '錯誤：連線狀態： %s ', - errorSoundIO: '錯誤：無法讀取音效檔 (Flash IO Error).', - errorSocketIO: '錯誤：無法連線到伺服器的socket (Flash IO Error).', - errorSocketSecurity: '錯誤：無法連線到伺服器的socket (Flash Security Error).', - errorDOMSyntax: '錯誤：無效的 DOM 語法 (DOM ID: %s).' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/lang/zh.js b/library/ajaxchat/chat/js/lang/zh.js deleted file mode 100644 index ba41fad7f..000000000 --- a/library/ajaxchat/chat/js/lang/zh.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @author mikespook - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Ajax Chat language Object: -var ajaxChatLang = { - - login: '%s 进入聊天室。', - logout: '%s 退出聊天室。', - logoutTimeout: '%s 因超时，退出聊天室。', - logoutIP: '%s 因不合法的 IP 地址退出。', - logoutKicked: '%s 被踢出聊天室。', - channelEnter: '%s 进入频道。', - channelLeave: '%s 退出频道。', - privmsg: '（悄悄话）', - privmsgto: '（对 %s 说悄悄话）', - invite: '%s 邀请你加入 %s。', - inviteto: '对 %s 在频道 %s 的邀请已经发送。', - uninvite: '%s 撤销了你在频道 %s 的邀请。', - uninviteto: '对 %s 在频道 %s 的撤销邀请已经发送。', - queryOpen: '私人频道对 %s 打开。', - queryClose: '私人频道对 %s 关闭。', - ignoreAdded: '将 %s 加入忽略列表。', - ignoreRemoved: '从忽略列表中移除 %s。', - ignoreList: '已忽略用户：', - ignoreListEmpty: '已列出未忽略用户。', - who: '在线用户：', - whoChannel: '频道 %s 的在线用户：', - whoEmpty: '指定频道中没有在线用户。', - list: '可用频道：', - bans: '已禁言用户：', - bansEmpty: '已列出未禁言用户。', - unban: '用户 %s 的禁言已取消。', - whois: '用户 %s - IP 地址：', - whereis: '用户 %s 进入频道 %s.', - roll: '%s 摇出了 %s 并且得到了 %s。', - nick: '%s 改名为 %s。', - toggleUserMenu: '切换用户 %s 的菜单', - userMenuLogout: '退出', - userMenuWho: '列出在线用户', - userMenuList: '列出可用的频道', - userMenuAction: '动作描述', - userMenuRoll: '摇骰子', - userMenuNick: '修改用户名', - userMenuEnterPrivateRoom: '进入私人房间', - userMenuSendPrivateMessage: '发送私人消息', - userMenuDescribe: '发送私人动作', - userMenuOpenPrivateChannel: '打开私人频道', - userMenuClosePrivateChannel: '关闭私人频道', - userMenuInvite: '邀请', - userMenuUninvite: '撤销邀请', - userMenuIgnore: '忽略/接收', - userMenuIgnoreList: '列出忽略的用户', - userMenuWhereis: '显示频道', - userMenuKick: '踢/禁', - userMenuBans: '列出禁言的用户', - userMenuWhois: '显示 IP', - unbanUser: '撤销用户 %s 禁言', - joinChannel: '加入频道 %s', - cite: '%s 说：', - urlDialog: '请输入网页地址（URL）：', - deleteMessage: '删除聊天记录', - deleteMessageConfirm: '要删除已经发出的聊天记录吗？', - errorCookiesRequired: '聊天室需要开启 Cookie 功能。', - errorUserNameNotFound: '错误：未找到用户 %s。', - errorMissingText: '错误：缺少消息内容。', - errorMissingUserName: '错误：缺少用户名。', - errorInvalidUserName: 'Error: Invalid username.', - errorUserNameInUse: 'Error: Username already in use.', - errorMissingChannelName: '错误：缺少频道名。', - errorInvalidChannelName: '错误：错误的频道名：%s', - errorPrivateMessageNotAllowed: '错误：不允许发送私人消息。', - errorInviteNotAllowed: '错误：你在这个频道没有权限邀请他人。', - errorUninviteNotAllowed: '错误：你在这个频道没有权限取消邀请。', - errorNoOpenQuery: '错误：没有私人频道开放。', - errorKickNotAllowed: '错误：没有权限提出 %s。', - errorCommandNotAllowed: '错误：不允许的命令：%s', - errorUnknownCommand: '错误：未知命令：%s', - errorMaxMessageRate: '错误：超出了每分钟最大讯息数。', - errorConnectionTimeout: '错误：连接超时，请重试。', - errorConnectionStatus: '错误：连接状态：%s', - errorSoundIO: '错误：加载声音文件失败（Flash IO 错误）。', - errorSocketIO: '错误：连接 Socket 服务器失败（Flash IO 错误）。', - errorSocketSecurity: '错误：连接 Socket 服务器失败（Flash 安全错误）。', - errorDOMSyntax: '错误：错误的 DOM 语法（DOM ID：%s）。' - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/js/logs.js b/library/ajaxchat/chat/js/logs.js deleted file mode 100644 index 9ec694cee..000000000 --- a/library/ajaxchat/chat/js/logs.js +++ /dev/null @@ -1,128 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Overrides client-side functionality for the logs view: - - ajaxChat.logsMonitorMode = null; - ajaxChat.logsLastID = null; - ajaxChat.logsCommand = null; - - ajaxChat.startChatUpdate = function() { - var infos = 'userID,userName,userRole'; - if(this.socketServerEnabled) { - infos += ',socketRegistrationID'; - } - this.updateChat('&getInfos=' + this.encodeText(infos)); - } - - ajaxChat.updateChat = function(paramString) { - // Only update if we have parameters, are in monitor mode or the lastID has changed since the last update: - if(paramString || this.logsMonitorMode || !this.logsLastID || this.lastID != this.logsLastID) { - // Update the logsLastID for the lastID check: - this.logsLastID = this.lastID; - - var requestUrl = this.ajaxURL - + '&lastID=' - + this.lastID; - if(paramString) { - requestUrl += paramString; - } - requestUrl += '&' + this.getLogsCommand(); - this.makeRequest(requestUrl,'GET',null); - } else { - this.logsLastID = null; - } - } - - ajaxChat.sendMessage = function() { - this.getLogs(); - } - - ajaxChat.getLogs = function() { - clearTimeout(this.timer); - this.clearChatList(); - this.lastID = 0; - this.logsCommand = null; - this.makeRequest(this.ajaxURL,'POST',this.getLogsCommand()); - } - - ajaxChat.getLogsCommand = function() { - if(!this.logsCommand) { - if(!this.dom['inputField'].value && - parseInt(this.dom['yearSelection'].value) <= 0 && - parseInt(this.dom['hourSelection'].value) <= 0) { - this.logsMonitorMode = true; - } else { - this.logsMonitorMode = false; - } - this.logsCommand = 'command=getLogs' - + '&channelID=' + this.dom['channelSelection'].value - + '&year=' + this.dom['yearSelection'].value - + '&month=' + this.dom['monthSelection'].value - + '&day=' + this.dom['daySelection'].value - + '&hour=' + this.dom['hourSelection'].value - + '&search=' + this.encodeText(this.dom['inputField'].value); - } - return this.logsCommand; - } - - ajaxChat.onNewMessage = function(dateObject, userID, userName, userRoleClass, messageID, messageText, channelID, ip) { - if(messageText.indexOf('/delete') == 0) { - return false; - } - if(this.logsMonitorMode) { - this.blinkOnNewMessage(dateObject, userID, userName, userRoleClass, messageID, messageText, channelID, ip); - this.playSoundOnNewMessage( - dateObject, userID, userName, userRoleClass, messageID, messageText, channelID, ip - ); - } - return true; - } - - ajaxChat.logout = function() { - clearTimeout(this.timer); - this.makeRequest(this.ajaxURL,'POST','logout=true'); - } - - ajaxChat.switchLanguage = function(langCode) { - window.location.search = '?view=logs&lang='+langCode; - } - - ajaxChat.setChatUpdateTimer = function() { - clearTimeout(this.timer); - var timeout; - if(this.socketIsConnected && this.logsLastID && this.lastID == this.logsLastID) { - timeout = this.socketTimerRate; - } else { - timeout = this.timerRate; - if(this.socketServerEnabled && !this.socketReconnectTimer) { - // If the socket connection fails try to reconnect once in a minute: - this.socketReconnectTimer = setTimeout('ajaxChat.socketConnect();', 60000); - } - } - this.timer = setTimeout('ajaxChat.updateChat(null);', timeout); - } - - ajaxChat.socketUpdate = function(data) { - if(this.logsMonitorMode) { - var xmlDoc = this.loadXML(data); - if(xmlDoc) { - var selectedChannelID = parseInt(this.dom['channelSelection'].value); - var channelID = parseInt(xmlDoc.firstChild.getAttribute('channelID')); - if(selectedChannelID == -3 || channelID == selectedChannelID || - selectedChannelID == -2 && channelID >= this.privateMessageDiff || - selectedChannelID == -1 - && channelID >= this.privateChannelDiff - && channelID < this.privateMessageDiff - ) { - this.handleChatMessages(xmlDoc.getElementsByTagName('message')); - } - } - } - } - \ No newline at end of file diff --git a/library/ajaxchat/chat/js/shoutbox.js b/library/ajaxchat/chat/js/shoutbox.js deleted file mode 100644 index b283277a7..000000000 --- a/library/ajaxchat/chat/js/shoutbox.js +++ /dev/null @@ -1,12 +0,0 @@ -/* - * @package AJAX_Chat - * @author Sebastian Tschan - * @copyright (c) Sebastian Tschan - * @license Modified MIT License - * @link https://blueimp.net/ajax/ - */ - -// Overrides functionality for the shoutbox view: - - ajaxChat.handleLogout = function() { - } diff --git a/library/ajaxchat/chat/lib/.htaccess b/library/ajaxchat/chat/lib/.htaccess deleted file mode 100644 index 91e386dc9..000000000 --- a/library/ajaxchat/chat/lib/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -AuthType Basic -AuthName "Forbidden" -AuthUserFile /dev/null -require user nobody \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChat.php b/library/ajaxchat/chat/lib/class/AJAXChat.php deleted file mode 100644 index 215b2c4e1..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChat.php +++ /dev/null @@ -1,3326 +0,0 @@ -initialize(); - } - - function initialize() { - // Initialize configuration settings: - $this->initConfig(); - - // Initialize the DataBase connection: - $this->initDataBaseConnection(); - - // Initialize request variables: - $this->initRequestVars(); - - // Initialize the chat session: - $this->initSession(); - - // Handle the browser request and send the response content: - $this->handleRequest(); - } - - function initConfig() { - $config = null; - if (!include(AJAX_CHAT_PATH.'lib/config.php')) { - echo('Error: Could not find a config.php file in "'.AJAX_CHAT_PATH.'"lib/". Check to make sure the file exists.'); - die(); - } - $this->_config = &$config; - - // Initialize custom configuration settings: - $this->initCustomConfig(); - } - - function initRequestVars() { - $this->_requestVars = array(); - $this->_requestVars['ajax'] = isset($_REQUEST['ajax']) ? true : false; - $this->_requestVars['userID'] = isset($_REQUEST['userID']) ? $_REQUEST['userID'] : null; - $this->_requestVars['userName'] = isset($_REQUEST['userName']) ? $_REQUEST['userName'] : null; - $this->_requestVars['channelID'] = isset($_REQUEST['channelID']) ? $_REQUEST['channelID'] : null; - $this->_requestVars['channelName'] = isset($_REQUEST['channelName']) ? $_REQUEST['channelName'] : null; - $this->_requestVars['text'] = isset($_POST['text']) ? $_POST['text'] : null; - $this->_requestVars['lastID'] = isset($_REQUEST['lastID']) ? $_REQUEST['lastID'] : ''; - $this->_requestVars['login'] = isset($_REQUEST['login']) ? true : false; - $this->_requestVars['logout'] = isset($_REQUEST['logout']) ? true : false; - $this->_requestVars['password'] = isset($_REQUEST['password']) ? $_REQUEST['password'] : null; - $this->_requestVars['view'] = isset($_REQUEST['view']) ? $_REQUEST['view'] : null; - $this->_requestVars['year'] = isset($_REQUEST['year']) ? (int)$_REQUEST['year'] : null; - $this->_requestVars['month'] = isset($_REQUEST['month']) ? (int)$_REQUEST['month'] : null; - $this->_requestVars['day'] = isset($_REQUEST['day']) ? (int)$_REQUEST['day'] : null; - $this->_requestVars['hour'] = isset($_REQUEST['hour']) ? (int)$_REQUEST['hour'] : null; - $this->_requestVars['search'] = isset($_REQUEST['search']) ? $_REQUEST['search'] : null; - $this->_requestVars['shoutbox'] = isset($_REQUEST['shoutbox']) ? true : false; - $this->_requestVars['getInfos'] = isset($_REQUEST['getInfos']) ? $_REQUEST['getInfos'] : null; - $this->_requestVars['lang'] = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : null; - $this->_requestVars['delete'] = isset($_REQUEST['delete']) ? (int)$_REQUEST['delete'] : null; - - // Initialize custom request variables: - $this->initCustomRequestVars(); - - // Remove slashes which have been added to user input strings if magic_quotes_gpc is On: - if(get_magic_quotes_gpc()) { - // It is safe to remove the slashes as we escape user data ourself - array_walk( - $this->_requestVars, - create_function( - '&$value, $key', - 'if(is_string($value)) $value = stripslashes($value);' - ) - ); - } - } - - function initDataBaseConnection() { - // Create a new database object: - $this->db = new AJAXChatDataBase( - $this->_config['dbConnection'] - ); - // Use a new database connection if no existing is given: - if(!$this->_config['dbConnection']['link']) { - // Connect to the database server: - $this->db->connect($this->_config['dbConnection']); - if($this->db->error()) { - echo $this->db->getError(); - die(); - } - // Select the database: - $this->db->select($this->_config['dbConnection']['name']); - if($this->db->error()) { - echo $this->db->getError(); - die(); - } - } - // Unset the dbConnection array for safety purposes: - unset($this->_config['dbConnection']); - } - - function getDataBaseTable($table) { - return ($this->db->getName() ? '`'.$this->db->getName().'`.'.$this->getConfig('dbTableNames',$table) : $this->getConfig('dbTableNames',$table)); - } - - function initSession() { - // Start the PHP session (if not already started): - $this->startSession(); - - if($this->isLoggedIn()) { - // Logout if we receive a logout request, the chat has been closed or the userID could not be revalidated: - if($this->getRequestVar('logout') || !$this->isChatOpen() || !$this->revalidateUserID()) { - $this->logout(); - return; - } - // Logout if the Session IP is not the same when logged in and ipCheck is enabled: - if($this->getConfig('ipCheck') && ($this->getSessionIP() === null || $this->getSessionIP() != $_SERVER['REMOTE_ADDR'])) { - $this->logout('IP'); - return; - } - } else if( - // Login if auto-login enabled or a login, userName or shoutbox parameter is given: - $this->getConfig('forceAutoLogin') || - $this->getRequestVar('login') || - $this->getRequestVar('userName') || - $this->getRequestVar('shoutbox') - ) { - $this->login(); - } - - // Initialize the view: - $this->initView(); - - if($this->getView() == 'chat') { - $this->initChatViewSession(); - } else if($this->getView() == 'logs') { - $this->initLogsViewSession(); - } - - if(!$this->getRequestVar('ajax') && !headers_sent()) { - // Set style cookie: - $this->setStyle(); - // Set langCode cookie: - $this->setLangCodeCookie(); - } - - $this->initCustomSession(); - } - - function initLogsViewSession() { - if($this->getConfig('socketServerEnabled')) { - if(!$this->getSessionVar('logsViewSocketAuthenticated')) { - $this->updateLogsViewSocketAuthentication(); - $this->setSessionVar('logsViewSocketAuthenticated', true); - } - } - } - - function updateLogsViewSocketAuthentication() { - if($this->getUserRole() != AJAX_CHAT_ADMIN) { - $channels = array(); - foreach($this->getChannels() as $channel) { - if($this->getConfig('logsUserAccessChannelList') && !in_array($channel, $this->getConfig('logsUserAccessChannelList'))) { - continue; - } - array_push($channels, $channel); - } - array_push($channels, $this->getPrivateMessageID()); - array_push($channels, $this->getPrivateChannelID()); - } else { - // The channelID "ALL" authenticates for all channels: - $channels = array('ALL'); - } - $this->updateSocketAuthentication( - $this->getUserID(), - $this->getSocketRegistrationID(), - $channels - ); - } - - function initChatViewSession() { - // If channel is not null we are logged in to the chat view: - if($this->getChannel() !== null) { - // Check if the current user has been logged out due to inactivity: - if(!$this->isUserOnline()) { - $this->logout(); - return; - } - if($this->getRequestVar('ajax')) { - $this->initChannel(); - $this->updateOnlineStatus(); - $this->checkAndRemoveInactive(); - } - } else { - if($this->getRequestVar('ajax')) { - // Set channel, insert login messages and add to online list on first ajax request in chat view: - $this->chatViewLogin(); - } - } - } - - function isChatOpen() { - if($this->getUserRole() == AJAX_CHAT_ADMIN) - return true; - if($this->getConfig('chatClosed')) - return false; - $time = time(); - if($this->getConfig('timeZoneOffset') !== null) { - // Subtract the server timezone offset and add the config timezone offset: - $time -= date('Z', $time); - $time += $this->getConfig('timeZoneOffset'); - } - // Check the opening hours: - if($this->getConfig('openingHour') < $this->getConfig('closingHour')) - { - if(($this->getConfig('openingHour') > date('G', $time)) || ($this->getConfig('closingHour') <= date('G', $time))) - return false; - } - else - { - if(($this->getConfig('openingHour') > date('G', $time)) && ($this->getConfig('closingHour') <= date('G', $time))) - return false; - } - // Check the opening weekdays: - if(!in_array(date('w', $time), $this->getConfig('openingWeekDays'))) - return false; - return true; - } - - function handleRequest() { - if($this->getRequestVar('ajax')) { - if($this->isLoggedIn()) { - // Parse info requests (for current userName, etc.): - $this->parseInfoRequests(); - - // Parse command requests (e.g. message deletion): - $this->parseCommandRequests(); - - // Parse message requests: - $this->initMessageHandling(); - } - // Send chat messages and online user list in XML format: - $this->sendXMLMessages(); - } else { - // Display XHTML content for non-ajax requests: - $this->sendXHTMLContent(); - } - } - - function parseCommandRequests() { - if($this->getRequestVar('delete') !== null) { - $this->deleteMessage($this->getRequestVar('delete')); - } - } - - function parseInfoRequests() { - if($this->getRequestVar('getInfos')) { - $infoRequests = explode(',', $this->getRequestVar('getInfos')); - foreach($infoRequests as $infoRequest) { - $this->parseInfoRequest($infoRequest); - } - } - } - - function parseInfoRequest($infoRequest) { - switch($infoRequest) { - case 'userID': - $this->addInfoMessage($this->getUserID(), 'userID'); - break; - case 'userName': - $this->addInfoMessage($this->getUserName(), 'userName'); - break; - case 'userRole': - $this->addInfoMessage($this->getUserRole(), 'userRole'); - break; - case 'channelID': - $this->addInfoMessage($this->getChannel(), 'channelID'); - break; - case 'channelName': - $this->addInfoMessage($this->getChannelName(), 'channelName'); - break; - case 'socketRegistrationID': - $this->addInfoMessage($this->getSocketRegistrationID(), 'socketRegistrationID'); - break; - default: - $this->parseCustomInfoRequest($infoRequest); - } - } - - function sendXHTMLContent() { - $httpHeader = new AJAXChatHTTPHeader($this->getConfig('contentEncoding'), $this->getConfig('contentType')); - - $template = new AJAXChatTemplate($this, $this->getTemplateFileName(), $httpHeader->getContentType()); - - // Send HTTP header: - $httpHeader->send(); - - // Send parsed template content: - echo $template->getParsedContent(); - } - - function getTemplateFileName() { - switch($this->getView()) { - case 'chat': - return AJAX_CHAT_PATH.'lib/template/loggedIn.html'; - case 'logs': - return AJAX_CHAT_PATH.'lib/template/logs.html'; - default: - return AJAX_CHAT_PATH.'lib/template/loggedOut.html'; - } - } - - function initView() { - $this->_view = null; - // "chat" is the default view: - $view = ($this->getRequestVar('view') === null) ? 'chat' : $this->getRequestVar('view'); - if($this->hasAccessTo($view)) { - $this->_view = $view; - } - } - - function getView() { - return $this->_view; - } - - function hasAccessTo($view) { - switch($view) { - case 'chat': - case 'teaser': - if($this->isLoggedIn()) { - return true; - } - return false; - case 'logs': - if($this->isLoggedIn() && ($this->getUserRole() == AJAX_CHAT_ADMIN || - ($this->getConfig('logsUserAccess') && - ($this->getUserRole() == AJAX_CHAT_MODERATOR || $this->getUserRole() == AJAX_CHAT_USER)) - )) { - return true; - } - return false; - default: - return false; - } - } - - function login() { - // Retrieve valid login user data (from request variables or session data): - $userData = $this->getValidLoginUserData(); - - if(!$userData) { - $this->addInfoMessage('errorInvalidUser'); - return false; - } - - // If the chat is closed, only the admin may login: - if(!$this->isChatOpen() && $userData['userRole'] != AJAX_CHAT_ADMIN) { - $this->addInfoMessage('errorChatClosed'); - return false; - } - - if(!$this->getConfig('allowGuestLogins') && $userData['userRole'] == AJAX_CHAT_GUEST) { - return false; - } - - // Check if userID or userName are already listed online: - if($this->isUserOnline($userData['userID']) || $this->isUserNameInUse($userData['userName'])) { - if($userData['userRole'] == AJAX_CHAT_USER || $userData['userRole'] == AJAX_CHAT_MODERATOR || $userData['userRole'] == AJAX_CHAT_ADMIN) { - // Set the registered user inactive and remove the inactive users so the user can be logged in again: - $this->setInactive($userData['userID'], $userData['userName']); - $this->removeInactive(); - } else { - $this->addInfoMessage('errorUserInUse'); - return false; - } - } - - // Check if user is banned: - if($userData['userRole'] != AJAX_CHAT_ADMIN && $this->isUserBanned($userData['userName'], $userData['userID'], $_SERVER['REMOTE_ADDR'])) { - $this->addInfoMessage('errorBanned'); - return false; - } - - // Check if the max number of users is logged in (not affecting moderators or admins): - if(!($userData['userRole'] == AJAX_CHAT_MODERATOR || $userData['userRole'] == AJAX_CHAT_ADMIN) && $this->isMaxUsersLoggedIn()) { - $this->addInfoMessage('errorMaxUsersLoggedIn'); - return false; - } - - // Use a new session id (if session has been started by the chat): - $this->regenerateSessionID(); - - // Log in: - $this->setUserID($userData['userID']); - $this->setUserName($userData['userName']); - $this->setLoginUserName($userData['userName']); - $this->setUserRole($userData['userRole']); - $this->setLoggedIn(true); - $this->setLoginTimeStamp(time()); - - // IP Security check variable: - $this->setSessionIP($_SERVER['REMOTE_ADDR']); - - // The client authenticates to the socket server using a socketRegistrationID: - if($this->getConfig('socketServerEnabled')) { - $this->setSocketRegistrationID( - md5(uniqid(rand(), true)) - ); - } - - // Add userID, userName and userRole to info messages: - $this->addInfoMessage($this->getUserID(), 'userID'); - $this->addInfoMessage($this->getUserName(), 'userName'); - $this->addInfoMessage($this->getUserRole(), 'userRole'); - - // Purge logs: - if($this->getConfig('logsPurgeLogs')) { - $this->purgeLogs(); - } - - return true; - } - - function chatViewLogin() { - $this->setChannel($this->getValidRequestChannelID()); - $this->addToOnlineList(); - - // Add channelID and channelName to info messages: - $this->addInfoMessage($this->getChannel(), 'channelID'); - $this->addInfoMessage($this->getChannelName(), 'channelName'); - - // Login message: - $text = '/login '.$this->getUserName(); - $this->insertChatBotMessage( - $this->getChannel(), - $text, - null, - 1 - ); - } - - function getValidRequestChannelID() { - $channelID = $this->getRequestVar('channelID'); - $channelName = $this->getRequestVar('channelName'); - // Check the given channelID, or get channelID from channelName: - if($channelID === null) { - if($channelName !== null) { - $channelID = $this->getChannelIDFromChannelName($channelName); - // channelName might need encoding conversion: - if($channelID === null) { - $channelID = $this->getChannelIDFromChannelName( - $this->trimChannelName($channelName, $this->getConfig('contentEncoding')) - ); - } - } - } - // Validate the resulting channelID: - if(!$this->validateChannel($channelID)) { - if($this->getChannel() !== null) { - return $this->getChannel(); - } - return $this->getConfig('defaultChannelID'); - } - return $channelID; - } - - function initChannel() { - $channelID = $this->getRequestVar('channelID'); - $channelName = $this->getRequestVar('channelName'); - if($channelID !== null) { - $this->switchChannel($this->getChannelNameFromChannelID($channelID)); - } else if($channelName !== null) { - if($this->getChannelIDFromChannelName($channelName) === null) { - // channelName might need encoding conversion: - $channelName = $this->trimChannelName($channelName, $this->getConfig('contentEncoding')); - } - $this->switchChannel($channelName); - } - } - - function logout($type=null) { - // Update the socket server authentication for the user: - if($this->getConfig('socketServerEnabled')) { - $this->updateSocketAuthentication($this->getUserID()); - } - if($this->isUserOnline()) { - $this->chatViewLogout($type); - } - $this->setLoggedIn(false); - $this->destroySession(); - - // Re-initialize the view: - $this->initView(); - } - - function chatViewLogout($type) { - $this->removeFromOnlineList(); - if($type !== null) { - $type = ' '.$type; - } - // Logout message - $text = '/logout '.$this->getUserName().$type; - $this->insertChatBotMessage( - $this->getChannel(), - $text, - null, - 1 - ); - } - - function switchChannel($channelName) { - $channelID = $this->getChannelIDFromChannelName($channelName); - - if($channelID !== null && $this->getChannel() == $channelID) { - // User is already in the given channel, return: - return; - } - - // Check if we have a valid channel: - if(!$this->validateChannel($channelID)) { - // Invalid channel: - $text = '/error InvalidChannelName '.$channelName; - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - $text - ); - return; - } - - $oldChannel = $this->getChannel(); - - $this->setChannel($channelID); - $this->updateOnlineList(); - - // Channel leave message - $text = '/channelLeave '.$this->getUserName(); - $this->insertChatBotMessage( - $oldChannel, - $text, - null, - 1 - ); - - // Channel enter message - $text = '/channelEnter '.$this->getUserName(); - $this->insertChatBotMessage( - $this->getChannel(), - $text, - null, - 1 - ); - - $this->addInfoMessage($channelName, 'channelSwitch'); - $this->addInfoMessage($channelID, 'channelID'); - $this->_requestVars['lastID'] = 0; - } - - function addToOnlineList() { - $sql = 'INSERT INTO '.$this->getDataBaseTable('online').'( - userID, - userName, - userRole, - channel, - dateTime, - ip - ) - VALUES ( - '.$this->db->makeSafe($this->getUserID()).', - '.$this->db->makeSafe($this->getUserName()).', - '.$this->db->makeSafe($this->getUserRole()).', - '.$this->db->makeSafe($this->getChannel()).', - NOW(), - '.$this->db->makeSafe($this->ipToStorageFormat($_SERVER['REMOTE_ADDR'])).' - );'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $this->resetOnlineUsersData(); - } - - function removeFromOnlineList() { - $sql = 'DELETE FROM - '.$this->getDataBaseTable('online').' - WHERE - userID = '.$this->db->makeSafe($this->getUserID()).';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $this->removeUserFromOnlineUsersData(); - } - - function updateOnlineList() { - $sql = 'UPDATE - '.$this->getDataBaseTable('online').' - SET - userName = '.$this->db->makeSafe($this->getUserName()).', - channel = '.$this->db->makeSafe($this->getChannel()).', - dateTime = NOW(), - ip = '.$this->db->makeSafe($this->ipToStorageFormat($_SERVER['REMOTE_ADDR'])).' - WHERE - userID = '.$this->db->makeSafe($this->getUserID()).';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $this->resetOnlineUsersData(); - } - - function initMessageHandling() { - // Don't handle messages if we are not in chat view: - if($this->getView() != 'chat') { - return; - } - - // Check if we have been uninvited from a private or restricted channel: - if(!$this->validateChannel($this->getChannel())) { - // Switch to the default channel: - $this->switchChannel($this->getChannelNameFromChannelID($this->getConfig('defaultChannelID'))); - return; - } - - if($this->getRequestVar('text') !== null) { - $this->insertMessage($this->getRequestVar('text')); - } - } - - function insertParsedMessage($text) { - - // If a queryUserName is set, sent all messages as private messages to this userName: - if($this->getQueryUserName() !== null && strpos($text, '/') !== 0) { - $text = '/msg '.$this->getQueryUserName().' '.$text; - } - - // Parse IRC-style commands: - if(strpos($text, '/') === 0) { - $textParts = explode(' ', $text); - - switch($textParts[0]) { - - // Channel switch: - case '/join': - $this->insertParsedMessageJoin($textParts); - break; - - // Logout: - case '/quit': - $this->logout(); - break; - - // Private message: - case '/msg': - case '/describe': - $this->insertParsedMessagePrivMsg($textParts); - break; - - // Invitation: - case '/invite': - $this->insertParsedMessageInvite($textParts); - break; - - // Uninvitation: - case '/uninvite': - $this->insertParsedMessageUninvite($textParts); - break; - - // Private messaging: - case '/query': - $this->insertParsedMessageQuery($textParts); - break; - - // Kicking offending users from the chat: - case '/kick': - $this->insertParsedMessageKick($textParts); - break; - - // Listing banned users: - case '/bans': - $this->insertParsedMessageBans($textParts); - break; - - // Unban user (remove from ban list): - case '/unban': - $this->insertParsedMessageUnban($textParts); - break; - - // Describing actions: - case '/me': - case '/action': - $this->insertParsedMessageAction($textParts); - break; - - - // Listing online Users: - case '/who': - $this->insertParsedMessageWho($textParts); - break; - - // Listing available channels: - case '/list': - $this->insertParsedMessageList($textParts); - break; - - // Retrieving the channel of a User: - case '/whereis': - $this->insertParsedMessageWhereis($textParts); - break; - - // Listing information about a User: - case '/whois': - $this->insertParsedMessageWhois($textParts); - break; - - // Rolling dice: - case '/roll': - $this->insertParsedMessageRoll($textParts); - break; - - // Switching userName: - case '/nick': - $this->insertParsedMessageNick($textParts); - break; - - // Custom or unknown command: - default: - if(!$this->parseCustomCommands($text, $textParts)) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UnknownCommand '.$textParts[0] - ); - } - } - - } else { - // No command found, just insert the plain message: - $this->insertCustomMessage( - $this->getUserID(), - $this->getUserName(), - $this->getUserRole(), - $this->getChannel(), - $text - ); - } - } - - function insertParsedMessageJoin($textParts) { - if(count($textParts) == 1) { - // join with no arguments is the own private channel, if allowed: - if($this->isAllowedToCreatePrivateChannel()) { - // Private channels are identified by square brackets: - $this->switchChannel($this->getChannelNameFromChannelID($this->getPrivateChannelID())); - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingChannelName' - ); - } - } else { - $this->switchChannel($textParts[1]); - } - } - - function insertParsedMessagePrivMsg($textParts) { - if($this->isAllowedToSendPrivateMessage()) { - if(count($textParts) < 3) { - if(count($textParts) == 2) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingText' - ); - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } - } else { - // Get UserID from UserName: - $toUserID = $this->getIDFromName($textParts[1]); - if($toUserID === null) { - if($this->getQueryUserName() !== null) { - // Close the current query: - $this->insertMessage('/query'); - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } - } else { - // Insert /privaction command if /describe is used: - $command = ($textParts[0] == '/describe') ? '/privaction' : '/privmsg'; - // Copy of private message to current User: - $this->insertCustomMessage( - $this->getUserID(), - $this->getUserName(), - $this->getUserRole(), - $this->getPrivateMessageID(), - $command.'to '.$textParts[1].' '.implode(' ', array_slice($textParts, 2)) - ); - // Private message to requested User: - $this->insertCustomMessage( - $this->getUserID(), - $this->getUserName(), - $this->getUserRole(), - $this->getPrivateMessageID($toUserID), - $command.' '.implode(' ', array_slice($textParts, 2)) - ); - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error PrivateMessageNotAllowed' - ); - } - } - - function insertParsedMessageInvite($textParts) { - if($this->getChannel() == $this->getPrivateChannelID() || in_array($this->getChannel(), $this->getChannels())) { - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - $toUserID = $this->getIDFromName($textParts[1]); - if($toUserID === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - // Add the invitation to the database: - $this->addInvitation($toUserID); - $invitationChannelName = $this->getChannelNameFromChannelID($this->getChannel()); - // Copy of invitation to current User: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/inviteto '.$textParts[1].' '.$invitationChannelName - ); - // Invitation to requested User: - $this->insertChatBotMessage( - $this->getPrivateMessageID($toUserID), - '/invite '.$this->getUserName().' '.$invitationChannelName - ); - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error InviteNotAllowed' - ); - } - } - - function insertParsedMessageUninvite($textParts) { - if($this->getChannel() == $this->getPrivateChannelID() || in_array($this->getChannel(), $this->getChannels())) { - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - $toUserID = $this->getIDFromName($textParts[1]); - if($toUserID === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - // Remove the invitation from the database: - $this->removeInvitation($toUserID); - $invitationChannelName = $this->getChannelNameFromChannelID($this->getChannel()); - // Copy of uninvitation to current User: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/uninviteto '.$textParts[1].' '.$invitationChannelName - ); - // Uninvitation to requested User: - $this->insertChatBotMessage( - $this->getPrivateMessageID($toUserID), - '/uninvite '.$this->getUserName().' '.$invitationChannelName - ); - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UninviteNotAllowed' - ); - } - } - - function insertParsedMessageQuery($textParts) { - if($this->isAllowedToSendPrivateMessage()) { - if(count($textParts) == 1) { - if($this->getQueryUserName() !== null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/queryClose '.$this->getQueryUserName() - ); - // Close the current query: - $this->setQueryUserName(null); - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error NoOpenQuery' - ); - } - } else { - if($this->getIDFromName($textParts[1]) === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - if($this->getQueryUserName() !== null) { - // Close the current query: - $this->insertMessage('/query'); - } - // Open a query to the requested user: - $this->setQueryUserName($textParts[1]); - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/queryOpen '.$textParts[1] - ); - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error PrivateMessageNotAllowed' - ); - } - } - - function insertParsedMessageKick($textParts) { - // Only moderators/admins may kick users: - if($this->getUserRole() == AJAX_CHAT_ADMIN || $this->getUserRole() == AJAX_CHAT_MODERATOR) { - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - // Get UserID from UserName: - $kickUserID = $this->getIDFromName($textParts[1]); - if($kickUserID === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - // Check the role of the user to kick: - $kickUserRole = $this->getRoleFromID($kickUserID); - if($kickUserRole == AJAX_CHAT_ADMIN || ($kickUserRole == AJAX_CHAT_MODERATOR && $this->getUserRole() != AJAX_CHAT_ADMIN)) { - // Admins and moderators may not be kicked: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error KickNotAllowed '.$textParts[1] - ); - } else { - // Kick user and insert message: - $channel = $this->getChannelFromID($kickUserID); - $banMinutes = (count($textParts) > 2) ? $textParts[2] : null; - $this->kickUser($textParts[1], $banMinutes, $kickUserID); - // If no channel found, user logged out before he could be kicked - if($channel !== null) { - $this->insertChatBotMessage( - $channel, - '/kick '.$textParts[1], - null, - 1 - ); - // Send a copy of the message to the current user, if not in the channel: - if($channel != $this->getChannel()) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/kick '.$textParts[1], - null, - 1 - ); - } - } - } - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error CommandNotAllowed '.$textParts[0] - ); - } - } - - function insertParsedMessageBans($textParts) { - // Only moderators/admins may see the list of banned users: - if($this->getUserRole() == AJAX_CHAT_ADMIN || $this->getUserRole() == AJAX_CHAT_MODERATOR) { - $this->removeExpiredBans(); - $bannedUsers = $this->getBannedUsers(); - if(count($bannedUsers) > 0) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/bans '.implode(' ', $bannedUsers) - ); - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/bansEmpty -' - ); - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error CommandNotAllowed '.$textParts[0] - ); - } - } - - function insertParsedMessageUnban($textParts) { - // Only moderators/admins may unban users: - if($this->getUserRole() == AJAX_CHAT_ADMIN || $this->getUserRole() == AJAX_CHAT_MODERATOR) { - $this->removeExpiredBans(); - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - if(!in_array($textParts[1], $this->getBannedUsers())) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - // Unban user and insert message: - $this->unbanUser($textParts[1]); - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/unban '.$textParts[1] - ); - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error CommandNotAllowed '.$textParts[0] - ); - } - } - - function insertParsedMessageAction($textParts) { - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingText' - ); - } else { - if($this->getQueryUserName() !== null) { - // If we are in query mode, sent the action to the query user: - $this->insertMessage('/describe '.$this->getQueryUserName().' '.implode(' ', array_slice($textParts, 1))); - } else { - $this->insertCustomMessage( - $this->getUserID(), - $this->getUserName(), - $this->getUserRole(), - $this->getChannel(), - implode(' ', $textParts) - ); - } - } - } - - function insertParsedMessageWho($textParts) { - if(count($textParts) == 1) { - if($this->isAllowedToListHiddenUsers()) { - // List online users from any channel: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/who '.implode(' ', $this->getOnlineUsers()) - ); - } else { - // Get online users for all accessible channels: - $channels = $this->getChannels(); - // Add the own private channel if allowed: - if($this->isAllowedToCreatePrivateChannel()) { - array_push($channels, $this->getPrivateChannelID()); - } - // Add the invitation channels: - foreach($this->getInvitations() as $channelID) { - if(!in_array($channelID, $channels)) { - array_push($channels, $channelID); - } - } - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/who '.implode(' ', $this->getOnlineUsers($channels)) - ); - } - } else { - $channelName = $textParts[1]; - $channelID = $this->getChannelIDFromChannelName($channelName); - if(!$this->validateChannel($channelID)) { - // Invalid channel: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error InvalidChannelName '.$channelName - ); - } else { - // Get online users for the given channel: - $onlineUsers = $this->getOnlineUsers(array($channelID)); - if(count($onlineUsers) > 0) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/whoChannel '.$channelName.' '.implode(' ', $onlineUsers) - ); - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/whoEmpty -' - ); - } - } - } - } - - function insertParsedMessageList($textParts) { - // Get the names of all accessible channels: - $channelNames = $this->getChannelNames(); - // Add the own private channel, if allowed: - if($this->isAllowedToCreatePrivateChannel()) { - array_push($channelNames, $this->getPrivateChannelName()); - } - // Add the invitation channels: - foreach($this->getInvitations() as $channelID) { - $channelName = $this->getChannelNameFromChannelID($channelID); - if($channelName !== null && !in_array($channelName, $channelNames)) { - array_push($channelNames, $channelName); - } - } - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/list '.implode(' ', $channelNames) - ); - } - - function insertParsedMessageWhereis($textParts) { - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - // Get UserID from UserName: - $whereisUserID = $this->getIDFromName($textParts[1]); - if($whereisUserID === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - $channelID = $this->getChannelFromID($whereisUserID); - if($this->validateChannel($channelID)) { - $channelName = $this->getChannelNameFromChannelID($channelID); - } else { - $channelName = null; - } - if($channelName === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - // List user information: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/whereis '.$textParts[1].' '.$channelName - ); - } - } - } - } - - function insertParsedMessageWhois($textParts) { - // Only moderators/admins: - if($this->getUserRole() == AJAX_CHAT_ADMIN || $this->getUserRole() == AJAX_CHAT_MODERATOR) { - if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - // Get UserID from UserName: - $whoisUserID = $this->getIDFromName($textParts[1]); - if($whoisUserID === null) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameNotFound '.$textParts[1] - ); - } else { - // List user information: - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/whois '.$textParts[1].' '.$this->getIPFromID($whoisUserID) - ); - } - } - } else { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error CommandNotAllowed '.$textParts[0] - ); - } - } - - function insertParsedMessageRoll($textParts) { - if(count($textParts) == 1) { - // default is one d6: - $text = '/roll '.$this->getUserName().' 1d6 '.$this->rollDice(6); - } else { - $diceParts = explode('d', $textParts[1]); - if(count($diceParts) == 2) { - $number = (int)$diceParts[0]; - $sides = (int)$diceParts[1]; - - // Dice number must be an integer between 1 and 100, else roll only one: - $number = ($number > 0 && $number <= 100) ? $number : 1; - - // Sides must be an integer between 1 and 100, else take 6: - $sides = ($sides > 0 && $sides <= 100) ? $sides : 6; - - $text = '/roll '.$this->getUserName().' '.$number.'d'.$sides.' '; - for($i=0; $i<$number; $i++) { - if($i != 0) - $text .= ','; - $text .= $this->rollDice($sides); - } - } else { - // if dice syntax is invalid, roll one d6: - $text = '/roll '.$this->getUserName().' 1d6 '.$this->rollDice(6); - } - } - $this->insertChatBotMessage( - $this->getChannel(), - $text - ); - } - - function insertParsedMessageNick($textParts) { - if(!$this->getConfig('allowNickChange') || - (!$this->getConfig('allowGuestUserName') && $this->getUserRole() == AJAX_CHAT_GUEST)) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error CommandNotAllowed '.$textParts[0] - ); - } else if(count($textParts) == 1) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MissingUserName' - ); - } else { - $newUserName = implode(' ', array_slice($textParts, 1)); - if($newUserName == $this->getLoginUserName()) { - // Allow the user to regain the original login userName: - $prefix = ''; - $suffix = ''; - } else if($this->getUserRole() == AJAX_CHAT_GUEST) { - $prefix = $this->getConfig('guestUserPrefix'); - $suffix = $this->getConfig('guestUserSuffix'); - } else { - $prefix = $this->getConfig('changedNickPrefix'); - $suffix = $this->getConfig('changedNickSuffix'); - } - $maxLength = $this->getConfig('userNameMaxLength') - - $this->stringLength($prefix) - - $this->stringLength($suffix); - $newUserName = $this->trimString($newUserName, 'UTF-8', $maxLength, true); - if(!$newUserName) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error InvalidUserName' - ); - } else { - $newUserName = $prefix.$newUserName.$suffix; - if($this->isUserNameInUse($newUserName)) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error UserNameInUse' - ); - } else { - $oldUserName = $this->getUserName(); - $this->setUserName($newUserName); - $this->updateOnlineList(); - // Add info message to update the client-side stored userName: - $this->addInfoMessage($this->getUserName(), 'userName'); - $this->insertChatBotMessage( - $this->getChannel(), - '/nick '.$oldUserName.' '.$newUserName, - null, - 2 - ); - } - } - } - } - - function insertMessage($text) { - if(!$this->isAllowedToWriteMessage()) - return; - - if(!$this->floodControl()) - return; - - $text = $this->trimMessageText($text); - if($text == '') - return; - - if(!$this->onNewMessage($text)) - return; - - $text = $this->replaceCustomText($text); - - $this->insertParsedMessage($text); - } - - function deleteMessage($messageID) { - // Retrieve the channel of the given message: - $sql = 'SELECT - channel - FROM - '.$this->getDataBaseTable('messages').' - WHERE - id='.$this->db->makeSafe($messageID).';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $row = $result->fetch(); - - if($row['channel'] !== null) { - $channel = $row['channel']; - - if($this->getUserRole() == AJAX_CHAT_ADMIN) { - $condition = ''; - } else if($this->getUserRole() == AJAX_CHAT_MODERATOR) { - $condition = ' AND - NOT (userRole='.$this->db->makeSafe(AJAX_CHAT_ADMIN).') - AND - NOT (userRole='.$this->db->makeSafe(AJAX_CHAT_CHATBOT).')'; - } else if($this->getUserRole() == AJAX_CHAT_USER && $this->getConfig('allowUserMessageDelete')) { - $condition = 'AND - ( - userID='.$this->db->makeSafe($this->getUserID()).' - OR - ( - channel = '.$this->db->makeSafe($this->getPrivateMessageID()).' - OR - channel = '.$this->db->makeSafe($this->getPrivateChannelID()).' - ) - AND - NOT (userRole='.$this->db->makeSafe(AJAX_CHAT_ADMIN).') - AND - NOT (userRole='.$this->db->makeSafe(AJAX_CHAT_CHATBOT).') - )'; - } else { - return false; - } - - // Remove given message from the database: - $sql = 'DELETE FROM - '.$this->getDataBaseTable('messages').' - WHERE - id='.$this->db->makeSafe($messageID).' - '.$condition.';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - if($result->affectedRows() == 1) { - // Insert a deletion command to remove the message from the clients chatlists: - $this->insertChatBotMessage($channel, '/delete '.$messageID); - return true; - } - } - return false; - } - - function floodControl() { - // Moderators and Admins need no flood control: - if($this->getUserRole() == AJAX_CHAT_MODERATOR || $this->getUserRole() == AJAX_CHAT_ADMIN) { - return true; - } - $time = time(); - // Check the time of the last inserted message: - if($this->getInsertedMessagesRateTimeStamp()+60 < $time) { - $this->setInsertedMessagesRateTimeStamp($time); - $this->setInsertedMessagesRate(1); - } else { - // Increase the inserted messages rate: - $rate = $this->getInsertedMessagesRate()+1; - $this->setInsertedMessagesRate($rate); - // Check if message rate is too high: - if($rate > $this->getConfig('maxMessageRate')) { - $this->insertChatBotMessage( - $this->getPrivateMessageID(), - '/error MaxMessageRate' - ); - // Return false so the message is not inserted: - return false; - } - } - return true; - } - - function isAllowedToWriteMessage() { - if($this->getUserRole() != AJAX_CHAT_GUEST) - return true; - if($this->getConfig('allowGuestWrite')) - return true; - return false; - } - - function insertChatBotMessage($channelID, $messageText, $ip=null, $mode=0) { - $this->insertCustomMessage( - $this->getConfig('chatBotID'), - $this->getConfig('chatBotName'), - AJAX_CHAT_CHATBOT, - $channelID, - $messageText, - $ip, - $mode - ); - } - - function insertCustomMessage($userID, $userName, $userRole, $channelID, $text, $ip=null, $mode=0) { - // The $mode parameter is used for socket updates: - // 0 = normal messages - // 1 = channel messages (e.g. login/logout, channel enter/leave, kick) - // 2 = messages with online user updates (nick) - - $ip = $ip ? $ip : $_SERVER['REMOTE_ADDR']; - - $sql = 'INSERT INTO '.$this->getDataBaseTable('messages').'( - userID, - userName, - userRole, - channel, - dateTime, - ip, - text - ) - VALUES ( - '.$this->db->makeSafe($userID).', - '.$this->db->makeSafe($userName).', - '.$this->db->makeSafe($userRole).', - '.$this->db->makeSafe($channelID).', - NOW(), - '.$this->db->makeSafe($this->ipToStorageFormat($ip)).', - '.$this->db->makeSafe($text).' - );'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - if($this->getConfig('socketServerEnabled')) { - $this->sendSocketMessage( - $this->getSocketBroadcastMessage( - $this->db->getLastInsertedID(), - time(), - $userID, - $userName, - $userRole, - $channelID, - $text, - $mode - ) - ); - } - } - - function getSocketBroadcastMessage( - $messageID, - $timeStamp, - $userID, - $userName, - $userRole, - $channelID, - $text, - $mode - ) { - // The $mode parameter: - // 0 = normal messages - // 1 = channel messages (e.g. login/logout, channel enter/leave, kick) - // 2 = messages with online user updates (nick) - - // Get the message XML content: - $xml = ''; - if($mode) { - // Add the list of online users if the user list has been updated ($mode > 0): - $xml .= $this->getChatViewOnlineUsersXML(array($channelID)); - } - if($mode != 1 || $this->getConfig('showChannelMessages')) { - $xml .= ''; - $xml .= $this->getChatViewMessageXML( - $messageID, - $timeStamp, - $userID, - $userName, - $userRole, - $channelID, - $text - ); - $xml .= ''; - } - $xml .= ''; - return $xml; - } - - function sendSocketMessage($message) { - // Open a TCP socket connection to the socket server: - if($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)) { - if(@socket_connect($socket, $this->getConfig('socketServerIP'), $this->getConfig('socketServerPort'))) { - // Append a null-byte to the string as EOL (End Of Line) character - // which is required by Flash XML socket communication: - $message .= "\0"; - @socket_write( - $socket, - $message, - strlen($message) // Using strlen to count the bytes instead of the number of UTF-8 characters - ); - } - @socket_close($socket); - } - } - - function updateSocketAuthentication($userID, $socketRegistrationID=null, $channels=null) { - // If no $socketRegistrationID or no $channels are given the authentication is removed for the given user: - $authentication = ''; - if($channels) { - foreach($channels as $channelID) { - $authentication .= ''; - } - } - $authentication .= ''; - $this->sendSocketMessage($authentication); - } - - function setSocketRegistrationID($value) { - $this->setSessionVar('SocketRegistrationID', $value); - } - - function getSocketRegistrationID() { - return $this->getSessionVar('SocketRegistrationID'); - } - - function rollDice($sides) { - // seed with microseconds since last "whole" second: - mt_srand((double)microtime()*1000000); - - return mt_rand(1, $sides); - } - - function kickUser($userName, $banMinutes=null, $userID=null) { - if($userID === null) { - $userID = $this->getIDFromName($userName); - } - if($userID === null) { - return; - } - - $banMinutes = $banMinutes ? $banMinutes : $this->getConfig('defaultBanTime'); - - if($banMinutes) { - // Ban User for the given time in minutes: - $this->banUser($userName, $banMinutes, $userID); - } - - // Remove given User from online list: - $sql = 'DELETE FROM - '.$this->getDataBaseTable('online').' - WHERE - userID = '.$this->db->makeSafe($userID).';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - // Update the socket server authentication for the kicked user: - if($this->getConfig('socketServerEnabled')) { - $this->updateSocketAuthentication($userID); - } - - $this->removeUserFromOnlineUsersData($userID); - } - - function getBannedUsersData($key=null, $value=null) { - if($this->_bannedUsersData === null) { - $this->_bannedUsersData = array(); - - $sql = 'SELECT - userID, - userName, - ip - FROM - '.$this->getDataBaseTable('bans').' - WHERE - NOW() < dateTime;'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - while($row = $result->fetch()) { - $row['ip'] = $this->ipFromStorageFormat($row['ip']); - array_push($this->_bannedUsersData, $row); - } - - $result->free(); - } - - if($key) { - $bannedUsersData = array(); - foreach($this->_bannedUsersData as $bannedUserData) { - if(!isset($bannedUserData[$key])) { - return $bannedUsersData; - } - if($value) { - if($bannedUserData[$key] == $value) { - array_push($bannedUsersData, $bannedUserData); - } else { - continue; - } - } else { - array_push($bannedUsersData, $bannedUserData[$key]); - } - } - return $bannedUsersData; - } - - return $this->_bannedUsersData; - } - - function getBannedUsers() { - return $this->getBannedUsersData('userName'); - } - - function banUser($userName, $banMinutes=null, $userID=null) { - if($userID === null) { - $userID = $this->getIDFromName($userName); - } - $ip = $this->getIPFromID($userID); - if(!$ip || $userID === null) { - return; - } - - // Remove expired bans: - $this->removeExpiredBans(); - - $banMinutes = (int)$banMinutes; - if(!$banMinutes) { - // If banMinutes is not a valid integer, use the defaultBanTime: - $banMinutes = $this->getConfig('defaultBanTime'); - } - - $sql = 'INSERT INTO '.$this->getDataBaseTable('bans').'( - userID, - userName, - dateTime, - ip - ) - VALUES ( - '.$this->db->makeSafe($userID).', - '.$this->db->makeSafe($userName).', - DATE_ADD(NOW(), interval '.$this->db->makeSafe($banMinutes).' MINUTE), - '.$this->db->makeSafe($this->ipToStorageFormat($ip)).' - );'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function unbanUser($userName) { - $sql = 'DELETE FROM - '.$this->getDataBaseTable('bans').' - WHERE - userName = '.$this->db->makeSafe($userName).';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function removeExpiredBans() { - $sql = 'DELETE FROM - '.$this->getDataBaseTable('bans').' - WHERE - dateTime < NOW();'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function setInactive($userID, $userName=null) { - $condition = 'userID='.$this->db->makeSafe($userID); - if($userName !== null) { - $condition .= ' OR userName='.$this->db->makeSafe($userName); - } - $sql = 'UPDATE - '.$this->getDataBaseTable('online').' - SET - dateTime = DATE_SUB(NOW(), interval '.(intval($this->getConfig('inactiveTimeout'))+1).' MINUTE) - WHERE - '.$condition.';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $this->resetOnlineUsersData(); - } - - function removeInactive() { - $sql = 'SELECT - userID, - userName, - channel - FROM - '.$this->getDataBaseTable('online').' - WHERE - NOW() > DATE_ADD(dateTime, interval '.$this->getConfig('inactiveTimeout').' MINUTE);'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - if($result->numRows() > 0) { - $condition = ''; - while($row = $result->fetch()) { - if(!empty($condition)) - $condition .= ' OR '; - // Add userID to condition for removal: - $condition .= 'userID='.$this->db->makeSafe($row['userID']); - - // Update the socket server authentication for the kicked user: - if($this->getConfig('socketServerEnabled')) { - $this->updateSocketAuthentication($row['userID']); - } - - $this->removeUserFromOnlineUsersData($row['userID']); - - // Insert logout timeout message: - $text = '/logout '.$row['userName'].' Timeout'; - $this->insertChatBotMessage( - $row['channel'], - $text, - null, - 1 - ); - } - - $result->free(); - - $sql = 'DELETE FROM - '.$this->getDataBaseTable('online').' - WHERE - '.$condition.';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - } - - function updateOnlineStatus() { - // Update online status every 50 seconds (this allows update requests to be in time): - if(!$this->getStatusUpdateTimeStamp() || ((time() - $this->getStatusUpdateTimeStamp()) > 50)) { - $this->updateOnlineList(); - $this->setStatusUpdateTimeStamp(time()); - } - } - - function checkAndRemoveInactive() { - // Remove inactive users every inactiveCheckInterval: - if(!$this->getInactiveCheckTimeStamp() || ((time() - $this->getInactiveCheckTimeStamp()) > $this->getConfig('inactiveCheckInterval')*60)) { - $this->removeInactive(); - $this->setInactiveCheckTimeStamp(time()); - } - } - - function sendXMLMessages() { - $httpHeader = new AJAXChatHTTPHeader('UTF-8', 'text/xml'); - - // Send HTTP header: - $httpHeader->send(); - - // Output XML messages: - echo $this->getXMLMessages(); - } - - function getXMLMessages() { - switch($this->getView()) { - case 'chat': - return $this->getChatViewXMLMessages(); - case 'teaser': - return $this->getTeaserViewXMLMessages(); - case 'logs': - return $this->getLogsViewXMLMessages(); - default: - return $this->getLogoutXMLMessage(); - } - } - - function getMessageCondition() { - $condition = 'id > '.$this->db->makeSafe($this->getRequestVar('lastID')).' - AND ( - channel = '.$this->db->makeSafe($this->getChannel()).' - OR - channel = '.$this->db->makeSafe($this->getPrivateMessageID()).' - ) - AND - '; - if($this->getConfig('requestMessagesPriorChannelEnter') || - ($this->getConfig('requestMessagesPriorChannelEnterList') && in_array($this->getChannel(), $this->getConfig('requestMessagesPriorChannelEnterList')))) { - $condition .= 'NOW() < DATE_ADD(dateTime, interval '.$this->getConfig('requestMessagesTimeDiff').' HOUR)'; - } else { - $condition .= 'dateTime >= FROM_UNIXTIME(' . $this->getChannelEnterTimeStamp() . ')'; - } - return $condition; - } - - function getMessageFilter() { - $filterChannelMessages = ''; - if(!$this->getConfig('showChannelMessages') || $this->getRequestVar('shoutbox')) { - $filterChannelMessages = ' AND NOT ( - text LIKE (\'/login%\') - OR - text LIKE (\'/logout%\') - OR - text LIKE (\'/channelEnter%\') - OR - text LIKE (\'/channelLeave%\') - OR - text LIKE (\'/kick%\') - )'; - } - return $filterChannelMessages; - } - - function getInfoMessagesXML() { - $xml = ''; - // Go through the info messages: - foreach($this->getInfoMessages() as $type=>$infoArray) { - foreach($infoArray as $info) { - $xml .= ''; - $xml .= 'encodeSpecialChars($info).']]>'; - $xml .= ''; - } - } - $xml .= ''; - return $xml; - } - - function getChatViewOnlineUsersXML($channelIDs) { - // Get the online users for the given channels: - $onlineUsersData = $this->getOnlineUsersData($channelIDs); - $xml = ''; - foreach($onlineUsersData as $onlineUserData) { - $xml .= 'encodeSpecialChars($onlineUserData['userName']).']]>'; - $xml .= ''; - } - $xml .= ''; - return $xml; - } - - function getLogoutXMLMessage() { - $xml = ''; - $xml .= ''; - $xml .= ''; - $xml .= ''; - $xml .= 'encodeSpecialChars($this->getConfig('logoutData')).']]>'; - $xml .= ''; - $xml .= ''; - $xml .= ''; - return $xml; - } - - function getChatViewMessageXML( - $messageID, - $timeStamp, - $userID, - $userName, - $userRole, - $channelID, - $text - ) { - $message = 'encodeSpecialChars($userName).']]>'; - $message .= 'encodeSpecialChars($text).']]>'; - $message .= ''; - return $message; - } - - function getChatViewMessagesXML() { - // Get the last messages in descending order (this optimises the LIMIT usage): - $sql = 'SELECT - id, - userID, - userName, - userRole, - channel AS channelID, - UNIX_TIMESTAMP(dateTime) AS timeStamp, - text - FROM - '.$this->getDataBaseTable('messages').' - WHERE - '.$this->getMessageCondition().' - '.$this->getMessageFilter().' - ORDER BY - id - DESC - LIMIT '.$this->getConfig('requestMessagesLimit').';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $messages = ''; - - // Add the messages in reverse order so it is ascending again: - while($row = $result->fetch()) { - $message = $this->getChatViewMessageXML( - $row['id'], - $row['timeStamp'], - $row['userID'], - $row['userName'], - $row['userRole'], - $row['channelID'], - $row['text'] - ); - $messages = $message.$messages; - } - $result->free(); - - $messages = ''.$messages.''; - return $messages; - } - - function getChatViewXMLMessages() { - $xml = ''; - $xml .= ''; - $xml .= $this->getInfoMessagesXML(); - $xml .= $this->getChatViewOnlineUsersXML(array($this->getChannel())); - $xml .= $this->getChatViewMessagesXML(); - $xml .= ''; - return $xml; - } - - function getTeaserMessageCondition() { - $channelID = $this->getValidRequestChannelID(); - $condition = 'channel = '.$this->db->makeSafe($channelID).' - AND - '; - if($this->getConfig('requestMessagesPriorChannelEnter') || - ($this->getConfig('requestMessagesPriorChannelEnterList') && in_array($channelID, $this->getConfig('requestMessagesPriorChannelEnterList')))) { - $condition .= 'NOW() < DATE_ADD(dateTime, interval '.$this->getConfig('requestMessagesTimeDiff').' HOUR)'; - } else { - // Teaser content may not be shown for this channel: - $condition .= '0 = 1'; - } - return $condition; - } - - function getTeaserViewMessagesXML() { - // Get the last messages in descending order (this optimises the LIMIT usage): - $sql = 'SELECT - id, - userID, - userName, - userRole, - channel AS channelID, - UNIX_TIMESTAMP(dateTime) AS timeStamp, - text - FROM - '.$this->getDataBaseTable('messages').' - WHERE - '.$this->getTeaserMessageCondition().' - '.$this->getMessageFilter().' - ORDER BY - id - DESC - LIMIT '.$this->getConfig('requestMessagesLimit').';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $messages = ''; - - // Add the messages in reverse order so it is ascending again: - while($row = $result->fetch()) { - $message = ''; - $message .= 'encodeSpecialChars($row['userName']).']]>'; - $message .= 'encodeSpecialChars($row['text']).']]>'; - $message .= ''; - $messages = $message.$messages; - } - $result->free(); - - $messages = ''.$messages.''; - return $messages; - } - - function getTeaserViewXMLMessages() { - $xml = ''; - $xml .= ''; - $xml .= $this->getInfoMessagesXML(); - $xml .= $this->getTeaserViewMessagesXML(); - $xml .= ''; - return $xml; - } - - function getLogsViewCondition() { - $condition = 'id > '.$this->db->makeSafe($this->getRequestVar('lastID')); - - // Check the channel condition: - switch($this->getRequestVar('channelID')) { - case '-3': - // Just display messages from all accessible channels - if($this->getUserRole() != AJAX_CHAT_ADMIN) { - $condition .= ' AND (channel = '.$this->db->makeSafe($this->getPrivateMessageID()); - $condition .= ' OR channel = '.$this->db->makeSafe($this->getPrivateChannelID()); - foreach($this->getChannels() as $channel) { - if($this->getConfig('logsUserAccessChannelList') && !in_array($channel, $this->getConfig('logsUserAccessChannelList'))) { - continue; - } - $condition .= ' OR channel = '.$this->db->makeSafe($channel); - } - $condition .= ')'; - } - break; - case '-2': - if($this->getUserRole() != AJAX_CHAT_ADMIN) { - $condition .= ' AND channel = '.($this->getPrivateMessageID()); - } else { - $condition .= ' AND channel > '.($this->getConfig('privateMessageDiff')-1); - } - break; - case '-1': - if($this->getUserRole() != AJAX_CHAT_ADMIN) { - $condition .= ' AND channel = '.($this->getPrivateChannelID()); - } else { - $condition .= ' AND (channel > '.($this->getConfig('privateChannelDiff')-1).' AND channel < '.($this->getConfig('privateMessageDiff')).')'; - } - break; - default: - if(($this->getUserRole() == AJAX_CHAT_ADMIN || !$this->getConfig('logsUserAccessChannelList') || in_array($this->getRequestVar('channelID'), $this->getConfig('logsUserAccessChannelList'))) - && $this->validateChannel($this->getRequestVar('channelID'))) { - $condition .= ' AND channel = '.$this->db->makeSafe($this->getRequestVar('channelID')); - } else { - // No valid channel: - $condition .= ' AND 0 = 1'; - } - } - - // Check the period condition: - $hour = ($this->getRequestVar('hour') === null || $this->getRequestVar('hour') > 23 || $this->getRequestVar('hour') < 0) ? null : $this->getRequestVar('hour'); - $day = ($this->getRequestVar('day') === null || $this->getRequestVar('day') > 31 || $this->getRequestVar('day') < 1) ? null : $this->getRequestVar('day'); - $month = ($this->getRequestVar('month') === null || $this->getRequestVar('month') > 12 || $this->getRequestVar('month') < 1) ? null : $this->getRequestVar('month'); - $year = ($this->getRequestVar('year') === null || $this->getRequestVar('year') > date('Y') || $this->getRequestVar('year') < $this->getConfig('logsFirstYear')) ? null : $this->getRequestVar('year'); - - // If a time (hour) is given but no date (year, month, day), use the current date: - if($hour !== null) { - if($day === null) - $day = date('j'); - if($month === null) - $month = date('n'); - if($year === null) - $year = date('Y'); - } - - if($year === null) { - // No year given, so no period condition - } else if($month === null) { - // Define the given year as period: - $periodStart = mktime(0, 0, 0, 1, 1, $year); - // The last day in a month can be expressed by using 0 for the day of the next month: - $periodEnd = mktime(23, 59, 59, 13, 0, $year); - } else if($day === null) { - // Define the given month as period: - $periodStart = mktime(0, 0, 0, $month, 1, $year); - // The last day in a month can be expressed by using 0 for the day of the next month: - $periodEnd = mktime(23, 59, 59, $month+1, 0, $year); - } else if($hour === null){ - // Define the given day as period: - $periodStart = mktime(0, 0, 0, $month, $day, $year); - $periodEnd = mktime(23, 59, 59, $month, $day, $year); - } else { - // Define the given hour as period: - $periodStart = mktime($hour, 0, 0, $month, $day, $year); - $periodEnd = mktime($hour, 59, 59, $month, $day, $year); - } - - if(isset($periodStart)) - $condition .= ' AND dateTime > \''.date('Y-m-d H:i:s', $periodStart).'\' AND dateTime <= \''.date('Y-m-d H:i:s', $periodEnd).'\''; - - // Check the search condition: - if($this->getRequestVar('search')) { - if(($this->getUserRole() == AJAX_CHAT_ADMIN || $this->getUserRole() == AJAX_CHAT_MODERATOR) && strpos($this->getRequestVar('search'), 'ip=') === 0) { - // Search for messages with the given IP: - $ip = substr($this->getRequestVar('search'), 3); - $condition .= ' AND (ip = '.$this->db->makeSafe($this->ipToStorageFormat($ip)).')'; - } else if(strpos($this->getRequestVar('search'), 'userID=') === 0) { - // Search for messages with the given userID: - $userID = substr($this->getRequestVar('search'), 7); - $condition .= ' AND (userID = '.$this->db->makeSafe($userID).')'; - } else { - // Use the search value as regular expression on message text and username: - $condition .= ' AND (userName REGEXP '.$this->db->makeSafe($this->getRequestVar('search')).' OR text REGEXP '.$this->db->makeSafe($this->getRequestVar('search')).')'; - } - } - - // If no period or search condition is given, just monitor the last messages on the given channel: - if(!isset($periodStart) && !$this->getRequestVar('search')) { - $condition .= ' AND NOW() < DATE_ADD(dateTime, interval '.$this->getConfig('logsRequestMessagesTimeDiff').' HOUR)'; - } - - return $condition; - } - - function getLogsViewMessagesXML() { - $sql = 'SELECT - id, - userID, - userName, - userRole, - channel AS channelID, - UNIX_TIMESTAMP(dateTime) AS timeStamp, - ip, - text - FROM - '.$this->getDataBaseTable('messages').' - WHERE - '.$this->getLogsViewCondition().' - ORDER BY - id - LIMIT '.$this->getConfig('logsRequestMessagesLimit').';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - $xml = ''; - while($row = $result->fetch()) { - $xml .= 'getUserRole() == AJAX_CHAT_ADMIN || $this->getUserRole() == AJAX_CHAT_MODERATOR) { - $xml .= ' ip="'.$this->ipFromStorageFormat($row['ip']).'"'; - } - $xml .= '>'; - $xml .= 'encodeSpecialChars($row['userName']).']]>'; - $xml .= 'encodeSpecialChars($row['text']).']]>'; - $xml .= ''; - } - $result->free(); - - $xml .= ''; - - return $xml; - } - - function getLogsViewXMLMessages() { - $xml = ''; - $xml .= ''; - $xml .= $this->getInfoMessagesXML(); - $xml .= $this->getLogsViewMessagesXML(); - $xml .= ''; - return $xml; - } - - function purgeLogs() { - $sql = 'DELETE FROM - '.$this->getDataBaseTable('messages').' - WHERE - dateTime < DATE_SUB(NOW(), interval '.$this->getConfig('logsPurgeTimeDiff').' DAY);'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function getInfoMessages($type=null) { - if(!isset($this->_infoMessages)) { - $this->_infoMessages = array(); - } - if($type) { - if(!isset($this->_infoMessages[$type])) { - $this->_infoMessages[$type] = array(); - } - return $this->_infoMessages[$type]; - } else { - return $this->_infoMessages; - } - } - - function addInfoMessage($info, $type='error') { - if(!isset($this->_infoMessages)) { - $this->_infoMessages = array(); - } - if(!isset($this->_infoMessages[$type])) { - $this->_infoMessages[$type] = array(); - } - if(!in_array($info, $this->_infoMessages[$type])) { - array_push($this->_infoMessages[$type], $info); - } - } - - function getRequestVars() { - return $this->_requestVars; - } - - function getRequestVar($key) { - if($this->_requestVars && isset($this->_requestVars[$key])) { - return $this->_requestVars[$key]; - } - return null; - } - - function setRequestVar($key, $value) { - if(!$this->_requestVars) { - $this->_requestVars = array(); - } - $this->_requestVars[$key] = $value; - } - - function getOnlineUsersData($channelIDs=null, $key=null, $value=null) { - if($this->_onlineUsersData === null) { - $this->_onlineUsersData = array(); - - $sql = 'SELECT - userID, - userName, - userRole, - channel, - UNIX_TIMESTAMP(dateTime) AS timeStamp, - ip - FROM - '.$this->getDataBaseTable('online').' - ORDER BY - userName;'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - while($row = $result->fetch()) { - $row['ip'] = $this->ipFromStorageFormat($row['ip']); - array_push($this->_onlineUsersData, $row); - } - - $result->free(); - } - - if($channelIDs || $key) { - $onlineUsersData = array(); - foreach($this->_onlineUsersData as $userData) { - if($channelIDs && !in_array($userData['channel'], $channelIDs)) { - continue; - } - if($key) { - if(!isset($userData[$key])) { - return $onlineUsersData; - } - if($value !== null) { - if($userData[$key] == $value) { - array_push($onlineUsersData, $userData); - } else { - continue; - } - } else { - array_push($onlineUsersData, $userData[$key]); - } - } else { - array_push($onlineUsersData, $userData); - } - } - return $onlineUsersData; - } - - return $this->_onlineUsersData; - } - - function removeUserFromOnlineUsersData($userID=null) { - if(!$this->_onlineUsersData) { - return; - } - $userID = ($userID === null) ? $this->getUserID() : $userID; - for($i=0; $i_onlineUsersData); $i++) { - if($this->_onlineUsersData[$i]['userID'] == $userID) { - array_splice($this->_onlineUsersData, $i, 1); - break; - } - } - } - - function resetOnlineUsersData() { - $this->_onlineUsersData = null; - } - - function getOnlineUsers($channelIDs=null) { - return $this->getOnlineUsersData($channelIDs, 'userName'); - } - - function getOnlineUserIDs($channelIDs=null) { - return $this->getOnlineUsersData($channelIDs, 'userID'); - } - - function startSession() { - if(!session_id()) { - // Set the session name: - session_name($this->getConfig('sessionName')); - - // Set session cookie parameters: - session_set_cookie_params( - 0, // The session is destroyed on logout anyway, so no use to set this - $this->getConfig('sessionCookiePath'), - $this->getConfig('sessionCookieDomain'), - $this->getConfig('sessionCookieSecure') - ); - - // Start the session: - session_start(); - - // We started a new session: - $this->_sessionNew = true; - } - } - - function destroySession() { - if($this->_sessionNew) { - // Delete all session variables: - $_SESSION = array(); - - // Delete the session cookie: - if (isset($_COOKIE[session_name()])) { - setcookie( - session_name(), - '', - time()-42000, - $this->getConfig('sessionCookiePath'), - $this->getConfig('sessionCookieDomain'), - $this->getConfig('sessionCookieSecure') - ); - } - - // Destroy the session: - session_destroy(); - } else { - // Unset all session variables starting with the sessionKeyPrefix: - foreach($_SESSION as $key=>$value) { - if(strpos($key, $this->getConfig('sessionKeyPrefix')) === 0) { - unset($_SESSION[$key]); - } - } - } - } - - function regenerateSessionID() { - if($this->_sessionNew) { - // Regenerate session id: - @session_regenerate_id(true); - } - } - - function getSessionVar($key, $prefix=null) { - if($prefix === null) - $prefix = $this->getConfig('sessionKeyPrefix'); - - // Return the session value if existing: - if(isset($_SESSION[$prefix.$key])) - return $_SESSION[$prefix.$key]; - else - return null; - } - - function setSessionVar($key, $value, $prefix=null) { - if($prefix === null) - $prefix = $this->getConfig('sessionKeyPrefix'); - - // Set the session value: - $_SESSION[$prefix.$key] = $value; - } - - function getSessionIP() { - return $this->getSessionVar('IP'); - } - - function setSessionIP($ip) { - $this->setSessionVar('IP', $ip); - } - - function getQueryUserName() { - return $this->getSessionVar('QueryUserName'); - } - - function setQueryUserName($userName) { - $this->setSessionVar('QueryUserName', $userName); - } - - function getInvitations() { - if($this->_invitations === null) { - $this->_invitations = array(); - - $sql = 'SELECT - channel - FROM - '.$this->getDataBaseTable('invitations').' - WHERE - userID='.$this->db->makeSafe($this->getUserID()).' - AND - DATE_SUB(NOW(), interval 1 DAY) < dateTime;'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - - while($row = $result->fetch()) { - array_push($this->_invitations, $row['channel']); - } - - $result->free(); - } - return $this->_invitations; - } - - function removeExpiredInvitations() { - $sql = 'DELETE FROM - '.$this->getDataBaseTable('invitations').' - WHERE - DATE_SUB(NOW(), interval 1 DAY) > dateTime;'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function addInvitation($userID, $channelID=null) { - $this->removeExpiredInvitations(); - - $channelID = ($channelID === null) ? $this->getChannel() : $channelID; - - $sql = 'INSERT INTO '.$this->getDataBaseTable('invitations').'( - userID, - channel, - dateTime - ) - VALUES ( - '.$this->db->makeSafe($userID).', - '.$this->db->makeSafe($channelID).', - NOW() - );'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function removeInvitation($userID, $channelID=null) { - $channelID = ($channelID === null) ? $this->getChannel() : $channelID; - - $sql = 'DELETE FROM - '.$this->getDataBaseTable('invitations').' - WHERE - userID='.$this->db->makeSafe($userID).' - AND - channel='.$this->db->makeSafe($channelID).';'; - - // Create a new SQL query: - $result = $this->db->sqlQuery($sql); - - // Stop if an error occurs: - if($result->error()) { - echo $result->getError(); - die(); - } - } - - function getUserID() { - return $this->getSessionVar('UserID'); - } - - function setUserID($id) { - $this->setSessionVar('UserID', $id); - } - - function getUserName() { - return $this->getSessionVar('UserName'); - } - - function setUserName($name) { - $this->setSessionVar('UserName', $name); - } - - function getLoginUserName() { - return $this->getSessionVar('LoginUserName'); - } - - function setLoginUserName($name) { - $this->setSessionVar('LoginUserName', $name); - } - - function getUserRole() { - $userRole = $this->getSessionVar('UserRole'); - if($userRole === null) - return AJAX_CHAT_GUEST; - return $userRole; - } - - function setUserRole($role) { - $this->setSessionVar('UserRole', $role); - } - - function getChannel() { - return $this->getSessionVar('Channel'); - } - - function setChannel($channel) { - $this->setSessionVar('Channel', $channel); - - // Save the channel enter timestamp: - $this->setChannelEnterTimeStamp(time()); - - // Update the channel authentication for the socket server: - if($this->getConfig('socketServerEnabled')) { - $this->updateSocketAuthentication( - $this->getUserID(), - $this->getSocketRegistrationID(), - array($channel,$this->getPrivateMessageID()) - ); - } - - // Reset the logs view socket authentication session var: - if($this->getSessionVar('logsViewSocketAuthenticated')) { - $this->setSessionVar('logsViewSocketAuthenticated', false); - } - } - - function isLoggedIn() { - return (bool)$this->getSessionVar('LoggedIn'); - } - - function setLoggedIn($bool) { - $this->setSessionVar('LoggedIn', $bool); - } - - function getLoginTimeStamp() { - return $this->getSessionVar('LoginTimeStamp'); - } - - function setLoginTimeStamp($time) { - $this->setSessionVar('LoginTimeStamp', $time); - } - - function getChannelEnterTimeStamp() { - return $this->getSessionVar('ChannelEnterTimeStamp'); - } - - function setChannelEnterTimeStamp($time) { - $this->setSessionVar('ChannelEnterTimeStamp', $time); - } - - function getStatusUpdateTimeStamp() { - return $this->getSessionVar('StatusUpdateTimeStamp'); - } - - function setStatusUpdateTimeStamp($time) { - $this->setSessionVar('StatusUpdateTimeStamp', $time); - } - - function getInactiveCheckTimeStamp() { - return $this->getSessionVar('InactiveCheckTimeStamp'); - } - - function setInactiveCheckTimeStamp($time) { - $this->setSessionVar('InactiveCheckTimeStamp', $time); - } - - function getInsertedMessagesRate() { - return $this->getSessionVar('InsertedMessagesRate'); - } - - function setInsertedMessagesRate($rate) { - $this->setSessionVar('InsertedMessagesRate', $rate); - } - - function getInsertedMessagesRateTimeStamp() { - return $this->getSessionVar('InsertedMessagesRateTimeStamp'); - } - - function setInsertedMessagesRateTimeStamp($time) { - $this->setSessionVar('InsertedMessagesRateTimeStamp', $time); - } - - function getLangCode() { - // Get the langCode from request or cookie: - $langCodeCookie = isset($_COOKIE[$this->getConfig('sessionName').'_lang']) ? $_COOKIE[$this->getConfig('sessionName').'_lang'] : null; - $langCode = $this->getRequestVar('lang') ? $this->getRequestVar('lang') : $langCodeCookie; - // Check if the langCode is valid: - if(!in_array($langCode, $this->getConfig('langAvailable'))) { - // Determine the user language: - $language = new AJAXChatLanguage($this->getConfig('langAvailable'), $this->getConfig('langDefault')); - $langCode = $language->getLangCode(); - } - return $langCode; - } - - function setLangCodeCookie() { - setcookie( - $this->getConfig('sessionName').'_lang', - $this->getLangCode(), - time()+60*60*24*$this->getConfig('sessionCookieLifeTime'), - $this->getConfig('sessionCookiePath'), - $this->getConfig('sessionCookieDomain'), - $this->getConfig('sessionCookieSecure') - ); - } - - function removeUnsafeCharacters($str) { - // Remove NO-WS-CTL, non-whitespace control characters (RFC 2822), decimal 1–8, 11–12, 14–31, and 127: - return AJAXChatEncoding::removeUnsafeCharacters($str); - } - - function subString($str, $start=0, $length=null, $encoding='UTF-8') { - return AJAXChatString::subString($str, $start, $length, $encoding); - } - - function stringLength($str, $encoding='UTF-8') { - return AJAXChatString::stringLength($str, $encoding); - } - - function trimMessageText($text) { - return $this->trimString($text, 'UTF-8', $this->getConfig('messageTextMaxLength')); - } - - function trimUserName($userName) { - return $this->trimString($userName, null, $this->getConfig('userNameMaxLength'), true, true); - } - - function trimChannelName($channelName) { - return $this->trimString($channelName, null, null, true, true); - } - - function trimString($str, $sourceEncoding=null, $maxLength=null, $replaceWhitespace=false, $decodeEntities=false, $htmlEntitiesMap=null) { - // Make sure the string contains valid unicode: - $str = $this->convertToUnicode($str, $sourceEncoding); - - // Make sure the string contains no unsafe characters: - $str = $this->removeUnsafeCharacters($str); - - // Strip whitespace from the beginning and end of the string: - $str = trim($str); - - if($replaceWhitespace) { - // Replace any whitespace in the userName with the underscore "_": - $str = preg_replace('/\s/u', '_', $str); - } - - if($decodeEntities) { - // Decode entities: - $str = $this->decodeEntities($str, 'UTF-8', $htmlEntitiesMap); - } - - if($maxLength) { - // Cut the string to the allowed length: - $str = $this->subString($str, 0, $maxLength); - } - - return $str; - } - - function convertToUnicode($str, $sourceEncoding=null) { - if($sourceEncoding === null) { - $sourceEncoding = $this->getConfig('sourceEncoding'); - } - return $this->convertEncoding($str, $sourceEncoding, 'UTF-8'); - } - - function convertFromUnicode($str, $contentEncoding=null) { - if($contentEncoding === null) { - $contentEncoding = $this->getConfig('contentEncoding'); - } - return $this->convertEncoding($str, 'UTF-8', $contentEncoding); - } - - function convertEncoding($str, $charsetFrom, $charsetTo) { - return AJAXChatEncoding::convertEncoding($str, $charsetFrom, $charsetTo); - } - - function encodeEntities($str, $encoding='UTF-8', $convmap=null) { - return AJAXChatEncoding::encodeEntities($str, $encoding, $convmap); - } - - function decodeEntities($str, $encoding='UTF-8', $htmlEntitiesMap=null) { - return AJAXChatEncoding::decodeEntities($str, $encoding, $htmlEntitiesMap); - } - - function htmlEncode($str) { - return AJAXChatEncoding::htmlEncode($str, $this->getConfig('contentEncoding')); - } - - function encodeSpecialChars($str) { - return AJAXChatEncoding::encodeSpecialChars($str); - } - - function decodeSpecialChars($str) { - return AJAXChatEncoding::decodeSpecialChars($str); - } - - function ipToStorageFormat($ip) { - if(function_exists('inet_pton')) { - // ipv4 & ipv6: - return @inet_pton($ip); - } - // Only ipv4: - return @pack('N',@ip2long($ip)); - } - - function ipFromStorageFormat($ip) { - if(function_exists('inet_ntop')) { - // ipv4 & ipv6: - return @inet_ntop($ip); - } - // Only ipv4: - $unpacked = @unpack('Nlong',$ip); - if(isset($unpacked['long'])) { - return @long2ip($unpacked['long']); - } - return null; - } - - function getConfig($key, $subkey=null) { - if($subkey) - return $this->_config[$key][$subkey]; - else - return $this->_config[$key]; - } - - function setConfig($key, $subkey, $value) { - if($subkey) { - if(!isset($this->_config[$key])) { - $this->_config[$key] = array(); - } - $this->_config[$key][$subkey] = $value; - } else { - $this->_config[$key] = $value; - } - } - - function getLang($key=null) { - if(!$this->_lang) { - // Include the language file: - $lang = null; - require(AJAX_CHAT_PATH.'lib/lang/'.$this->getLangCode().'.php'); - $this->_lang = &$lang; - } - if($key === null) - return $this->_lang; - if(isset($this->_lang[$key])) - return $this->_lang[$key]; - return null; - } - - function getChatURL() { - if(defined('AJAX_CHAT_URL')) { - return AJAX_CHAT_URL; - } - - return - (isset($_SERVER['HTTPS']) ? 'https://' : 'http://'). - (isset($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : ''). - (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME']. - (isset($_SERVER['HTTPS']) && $_SERVER['SERVER_PORT'] == 443 || $_SERVER['SERVER_PORT'] == 80 ? '' : ':'.$_SERVER['SERVER_PORT']))). - substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/')+1); - } - - function getIDFromName($userName) { - $userDataArray = $this->getOnlineUsersData(null,'userName',$userName); - if($userDataArray && isset($userDataArray[0])) { - return $userDataArray[0]['userID']; - } - return null; - } - - function getNameFromID($userID) { - $userDataArray = $this->getOnlineUsersData(null,'userID',$userID); - if($userDataArray && isset($userDataArray[0])) { - return $userDataArray[0]['userName']; - } - return null; - } - - function getChannelFromID($userID) { - $userDataArray = $this->getOnlineUsersData(null,'userID',$userID); - if($userDataArray && isset($userDataArray[0])) { - return $userDataArray[0]['channel']; - } - return null; - } - - function getIPFromID($userID) { - $userDataArray = $this->getOnlineUsersData(null,'userID',$userID); - if($userDataArray && isset($userDataArray[0])) { - return $userDataArray[0]['ip']; - } - return null; - } - - function getRoleFromID($userID) { - $userDataArray = $this->getOnlineUsersData(null,'userID',$userID); - if($userDataArray && isset($userDataArray[0])) { - return $userDataArray[0]['userRole']; - } - return null; - } - - function getChannelNames() { - return array_flip($this->getChannels()); - } - - function getChannelIDFromChannelName($channelName) { - if(!$channelName) - return null; - $channels = $this->getAllChannels(); - if(array_key_exists($channelName,$channels)) { - return $channels[$channelName]; - } - $channelID = null; - // Check if the requested channel is the own private channel: - if($channelName == $this->getPrivateChannelName()) { - return $this->getPrivateChannelID(); - } - // Try to retrieve a private room ID: - $strlenChannelName = $this->stringLength($channelName); - $strlenPrefix = $this->stringLength($this->getConfig('privateChannelPrefix')); - $strlenSuffix = $this->stringLength($this->getConfig('privateChannelSuffix')); - if($this->subString($channelName,0,$strlenPrefix) == $this->getConfig('privateChannelPrefix') - && $this->subString($channelName,$strlenChannelName-$strlenSuffix) == $this->getConfig('privateChannelSuffix')) { - $userName = $this->subString( - $channelName, - $strlenPrefix, - $strlenChannelName-($strlenPrefix+$strlenSuffix) - ); - $userID = $this->getIDFromName($userName); - if($userID !== null) { - $channelID = $this->getPrivateChannelID($userID); - } - } - return $channelID; - } - - function getChannelNameFromChannelID($channelID) { - foreach($this->getAllChannels() as $key=>$value) { - if($value == $channelID) { - return $key; - } - } - // Try to retrieve a private room name: - if($channelID == $this->getPrivateChannelID()) { - return $this->getPrivateChannelName(); - } - $userName = $this->getNameFromID($channelID-$this->getConfig('privateChannelDiff')); - if($userName === null) { - return null; - } - return $this->getPrivateChannelName($userName); - } - - function getChannelName() { - return $this->getChannelNameFromChannelID($this->getChannel()); - } - - function getPrivateChannelName($userName=null) { - if($userName === null) { - $userName = $this->getUserName(); - } - return $this->getConfig('privateChannelPrefix').$userName.$this->getConfig('privateChannelSuffix'); - } - - function getPrivateChannelID($userID=null) { - if($userID === null) { - $userID = $this->getUserID(); - } - return $userID . '.' . $this->getConfig('privateChannelDiff'); - } - - function getPrivateMessageID($userID=null) { - if($userID === null) { - $userID = $this->getUserID(); - } - return $userID . '.' . $this->getConfig('privateMessageDiff'); - } - - function isAllowedToSendPrivateMessage() { - if($this->getConfig('allowPrivateMessages') || $this->getUserRole() == AJAX_CHAT_ADMIN) { - return true; - } - return false; - } - - function isAllowedToCreatePrivateChannel() { - if($this->getConfig('allowPrivateChannels')) { - switch($this->getUserRole()) { - case AJAX_CHAT_USER: - return true; - case AJAX_CHAT_MODERATOR: - return true; - case AJAX_CHAT_ADMIN: - return true; - default: - return false; - } - } - return false; - } - - function isAllowedToListHiddenUsers() { - // Hidden users are users within private or restricted channels: - switch($this->getUserRole()) { - case AJAX_CHAT_MODERATOR: - return true; - case AJAX_CHAT_ADMIN: - return true; - default: - return false; - } - } - - function isUserOnline($userID=null) { - $userID = ($userID === null) ? $this->getUserID() : $userID; - $userDataArray = $this->getOnlineUsersData(null,'userID',$userID); - if($userDataArray && count($userDataArray) > 0) { - return true; - } - return false; - } - - function isUserNameInUse($userName=null) { - $userName = ($userName === null) ? $this->getUserName() : $userName; - $userDataArray = $this->getOnlineUsersData(null,'userName',$userName); - if($userDataArray && count($userDataArray) > 0) { - return true; - } - return false; - } - - function isUserBanned($userName, $userID=null, $ip=null) { - if($userID !== null) { - $bannedUserDataArray = $this->getBannedUsersData('userID',$userID); - if($bannedUserDataArray && isset($bannedUserDataArray[0])) { - return true; - } - } - if($ip !== null) { - $bannedUserDataArray = $this->getBannedUsersData('ip',$ip); - if($bannedUserDataArray && isset($bannedUserDataArray[0])) { - return true; - } - } - $bannedUserDataArray = $this->getBannedUsersData('userName',$userName); - if($bannedUserDataArray && isset($bannedUserDataArray[0])) { - return true; - } - return false; - } - - function isMaxUsersLoggedIn() { - if(count($this->getOnlineUsersData()) >= $this->getConfig('maxUsersLoggedIn')) { - return true; - } - return false; - } - - function validateChannel($channelID) { - if($channelID === null) { - return false; - } - // Return true for normal channels the user has acces to: - if(in_array($channelID, $this->getChannels())) { - return true; - } - // Return true if the user is allowed to join his own private channel: - if($channelID == $this->getPrivateChannelID() && $this->isAllowedToCreatePrivateChannel()) { - return true; - } - // Return true if the user has been invited to a restricted or private channel: - if(in_array($channelID, $this->getInvitations())) { - return true; - } - // No valid channel, return false: - return false; - } - - function createGuestUserName() { - $maxLength = $this->getConfig('userNameMaxLength') - - $this->stringLength($this->getConfig('guestUserPrefix')) - - $this->stringLength($this->getConfig('guestUserSuffix')); - - // seed with microseconds since last "whole" second: - mt_srand((double)microtime()*1000000); - - // Create a random userName using numbers between 100000 and 999999: - $userName = substr(mt_rand(100000, 999999), 0, $maxLength); - - return $this->getConfig('guestUserPrefix').$userName.$this->getConfig('guestUserSuffix'); - } - - // Guest userIDs must not interfere with existing userIDs and must be lower than privateChannelDiff: - function createGuestUserID() { - // seed with microseconds since last "whole" second: - mt_srand((double)microtime()*1000000); - - return mt_rand($this->getConfig('minGuestUserID'), $this->getConfig('privateChannelDiff')-1); - } - - function getGuestUser() { - if(!$this->getConfig('allowGuestLogins')) - return null; - - if($this->getConfig('allowGuestUserName')) { - $maxLength = $this->getConfig('userNameMaxLength') - - $this->stringLength($this->getConfig('guestUserPrefix')) - - $this->stringLength($this->getConfig('guestUserSuffix')); - - // Trim guest userName: - $userName = $this->trimString($this->getRequestVar('userName'), null, $maxLength, true, true); - - // If given userName is invalid, create one: - if(!$userName) { - $userName = $this->createGuestUserName(); - } else { - // Add the guest users prefix and suffix to the given userName: - $userName = $this->getConfig('guestUserPrefix').$userName.$this->getConfig('guestUserSuffix'); - } - } else { - $userName = $this->createGuestUserName(); - } - - $userData = array(); - $userData['userID'] = $this->createGuestUserID(); - $userData['userName'] = $userName; - $userData['userRole'] = AJAX_CHAT_GUEST; - return $userData; - } - - function getCustomVar($key) { - if(!isset($this->_customVars)) - $this->_customVars = array(); - if(!isset($this->_customVars[$key])) - return null; - return $this->_customVars[$key]; - } - - function setCustomVar($key, $value) { - if(!isset($this->_customVars)) - $this->_customVars = array(); - $this->_customVars[$key] = $value; - } - - // Override to replace custom template tags: - // Return the replacement for the given tag (and given tagContent) - function replaceCustomTemplateTags($tag, $tagContent) { - return null; - } - - // Override to initialize custom configuration settings: - function initCustomConfig() { - } - - // Override to add custom request variables: - // Add values to the request variables array: $this->_requestVars['customVariable'] = null; - function initCustomRequestVars() { - } - - // Override to add custom session code right after the session has been started: - function initCustomSession() { - } - - // Override, to parse custom info requests: - // $infoRequest contains the current info request - // Add info responses using the method addInfoMessage($info, $type) - function parseCustomInfoRequest($infoRequest) { - } - - // Override to replace custom text: - // Return replaced text - // $text contains the whole message - function replaceCustomText(&$text) { - return $text; - } - - // Override to add custom commands: - // Return true if a custom command has been successfully parsed, else false - // $text contains the whole message, $textParts the message split up as words array - function parseCustomCommands($text, $textParts) { - return false; - } - - // Override to perform custom actions on new messages: - // Return true if message may be inserted, else false - // $text contains the whole message - function onNewMessage($text) { - return true; - } - - // Override to perform custom actions on new messages: - // Method to set the style cookie depending on user data - function setStyle() { - } - - // Override: - // Returns true if the userID of the logged in user is identical to the userID of the authentication system - // or the user is authenticated as guest in the chat and the authentication system - function revalidateUserID() { - return true; - } - - // Override: - // Returns an associative array containing userName, userID and userRole - // Returns null if login is invalid - function getValidLoginUserData() { - // Check if we have a valid registered user: - if(false) { - // Here is the place to check user authentication - } else { - // Guest users: - return $this->getGuestUser(); - } - } - - // Override: - // Store the channels the current user has access to - // Make sure channel names don't contain any whitespace - function &getChannels() { - if($this->_channels === null) { - $this->_channels = $this->getAllChannels(); - } - return $this->_channels; - } - - // Override: - // Store all existing channels - // Make sure channel names don't contain any whitespace - function &getAllChannels() { - if($this->_allChannels === null) { - $this->_allChannels = array(); - - // Default channel, public to everyone: - $this->_allChannels[$this->trimChannelName($this->getConfig('defaultChannelName'))] = $this->getConfig('defaultChannelID'); - } - return $this->_allChannels; - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatDataBase.php b/library/ajaxchat/chat/lib/class/AJAXChatDataBase.php deleted file mode 100644 index 2143c5aa0..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatDataBase.php +++ /dev/null @@ -1,81 +0,0 @@ -_db = new AJAXChatDatabaseMySQLi($dbConnectionConfig); - break; - case 'mysql': - $this->_db = new AJAXChatDatabaseMySQL($dbConnectionConfig); - break; - default: - // Use MySQLi if available, else MySQL (and check the type of a given database connection object): - if(function_exists('mysqli_connect') && (!$dbConnectionConfig['link'] || is_object($dbConnectionConfig['link']))) { - $this->_db = new AJAXChatDatabaseMySQLi($dbConnectionConfig); - } else { - $this->_db = new AJAXChatDatabaseMySQL($dbConnectionConfig); - } - } - } - - // Method to connect to the DataBase server: - function connect(&$dbConnectionConfig) { - return $this->_db->connect($dbConnectionConfig); - } - - // Method to select the DataBase: - function select($dbName) { - return $this->_db->select($dbName); - } - - // Method to determine if an error has occured: - function error() { - return $this->_db->error(); - } - - // Method to return the error report: - function getError() { - return $this->_db->getError(); - } - - // Method to return the connection identifier: - function &getConnectionID() { - return $this->_db->getConnectionID(); - } - - // Method to prevent SQL injections: - function makeSafe($value) { - return $this->_db->makeSafe($value); - } - - // Method to perform SQL queries: - function sqlQuery($sql) { - return $this->_db->sqlQuery($sql); - } - - // Method to retrieve the current DataBase name: - function getName() { - return $this->_db->getName(); - //If your database has hyphens ( - ) in it, try using this instead: - //return '`'.$this->_db->getName().'`'; - } - - // Method to retrieve the last inserted ID: - function getLastInsertedID() { - return $this->_db->getLastInsertedID(); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatEncoding.php b/library/ajaxchat/chat/lib/class/AJAXChatEncoding.php deleted file mode 100644 index 96b2482c7..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatEncoding.php +++ /dev/null @@ -1,138 +0,0 @@ -'&', '<'=>'<', '>'=>'>', "'"=>''', '"'=>'"'); - } - return $specialChars; - } - - // Helper function to store Regular expression for NO-WS-CTL as we cannot use static class members in PHP4: - public static function getRegExp_NO_WS_CTL() { - static $regExp_NO_WS_CTL; - if(!$regExp_NO_WS_CTL) { - // Regular expression for NO-WS-CTL, non-whitespace control characters (RFC 2822), decimal 1–8, 11–12, 14–31, and 127: - $regExp_NO_WS_CTL = '/[\x0\x1\x2\x3\x4\x5\x6\x7\x8\xB\xC\xE\xF\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F]/'; - } - return $regExp_NO_WS_CTL; - } - - public static function convertEncoding($str, $charsetFrom, $charsetTo) { - if(function_exists('mb_convert_encoding')) { - return mb_convert_encoding($str, $charsetTo, $charsetFrom); - } - if(function_exists('iconv')) { - return iconv($charsetFrom, $charsetTo, $str); - } - if(($charsetFrom == 'UTF-8') && ($charsetTo == 'ISO-8859-1')) { - return utf8_decode($str); - } - if(($charsetFrom == 'ISO-8859-1') && ($charsetTo == 'UTF-8')) { - return utf8_encode($str); - } - return $str; - } - - public static function htmlEncode($str, $contentCharset='UTF-8') { - switch($contentCharset) { - case 'UTF-8': - // Encode only special chars (&, <, >, ', ") as entities: - return AJAXChatEncoding::encodeSpecialChars($str); - break; - case 'ISO-8859-1': - case 'ISO-8859-15': - // Encode special chars and all extended characters above ISO-8859-1 charset as entities, then convert to content charset: - return AJAXChatEncoding::convertEncoding(AJAXChatEncoding::encodeEntities($str, 'UTF-8', array( - 0x26, 0x26, 0, 0xFFFF, // & - 0x3C, 0x3C, 0, 0xFFFF, // < - 0x3E, 0x3E, 0, 0xFFFF, // > - 0x27, 0x27, 0, 0xFFFF, // ' - 0x22, 0x22, 0, 0xFFFF, // " - 0x100, 0x2FFFF, 0, 0xFFFF // above ISO-8859-1 - )), 'UTF-8', $contentCharset); - break; - default: - // Encode special chars and all characters above ASCII charset as entities, then convert to content charset: - return AJAXChatEncoding::convertEncoding(AJAXChatEncoding::encodeEntities($str, 'UTF-8', array( - 0x26, 0x26, 0, 0xFFFF, // & - 0x3C, 0x3C, 0, 0xFFFF, // < - 0x3E, 0x3E, 0, 0xFFFF, // > - 0x27, 0x27, 0, 0xFFFF, // ' - 0x22, 0x22, 0, 0xFFFF, // " - 0x80, 0x2FFFF, 0, 0xFFFF // above ASCII - )), 'UTF-8', $contentCharset); - } - } - - public static function encodeSpecialChars($str) { - return strtr($str, AJAXChatEncoding::getSpecialChars()); - } - - public static function decodeSpecialChars($str) { - return strtr($str, array_flip(AJAXChatEncoding::getSpecialChars())); - } - - public static function encodeEntities($str, $encoding='UTF-8', $convmap=null) { - if($convmap && function_exists('mb_encode_numericentity')) { - return mb_encode_numericentity($str, $convmap, $encoding); - } - return htmlentities($str, ENT_QUOTES, $encoding); - } - - public static function decodeEntities($str, $encoding='UTF-8', $htmlEntitiesMap=null) { - // Due to PHP bug #25670, html_entity_decode does not work with UTF-8 for PHP versions < 5: - if(function_exists('html_entity_decode') && version_compare(phpversion(), 5, '>=')) { - // Replace numeric and literal entities: - $str = html_entity_decode($str, ENT_QUOTES, $encoding); - // Replace additional literal HTML entities if an HTML entities map is given: - if($htmlEntitiesMap) { - $str = strtr($str, $htmlEntitiesMap); - } - } else { - // Replace numeric entities: - $str = preg_replace('~&#([0-9]+);~e', 'AJAXChatEncoding::unicodeChar("\\1")', $str); - $str = preg_replace('~&#x([0-9a-f]+);~ei', 'AJAXChatEncoding::unicodeChar(hexdec("\\1"))', $str); - // Replace literal entities: - $htmlEntitiesMap = $htmlEntitiesMap ? $htmlEntitiesMap : array_flip(get_html_translation_table(HTML_ENTITIES, ENT_QUOTES)); - $str = strtr($str, $htmlEntitiesMap); - } - return $str; - } - - public static function unicodeChar($c) { - if($c <= 0x7F) { - return chr($c); - } else if($c <= 0x7FF) { - return chr(0xC0 | $c >> 6) . chr(0x80 | $c & 0x3F); - } else if($c <= 0xFFFF) { - return chr(0xE0 | $c >> 12) . chr(0x80 | $c >> 6 & 0x3F) - . chr(0x80 | $c & 0x3F); - } else if($c <= 0x10FFFF) { - return chr(0xF0 | $c >> 18) . chr(0x80 | $c >> 12 & 0x3F) - . chr(0x80 | $c >> 6 & 0x3F) - . chr(0x80 | $c & 0x3F); - } else { - return null; - } - } - - public static function removeUnsafeCharacters($str) { - // Remove NO-WS-CTL, non-whitespace control characters (RFC 2822), decimal 1–8, 11–12, 14–31, and 127: - return preg_replace(AJAXChatEncoding::getRegExp_NO_WS_CTL(), '', $str); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatFileSystem.php b/library/ajaxchat/chat/lib/class/AJAXChatFileSystem.php deleted file mode 100644 index c9626c36a..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatFileSystem.php +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatHTTPHeader.php b/library/ajaxchat/chat/lib/class/AJAXChatHTTPHeader.php deleted file mode 100644 index 7340bfcf0..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatHTTPHeader.php +++ /dev/null @@ -1,56 +0,0 @@ -_contentType = $contentType.'; charset='.$encoding; - $this->_constant = true; - } else { - if(isset($_SERVER['HTTP_ACCEPT']) && (strpos($_SERVER['HTTP_ACCEPT'],'application/xhtml+xml') !== false)) { - $this->_contentType = 'application/xhtml+xml; charset='.$encoding; - } else { - $this->_contentType = 'text/html; charset='.$encoding; - } - $this->_constant = false; - } - $this->_noCache = $noCache; - } - - // Method to send the HTTP header: - function send() { - // Prevent caching: - if($this->_noCache) { - header('Cache-Control: no-cache, must-revalidate'); - header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); - } - - // Send the content-type-header: - header('Content-Type: '.$this->_contentType); - - // Send vary header if content-type varies (important for proxy-caches): - if(!$this->_constant) { - header('Vary: Accept'); - } - } - - // Method to return the content-type string: - function getContentType() { - // Return the content-type string: - return $this->_contentType; - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatLanguage.php b/library/ajaxchat/chat/lib/class/AJAXChatLanguage.php deleted file mode 100644 index b19724710..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatLanguage.php +++ /dev/null @@ -1,102 +0,0 @@ -_regExpAcceptLangCode = '/^([a-z]{1,8}(?:-[a-z]{1,8})*)(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i'; - $this->_availableLangCodes = $availableLangCodes; - $this->_defaultLangCode = $defaultLangCode; - if($langCode && in_array($langCode, $availableLangCodes)) { - $this->_langCode = $langCode; - } - $this->_strictMode = $strictMode; - } - - // Method to detect the language code from the HTTP_ACCEPT_LANGUAGE header: - function detectLangCode() { - // If HTTP_ACCEPT_LANGUAGE is empty use defaultLangCode: - if(empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - $this->_langCode = $this->_defaultLangCode; - return; - } - - // Split up the HTTP_ACCEPT_LANGUAGE header: - $acceptedLanguages = preg_split('/,\s*/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); - - $currentLangCode = $this->_defaultLangCode; - $currentLangQuality = 0.0; - - foreach($acceptedLanguages as $acceptedLanguage) { - // Parse the language string: - $match = preg_match($this->_regExpAcceptLangCode, $acceptedLanguage, $matches); - // Check if the syntax is valid: - if(!$match) { - continue; - } - - // Get and split the language code: - $langCodeParts = explode ('-', $matches[1]); - - // Get the language quality given as float value: - if(isset($matches[2])) { - $langQuality = (float)$matches[2]; - } else { - // Missing language quality value is maximum quality: - $langQuality = 1.0; - } - - // Go through it until the language code is empty: - while(count($langCodeParts)) { - // Join the current langCodeParts: - $langCode = strtolower(join('-', $langCodeParts)); - // Check if the langCode is in the available list: - if(in_array($langCode, $this->_availableLangCodes)) { - // Check the quality setting: - if ($langQuality > $currentLangQuality) { - $currentLangCode = $langCode; - $currentLangQuality = $langQuality; - break; - } - } - // If strict mode is set, don't minimalize the language code: - if($this->_strictMode) { - break; - } - // else chop off the right part: - array_pop($langCodeParts); - } - } - - $this->_langCode = $currentLangCode; - } - - function getLangCode() { - if(!$this->_langCode) { - $this->detectLangCode(); - } - return $this->_langCode; - } - - function setLangCode($langCode) { - $this->_langCode = $langCode; - } - - function getLangCodes() { - return $this->_availableLangCodes; - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatMySQLDataBase.php b/library/ajaxchat/chat/lib/class/AJAXChatMySQLDataBase.php deleted file mode 100644 index 6dca348d1..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatMySQLDataBase.php +++ /dev/null @@ -1,92 +0,0 @@ -_connectionID = $dbConnectionConfig['link']; - $this->_dbName = $dbConnectionConfig['name']; - } - - // Method to connect to the DataBase server: - function connect(&$dbConnectionConfig) { - $this->_connectionID = @mysql_connect( - $dbConnectionConfig['host'], - $dbConnectionConfig['user'], - $dbConnectionConfig['pass'], - true - ); - if(!$this->_connectionID) { - $this->_errno = null; - $this->_error = 'Database connection failed.'; - return false; - } - return true; - } - - // Method to select the DataBase: - function select($dbName) { - if(!@mysql_select_db($dbName, $this->_connectionID)) { - $this->_errno = mysql_errno($this->_connectionID); - $this->_error = mysql_error($this->_connectionID); - return false; - } - $this->_dbName = $dbName; - return true; - } - - // Method to determine if an error has occured: - function error() { - return (bool)$this->_error; - } - - // Method to return the error report: - function getError() { - if($this->error()) { - $str = 'Error-Report: ' .$this->_error."\n"; - $str .= 'Error-Code: '.$this->_errno."\n"; - } else { - $str = 'No errors.'."\n"; - } - return $str; - } - - // Method to return the connection identifier: - function &getConnectionID() { - return $this->_connectionID; - } - - // Method to prevent SQL injections: - function makeSafe($value) { - return "'".mysql_real_escape_string($value, $this->_connectionID)."'"; - } - - // Method to perform SQL queries: - function sqlQuery($sql) { - return new AJAXChatMySQLQuery($sql, $this->_connectionID); - } - - // Method to retrieve the current DataBase name: - function getName() { - return $this->_dbName; - } - - // Method to retrieve the last inserted ID: - function getLastInsertedID() { - return mysql_insert_id($this->_connectionID); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatMySQLQuery.php b/library/ajaxchat/chat/lib/class/AJAXChatMySQLQuery.php deleted file mode 100644 index f2f3fd466..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatMySQLQuery.php +++ /dev/null @@ -1,89 +0,0 @@ -_sql = trim($sql); - $this->_connectionID = $connectionID; - if($this->_connectionID) { - $this->_result = mysql_query($this->_sql, $this->_connectionID); - if(!$this->_result) { - $this->_errno = mysql_errno($this->_connectionID); - $this->_error = mysql_error($this->_connectionID); - } - } else { - $this->_result = mysql_query($this->_sql); - if(!$this->_result) { - $this->_errno = mysql_errno(); - $this->_error = mysql_error(); - } - } - } - - // Returns true if an error occured: - function error() { - // Returns true if the Result-ID is valid: - return !(bool)($this->_result); - } - - // Returns an Error-String: - function getError() { - if($this->error()) { - $str = 'Query: ' .$this->_sql ."\n"; - $str .= 'Error-Report: ' .$this->_error."\n"; - $str .= 'Error-Code: '.$this->_errno; - } else { - $str = "No errors."; - } - return $str; - } - - // Returns the content: - function fetch() { - if($this->error()) { - return null; - } else { - return mysql_fetch_assoc($this->_result); - } - } - - // Returns the number of rows (SELECT or SHOW): - function numRows() { - if($this->error()) { - return null; - } else { - return mysql_num_rows($this->_result); - } - } - - // Returns the number of affected rows (INSERT, UPDATE, REPLACE or DELETE): - function affectedRows() { - if($this->error()) { - return null; - } else { - return mysql_affected_rows($this->_connectionID); - } - } - - // Frees the memory: - function free() { - @mysql_free_result($this->_result); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatMySQLiDataBase.php b/library/ajaxchat/chat/lib/class/AJAXChatMySQLiDataBase.php deleted file mode 100644 index 9bc611e2d..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatMySQLiDataBase.php +++ /dev/null @@ -1,91 +0,0 @@ -_connectionID = $dbConnectionConfig['link']; - $this->_dbName = $dbConnectionConfig['name']; - } - - // Method to connect to the DataBase server: - function connect(&$dbConnectionConfig) { - @$this->_connectionID = new mysqli( - $dbConnectionConfig['host'], - $dbConnectionConfig['user'], - $dbConnectionConfig['pass'] - ); - if($this->_connectionID->connect_errno) { - $this->_errno = mysqli_connect_errno(); - $this->_error = mysqli_connect_error(); - return false; - } - return true; - } - - // Method to select the DataBase: - function select($dbName) { - if(!$this->_connectionID->select_db($dbName)) { - $this->_errno = $this->_connectionID->errno; - $this->_error = $this->_connectionID->error; - return false; - } - $this->_dbName = $dbName; - return true; - } - - // Method to determine if an error has occured: - function error() { - return (bool)$this->_error; - } - - // Method to return the error report: - function getError() { - if($this->error()) { - $str = 'Error-Report: ' .$this->_error."\n"; - $str .= 'Error-Code: '.$this->_errno."\n"; - } else { - $str = 'No errors.'."\n"; - } - return $str; - } - - // Method to return the connection identifier: - function &getConnectionID() { - return $this->_connectionID; - } - - // Method to prevent SQL injections: - function makeSafe($value) { - return "'".$this->_connectionID->escape_string($value)."'"; - } - - // Method to perform SQL queries: - function sqlQuery($sql) { - return new AJAXChatMySQLiQuery($sql, $this->_connectionID); - } - - // Method to retrieve the current DataBase name: - function getName() { - return $this->_dbName; - } - - // Method to retrieve the last inserted ID: - function getLastInsertedID() { - return $this->_connectionID->insert_id; - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatMySQLiQuery.php b/library/ajaxchat/chat/lib/class/AJAXChatMySQLiQuery.php deleted file mode 100644 index f81afd886..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatMySQLiQuery.php +++ /dev/null @@ -1,81 +0,0 @@ -_sql = trim($sql); - $this->_connectionID = $connectionID; - $this->_result = $this->_connectionID->query($this->_sql); - if(!$this->_result) { - $this->_errno = $this->_connectionID->errno; - $this->_error = $this->_connectionID->error; - } - } - - // Returns true if an error occured: - function error() { - // Returns true if the Result-ID is valid: - return !(bool)($this->_result); - } - - // Returns an Error-String: - function getError() { - if($this->error()) { - $str = 'Query: ' .$this->_sql ."\n"; - $str .= 'Error-Report: ' .$this->_error."\n"; - $str .= 'Error-Code: '.$this->_errno; - } else { - $str = "No errors."; - } - return $str; - } - - // Returns the content: - function fetch() { - if($this->error()) { - return null; - } else { - return $this->_result->fetch_assoc(); - } - } - - // Returns the number of rows (SELECT or SHOW): - function numRows() { - if($this->error()) { - return null; - } else { - return $this->_result->num_rows; - } - } - - // Returns the number of affected rows (INSERT, UPDATE, REPLACE or DELETE): - function affectedRows() { - if($this->error()) { - return null; - } else { - return $this->_connectionID->affected_rows; - } - } - - // Frees the memory: - function free() { - $this->_result->free(); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatString.php b/library/ajaxchat/chat/lib/class/AJAXChatString.php deleted file mode 100644 index 8997da5ea..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatString.php +++ /dev/null @@ -1,37 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/AJAXChatTemplate.php b/library/ajaxchat/chat/lib/class/AJAXChatTemplate.php deleted file mode 100644 index 16e53a7e6..000000000 --- a/library/ajaxchat/chat/lib/class/AJAXChatTemplate.php +++ /dev/null @@ -1,329 +0,0 @@ -ajaxChat = $ajaxChat; - $this->_regExpTemplateTags = '/\[(\w+?)(?:(?:\/)|(?:\](.+?)\[\/\1))\]/s'; - $this->_templateFile = $templateFile; - $this->_contentType = $contentType; - } - - function getParsedContent() { - if(!$this->_parsedContent) { - $this->parseContent(); - } - return $this->_parsedContent; - } - - function getContent() { - if(!$this->_content) { - $this->_content = AJAXChatFileSystem::getFileContents($this->_templateFile); - } - return $this->_content; - } - - function parseContent() { - $this->_parsedContent = $this->getContent(); - - // Remove the XML declaration if the content-type is not xml: - if($this->_contentType && (strpos($this->_contentType,'xml') === false)) { - $doctypeStart = strpos($this->_parsedContent, '_parsedContent = substr($this->_parsedContent, $doctypeStart); - } - } - - // Replace template tags ([TAG/] and [TAG]content[/TAG]) and return parsed template content: - $this->_parsedContent = preg_replace_callback($this->_regExpTemplateTags, array($this, 'replaceTemplateTags'), $this->_parsedContent); - } - - function replaceTemplateTags($tagData) { - switch($tagData[1]) { - case 'AJAX_CHAT_URL': - return $this->ajaxChat->htmlEncode($this->ajaxChat->getChatURL()); - - case 'LANG': - return $this->ajaxChat->htmlEncode($this->ajaxChat->getLang((isset($tagData[2]) ? $tagData[2] : null))); - case 'LANG_CODE': - return $this->ajaxChat->getLangCode(); - - case 'BASE_DIRECTION': - return $this->getBaseDirectionAttribute(); - - case 'CONTENT_ENCODING': - return $this->ajaxChat->getConfig('contentEncoding'); - - case 'CONTENT_TYPE': - return $this->_contentType; - - case 'LOGIN_URL': - return ($this->ajaxChat->getRequestVar('view') == 'logs') ? './?view=logs' : './'; - - case 'USER_NAME_MAX_LENGTH': - return $this->ajaxChat->getConfig('userNameMaxLength'); - case 'MESSAGE_TEXT_MAX_LENGTH': - return $this->ajaxChat->getConfig('messageTextMaxLength'); - - case 'LOGIN_CHANNEL_ID': - return $this->ajaxChat->getValidRequestChannelID(); - - case 'SESSION_NAME': - return $this->ajaxChat->getConfig('sessionName'); - - case 'COOKIE_EXPIRATION': - return $this->ajaxChat->getConfig('sessionCookieLifeTime'); - case 'COOKIE_PATH': - return $this->ajaxChat->getConfig('sessionCookiePath'); - case 'COOKIE_DOMAIN': - return $this->ajaxChat->getConfig('sessionCookieDomain'); - case 'COOKIE_SECURE': - return $this->ajaxChat->getConfig('sessionCookieSecure'); - - case 'CHAT_BOT_NAME': - return rawurlencode($this->ajaxChat->getConfig('chatBotName')); - case 'CHAT_BOT_ID': - return $this->ajaxChat->getConfig('chatBotID'); - - case 'ALLOW_USER_MESSAGE_DELETE': - if($this->ajaxChat->getConfig('allowUserMessageDelete')) - return 1; - else - return 0; - - case 'INACTIVE_TIMEOUT': - return $this->ajaxChat->getConfig('inactiveTimeout'); - - case 'PRIVATE_CHANNEL_DIFF': - return $this->ajaxChat->getConfig('privateChannelDiff'); - case 'PRIVATE_MESSAGE_DIFF': - return $this->ajaxChat->getConfig('privateMessageDiff'); - - case 'SHOW_CHANNEL_MESSAGES': - if($this->ajaxChat->getConfig('showChannelMessages')) - return 1; - else - return 0; - - case 'SOCKET_SERVER_ENABLED': - if($this->ajaxChat->getConfig('socketServerEnabled')) - return 1; - else - return 0; - - case 'SOCKET_SERVER_HOST': - if($this->ajaxChat->getConfig('socketServerHost')) { - $socketServerHost = $this->ajaxChat->getConfig('socketServerHost'); - } else { - $socketServerHost = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']); - } - return rawurlencode($socketServerHost); - - case 'SOCKET_SERVER_PORT': - return $this->ajaxChat->getConfig('socketServerPort'); - - case 'SOCKET_SERVER_CHAT_ID': - return $this->ajaxChat->getConfig('socketServerChatID'); - - case 'STYLE_SHEETS': - return $this->getStyleSheetLinkTags(); - - case 'CHANNEL_OPTIONS': - return $this->getChannelOptionTags(); - case 'STYLE_OPTIONS': - return $this->getStyleOptionTags(); - case 'LANGUAGE_OPTIONS': - return $this->getLanguageOptionTags(); - - case 'ERROR_MESSAGES': - return $this->getErrorMessageTags(); - - case 'LOGS_CHANNEL_OPTIONS': - return $this->getLogsChannelOptionTags(); - case 'LOGS_YEAR_OPTIONS': - return $this->getLogsYearOptionTags(); - case 'LOGS_MONTH_OPTIONS': - return $this->getLogsMonthOptionTags(); - case 'LOGS_DAY_OPTIONS': - return $this->getLogsDayOptionTags(); - case 'LOGS_HOUR_OPTIONS': - return $this->getLogsHourOptionTags(); - case 'CLASS_WRITEABLE': - $userdata = $this->ajaxChat->getValidLoginUserData(); - $guestwrite = $this->ajaxChat->getConfig('allowGuestWrite'); - if ($userdata['userRole'] === AJAX_CHAT_GUEST && $guestwrite === false) - return 'write_forbidden'; - else - return 'write_allowed'; - - default: - return $this->ajaxChat->replaceCustomTemplateTags($tagData[1], (isset($tagData[2]) ? $tagData[2] : null)); - } - } - - // Function to display alternating table row colors: - function alternateRow($rowOdd='rowOdd', $rowEven='rowEven') { - static $i; - $i += 1; - if($i % 2 == 0) { - return $rowEven; - } else { - return $rowOdd; - } - } - - function getBaseDirectionAttribute() { - $langCodeParts = explode('-', $this->ajaxChat->getLangCode()); - switch($langCodeParts[0]) { - case 'ar': - case 'fa': - case 'he': - return 'rtl'; - default: - return 'ltr'; - } - } - - function getStyleSheetLinkTags() { - $styleSheets = ''; - foreach($this->ajaxChat->getConfig('styleAvailable') as $style) { - $alternate = ($style == $this->ajaxChat->getConfig('styleDefault')) ? '' : 'alternate '; - $styleSheets .= ''; - } - return $styleSheets; - } - - function getChannelOptionTags() { - $channelOptions = ''; - $channelSelected = false; - foreach($this->ajaxChat->getChannels() as $name=>$id) { - if($this->ajaxChat->isLoggedIn() && $this->ajaxChat->getChannel()) { - $selected = ($id == $this->ajaxChat->getChannel()) ? ' selected="selected"' : ''; - } else { - $selected = ($id == $this->ajaxChat->getConfig('defaultChannelID')) ? ' selected="selected"' : ''; - } - if($selected) { - $channelSelected = true; - } - $channelOptions .= ''; - } - if($this->ajaxChat->isLoggedIn() && $this->ajaxChat->isAllowedToCreatePrivateChannel()) { - // Add the private channel of the user to the options list: - if(!$channelSelected && $this->ajaxChat->getPrivateChannelID() == $this->ajaxChat->getChannel()) { - $selected = ' selected="selected"'; - $channelSelected = true; - } else { - $selected = ''; - } - $privateChannelName = $this->ajaxChat->getPrivateChannelName(); - $channelOptions .= ''; - } - // If current channel is not in the list, try to retrieve the channelName: - if(!$channelSelected) { - $channelName = $this->ajaxChat->getChannelName(); - if($channelName !== null) { - $channelOptions .= ''; - } else { - // Show an empty selection: - $channelOptions .= ''; - } - } - return $channelOptions; - } - - function getStyleOptionTags() { - $styleOptions = ''; - foreach($this->ajaxChat->getConfig('styleAvailable') as $style) { - $selected = ($style == $this->ajaxChat->getConfig('styleDefault')) ? ' selected="selected"' : ''; - $styleOptions .= ''; - } - return $styleOptions; - } - - function getLanguageOptionTags() { - $languageOptions = ''; - $languageNames = $this->ajaxChat->getConfig('langNames'); - foreach($this->ajaxChat->getConfig('langAvailable') as $langCode) { - $selected = ($langCode == $this->ajaxChat->getLangCode()) ? ' selected="selected"' : ''; - $languageOptions .= ''; - } - return $languageOptions; - } - - function getErrorMessageTags() { - $errorMessages = ''; - foreach($this->ajaxChat->getInfoMessages('error') as $error) { - $errorMessages .= '
        '.$this->ajaxChat->htmlEncode($this->ajaxChat->getLang($error)).'
        '; - } - return $errorMessages; - } - - function getLogsChannelOptionTags() { - $channelOptions = ''; - $channelOptions .= ''; - foreach($this->ajaxChat->getChannels() as $key=>$value) { - if($this->ajaxChat->getUserRole() != AJAX_CHAT_ADMIN && $this->ajaxChat->getConfig('logsUserAccessChannelList') && !in_array($value, $this->ajaxChat->getConfig('logsUserAccessChannelList'))) { - continue; - } - $channelOptions .= ''; - } - $channelOptions .= ''; - $channelOptions .= ''; - return $channelOptions; - } - - function getLogsYearOptionTags() { - $yearOptions = ''; - $yearOptions .= ''; - for($year=date('Y'); $year>=$this->ajaxChat->getConfig('logsFirstYear'); $year--) { - $yearOptions .= ''; - } - return $yearOptions; - } - - function getLogsMonthOptionTags() { - $monthOptions = ''; - $monthOptions .= ''; - for($month=1; $month<=12; $month++) { - $monthOptions .= ''; - } - return $monthOptions; - } - - function getLogsDayOptionTags() { - $dayOptions = ''; - $dayOptions .= ''; - for($day=1; $day<=31; $day++) { - $dayOptions .= ''; - } - return $dayOptions; - } - - function getLogsHourOptionTags() { - $hourOptions = ''; - $hourOptions .= ''; - for($hour=0; $hour<=23; $hour++) { - $hourOptions .= ''; - } - return $hourOptions; - } - -} -?> diff --git a/library/ajaxchat/chat/lib/class/CustomAJAXChat.php b/library/ajaxchat/chat/lib/class/CustomAJAXChat.php deleted file mode 100644 index 9fff6ada9..000000000 --- a/library/ajaxchat/chat/lib/class/CustomAJAXChat.php +++ /dev/null @@ -1,126 +0,0 @@ -getCustomUsers(); - - if($this->getRequestVar('password')) { - // Check if we have a valid registered user: - - $userName = $this->getRequestVar('userName'); - $userName = $this->convertEncoding($userName, $this->getConfig('contentEncoding'), $this->getConfig('sourceEncoding')); - - $password = $this->getRequestVar('password'); - $password = $this->convertEncoding($password, $this->getConfig('contentEncoding'), $this->getConfig('sourceEncoding')); - - foreach($customUsers as $key=>$value) { - if(($value['userName'] == $userName) && ($value['password'] == $password)) { - $userData = array(); - $userData['userID'] = $key; - $userData['userName'] = $this->trimUserName($value['userName']); - $userData['userRole'] = $value['userRole']; - return $userData; - } - } - - return null; - } else { - // Guest users: - return $this->getGuestUser(); - } - } - - // Store the channels the current user has access to - // Make sure channel names don't contain any whitespace - function &getChannels() { - if($this->_channels === null) { - $this->_channels = array(); - - $customUsers = $this->getCustomUsers(); - - // Get the channels, the user has access to: - if($this->getUserRole() == AJAX_CHAT_GUEST) { - $validChannels = $customUsers[0]['channels']; - } else { - $validChannels = $customUsers[$this->getUserID()]['channels']; - } - - // Add the valid channels to the channel list (the defaultChannelID is always valid): - foreach($this->getAllChannels() as $key=>$value) { - if ($value == $this->getConfig('defaultChannelID')) { - $this->_channels[$key] = $value; - continue; - } - // Check if we have to limit the available channels: - if($this->getConfig('limitChannelList') && !in_array($value, $this->getConfig('limitChannelList'))) { - continue; - } - if(in_array($value, $validChannels)) { - $this->_channels[$key] = $value; - } - } - } - return $this->_channels; - } - - // Store all existing channels - // Make sure channel names don't contain any whitespace - function &getAllChannels() { - if($this->_allChannels === null) { - // Get all existing channels: - $customChannels = $this->getCustomChannels(); - - $defaultChannelFound = false; - - foreach($customChannels as $name=>$id) { - $this->_allChannels[$this->trimChannelName($name)] = $id; - if($id == $this->getConfig('defaultChannelID')) { - $defaultChannelFound = true; - } - } - - if(!$defaultChannelFound) { - // Add the default channel as first array element to the channel list - // First remove it in case it appeard under a different ID - unset($this->_allChannels[$this->getConfig('defaultChannelName')]); - $this->_allChannels = array_merge( - array( - $this->trimChannelName($this->getConfig('defaultChannelName'))=>$this->getConfig('defaultChannelID') - ), - $this->_allChannels - ); - } - } - return $this->_allChannels; - } - - function &getCustomUsers() { - // List containing the registered chat users: - $users = null; - require(AJAX_CHAT_PATH.'lib/data/users.php'); - return $users; - } - - function getCustomChannels() { - // List containing the custom channels: - $channels = null; - require(AJAX_CHAT_PATH.'lib/data/channels.php'); - // Channel array structure should be: - // ChannelName => ChannelID - return array_flip($channels); - } - -} \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/CustomAJAXChatInterface.php b/library/ajaxchat/chat/lib/class/CustomAJAXChatInterface.php deleted file mode 100644 index a950739c5..000000000 --- a/library/ajaxchat/chat/lib/class/CustomAJAXChatInterface.php +++ /dev/null @@ -1,21 +0,0 @@ -initConfig(); - - // Initialize the DataBase connection: - $this->initDataBaseConnection(); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/class/CustomAJAXChatShoutBox.php b/library/ajaxchat/chat/lib/class/CustomAJAXChatShoutBox.php deleted file mode 100644 index c014d639e..000000000 --- a/library/ajaxchat/chat/lib/class/CustomAJAXChatShoutBox.php +++ /dev/null @@ -1,25 +0,0 @@ -initConfig(); - } - - function getShoutBoxContent() { - $template = new AJAXChatTemplate($this, AJAX_CHAT_PATH.'lib/template/shoutbox.html'); - - // Return parsed template content: - return $template->getParsedContent(); - } - -} -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/classes.php b/library/ajaxchat/chat/lib/classes.php deleted file mode 100644 index ff1dee265..000000000 --- a/library/ajaxchat/chat/lib/classes.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/config.php.example b/library/ajaxchat/chat/lib/config.php.example deleted file mode 100644 index 023adcdbb..000000000 --- a/library/ajaxchat/chat/lib/config.php.example +++ /dev/null @@ -1,209 +0,0 @@ -'عربي', 'bg'=>'Български', 'ca'=>'Català', 'cy'=>'Cymraeg', 'cz'=>'Česky', 'da'=>'Dansk', 'de'=>'Deutsch', 'el'=>'Ελληνικα', 'en'=>'English', - 'es'=>'Español', 'et'=>'Eesti', 'fa'=>'فارسی', 'fi'=>'Suomi', 'fr'=>'Français', 'gl'=>'Galego', 'he'=>'עברית', 'hr' => 'Hrvatski', 'hu' => 'Magyar', 'in'=>'Bahasa Indonesia', 'it'=>'Italiano', - 'ja'=>'日本語','ka'=>'ქართული','kr'=>'한 글','mk'=>'Македонски', 'nl'=>'Nederlands', 'nl-be'=>'Nederlands (België)', 'no'=>'Norsk', 'pl'=> 'Polski', 'pt-br'=>'Português (Brasil)', 'pt-pt'=>'Português (Portugal)', - 'ro'=>'România', 'ru'=>'Русский', 'sk'=> 'Slovenčina', 'sl'=>'Slovensko', 'sr'=>'Srpski', 'sv'=> 'Svenska', 'th'=>'ภาษาไทย', - 'tr'=>'Türkçe', 'uk'=>'Українська', 'zh'=>'中文 (简体)', 'zh-tw'=>'中文 (繁體)' -); - -// Available styles: -$config['styleAvailable'] = array('beige','black','grey','Oxygen','Lithium','Sulfur','Cobalt','Mercury','Uranium','Plum','prosilver','subblack2','subSilver','Core','MyBB','vBulletin'); -// Default style: -$config['styleDefault'] = 'prosilver'; - -// The encoding used for the XHTML content: -$config['contentEncoding'] = 'UTF-8'; -// The encoding of the data source, like userNames and channelNames: -$config['sourceEncoding'] = 'UTF-8'; -// The content-type of the XHTML page (e.g. "text/html", will be set dependent on browser capabilities if set to null): -$config['contentType'] = null; - -// Session name used to identify the session cookie: -$config['sessionName'] = 'ajax_chat'; -// Prefix added to every session key: -$config['sessionKeyPrefix'] = 'ajaxChat'; -// The lifetime of the language, style and setting cookies in days: -$config['sessionCookieLifeTime'] = 365; -// The path of the cookies, '/' allows to read the cookies from all directories: -$config['sessionCookiePath'] = '/'; -// The domain of the cookies, defaults to the hostname of the server if set to null: -$config['sessionCookieDomain'] = null; -// If enabled, cookies must be sent over secure (SSL/TLS encrypted) connections: -$config['sessionCookieSecure'] = null; - -// Default channelName used together with the defaultChannelID if no channel with this ID exists: -$config['defaultChannelName'] = 'Public'; -// ChannelID used when no channel is given: -$config['defaultChannelID'] = 0; -// Defines an array of channelIDs (e.g. array(0, 1)) to limit the number of available channels, will be ignored if set to null: -$config['limitChannelList'] = null; - -// UserID plus this value are private channels (this is also the max userID and max channelID): -$config['privateChannelDiff'] = 500000000; -// UserID plus this value are used for private messages: -$config['privateMessageDiff'] = 1000000000; - -// Enable/Disable private Channels: -$config['allowPrivateChannels'] = true; -// Enable/Disable private Messages: -$config['allowPrivateMessages'] = true; - -// Private channels should be distinguished by either a prefix or a suffix or both (no whitespace): -$config['privateChannelPrefix'] = '['; -// Private channels should be distinguished by either a prefix or a suffix or both (no whitespace): -$config['privateChannelSuffix'] = ']'; - -// If enabled, users will be logged in automatically as guest users (if allowed), if not authenticated: -$config['forceAutoLogin'] = false; - -// Defines if login/logout and channel enter/leave are displayed: -$config['showChannelMessages'] = true; - -// If enabled, the chat will only be accessible for the admin: -$config['chatClosed'] = false; -// Defines the timezone offset in seconds (-12*60*60 to 12*60*60) - if null, the server timezone is used: -$config['timeZoneOffset'] = null; -// Defines the hour of the day the chat is opened (0 - closingHour): -$config['openingHour'] = 0; -// Defines the hour of the day the chat is closed (openingHour - 24): -$config['closingHour'] = 24; -// Defines the weekdays the chat is opened (0=Sunday to 6=Saturday): -$config['openingWeekDays'] = array(0,1,2,3,4,5,6); - -// Enable/Disable guest logins: -$config['allowGuestLogins'] = true; -// Enable/Disable write access for guest users - if disabled, guest users may not write messages: -$config['allowGuestWrite'] = true; -// Allow/Disallow guest users to choose their own userName: -$config['allowGuestUserName'] = true; -// Guest users should be distinguished by either a prefix or a suffix or both (no whitespace): -$config['guestUserPrefix'] = '('; -// Guest users should be distinguished by either a prefix or a suffix or both (no whitespace): -$config['guestUserSuffix'] = ')'; -// Guest userIDs may not be lower than this value (and not higher than privateChannelDiff): -$config['minGuestUserID'] = 400000000; - -// Allow/Disallow users to change their userName (Nickname): -$config['allowNickChange'] = true; -// Changed userNames should be distinguished by either a prefix or a suffix or both (no whitespace): -$config['changedNickPrefix'] = '('; -// Changed userNames should be distinguished by either a prefix or a suffix or both (no whitespace): -$config['changedNickSuffix'] = ')'; - -// Allow/Disallow registered users to delete their own messages: -$config['allowUserMessageDelete'] = true; - -// The userID used for ChatBot messages: -$config['chatBotID'] = 2147483647; -// The userName used for ChatBot messages -$config['chatBotName'] = 'ChatBot'; - -// Minutes until a user is declared inactive (last status update) - the minimum is 2 minutes: -$config['inactiveTimeout'] = 2; -// Interval in minutes to check for inactive users: -$config['inactiveCheckInterval'] = 5; - -// Defines if messages are shown which have been sent before the user entered the channel: -$config['requestMessagesPriorChannelEnter'] = true; -// Defines an array of channelIDs (e.g. array(0, 1)) for which the previous setting is always true (will be ignored if set to null): -$config['requestMessagesPriorChannelEnterList'] = null; -// Max time difference in hours for messages to display on each request: -$config['requestMessagesTimeDiff'] = 24; -// Max number of messages to display on each request: -$config['requestMessagesLimit'] = 10; - -// Max users in chat (does not affect moderators or admins): -$config['maxUsersLoggedIn'] = 100; -// Max userName length: -$config['userNameMaxLength'] = 16; -// Max messageText length: -$config['messageTextMaxLength'] = 1040; -// Defines the max number of messages a user may send per minute: -$config['maxMessageRate'] = 20; - -// Defines the default time in minutes a user gets banned if kicked from a moderator without ban minutes parameter: -$config['defaultBanTime'] = 5; - -// Argument that is given to the handleLogout JavaScript method: -$config['logoutData'] = './?logout=true'; - -// If true, checks if the user IP is the same when logged in: -$config['ipCheck'] = true; - -// Defines the max time difference in hours for logs when no period or search condition is given: -$config['logsRequestMessagesTimeDiff'] = 1; -// Defines how many logs are returned on each logs request: -$config['logsRequestMessagesLimit'] = 10; - -// Defines the earliest year used for the logs selection: -$config['logsFirstYear'] = 2007; - -// Defines if old messages are purged from the database: -$config['logsPurgeLogs'] = false; -// Max time difference in days for old messages before they are purged from the database: -$config['logsPurgeTimeDiff'] = 365; - -// Defines if registered users (including moderators) have access to the logs (admins are always granted access): -$config['logsUserAccess'] = false; -// Defines a list of channels (e.g. array(0, 1)) to limit the logs access for registered users, includes all channels the user has access to if set to null: -$config['logsUserAccessChannelList'] = null; - -// Defines if the socket server is enabled: -$config['socketServerEnabled'] = false; -// Defines the hostname of the socket server used to connect from client side (the server hostname is used if set to null): -$config['socketServerHost'] = null; -// Defines the IP of the socket server used to connect from server side to broadcast update messages: -$config['socketServerIP'] = '127.0.0.1'; -// Defines the port of the socket server: -$config['socketServerPort'] = 1935; -// This ID can be used to distinguish between different chat installations using the same socket server: -$config['socketServerChatID'] = 0; -?> \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/custom.php b/library/ajaxchat/chat/lib/custom.php deleted file mode 100644 index a9d08841b..000000000 --- a/library/ajaxchat/chat/lib/custom.php +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/data/channels.php b/library/ajaxchat/chat/lib/data/channels.php deleted file mode 100644 index 8688e5e7b..000000000 --- a/library/ajaxchat/chat/lib/data/channels.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/data/users.php b/library/ajaxchat/chat/lib/data/users.php deleted file mode 100644 index 52ca77e50..000000000 --- a/library/ajaxchat/chat/lib/data/users.php +++ /dev/null @@ -1,40 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/ar.php b/library/ajaxchat/chat/lib/lang/ar.php deleted file mode 100644 index af9c8305e..000000000 --- a/library/ajaxchat/chat/lib/lang/ar.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/bg.php b/library/ajaxchat/chat/lib/lang/bg.php deleted file mode 100644 index 46d6af163..000000000 --- a/library/ajaxchat/chat/lib/lang/bg.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/ca.php b/library/ajaxchat/chat/lib/lang/ca.php deleted file mode 100644 index e45c376da..000000000 --- a/library/ajaxchat/chat/lib/lang/ca.php +++ /dev/null @@ -1,125 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/cy.php b/library/ajaxchat/chat/lib/lang/cy.php deleted file mode 100644 index dea446df5..000000000 --- a/library/ajaxchat/chat/lib/lang/cy.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/cz.php b/library/ajaxchat/chat/lib/lang/cz.php deleted file mode 100644 index cc6868c1e..000000000 --- a/library/ajaxchat/chat/lib/lang/cz.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/da.php b/library/ajaxchat/chat/lib/lang/da.php deleted file mode 100644 index 55e7eff1b..000000000 --- a/library/ajaxchat/chat/lib/lang/da.php +++ /dev/null @@ -1,123 +0,0 @@ - diff --git a/library/ajaxchat/chat/lib/lang/de.php b/library/ajaxchat/chat/lib/lang/de.php deleted file mode 100644 index f345d100a..000000000 --- a/library/ajaxchat/chat/lib/lang/de.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/el.php b/library/ajaxchat/chat/lib/lang/el.php deleted file mode 100644 index 526c31bf9..000000000 --- a/library/ajaxchat/chat/lib/lang/el.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/en.php b/library/ajaxchat/chat/lib/lang/en.php deleted file mode 100644 index cb9492bde..000000000 --- a/library/ajaxchat/chat/lib/lang/en.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/es.php b/library/ajaxchat/chat/lib/lang/es.php deleted file mode 100644 index 27b9b7273..000000000 --- a/library/ajaxchat/chat/lib/lang/es.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/et.php b/library/ajaxchat/chat/lib/lang/et.php deleted file mode 100644 index f1169fe19..000000000 --- a/library/ajaxchat/chat/lib/lang/et.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/fa.php b/library/ajaxchat/chat/lib/lang/fa.php deleted file mode 100644 index 0dc3cb132..000000000 --- a/library/ajaxchat/chat/lib/lang/fa.php +++ /dev/null @@ -1,124 +0,0 @@ - diff --git a/library/ajaxchat/chat/lib/lang/fi.php b/library/ajaxchat/chat/lib/lang/fi.php deleted file mode 100644 index 73466b412..000000000 --- a/library/ajaxchat/chat/lib/lang/fi.php +++ /dev/null @@ -1,125 +0,0 @@ - diff --git a/library/ajaxchat/chat/lib/lang/fr.php b/library/ajaxchat/chat/lib/lang/fr.php deleted file mode 100644 index 52ffaf1a2..000000000 --- a/library/ajaxchat/chat/lib/lang/fr.php +++ /dev/null @@ -1,125 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/gl.php b/library/ajaxchat/chat/lib/lang/gl.php deleted file mode 100644 index 54b8a8ee6..000000000 --- a/library/ajaxchat/chat/lib/lang/gl.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/he.php b/library/ajaxchat/chat/lib/lang/he.php deleted file mode 100644 index 39fa799d2..000000000 --- a/library/ajaxchat/chat/lib/lang/he.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/hr.php b/library/ajaxchat/chat/lib/lang/hr.php deleted file mode 100644 index ed0451033..000000000 --- a/library/ajaxchat/chat/lib/lang/hr.php +++ /dev/null @@ -1,123 +0,0 @@ - diff --git a/library/ajaxchat/chat/lib/lang/hu.php b/library/ajaxchat/chat/lib/lang/hu.php deleted file mode 100644 index 5f2174134..000000000 --- a/library/ajaxchat/chat/lib/lang/hu.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/in.php b/library/ajaxchat/chat/lib/lang/in.php deleted file mode 100644 index 175cc904b..000000000 --- a/library/ajaxchat/chat/lib/lang/in.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/it.php b/library/ajaxchat/chat/lib/lang/it.php deleted file mode 100644 index abcd4f9db..000000000 --- a/library/ajaxchat/chat/lib/lang/it.php +++ /dev/null @@ -1,125 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/ja.php b/library/ajaxchat/chat/lib/lang/ja.php deleted file mode 100644 index 075fc4fcb..000000000 --- a/library/ajaxchat/chat/lib/lang/ja.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/ka.php b/library/ajaxchat/chat/lib/lang/ka.php deleted file mode 100644 index d92d50886..000000000 --- a/library/ajaxchat/chat/lib/lang/ka.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/kr.php b/library/ajaxchat/chat/lib/lang/kr.php deleted file mode 100644 index 687dd6e30..000000000 --- a/library/ajaxchat/chat/lib/lang/kr.php +++ /dev/null @@ -1,123 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/mk.php b/library/ajaxchat/chat/lib/lang/mk.php deleted file mode 100644 index f43bcfb7d..000000000 --- a/library/ajaxchat/chat/lib/lang/mk.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/nl-be.php b/library/ajaxchat/chat/lib/lang/nl-be.php deleted file mode 100644 index db01b9871..000000000 --- a/library/ajaxchat/chat/lib/lang/nl-be.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/nl.php b/library/ajaxchat/chat/lib/lang/nl.php deleted file mode 100644 index c7dcc4b38..000000000 --- a/library/ajaxchat/chat/lib/lang/nl.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/no.php b/library/ajaxchat/chat/lib/lang/no.php deleted file mode 100644 index 52fe4afbe..000000000 --- a/library/ajaxchat/chat/lib/lang/no.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/pl.php b/library/ajaxchat/chat/lib/lang/pl.php deleted file mode 100644 index 92a1716a6..000000000 --- a/library/ajaxchat/chat/lib/lang/pl.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/pt-br.php b/library/ajaxchat/chat/lib/lang/pt-br.php deleted file mode 100644 index 034a5fb09..000000000 --- a/library/ajaxchat/chat/lib/lang/pt-br.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/pt-pt.php b/library/ajaxchat/chat/lib/lang/pt-pt.php deleted file mode 100644 index e3399eb04..000000000 --- a/library/ajaxchat/chat/lib/lang/pt-pt.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/ro.php b/library/ajaxchat/chat/lib/lang/ro.php deleted file mode 100644 index 8e6d6418f..000000000 --- a/library/ajaxchat/chat/lib/lang/ro.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/ru.php b/library/ajaxchat/chat/lib/lang/ru.php deleted file mode 100644 index ac86531dc..000000000 --- a/library/ajaxchat/chat/lib/lang/ru.php +++ /dev/null @@ -1,125 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/sk.php b/library/ajaxchat/chat/lib/lang/sk.php deleted file mode 100644 index fae99a785..000000000 --- a/library/ajaxchat/chat/lib/lang/sk.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/sl.php b/library/ajaxchat/chat/lib/lang/sl.php deleted file mode 100644 index 6e4941532..000000000 --- a/library/ajaxchat/chat/lib/lang/sl.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/sr.php b/library/ajaxchat/chat/lib/lang/sr.php deleted file mode 100644 index a14ba5512..000000000 --- a/library/ajaxchat/chat/lib/lang/sr.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/sv.php b/library/ajaxchat/chat/lib/lang/sv.php deleted file mode 100644 index 87f03a0ce..000000000 --- a/library/ajaxchat/chat/lib/lang/sv.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/th.php b/library/ajaxchat/chat/lib/lang/th.php deleted file mode 100644 index 7ed3b1ef0..000000000 --- a/library/ajaxchat/chat/lib/lang/th.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/tr.php b/library/ajaxchat/chat/lib/lang/tr.php deleted file mode 100644 index 00f7dfaa6..000000000 --- a/library/ajaxchat/chat/lib/lang/tr.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/uk.php b/library/ajaxchat/chat/lib/lang/uk.php deleted file mode 100644 index a7d80c16b..000000000 --- a/library/ajaxchat/chat/lib/lang/uk.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/lang/zh-tw.php b/library/ajaxchat/chat/lib/lang/zh-tw.php deleted file mode 100644 index d39fe6b14..000000000 --- a/library/ajaxchat/chat/lib/lang/zh-tw.php +++ /dev/null @@ -1,123 +0,0 @@ - diff --git a/library/ajaxchat/chat/lib/lang/zh.php b/library/ajaxchat/chat/lib/lang/zh.php deleted file mode 100644 index 1d18f0bc0..000000000 --- a/library/ajaxchat/chat/lib/lang/zh.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/loggedIn.html b/library/ajaxchat/chat/lib/template/loggedIn.html deleted file mode 100644 index 16a75ebe9..000000000 --- a/library/ajaxchat/chat/lib/template/loggedIn.html +++ /dev/null @@ -1,387 +0,0 @@ - - - - - - - [LANG]title[/LANG] - - [STYLE_SHEETS/] - - - - - - - - - - -
        -
        -

        [LANG]title[/LANG]

        -
        -
        - - - - - - - -
        -
        - -
        -
        - -
        -
        - 0/[MESSAGE_TEXT_MAX_LENGTH/] - -
        -
        -
        - - - - - - - - -
        - -
        - - - - - -
        -
        -

        [LANG]onlineUsers[/LANG]

        -
        -
        - - - - -
        -
        - - - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/loggedOut.html b/library/ajaxchat/chat/lib/template/loggedOut.html deleted file mode 100644 index ba8a8a4a9..000000000 --- a/library/ajaxchat/chat/lib/template/loggedOut.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - [LANG]title[/LANG] - - [STYLE_SHEETS/] - - - - - - - - -
        -
        -

        [LANG]title[/LANG]

        -
        - -
        - - -

        -
        -

        -
        -

        -
        -

        -
        -
        -
        * [LANG]registeredUsers[/LANG]
        -
        - -
        [ERROR_MESSAGES/]
        - - -
        - - - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/logs.html b/library/ajaxchat/chat/lib/template/logs.html deleted file mode 100644 index d0b9162a9..000000000 --- a/library/ajaxchat/chat/lib/template/logs.html +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - [LANG]logsTitle[/LANG] - - [STYLE_SHEETS/] - - - - - - - - - - -
        -
        -

        [LANG]logsTitle[/LANG]

        -
        -
        - - - - - - - - - - - - - -
        - -
        -
        - -
        -
        - -
        -
        - - - -
        - - - -
        -
        - - - \ No newline at end of file diff --git a/library/ajaxchat/chat/lib/template/shoutbox.html b/library/ajaxchat/chat/lib/template/shoutbox.html deleted file mode 100644 index 5f2de9981..000000000 --- a/library/ajaxchat/chat/lib/template/shoutbox.html +++ /dev/null @@ -1,60 +0,0 @@ -
        - - - - - - -
        -
        - -
        - - - -
        -
        diff --git a/library/ajaxchat/chat/license.txt b/library/ajaxchat/chat/license.txt deleted file mode 100644 index 618f9a318..000000000 --- a/library/ajaxchat/chat/license.txt +++ /dev/null @@ -1,28 +0,0 @@ -Modified MIT License (MIT) - -Copyright (c) 2013 blueimp.net - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -The above license does not apply to files included in the AJAX Chat project -which fall under other licenses. Such files are provided with their own -license text included beside or within the files themselves. -The presence of this modified MIT license in AJAX Chat does NOT supersede -the licenses applying to those files. You many NOT redistribute this project -or included files in a way that conflicts with their respective licenses. \ No newline at end of file diff --git a/library/ajaxchat/chat/readme.html b/library/ajaxchat/chat/readme.html deleted file mode 100644 index 145e188d3..000000000 --- a/library/ajaxchat/chat/readme.html +++ /dev/null @@ -1,436 +0,0 @@ - - - - - AJAX Chat Readme - - - - - -
        - -

        AJAX Chat - - v 0.8.7 standalone ( blueimp.net/ajax/ ) - -

        - - - -

        This is the standalone version of blueimp's AJAX Chat designed to run on its own, without another web application.
        -If you want to integrate AJAX Chat with one of the forums we support, go back and choose the right version.
        -This version is good for customizing your own integration, or using on its own.

        - -

        - AJAX stands for "Asynchronous JavaScript and XML".
        - The AJAX Chat client (your browser) uses JavaScript to query the web server for updates.
        - Instead of delivering a complete HTML page only updated data is sent in XML format.
        - By using JavaScript the chat page can be updated without having to reload the whole page.
        - PHP is used to communicate with the database and authenticate users. -

        - -

        Requirements

        -
        - - - - - - - - - -
        Server-SideClient-Side
        - PHP >= 5
        - MySQL >= 4
        - Ruby >= 1.8 (optional) -         		- Enabled JavaScript
        - Enabled Cookies
        - Flash Plugin >= 9 (optional) -
        -
        - -

        Installation

        -
        -

        Download your preferred version of AJAX Chat and unzip the file on your computer.

        -

        Before You Begin

        -
        -

        - In order to edit PHP files you will need a good text editor. You should not use Windows notepad, wordpad, or Microsoft Word to edit PHP files. These programs will add something called a byte-order-mark (BOM) to the files and this may prevent chat from functioning properly. - We recommend using Notepad ++ ( http://notepad-plus-plus.org ) for editing all files. It also has the benefit of color-coding your files so you can edit them more easily.
        - If you get an error message like "Cannot modify header information - headers already sent" it is likely because you have used one of the above programs to edit files. -

        -
        - -

        Configure Database Settings

        -
        -

        - The first and most important thing you need to do is tell AJAX Chat how to connect to your database. This, and all core settings must be located inside the file lib/config.php.
        - You need to create this file.
        - An example config.php file can be found in lib/config.php.example that shipped with chat.
        - Duplicate this file and save it as config.php (or just delete .example from the end of the file name) and then fill out at least the following four fields in the file:

        -

        - $config['dbConnection']['host'] = 'your_database_hostname';
        - $config['dbConnection']['user'] = 'your_database_username';
        - $config['dbConnection']['pass'] = 'your_database_password';
        - $config['dbConnection']['name'] = 'your_database_name';         -

        -

        Sufficed to say you need this information. Talk to your hosting provider if you don't know.

        -

        In most cases, chat will function with only these fields filled out and you can proceed to the next step.
        -

        -

        If your host does not use mysqli you will need to change the connection type field:
        - $config['dbConnection']['type'] = null;
        - If this is set to "null" it defaults to "mysqli" if existing, else to "mysql". In most cases this field can be left as null.
        -
        - You can reference an existing database connection link or object by changing:
        - $config['dbConnection']['link'] = null;
        - If this is set to null, a new database connection is created.

        -
        - -

        Choose Your Channel Settings

        -
        -

        Edit the file lib/data/channels.php.
        - We have provided you with two sample channels, named public and private. You can add your own, or leave it as-is.
        - Channels follow the following format: -
        - $channels[channel id] = 'channel name'; - Each channel must have a unique channel id number and a unique name.
        - Whitespace in the channel names will be converted to the underscore "_".

        -
        - -

        Add Your Users

        -
        -

        Edit users in lib/data/users.php.
        - Users follow the following format: -

        -

        $users[user id] = array();
        - $users[user id]['userRole'] = AJAX_CHAT_ROLE;
        - $users[user id]['userName'] = 'user name';
        - $users[user id]['password'] = 'user password';
        - $users[user id]['channels'] = array(allowed channel ids);
        - Each user must have a unique user id number and a unique name.
        - The first user in the list (user id 0) is used for the guest user settings. All guest users will have access to the channels set for this user and the user role AJAX_CHAT_GUEST.
        - Registered users can have the user roles AJAX_CHAT_USER, AJAX_CHAT_MODERATOR or AJAX_CHAT_ADMIN. (this is case sensitive, type it exactly)
        - The list of channels a user has access to can be set for each user individually. Channel id's are separated by commas. eg: array(0,1,23); allows channels 0, 1 and 23.
        - Whitespace in the user names will be converted to the underscore "_".

        -
        - -

        Upload to Your Server

        -
        -

        Upload the chat folder to your server somewhere under your document root:
        - e.g. http://example.org/path/to/chat/

        -
        -

        Create the Database Tables

        -
        -

        There are two options available to you to create the database. The first, and usually the easiest option, is to run the installation script included with AJAX Chat. Alternatively, you may use a database tool like PHPMyAdmin to manually create the tables.

        -
          -
        1. To use the installation script, visit the following URL in your browser:
          - http://example.org/path/to/chat/install.php
          - Where - "http://example.org/path/to/chat/" is the real URL to your chat directory.
          2. -
        2. To install it manually using PHPMyAdmin or a similar tool, copy the contents of the chat.sql file and run it as a query.
          3. -
        -

        Either of these methods will create the tables your database needs to store chat messages and other information.

        -
        - -

        Delete the Installation Script

        -
        -

        Delete the file install.php from the chat directory on your server. You may also delete the file chat.sql.

        -
        - -

        Congradulation! You Are Winner!

        -
        -

        Yay! You're done! To test your chat, navigate to your chat URL in a browser: http://example.org/path/to/chat/index.php
        -         You are now free to customize chat to further suit your needs.

        -
        -
        - -

        Configuring and Customizing

        -
        -

        Configuration Files

        -
        -

        AJAX Chat is fully customizable and contains two configuration files:

        -
          -
        1. lib/config.php: This file contains the core configuration options for chat. Essential options for configuring the database, security, available languages, etc, are found here.
          2. -
        2. js/config.js: This file contains client side settings that change your users' default options in chat. Many of these settings can be changed by users in their options but some (like the refresh rate) cannot.
          3. -
        -

        Both of these files are well commented with information on what the settings mean.

        -
        - -

        Customizing the Layout

        -
        -

        The layout of AJAX Chat is fully customizable by using CSS (Cascaded Style Sheets).
        - AJAX Chat comes with a predefined set of styles. To add your own style, do the following:

        -
          -
        1. Add a new CSS file (e.g. mystyle.css) by copying one of the existing styles from the CSS directory.
          2. -
        2. Edit your file (css/mystyle.css) and adjust the CSS settings to your liking.
          3. -
        3. Add the name of your style without file extension to the available styles in lib/config.php:
          - // Available styles:
          - $config['styleAvailable'] = array('mystyle','beige','black','grey');
          - // Default style:
          - $config['styleDefault'] = 'mystyle';
          4. -
        -

        To further customize the layout you can adjust the template files in lib/template/.

        -

        Make sure you are creating valid XHTML, else you will produce errors in modern browsers.
        - This is due to the page content-type served as "application/xhtml+xml".
        - Using this content-type improves performance when manipulating the Document Object Model (DOM).

        -

        If for some reason you cannot create valid XHTML you can force a HTML content-type.
        - Just edit lib/config.php and set the following option:

        -

        $config['contentType'] = 'text/html';

        -
        - -

        Adjusting the Language Settings

        -
        -

        AJAX Chat comes with two language file directories:

        -
          -
        1. js/lang/: This directory contains the language files used for the chat messages localization. These are JavaScript files with the extension ".js".
          2. -
        2. lib/lang/: This directory contains the language files used for the template output. These are PHP files with the extension ".php".
          3. -
        -

        Many languages are already included with the download and you can customize them by editing these files.
        - For each language, you need a file in both of these directories, with the language code as file name (such as en.js and en.php)..
        - The language code is used following the ISO 639 standards.

        -

        The files for the english (language code "en") localization are js/lang/en.js and lib/lang/en.php.

        -

        If you create your own localization, you must put the files in the correct folders and then make two changes to config.php:

        -
          -
        1. Add the language code (this must match the filename you chose for the language. Remember to use commas correctly to separate multiple language codes):
          - $config['langAvailable'] = array('en');
          2. -
        2. Add the language name (this is what users see in the dropdown menu to choose the language):
          - $config['langNames'] = array('en'=>'English');
          3. -
        -

        To avoid errors, you should follow these rules:

        -
          -
        1. Make sure you encode your localization files in UTF-8 (without Byte-order mark).
          2. -
        2. Don't use HTML entities in your localization files.
          3. -
        3. Don't remove any "%s" inside the JavaScript language files - these are filled with dynamic data.
          4. -
        -
        - -

        Adding Features

        -
        -

        AJAX Chat is designed with numerous hooks and overrides available to improve core functionality without requiring you to edit the core files. - With an intermediate understading of PHP and javascript you can modify your chat to suit your needs.

        -

        Have a look through a few examples available on the wiki: - https://github.com/Frug/AJAX-Chat/wiki/General-modifications -

        -
        - -
        - -

        Logs

        -
        -

        Accessing the Logs

        -
        -

        By default, AJAX Chat stores all chat messages in the database.
        - To access the logs you have to add the GET parameter view=logs to your chat url (add ?view=logs to the end of the url):

        -

        e.g. http://example.org/path/to/chat/?view=logs

        -

        If you are not already logged in, you have to login as administrator to access the logs.

        -

        The log view enables you to monitor the latest chat messages on all channels.
        - It is also possible to view the logs of private rooms and private messages.
        - You have the option to filter the logs by date, time and search strings.

        -

        The search filter accepts MySQL style regular expressions as described here: http://dev.mysql.com/doc/refman/5.1/en/regexp.html
        - You can search for IPs, using the following syntax: ip=127.0.0.1

        -
        -
        - -

        Shoutbox

        -
        -

        AJAX Chat is also usable as shoutbox - this is a short guide on how to set it up:

        - -

        Shoutbox Stylesheet

        -
        -

        Add the following line to the stylesheet (CSS) of all pages displaying the shoutbox:

        -

        @import url("http://example.org/path/to/chat/css/shoutbox.css");

        -

        Replace http://example.org/path/to/chat/ with the URL to the chat.
        - Modify css/shoutbox.css to your liking.

        -
        - -

        Shoutbox Function

        -
        -

        Add the following function to your PHP code:

        - -
        -<?php
-function getShoutBoxContent() {
-// URL to the chat directory:
-if(!defined('AJAX_CHAT_URL')) {
-	define('AJAX_CHAT_URL', './chat/');
-}
-
-// Path to the chat directory:
-if(!defined('AJAX_CHAT_PATH')) {
-	define('AJAX_CHAT_PATH', realpath(dirname($_SERVER['SCRIPT_FILENAME']).'/chat').'/');
-}
-
-// Validate the path to the chat:
-if(@is_file(AJAX_CHAT_PATH.'lib/classes.php')) {
-	
-	// Include Class libraries:
-	require_once(AJAX_CHAT_PATH.'lib/classes.php');
-	
-	// Initialize the shoutbox:
-	$ajaxChat = new CustomAJAXChatShoutBox();
-	
-	// Parse and return the shoutbox template content:
-	return $ajaxChat->getShoutBoxContent();
-}
-
-return null;
-}
-?>
-
         - -

        Make sure AJAX_CHAT_URL and AJAX_CHAT_PATH point to the chat directory.

        -
        - -

        Shoutbox Output

        -
        -

        Display the shoutbox content using the shoutbox function:

        -

        <div style="width:200px;"><?php echo getShoutBoxContent(); ?></div>

        -
        -
        - -

        Socket Server

        -
        -

        Using the AJAX technology alone the chat clients have to permanently pull updates from the server.
        - This is due to AJAX being a web technology and HTTP being a stateless protocol.
        - Events pushed from server-side need a permanent or long-lasting socket connection between clients and server.
        - This requires either a custom HTTP server (called "comet") or another custom socket server.

        -

        AJAX Chat uses a JavaScript-to-Flash bridge to establish a permanent socket connection from client side.
        - The JavaScript-to-Flash bridge requires a Flash plugin >= 9 installed on the user browser.
        - Clients without this requirement will fall back to pull the server for updates.

        -

        This part of the setup is OPTIONAL and meant for experienced users only.

        -

        Installation

        -
        -

        The socket server coming with AJAX Chat is implemented in Ruby.
        - You need to be able to run a Ruby script as a service to run the socket server.
        - To be able to start the service, the script files in the socket/ directory have to be executable:

        -

        $ chmod +x server
        - $ chmod +x server.rb

        -

        "server" is a simple bash script to start and stop a service.
        - "server.rb" is the ruby socket server script.
        - "server.conf" is a configuration file - each setting is explained with a comment.

        -

        To start the service, execute the "server" script with the parameter "start":

        -

        $ ./server start

        -

        This will create two additional files:

        -

        "server.pid" contains the process id of the service.
        - "server.log" is filled with the socket server log.

        -

        To monitor the socket server logs, you can use the "tail" command included in most GNU/Linux distributions:

        -

        $ tail -f server.log

        -

        By default only errors and start/stop of the server are logged.
        - To get more detailed logs configure the log level by editing the configuration file.

        -

        To stop the service, execute the "server" script with the parameter "stop":

        -

        $ ./server stop

        -

        If the socket server is running, you have to enable the following option in lib/config.php:

        -

        $config['socketServerEnabled'] = true;
        -
        - This tells the server-side chat script to broadcast chat messages via the socket server.
        - Chat clients will establish a permanent connection to the socket server to listen for chat messages.

        -

        By default only local clients (127.0.0.1,::1) may broadcast messages.
        - Clients allowed to broadcast messages may also handle the channel authentication.
        - If your socket server is running on another host you should set the broadcast_clients option to the chat server IP.

        -

        Using the socket server increases response time while improving server performance at the same time.

        -
        - -

        Flash Permissions

        -
        -

        - Since Flash 9.0.115.0 and all Flash 10 versions, permissions for creating sockets using Flash have changed.
        - Now an explicit permission (using xml-syntax) is required for creating socket connections.
        - In the current state, socket server won't work with the newest Flash versions.
        - You will get a "Flash security error" in the browser. -

        -

        - A solution is to use a policy-files server which will listen to connections in port 843 in the server.
        - Each time a client tries to connect to the chat, the Flash client will request the policy authorization to the server.
        - The policy-files server is downloadable from http://ammonlauritzen.com/FlashPolicyService-09b.zip
        - It works with FF3 and IE7 (not yet tested in other browsers). -

        -

        A more detailed explanation can be found here:

        -

        * http://ammonlauritzen.com/blog/2007/12/13/new-flash-security-policies/
        - * http://ammonlauritzen.com/blog/2008/04/22/flash-policy-service-daemon/
        -

        -

        Official Adobe documentation:

        -

        * http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security.html
        - * http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security_04.html

        -
        -

         

        -
        - -

        Support

        -
        -

        - Please do not email the devs with support questions.
        - For further documentation and some examples, check out our github wiki.
        - For general support questions use our google group.
        - For specific bug reports and a list of pending issues view our github project.
        -

        -
        - - -
        -

        - Your donations contribute to the growth and development of this project and are always appreciated.
        -

        - - - - -
        - I'm on gittip at https://www.gittip.com/Frug -

        -
        - -

        License

        -
        -

        Bluimp's AJAX Chat is released under a Modified MIT License.

        -

        You should also find this license included with your download of this project.

        -
        - -

        back to top

        - -
        - - diff --git a/library/ajaxchat/chat/socket/.htaccess b/library/ajaxchat/chat/socket/.htaccess deleted file mode 100644 index 91e386dc9..000000000 --- a/library/ajaxchat/chat/socket/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -AuthType Basic -AuthName "Forbidden" -AuthUserFile /dev/null -require user nobody \ No newline at end of file diff --git a/library/ajaxchat/chat/socket/server b/library/ajaxchat/chat/socket/server deleted file mode 100644 index 806b5ef74..000000000 --- a/library/ajaxchat/chat/socket/server +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -# Simple bash script to start and stop a service -# Works without access to /var/run/ or ps and pidof commands -# -# Date:: Wed, 09 Jan 2008 -# Author:: Sebastian Tschan, https://blueimp.net -# License:: GNU Affero General Public License - - -SERVICE_TITLE=Service -SERVICE_BASENAME=${0##*/} -SERVICE_DIR=${0%/$SERVICE_BASENAME} -SERVICE_COMMAND=$SERVICE_DIR/$SERVICE_BASENAME.rb -SERVICE_CONFIG=$SERVICE_DIR/$SERVICE_BASENAME.conf -SERVICE_LOG=$SERVICE_DIR/$SERVICE_BASENAME.log -SERVICE_PIDFILE=$SERVICE_DIR/$SERVICE_BASENAME.pid - - -function start -{ - if [ -f $SERVICE_PIDFILE ] - then - echo "PID file $SERVICE_PIDFILE found - $SERVICE_TITLE already running?" - else - $SERVICE_COMMAND $SERVICE_CONFIG >> $SERVICE_LOG & echo "Started $SERVICE_TITLE..." - PID=$! - echo $PID > $SERVICE_PIDFILE - fi - exit 0 -} - -function stop -{ - if [ -f $SERVICE_PIDFILE ] - then - PID=`cat $SERVICE_PIDFILE` - kill -TERM $PID - rm -f $SERVICE_PIDFILE - echo "Stopped $SERVICE_TITLE." - else - echo "PID file $SERVICE_PIDFILE not found - $SERVICE_TITLE not running?" - fi - exit 0 -} - -function main -{ - for arg in $@ - do - if [ $arg == "start" ] - then - start - elif [ $arg == "stop" ] - then - stop - else - echo "Unknown argument:" $arg - echo "Usage: $0 [start|stop]" - exit 0 - fi - done - - echo "Missing argument." - echo "Usage: $0 [start|stop]" - exit 0 -} - - -# Script execution: -main $@ \ No newline at end of file diff --git a/library/ajaxchat/chat/socket/server.conf b/library/ajaxchat/chat/socket/server.conf deleted file mode 100644 index 47c6849da..000000000 --- a/library/ajaxchat/chat/socket/server.conf +++ /dev/null @@ -1,22 +0,0 @@ - -# Server address (leave empty to bind to all available interfaces): -server_address= - -# Server port: -server_port=1935 - -# Comma-separated list of clients allowed to broadcast (allows all if empty): -broadcast_clients=127.0.0.1,::1 - -# Maximum number of clients (0 allows an unlimited number of clients): -max_clients=0 - -# Comma-separated list of domains from which downloaded Flash clients are allowed to connect (* allows all domains): -allow_access_from=* - -# Log level: -# 0 = log only errors and server start/stop -# 1 = log client connections -# 2 = log all messages but no broadcast content -# 3 = log everything -log_level=0 diff --git a/library/ajaxchat/chat/socket/server.rb b/library/ajaxchat/chat/socket/server.rb deleted file mode 100644 index c2f532c84..000000000 --- a/library/ajaxchat/chat/socket/server.rb +++ /dev/null @@ -1,400 +0,0 @@ -#!/usr/bin/env ruby - -# Simple Ruby XML Socket Server -# -# This is a a simple socket server implementation in ruby -# to communicate with flash clients via Flash XML Sockets. -# -# The socket code is based on the tutorial -# "Sockets programming in Ruby" -# by M. Tim Jones (mtj@mtjones.com). -# -# Date:: Tue, 05 Mar 2008 -# Author:: Sebastian Tschan, https://blueimp.net -# License:: GNU Affero General Public License - -# Include socket library: -require 'socket' -# Include XML libraries: -require 'rexml/document' -require 'rexml/streamlistener' - -# XML Stream Handler class used to parse chat messages: -class XMLStreamHandler - attr_reader :type,:chat_id,:user_id,:reg_id,:channel_id,:channel_ids - # Called when an opening tag (including attributes) is parsed: - def tag_start name, attrs - case name - when 'root' - # root messages are broadcast messages: - @type = :message - @chat_id = attrs['chatID'] - @channel_id = attrs['channelID'] - throw :break - when 'register' - # register messages are sent by chat clients: - @type = :register - @chat_id = attrs['chatID'] - @user_id = attrs['userID'] - @reg_id = attrs['regID'] - throw :break - when 'authenticate' - # authenticate messages are sent by the chat server client: - @type = :authenticate - @chat_id = attrs['chatID'] - @user_id = attrs['userID'] - @reg_id = attrs['regID'] - @channel_ids = Array::new - when 'channel' - # authenticate messages contain channel tags: - if @channel_ids - @channel_ids.push(attrs['id']) - else - throw :break - end - when 'policy-file-request' - # policy-file-requests are sent by flash clients for cross-domain authentication: - @type = :policy_file_request - throw :break - else - throw :break - end - end - # Called when a closing tag is parsed: - def tag_end name - if name == 'authenticate' - throw :break - end - end - def text text - # Called on text between tags - end - # Called when cdata is parsed: - alias cdata text -end - -# Socket Server class: -class SocketServer - - def initialize(config_file) - # List of configuration settings: - @config = Hash::new - # Initialize default settings: - initialize_default_properties - if config_file - # Load settings from configuration file: - load_properties_from_file(config_file) - end - # Sockets list: - @sockets = Array::new - # Clients list: - @clients = Hash::new - # Chats list, used to distinguish between different chat installations (contains channels list): - @chats = Hash::new - # Initialize server socket: - initialize_server_socket - if @server_socket - # Log server start (STDOUT.flush prevents output buffering): - puts "#{Time.now}\tServer started on Port #{@config[:server_port].to_s} ..."; STDOUT.flush - begin - # Start the server: - run - rescue SignalException - # Controlled stop: - ensure - for socket in @sockets - if socket != @server_socket - # Disconnect all clients: - handle_client_disconnection(socket, false) - end - end - @sockets = nil - @clients = nil - # Log server stop: - puts "#{Time.now}\tServer stopped."; STDOUT.flush - end - end - end - - def run - # Endless loop: - while 1 - # Blocking select call. The first three parameters are arrays of IO objects or nil. - # The last parameter is to set a timeout in seconds to force select to return - # if no event has occurred on any of the given IO object arrays. - res = select(@sockets, nil, nil, nil) - if res != nil then - # Iterate through the tagged read descriptors: - for socket in res[0] - # Received a connect to the server socket: - if socket == @server_socket then - accept_new_connection - else - # Received something on a client socket: - if socket.eof? then - # Handle client disconnection: - handle_client_disconnection(socket) - else - # Handle client input data: - handle_client_input(socket, socket.gets(@config[:eol])) - end - end - end - end - end - end - - private - - def initialize_default_properties - # Server address (empty = bind to all available interfaces): - @config[:server_address] = '' - # Server port: - @config[:server_port] = 1935 - # Comma-separated list of clients allowed to broadcast (allows all if empty): - @config[:broadcast_clients] = '' - # Defines if broadcast is sent to broadcasting client: - @config[:broadcast_self] = false - # Maximum number of clients (0 allows an unlimited number of clients): - @config[:max_clients] = 0 - # Comma-separated list of domains from which downloaded Flash clients are allowed to connect (* allows all domains): - @config[:allow_access_from] = '*' - # Defines the cross-domain-policy string sent to Flash clients as response to a policy-file-request: - @config[:cross_domain_policy] = '' - # EOL (End Of Line) character used by Flash XML Socket communication (a null-byte): - @config[:eol] = "\0" - # Log level (0 logs only errors and server start/stop, 1 logs client connections, 2 logs all messages but no broadcast content, 3 logs everything): - @config[:log_level] = 0 - end - - def load_properties_from_file(config_file) - # Open the config file and go through each line: - File.open(config_file, 'r') do |file| - file.read.each_line do |line| - # Remove trailing whitespace from the line: - line.strip! - # Get the position of the first "=": - i = line.index('=') - # Check if line is not a comment and a valid property: - if (!line.empty? && line[0] != ?# && i > 0) - # Add the configuration option to the config hash: - key = line[0..i - 1].strip - value = line[i + 1..-1].strip - # Parse boolean values: - if value.eql?('false') - @config[key.to_sym] = false - elsif value.eql?('true') - @config[key.to_sym] = true - # Parse integer numbers: - elsif value.to_i.to_s.eql?(value) - @config[key.to_sym] = value.to_i - # Parse floating point numbers: - elsif value.to_f.to_s.eql?(value) - @config[key.to_sym] = value.to_f - # Parse string values: - else - @config[key.to_sym] = value - end - end - end - end - if @config[:eol].empty? - # Use default EOL if configuration option is empty: - @config[:eol] = $/ - end - end - - def initialize_server_socket - begin - # The server socket, allowing connections from any interface and bound to the given port number: - @server_socket = TCPServer.new(@config[:server_address], @config[:server_port].to_i) - # Enable reuse of the server address (e.g. for rapid restarts of the server): - @server_socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1) - # Add the server socket to the sockets list: - @sockets.push(@server_socket) - rescue Exception => error - # Log initialization failure: - puts "#{Time.now}\tFailed to initialize Server on Port #{@config[:server_port].to_s}: #{error}."; STDOUT.flush - end - end - - def accept_new_connection - begin - # Accept the client connection (non-blocking): - socket = @server_socket.accept_nonblock - # Retrieve IP and Port: - ip = socket.peeraddr[3] - port = socket.peeraddr[1] - # Check if we have reached the maximum number of connected clients (always accept the broadcast clients): - if @config[:max_clients].to_i == 0 || @clients.size < @config[:max_clients].to_i || !@config[:broadcast_clients].empty? && @config[:broadcast_clients].include?(ip) - # Add the accepted socket connection to the socket list: - @sockets.push(socket) - # Create a new Hash to store the client data: - client = Hash::new - client[:id] = "[#{ip}]:#{port}" - # Check if the client is allowed to broadcast: - if @config[:broadcast_clients].empty? || @config[:broadcast_clients].include?(ip) - client[:allowed_to_broadcast] = true - else - client[:allowed_to_broadcast] = false - end - # Add the client to the clients list: - @clients[socket] = client - if @config[:log_level].to_i > 0 - # Log client connection and the number of connected clients: - puts "#{Time.now}\t#{client[:id]} Connects\t(#{@clients.size} connected)"; STDOUT.flush - end - else - # Close the socket connection: - socket.close - end - rescue - # Client disconnected before the address information (IP, Port) could be retrieved. - end - end - - def handle_client_disconnection(client_socket, delete_socket=true) - # Retrieve the client ID for the current socket: - client_id = @clients[client_socket][:id] - begin - # Close the socket connection: - client_socket.close - rescue - # Rescue if closing the socket fails - end - if delete_socket - # Remove the socket from the sockets list: - @sockets.delete(client_socket) - end - # Remove the client ID from the clients list: - @clients.delete(client_socket) - if @config[:log_level].to_i > 0 - # Log client disconnection and the number of connected clients: - puts "#{Time.now}\t#{client_id} Disconnects\t(#{@clients.size} connected)"; STDOUT.flush - end - end - - def handle_client_input(client_socket, str) - # Create a new XML stream handler: - handler = XMLStreamHandler.new - begin - # As soon as the parser has found the relevant information it throws a :break symbol: - catch :break do - # Parse the given input string for XML messages: - REXML::Document.parse_stream(str, handler) - end - # The handler stores a type property to define the parsed XML message: - case handler.type - when :message - handle_broadcast_message(client_socket, handler.chat_id, handler.channel_id, str) - when :register - handle_client_registration(client_socket, handler.chat_id, handler.user_id, handler.reg_id) - when :authenticate - handle_client_authentication(client_socket, handler.chat_id, handler.user_id, handler.reg_id, handler.channel_ids) - when :policy_file_request - handle_policy_file_request(client_socket) - end - rescue Exception => error - # Rescue if parsing the client input fails and log the error message: - puts "#{Time.now}\t#{@clients[client_socket][:id]} Client Input Error:#{error.to_s.dump}"; STDOUT.flush - end - end - - def handle_broadcast_message(client_socket, chat_id, channel_id, str) - # Check if the_client is allowed to broadcast: - if @clients[client_socket][:allowed_to_broadcast] - # Check if the chat and channel have been registered: - if @chats[chat_id] && (@chats[chat_id][channel_id] || @chats[chat_id]['ALL']) - # Go through the sockets list: - @sockets.each do |socket| - # Skip the server socket and skip the the client socket if broadcast is not to be sent to self: - if socket != @server_socket && (@config[:broadcast_self] || socket != client_socket) - # Only write to clients registered to the given channel or to the "ALL" channel: - if @chats[chat_id]['ALL'] - reg_id = @chats[chat_id]['ALL'][@clients[socket][:user_id]] - end - if !reg_id && @chats[chat_id][channel_id] - reg_id = @chats[chat_id][channel_id][@clients[socket][:user_id]] - end - # Check if the reg_id stored for the given channel and user_id matches the clients reg_id: - if reg_id && reg_id.eql?(@clients[socket][:reg_id]) - begin - # Write the broadcast message on the socket connection: - socket.write(str) - rescue - # Rescue if writing to the socket fails - end - end - end - end - end - if @config[:log_level].to_i > 2 - # Log the message sent by the broadcast client: - puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} Channel:#{channel_id.to_s.dump} Message:#{str.to_s.dump}"; STDOUT.flush - elsif @config[:log_level].to_i > 1 - # Log the message sent by the broadcast client: - puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} Channel:#{channel_id.to_s.dump} Message"; STDOUT.flush - end - end - end - - def handle_client_registration(client_socket, chat_id, user_id, reg_id) - # Save the chat_id, use_id and reg_id as client properties: - @clients[client_socket][:chat_id] = chat_id - @clients[client_socket][:user_id] = user_id - @clients[client_socket][:reg_id] = reg_id - if @config[:log_level].to_i > 1 - # Log the client registration: - puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} User:#{user_id.to_s.dump} Reg:#{reg_id.to_s.dump}"; STDOUT.flush - end - end - - def handle_client_authentication(client_socket, chat_id, user_id, reg_id, channel_ids) - # Only the broadcast clients may send authentication messages: - if @clients[client_socket][:allowed_to_broadcast] - # Create a new chat item if not found for the given chat_id: - if !@chats[chat_id] - @chats[chat_id] = Hash.new - end - # Go through the list of channels for the given chat: - @chats[chat_id].each_key do |key| - # Delete all items for the given user on all channels of the given chat: - @chats[chat_id][key].delete(user_id) - # If the chat channel is empty, delete the channel item: - if @chats[chat_id][key].size == 0 - @chats[chat_id].delete(key) - end - end - # Go through the list of authenticated channel_ids: - channel_ids.each do |channel_id| - # Create a new channel item if not found for the current channel_id (and the given chat_id): - if !@chats[chat_id][channel_id] - @chats[chat_id][channel_id] = Hash.new - end - # Add a user item of the given user_id with the given reg_id to the current channel: - @chats[chat_id][channel_id][user_id] = reg_id - end - if @config[:log_level].to_i > 1 - # Log the client authentication: - puts "#{Time.now}\t#{@clients[client_socket][:id]} Chat:#{chat_id.to_s.dump} User:#{user_id.to_s.dump} Auth:#{reg_id.to_s.dump} Channels:#{channel_ids.join(',').dump}"; STDOUT.flush - end - end - end - - def handle_policy_file_request(client_socket) - begin - # Write the cross-domain-policy to the Flash client: - client_socket.write(@config[:cross_domain_policy]+@config[:eol]) - rescue - # Rescue if writing to the socket fails - end - if @config[:log_level].to_i > 1 - # Log the policy-file-request: - puts "#{Time.now}\t#{@clients[client_socket][:id]} Policy-File-Request"; STDOUT.flush - end - end - -end - -# Start the socket server with the first command line argument as configuration file: -SocketServer.new($*[0]) \ No newline at end of file diff --git a/library/ajaxchat/chat/sounds/index.html b/library/ajaxchat/chat/sounds/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/library/ajaxchat/chat/sounds/license.txt b/library/ajaxchat/chat/sounds/license.txt deleted file mode 100644 index d4a756fe8..000000000 --- a/library/ajaxchat/chat/sounds/license.txt +++ /dev/null @@ -1,28 +0,0 @@ -The sounds used for this project have been created by - -==================================== -Stuart Duffield (Soundsnap.com user) -==================================== - -http://soundsnap.com/user/21 - - -The sounds are licensed under the - -================= -Soundsnap Licence -================= - -http://soundsnap.com/licence - -You are Free: - -* To remix or transform the sounds in any way -* To copy, distribute and transmit the sounds -* To use the sounds in any music, film, video game, website etc. -whether commercial or not, without paying royalties or other fees - -You Cannot: - -* Make commercial distribution of these sounds 'as they are'. -For example, you cannot download and sell them as part of a CD library \ No newline at end of file diff --git a/library/ajaxchat/chat/sounds/sound_1.mp3 b/library/ajaxchat/chat/sounds/sound_1.mp3 deleted file mode 100644 index f9526e1ca..000000000 Binary files a/library/ajaxchat/chat/sounds/sound_1.mp3 and /dev/null differ diff --git a/library/ajaxchat/chat/sounds/sound_2.mp3 b/library/ajaxchat/chat/sounds/sound_2.mp3 deleted file mode 100644 index 73bdcd2b1..000000000 Binary files a/library/ajaxchat/chat/sounds/sound_2.mp3 and /dev/null differ diff --git a/library/ajaxchat/chat/sounds/sound_3.mp3 b/library/ajaxchat/chat/sounds/sound_3.mp3 deleted file mode 100644 index 1c765773a..000000000 Binary files a/library/ajaxchat/chat/sounds/sound_3.mp3 and /dev/null differ diff --git a/library/ajaxchat/chat/sounds/sound_4.mp3 b/library/ajaxchat/chat/sounds/sound_4.mp3 deleted file mode 100644 index d2f66baff..000000000 Binary files a/library/ajaxchat/chat/sounds/sound_4.mp3 and /dev/null differ diff --git a/library/ajaxchat/chat/sounds/sound_5.mp3 b/library/ajaxchat/chat/sounds/sound_5.mp3 deleted file mode 100644 index 0d5a5f299..000000000 Binary files a/library/ajaxchat/chat/sounds/sound_5.mp3 and /dev/null differ diff --git a/library/ajaxchat/chat/sounds/sound_6.mp3 b/library/ajaxchat/chat/sounds/sound_6.mp3 deleted file mode 100644 index df6007948..000000000 Binary files a/library/ajaxchat/chat/sounds/sound_6.mp3 and /dev/null differ diff --git a/library/ajaxchat/chat/src/EmptySwf.as b/library/ajaxchat/chat/src/EmptySwf.as deleted file mode 100644 index 373c5e375..000000000 --- a/library/ajaxchat/chat/src/EmptySwf.as +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2006 Adobe Systems Incorporated - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ - -package { - import flash.display.MovieClip; - import bridge.FABridge; - - public class EmptySwf extends MovieClip { - - private var externalBridge:FABridge; - - public function EmptySwf() { - super(); - externalBridge = new FABridge(); - externalBridge.rootObject = this; - } - } -} diff --git a/library/ajaxchat/chat/src/FABridge.as b/library/ajaxchat/chat/src/FABridge.as deleted file mode 100644 index d03dba01a..000000000 --- a/library/ajaxchat/chat/src/FABridge.as +++ /dev/null @@ -1,943 +0,0 @@ -/* -Copyright � 2006 Adobe Systems Incorporated - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ - - -/* - * The Bridge class, responsible for navigating JS instances - */ -package bridge -{ - -/* - * imports - */ -import flash.external.ExternalInterface; -import flash.utils.Timer; -import flash.events.*; -import flash.display.DisplayObject; -import flash.system.ApplicationDomain; -import flash.utils.Dictionary; -import flash.utils.setTimeout; - -import mx.collections.errors.ItemPendingError; -import mx.core.IMXMLObject; - -import flash.utils.getQualifiedClassName; -import flash.utils.describeType; -import flash.events.TimerEvent; - -/** - * The FABridge class, responsible for proxying AS objects into javascript - */ -public class FABridge extends EventDispatcher implements IMXMLObject -{ - - //holds a list of stuff to call later, to break the recurrence of the js <> as calls - //you must use the full class name, as returned by the getQualifiedClassName() function - public static const MethodsToCallLater:Object = new Object(); - MethodsToCallLater["mx.collections::ArrayCollection"]="refresh,removeItemAt"; - - public static const EventsToCallLater:Object = new Object(); - EventsToCallLater["mx.data.events::UnresolvedConflictsEvent"]="true"; - EventsToCallLater["mx.events::PropertyChangeEvent"]="true"; - - public static const INITIALIZED:String = "bridgeInitialized"; - - // constructor - public function FABridge() - { - super(); - initializeCallbacks(); - } - - // private vars - - /** - * stores a cache of descriptions of AS types suitable for sending to JS - */ - private var localTypeMap:Dictionary = new Dictionary(); - - /** - * stores an id-referenced dictionary of objects exported to JS - */ - private var localInstanceMap:Dictionary = new Dictionary(); - - /** - * stores an id-referenced dictionary of functions exported to JS - */ - private var localFunctionMap:Dictionary = new Dictionary(); - - /** - * stores an id-referenced dictionary of proxy functions imported from JS - */ - private var remoteFunctionCache:Dictionary = new Dictionary(); - - /** - * stores a list of custom serialization functions - */ - private var customSerializersMap:Dictionary = new Dictionary(); - - /** - * stores a map of object ID's and their reference count - */ - private var refMap:Dictionary = new Dictionary(); - /** - * a local counter for generating unique IDs - */ - private var nextID:Number = 0; - - private var lastRef:int; - - /* values that can't be serialized natively across the bridge are packed and identified by type. - These constants represent different serialization types */ - public static const TYPE_ASINSTANCE:uint = 1; - public static const TYPE_ASFUNCTION:uint = 2; - public static const TYPE_JSFUNCTION:uint = 3; - public static const TYPE_ANONYMOUS:uint = 4; - - private var _initChecked:Boolean = false; - - // properties - - //getters and setters for the main component in the swf - the root - public function get rootObject():DisplayObject {return _rootObject;} - public function set rootObject(value:DisplayObject):void - { - _rootObject = value; - checkInitialized(); - } - - /** - * the bridge name - */ - public var bridgeName:String; - private var _registerComplete:Boolean = false; - - /** - * increment the reference count for an object being passed over the bridge - */ - public function incRef(objId:int):void - { - if(refMap[objId] == null) { - //the object is being created; we now add it to the map and set its refCount = 1 - refMap[objId] = 1; - } else { - refMap[objId] = refMap[objId] +1; - } - } - - /** - * when an object has been completely passed to JS its reference count is decreased with 1 - */ - public function releaseRef(objId:int):void - { - if(refMap[objId] != null) - { - var newRefVal:int = refMap[objId] - 1; - // if the object exists in the referenceMap and its count equals or has dropped under 0 we clean it up - if(refMap[objId] != null && newRefVal <= 0) - { - delete refMap[objId]; - delete localInstanceMap[objId]; - } - else - { - refMap[objId] = newRefVal; - } - } - } - - /** - * attaches the callbacks to external interface - */ - public function initializeCallbacks():void - { - if (ExternalInterface.available == false) - { - return; - } - - ExternalInterface.addCallback("getRoot", js_getRoot); - ExternalInterface.addCallback("getPropFromAS", js_getPropFromAS); - ExternalInterface.addCallback("setPropInAS", js_setPropertyInAS); - ExternalInterface.addCallback("invokeASMethod", js_invokeMethod); - ExternalInterface.addCallback("invokeASFunction", js_invokeFunction); - ExternalInterface.addCallback("releaseASObjects", js_releaseASObjects); - ExternalInterface.addCallback("create", js_create); - ExternalInterface.addCallback("releaseNamedASObject",js_releaseNamedASObject); - ExternalInterface.addCallback("incRef", incRef); - ExternalInterface.addCallback("releaseRef", releaseRef); - } - - private var _rootObject:DisplayObject; - - private var _document:DisplayObject; - - /** - * called to check whether the bridge has been initialized for the specified document/id pairs - */ - public function initialized(document:Object, id:String):void - { - _document = (document as DisplayObject); - - if (_document != null) - { - checkInitialized(); - } - } - - private function get baseObject():DisplayObject - { - return (rootObject == null)? _document:rootObject; - } - - - private function checkInitialized():void - { - if(_initChecked== true) - { - return; - } - _initChecked = true; - - // oops! timing error. Player team is working on it. - var t:Timer = new Timer(200,1); - t.addEventListener(TimerEvent.TIMER,auxCheckInitialized); - t.start(); - } - - /** - * auxiliary initialization check that is called after the timing has occurred - */ - private function auxCheckInitialized(e:Event):void - { - - var bCanGetParams:Boolean = true; - - try - { - var params:Object = baseObject.root.loaderInfo.parameters; - } - catch (e:Error) - { - bCanGetParams = false; - } - - if (bCanGetParams == false) - { - var t:Timer = new Timer(100); - var timerFunc:Function = function(e:TimerEvent):void - { - if(baseObject.root != null) - { - try - { - bCanGetParams = true; - var params:Object = baseObject.root.loaderInfo.parameters; - } - catch (err:Error) - { - bCanGetParams = false; - } - if (bCanGetParams) - { - t.removeEventListener(TimerEvent.TIMER, timerFunc); - t.stop(); - dispatchInit(); - } - } - } - t.addEventListener(TimerEvent.TIMER, timerFunc); - t.start(); - } - else - { - dispatchInit(); - } - } - - /** - * call into JS to annunce that the bridge is ready to be used - */ - private function dispatchInit(e:Event = null):void - { - if(_registerComplete == true) - { - return; - } - - if (ExternalInterface.available == false) - { - return; - } - - if (bridgeName == null) - { - bridgeName = baseObject.root.loaderInfo.parameters["bridgeName"]; - - if(bridgeName == null) - { - bridgeName = "flash"; - } - } - - _registerComplete = ExternalInterface.call("FABridge__bridgeInitialized", [bridgeName]); - dispatchEvent(new Event(FABridge.INITIALIZED)); - } - - // serialization/deserialization - - /** serializes a value for transfer across the bridge. primitive types are left as is. Arrays are left as arrays, but individual - * values in the array are serialized according to their type. Functions and class instances are inserted into a hash table and sent - * across as keys into the table. - * - * For class instances, if the instance has been sent before, only its id is passed. If This is the first time the instance has been sent, - * a ref descriptor is sent associating the id with a type string. If this is the first time any instance of that type has been sent - * across, a descriptor indicating methods, properties, and variables of the type is also sent across - */ - public function serialize(value:*, keep_refs:Boolean=false):* - { - var result:* = {}; - result.newTypes = []; - result.newRefs = {}; - - if (value is Number || value is Boolean || value is String || value == null || value == undefined || value is int || value is uint) - { - result = value; - } - else if (value is Array) - { - result = []; - for(var i:int = 0; i < value.length; i++) - { - result[i] = serialize(value[i], keep_refs); - } - } - else if (value is Function) - { - // serialize a class - result.type = TYPE_ASFUNCTION; - result.value = getFunctionID(value, true); - } - else if (getQualifiedClassName(value) == "Object") - { - result.type = TYPE_ANONYMOUS; - result.value = value; - } - else - { - // serialize a class - result.type = TYPE_ASINSTANCE; - // make sure the type info is available - var className:String = getQualifiedClassName(value); - - var serializer:Function = customSerializersMap[className]; - - // try looking up the serializer under an alternate name - if (serializer == null) - { - if (className.indexOf('$') > 0) - { - var split:int = className.lastIndexOf(':'); - if (split > 0) - { - var alternate:String = className.substring(split+1); - serializer = customSerializersMap[alternate]; - } - } - } - - if (serializer != null) - { - return serializer.apply(null, [value, keep_refs]); - } - else - { - if (retrieveCachedTypeDescription(className, false) == null) - { - try - { - result.newTypes.push(retrieveCachedTypeDescription(className, true)); - } - catch(err:Error) - { - var interfaceInfo:XMLList = describeType(value).implementsInterface; - for each (var interf:XML in interfaceInfo) - { - className = interf.@type.toString(); - if (retrieveCachedTypeDescription(className, false) == null){ - result.newTypes.push(retrieveCachedTypeDescription(className, true)); - } //end if push new data type - - } //end for going through interfaces - var baseClass:String = describeType(value).@base.toString(); - if (retrieveCachedTypeDescription(baseClass, false) == null){ - result.newTypes.push(retrieveCachedTypeDescription(baseClass, true)); - } //end if push new data type - } - } - - // make sure the reference is known - var objRef:Number = getRef(value, false); - var should_keep_ref:Boolean = false; - if (isNaN(objRef)) - { - //create the reference if necessary - objRef = getRef(value, true); - should_keep_ref = true; - } - - result.newRefs[objRef] = className; - //trace("serializing new reference: " + className + " with value" + value); - - //the result is a getProperty / invokeMethod call. How can we know how much you will need the object ? - if (keep_refs && should_keep_ref) { - incRef(objRef); - } - result.value = objRef; - } - } - return result; - } - - /** - * deserializes a value passed in from javascript. See serialize for details on how values are packed and - * unpacked for transfer across the bridge. - */ - public function deserialize(valuePackage:*):* - { - var result:*; - if (valuePackage is Number || valuePackage is Boolean || valuePackage is String || valuePackage === null || valuePackage === undefined || valuePackage is int || valuePackage is uint) - { - result = valuePackage; - } - else if(valuePackage is Array) - { - result = []; - for (var i:int = 0; i < valuePackage.length; i++) - { - result[i] = deserialize(valuePackage[i]); - } - } - else if (valuePackage.type == FABridge.TYPE_JSFUNCTION) - { - result = getRemoteFunctionProxy(valuePackage.value, true); - } - else if (valuePackage.type == FABridge.TYPE_ASFUNCTION) - { - throw new Error("as functions can't be passed back to as yet"); - } - else if (valuePackage.type == FABridge.TYPE_ASINSTANCE) - { - result = resolveRef(valuePackage.value); - } - else if (valuePackage.type == FABridge.TYPE_ANONYMOUS) - { - result = valuePackage.value; - } - return result; - } - - public function addCustomSerialization(className:String, serializationFunction:Function):void - { - customSerializersMap[className] = serializationFunction; - } - - - // type management - - /** - * retrieves a type description for the type indicated by className, building one and caching it if necessary - */ - public function retrieveCachedTypeDescription(className:String, createifNecessary:Boolean):Object - { - if(localTypeMap[className] == null && createifNecessary == true) - { - localTypeMap[className] = buildTypeDescription(className); - } - return localTypeMap[className]; - } - - public function addCachedTypeDescription(className:String, desc:Object):Object - { - if (localTypeMap[className] == null) - { - localTypeMap[className] = desc; - } - return localTypeMap[className]; - } - - /** - * builds a type description for the type indiciated by className - */ - public function buildTypeDescription(className:String):Object - { - var desc:Object = {}; - - className = className.replace(/::/,"."); - - var objClass:Class = Class(ApplicationDomain.currentDomain.getDefinition(className)); - - var xData:XML = describeType(objClass); - - desc.name = xData.@name.toString(); - - var methods:Array = []; - var xMethods:XMLList = xData.factory.method; - for (var i:int = 0; i < xMethods.length(); i++) - { - methods.push(xMethods[i].@name.toString()); - } - desc.methods = methods; - - var accessors:Array = []; - var xAcc:XMLList = xData.factory.accessor; - for (i = 0; i < xAcc.length(); i++) - { - accessors.push(xAcc[i].@name.toString()); - } - xAcc = xData.factory.variable; - for (i = 0; i < xAcc.length(); i++) - { - accessors.push(xAcc[i].@name.toString()); - } - desc.accessors = accessors; - - return desc; - } - -// instance mgmt - - /** - * resolves an instance id passed from JS to an instance previously cached for representing in JS - */ - private function resolveRef(objRef:Number):Object - { - try - { - return (objRef == -1)? baseObject : localInstanceMap[objRef]; - } - catch(e:Error) - { - return serialize("__FLASHERROR__"+"||"+e.message); - } - - return (objRef == -1)? baseObject : localInstanceMap[objRef]; - } - - /** - * returns an id associated with the object provided for passing across the bridge to JS - */ - public function getRef(obj:Object, createIfNecessary:Boolean):Number - { - try - { - var ref:Number; - - if (createIfNecessary) - { - var newRef:Number = nextID++; - localInstanceMap[newRef] = obj; - ref = newRef; - } - else - { - for (var key:* in localInstanceMap) - { - if (localInstanceMap[key] === obj) - { - ref = key; - break; - } - } - } - } - catch(e:Error) - { - return serialize("__FLASHERROR__"+"||"+e.message) - } - - return ref; - } - - - // function management - - /** - * resolves a function ID passed from JS to a local function previously cached for representation in JS - */ - private function resolveFunctionID(funcID:Number):Function - { - return localFunctionMap[funcID]; - } - - /** - * associates a unique ID with a local function suitable for passing across the bridge to proxy in Javascript - */ - public function getFunctionID(f:Function, createIfNecessary:Boolean):Number - { - var ref:Number; - - if (createIfNecessary) - { - var newID:Number = nextID++; - localFunctionMap[newID] = f; - ref = newID; - } - else - { - for (var key:* in localFunctionMap) - { - if (localFunctionMap[key] === f) { - ref = key; - } - break; - } - } - - return ref; - } - - /** - * returns a proxy function that represents a function defined in javascript. This function can be called syncrhonously, and will - * return any values returned by the JS function - */ - public function getRemoteFunctionProxy(functionID:Number, createIfNecessary:Boolean):Function - { - try - { - if (remoteFunctionCache[functionID] == null) - { - remoteFunctionCache[functionID] = function(...args):* - { - var externalArgs:Array = args.concat(); - externalArgs.unshift(functionID); - var serializedArgs:* = serialize(externalArgs, true); - - if(checkToThrowLater(serializedArgs[1])) - { - setTimeout(function a():* { - try { - var retVal:* = ExternalInterface.call("FABridge__invokeJSFunction", serializedArgs); - for(var i:int = 0; i= 5 | Enabled JavaScript | -| MySQL >= 4 | Enabled Cookies | -| Ruby >= 1.8 (optional) | Flash Plugin >= 9 (optional) | - - -Features --------- -- Easy installation -- Usable as shoutbox -- Multiple channels -- Private messaging -- Private channels -- Invitation system -- Kick/Ban or Ignore offending Users -- Online users list with user menu -- Emoticons/Smilies -- Easy way to add custom emoticons -- BBCode support -- Optional Flash based sound support -- Optional visual update information (changing window title) -- Clickable Hyperlinks -- Splitting of long words to preserve chat layout -- Flood control -- Possibility to delete messages inside the chat -- IRC style commands -- Easy interface to add custom commands -- Possibility to define opening hours for the chat -- Possibility to enable/disable guest users -- Persistent client-side settings -- Multiple languages (auto-detection of ACCEPT_LANGUAGE browser setting) -- Multiple styles with easy layout customization through stylesheets (CSS) and templates -- Automatic adjustment of displayed time to local client timezone -- Standards compliance (XHTML 1.0 strict) -- Accepts any text input, including code and special characters -- Multiline input field with the possibility to enter line breaks -- Message length counter -- Realtime monitoring and logs viewer -- Support for unicode (UTF-8) and non-unicode content types -- Bandwidth saving update calls (only updated data is sent) -- Optional support to push updates over a Flash based socket connection (increased performance and responsiveness) -- Survives connection timeouts -- Easy integration into existing authentication systems -- Sample phpBB3, MyBB, PunBB, SMF and vBulletin integrations available -- Separation of layout and code -- Well commented Source Code -- Developed with Security as integral part - built to prevent Code injections, SQL injections, Cross-site scripting (XSS), Session stealing and other attacks -- Tested successfully with Microsoft Internet Explorer, Mozilla Firefox, Opera and Safari - built to work with all modern browsers :) - - - -Help ----- -Essential documentation is contained in the attached readme files - -For more documentation consult the github wiki: https://github.com/Frug/AJAX-Chat/wiki - -For support questions use google groups: https://groups.google.com/forum/#!forum/ajax-chat - -To report bugs use github issues: https://github.com/Frug/AJAX-Chat -- cgit v1.2.3 From 8c80589b5ab196287788ff385733dec1df005044 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 27 Jan 2014 21:02:57 -0800 Subject: chat data structures --- boot.php | 2 +- install/database.sql | 60 +++++++++++++++++++++++++++++++++++++++++++++------- install/update.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 110 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index b52ef87eb..73525b4b5 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1092 ); +define ( 'DB_UPDATE_VERSION', 1093 ); define ( 'EOL', '
        ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 597124566..1c87b725b 100644 --- a/install/database.sql +++ b/install/database.sql @@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS `attach` ( `aid` int(10) unsigned NOT NULL DEFAULT '0', `uid` int(10) unsigned NOT NULL DEFAULT '0', `hash` char(64) NOT NULL DEFAULT '', - `creator` char(128) NOT NULL DEFAULT '0', + `creator` char(128) NOT NULL DEFAULT '', `filename` char(255) NOT NULL DEFAULT '', `filetype` char(64) NOT NULL DEFAULT '', `filesize` int(10) unsigned NOT NULL DEFAULT '0', @@ -105,7 +105,6 @@ CREATE TABLE IF NOT EXISTS `attach` ( KEY `aid` (`aid`), KEY `uid` (`uid`), KEY `hash` (`hash`), - KEY `creator` (`creator`), KEY `filename` (`filename`), KEY `filetype` (`filetype`), KEY `filesize` (`filesize`), @@ -113,7 +112,8 @@ CREATE TABLE IF NOT EXISTS `attach` ( KEY `edited` (`edited`), KEY `revision` (`revision`), KEY `folder` (`folder`), - KEY `flags` (`flags`) + KEY `flags` (`flags`), + KEY `creator` (`creator`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `auth_codes` ( @@ -214,6 +214,50 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_dirdate` (`channel_dirdate`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `chat` ( + `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `chat_room` int(10) unsigned NOT NULL DEFAULT '0', + `chat_xchan` char(255) NOT NULL DEFAULT '', + `chat_text` mediumtext NOT NULL, + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`chat_id`), + KEY `chat_room` (`chat_room`), + KEY `chat_xchan` (`chat_xchan`), + KEY `created` (`created`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `chatpresence` ( + `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cp_room` int(10) unsigned NOT NULL DEFAULT '0', + `cp_xchan` char(255) NOT NULL DEFAULT '', + `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `cp_status` char(255) NOT NULL, + PRIMARY KEY (`cp_id`), + KEY `cp_room` (`cp_room`), + KEY `cp_xchan` (`cp_xchan`), + KEY `cp_last` (`cp_last`), + KEY `cp_status` (`cp_status`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `chatroom` ( + `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cr_aid` int(10) unsigned NOT NULL DEFAULT '0', + `cr_uid` int(10) unsigned NOT NULL DEFAULT '0', + `cr_name` char(255) NOT NULL DEFAULT '', + `cr_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `cr_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `allow_cid` mediumtext NOT NULL, + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, + PRIMARY KEY (`cr_id`), + KEY `cr_aid` (`cr_aid`), + KEY `cr_uid` (`cr_uid`), + KEY `cr_name` (`cr_name`), + KEY `cr_created` (`cr_created`), + KEY `cr_edited` (`cr_edited`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `clients` ( `client_id` varchar(20) NOT NULL, `pw` varchar(20) NOT NULL, @@ -596,17 +640,17 @@ CREATE TABLE IF NOT EXISTS `obj` ( `obj_type` int(10) unsigned NOT NULL DEFAULT '0', `obj_obj` char(255) NOT NULL DEFAULT '', `obj_channel` int(10) unsigned NOT NULL DEFAULT '0', - `allow_cid` MEDIUMTEXT NOT NULL DEFAULT '', - `allow_gid` MEDIUMTEXT NOT NULL DEFAULT '', - `deny_cid` MEDIUMTEXT NOT NULL DEFAULT '', - `deny_gid` MEDIUMTEXT NOT NULL DEFAULT '', + `allow_cid` mediumtext NOT NULL, + `allow_gid` mediumtext NOT NULL, + `deny_cid` mediumtext NOT NULL, + `deny_gid` mediumtext NOT NULL, PRIMARY KEY (`obj_id`), KEY `obj_verb` (`obj_verb`), KEY `obj_page` (`obj_page`), KEY `obj_type` (`obj_type`), KEY `obj_channel` (`obj_channel`), KEY `obj_obj` (`obj_obj`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `outq` ( `outq_hash` char(255) NOT NULL, diff --git a/install/update.php b/install/update.php index 3e5589820..9ab5db8c6 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 27 Jan 2014 23:49:42 -0800 Subject: preserve expiration when editing --- include/ItemObject.php | 2 +- include/conversation.php | 1 + mod/editpost.php | 12 +++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 9a62cee4b..e9a0b65c0 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -218,7 +218,7 @@ class Item extends BaseObject { 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), - 'expiretime' => (($item['expires'] > 0) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), + 'expiretime' => (($item['expires'] !== '0000-00-00 00:00:00') ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, diff --git a/include/conversation.php b/include/conversation.php index 34d661004..316bc1612 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -687,6 +687,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), + 'expiretime' => (($item['expires'] !== '0000-00-00 00:00:00') ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'location' => $location, 'indent' => '', 'owner_name' => $owner_name, diff --git a/mod/editpost.php b/mod/editpost.php index 7cc33d60d..918a70d36 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -92,6 +92,11 @@ function editpost_content(&$a) { } + $cipher = get_pconfig(get_app()->profile['profile_uid'],'system','default_cipher'); + if(! $cipher) + $cipher = 'aes256'; + + $o .= replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', @@ -128,11 +133,12 @@ function editpost_content(&$a) { '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), '$catsenabled' => $catsenabled, - '$defexpire' => $itm[0]['expires'], - '$feature_expire' => 'none', + '$defexpire' => datetime_convert('UTC', date_default_timezone_get(),$itm[0]['expires']), + '$feature_expire' => ((feature_enabled(get_app()->profile['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'), '$expires' => t('Set expiration date'), - '$feature_encrypt' => 'none', + '$feature_encrypt' => ((feature_enabled(get_app()->profile['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), '$encrypt' => t('Encrypt text'), + '$cipher' => $cipher, '$expiryModalOK' => t('OK'), '$expiryModalCANCEL' => t('Cancel'), )); -- cgit v1.2.3 From aa285b83c1c8f674be8f200d4feae6299eafc436 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Tue, 28 Jan 2014 10:58:31 +0100 Subject: to make visible what I try, ping still won't work, but I'm confused about get_channel --- mod/admin.php | 8 +++++++- mod/post.php | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 950c7e5ce..e59f15c74 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -468,6 +468,7 @@ function admin_page_site(&$a) { } function admin_page_hubloc_post(&$a){ check_form_security_token_redirectOnErr('/admin/hubloc', 'admin_hubloc'); + require_once('include/zot.php'); //prepare for ping @@ -477,7 +478,12 @@ function admin_page_hubloc_post(&$a){ intval($hublocid) ); $hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post'; - logger('hubloc_url : ' . $hublocurl , LOGGER_DEBUG); + logger('ping hubloc_url : ' . $hublocurl , LOGGER_DEBUG); + logger('ping get_channel : ' . print_r($a->get_channel(),true), LOGGER_DEBUG); + $m = zot_build_packet($a->get_channel(),'ping'); + $r = zot_zot($hubloc_url,$m); + logger('ping answer: ' . print_r($r,true), LOGGER_DEBUG); + } //if ( $_POST'' == "check" ) { diff --git a/mod/post.php b/mod/post.php index d01f61a5c..cce183e46 100644 --- a/mod/post.php +++ b/mod/post.php @@ -9,6 +9,8 @@ require_once('include/zot.php'); function post_init(&$a) { + logger('POST inside',LOGGER_DEBUG); + logger('POST given parameter: ' . print_r($_REQUEST,true), LOGGER_DEBUG); // Most access to this endpoint is via the post method. // Here we will pick out the magic auth params which arrive -- cgit v1.2.3 From 8c8be2a05e7646595b2c811dd4ab2ac7d7a98b69 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 28 Jan 2014 15:05:44 -0800 Subject: add client field to chatpresence - which will give us a place to put IP addresses for webRTC. Might as well allow for that since we'll (soon) have presence. Then we wouldn't need SIP and folks can "just" p2p each other using any mechanism they wish if they have permission to do so. --- boot.php | 2 +- doc/To-Do-Code.md | 4 ++-- install/database.sql | 1 + install/update.php | 8 +++++++- version.inc | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index 73525b4b5..7be74e64a 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1093 ); +define ( 'DB_UPDATE_VERSION', 1094 ); define ( 'EOL', '
        ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 3baf08d40..5804801b4 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -17,7 +17,7 @@ We need much more than this, but here are areas where developers can help. Pleas * (Advanced) create a UI for building Comanche pages -* Help with WebDAV and file storage implementation, especially replacing the fugly Sabre web UI. +* templatise and translate the Web interface to webDAV * Extend WebDAV to provide desktop access to photo albums @@ -25,7 +25,7 @@ We need much more than this, but here are areas where developers can help. Pleas * service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels. -* Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview +* Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV * Events module - event followups and RSVP diff --git a/install/database.sql b/install/database.sql index 1c87b725b..dba03da65 100644 --- a/install/database.sql +++ b/install/database.sql @@ -232,6 +232,7 @@ CREATE TABLE IF NOT EXISTS `chatpresence` ( `cp_xchan` char(255) NOT NULL DEFAULT '', `cp_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `cp_status` char(255) NOT NULL, + `cp_client` char(128) NOT NULL DEFAULT '', PRIMARY KEY (`cp_id`), KEY `cp_room` (`cp_room`), KEY `cp_xchan` (`cp_xchan`), diff --git a/install/update.php b/install/update.php index 9ab5db8c6..180b8d5a0 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 29 Jan 2014 00:43:54 +0100 Subject: Don't look for text emoticons inside the matching angle brackets of a HTML tag --- include/text.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/text.php b/include/text.php index f5c440e4a..4cb7a1d5e 100755 --- a/include/text.php +++ b/include/text.php @@ -891,6 +891,7 @@ function smilies($s, $sample = false) { $s = preg_replace_callback('/
        (.*?)<\/pre>/ism','smile_encode',$s);
 	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_encode',$s);
+	$s = preg_replace_callback('/<(.*?)>/s','smile_encode',$s);
 
 	$texts =  array( 
 		'<3', 
@@ -983,6 +984,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/
        (.*?)<\/pre>/ism','smile_decode',$s);
 	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_decode',$s);
+	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
 
 	return $s;
 
-- 
cgit v1.2.3


From 6e22aa25cc941f542a192ef32a2e8ee4f23bb1c1 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 15:52:54 -0800
Subject: basic presence indication

---
 mod/ping.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/mod/ping.php b/mod/ping.php
index dda87dec2..b9ecf9b41 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -43,6 +43,31 @@ function ping_init(&$a) {
 		unset($_SESSION['sysmsg_info']);
 	}
 
+	if(get_observer_hash() && (! $result['invalid'])) {
+		$r = q("select cp_id from chatpresence where cp_xchan = '%s'",
+			dbesc(get_observer_hash())
+		);
+		if($r) {
+			foreach($r as $rr) {
+				q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
+					intval($rr['cp_id'])
+				);
+			}
+		}
+		else {
+			q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
+				values( '%s', '%s', '%s', '%s' ) ",
+				dbesc(get_observer_hash()),
+				dbesc(datetime_convert()),
+				dbesc('online'),
+				dbesc($_SERVER['REMOTE_ADDR'])
+			);
+		}
+	}
+
+	q("delete from chatpresence where cp_last < UTC_TIMESTAMP() - INTERVAL 2 MINUTE"); 
+
+
 	if((! local_user()) || ($result['invalid'])) {
 		echo json_encode($result);
 		killme();
-- 
cgit v1.2.3


From 8efac0cfd6db063a469ada1db4e5767a5fd975c6 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 16:16:55 -0800
Subject: fix sql query and provide setting to hide online status

---
 mod/ping.php          | 2 +-
 mod/settings.php      | 7 +++++++
 view/tpl/settings.tpl | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mod/ping.php b/mod/ping.php
index b9ecf9b41..f067091da 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -50,6 +50,7 @@ function ping_init(&$a) {
 		if($r) {
 			foreach($r as $rr) {
 				q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
+					dbesc(datetime_convert()),
 					intval($rr['cp_id'])
 				);
 			}
@@ -67,7 +68,6 @@ function ping_init(&$a) {
 
 	q("delete from chatpresence where cp_last < UTC_TIMESTAMP() - INTERVAL 2 MINUTE"); 
 
-
 	if((! local_user()) || ($result['invalid'])) {
 		echo json_encode($result);
 		killme();
diff --git a/mod/settings.php b/mod/settings.php
index ee6ef45de..7ff76cd3e 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -266,6 +266,7 @@ function settings_post(&$a) {
 	$expire_network_only    = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only'])	 : 0);
 
 	$allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
+	$hide_presence    = (((x($_POST,'hide_presence')) && (intval($_POST['hide_presence']) == 1)) ? 1: 0);
 
 	$publish          = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
 	$page_flags       = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
@@ -395,6 +396,7 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'system','post_joingroup', $post_joingroup);
 	set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
 	set_pconfig(local_user(),'system','blocktags',$blocktags);
+	set_pconfig(local_user(),'system','hide_online_status',$hide_presence);
 
 
 	$r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_default_group = '%s', channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d, channel_a_republish = %d, channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s'  where channel_id = %d limit 1",
@@ -821,6 +823,9 @@ function settings_content(&$a) {
 		$unkmail    = $a->user['unkmail'];
 		$cntunkmail = $a->user['cntunkmail'];
 
+		$hide_presence = intval(get_pconfig(local_user(), 'system','hide_online_status'));
+
+
 		$expire_items = get_pconfig(local_user(), 'expire','items');
 		$expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
 	
@@ -918,6 +923,8 @@ function settings_content(&$a) {
 
 			'$h_prv' 	=> t('Security and Privacy Settings'),
 
+			'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents showing if you are available for chat')),
+
 			'$lbl_pmacro' => t('Quick Privacy Settings:'),
 			'$pmacro3'    => t('Very Public - extremely permissive'),
 			'$pmacro2'    => t('Typical - default public, privacy when desired'),
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 7b6add231..b1a4f956d 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -22,6 +22,9 @@
 
 
        {{$h_prv}}
        
 
+{{include file="field_checkbox.tpl" field=$hide_presence}}
+
+
 
        {{$lbl_pmacro}}
        
 
          
 
        • {{$pmacro3}}
          • 
-- 
cgit v1.2.3


From d79a2e3b55c7cf6c775b8ecf7fbf708248aa16c8 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 16:32:47 -0800
Subject: undo pull request #287

---
 include/text.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/text.php b/include/text.php
index 4cb7a1d5e..a459296cb 100755
--- a/include/text.php
+++ b/include/text.php
@@ -891,7 +891,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/
          (.*?)<\/pre>/ism','smile_encode',$s);
 	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_encode',$s);
-	$s = preg_replace_callback('/<(.*?)>/s','smile_encode',$s);
+//	$s = preg_replace_callback('/<(.*?)>/ism','smile_encode',$s);
 
 	$texts =  array( 
 		'<3', 
@@ -984,7 +984,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/
          (.*?)<\/pre>/ism','smile_decode',$s);
 	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_decode',$s);
-	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
+//	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
 
 	return $s;
 
-- 
cgit v1.2.3


From 3dfd38021f193d16d3c6ed4824fa24e42a62238f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 16:35:10 -0800
Subject: SECURITY: remove style and class bbcodes

---
 include/bbcode.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 084c02125..fec8750e9 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -442,14 +442,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	// Check for list text
 	$Text = str_replace("[*]", "
        • ", $Text);
 
-	// Check for style sheet commands
-	if (strpos($Text,'[/style]') !== false) {		
-		$Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","$2",$Text);
-	}
-	// Check for CSS classes
-	if (strpos($Text,'[/class]') !== false) {	
-		$Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","$2",$Text);
-	}
  	// handle nested lists
 	$endlessloop = 0;
 
-- 
cgit v1.2.3


From cc11535e34f1cc91251d7ca3f38ef38997774857 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 17:07:25 -0800
Subject: online indication on profile sidebar

---
 include/identity.php              | 28 +++++++++++++++++++++++++++-
 view/js/icon_translate.js         |  1 +
 view/theme/redbasic/css/style.css |  4 ++++
 view/tpl/profile_vcard.tpl        |  2 +-
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index a99474d42..ee289495d 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -544,6 +544,9 @@ function profile_load(&$a, $nickname, $profile = '') {
 	}
 
 	$a->profile = $r[0];
+	$online = get_online_status($nickname);
+	$a->profile['online_status'] = $online['result'];
+
 	$a->profile_uid = $r[0]['profile_uid'];
 
 	$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
@@ -678,13 +681,15 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 	$gender   = ((x($profile,'gender')   == 1) ? t('Gender:')   : False);
 	$marital  = ((x($profile,'marital')  == 1) ? t('Status:')   : False);
 	$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
+	$profile['online']   = (($profile['online_status'] === 'online') ? t('Online Now') : False);
+logger('online: ' . $profile['online']);
 
 	if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) {
 		$block = true;
 	}
 
 	if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-		$location = $pdesc = $gender = $marital = $homepage = False;
+		$location = $pdesc = $gender = $marital = $homepage = $online = False;
 	}
 
 	$firstname = ((strpos($profile['name'],' '))
@@ -1144,3 +1149,24 @@ function is_foreigner($s) {
 function is_member($s) {
 	return((is_foreigner($s)) ? false : true);
 }
+
+function get_online_status($nick) {
+
+	$ret = array('result' => false);
+
+	$r = q("select channel_id, channel_hash from channel where channel_address = '%s' limit 1",
+		dbesc(argv(1))
+	);
+	if($r) {
+		$hide = get_pconfig($r[0]['channel_id'],'system','hide_online_status');
+		if($hide)
+			return $ret;
+		$x = q("select cp_status from chatpresence where cp_xchan = '%s' and cp_room = 0 limit 1",
+			dbesc($r[0]['channel_hash'])
+		);
+		if($x)
+			$ret['result'] = $x[0]['cp_status'];
+	}
+
+	return $ret;
+}
diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index 9e69e0b7d..838ff899f 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -50,4 +50,5 @@ $(document).ready(function() {
 		$('.icon-check').addClass('');
 		$('.icon-globe').addClass('');
 		$('.icon-circle-blank').addClass('');
+		$('.icon-circle').addClass('');
 });
\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b2f90cbc1..02832b5f0 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2445,4 +2445,8 @@ img.mail-list-sender-photo {
 
 .abook-self {
 	background-color: #ffdddd;
+}
+.online-now {
+	color: red;
+	cursor: pointer;
 }
\ No newline at end of file
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index aaee02ab5..7a857fd67 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -16,7 +16,7 @@
 	
 	{{/if}}
 
-	
          {{$profile.name}}
          
+	
          {{$profile.name}}{{if $profile.online}} {{/if}}
          
 		
 	{{if $pdesc}}
          {{$profile.pdesc}}
          {{/if}}
 	
          {{$profile.name}}
          
-- 
cgit v1.2.3


From d970c69f91b96b3ef40752a95ecec8ca8b11b62a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 19:49:56 -0800
Subject: online indication to the directory popup

---
 include/identity.php        | 22 ++++++++++++++++++++++
 mod/dirprofile.php          |  4 ++++
 view/tpl/direntry_large.tpl |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/include/identity.php b/include/identity.php
index ee289495d..2db5d8ece 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1170,3 +1170,25 @@ function get_online_status($nick) {
 
 	return $ret;
 }
+
+
+function remote_online_status($webbie) {
+
+	$result = false;
+	$r = q("select * from hubloc where hubloc_addr = '%s' limit 1",
+		dbesc($webbie)
+	);
+	if(! $r)
+		return $result;
+
+	$url = $r[0]['hubloc_url'] . '/online/' . substr($webbie,0,strpos($webbie,'@'));
+
+	$x = z_fetch_url($url);
+	if($x['success']) {
+		$j = json_decode($x['body'],true);
+		if($j)
+			$result = (($j['result']) ? $j['result'] : false);
+	}
+	return $result;
+
+}
diff --git a/mod/dirprofile.php b/mod/dirprofile.php
index 1593b014a..d88144f52 100644
--- a/mod/dirprofile.php
+++ b/mod/dirprofile.php
@@ -74,6 +74,9 @@ function dirprofile_init(&$a) {
 						$qrlink = zid($rr['url']);
 						$connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); 		
 
+						$online = remote_online_status($rr['address']);
+
+
 						if(in_array($rr['hash'],$contacts))
 							$connect_link = '';
 
@@ -151,6 +154,7 @@ function dirprofile_init(&$a) {
 							'$photo' => $rr['photo_l'],
 							'$alttext' => $rr['name'] . ' ' . $rr['address'],
 							'$name' => $rr['name'],
+							'$online' => (($online) ? t('Online Now') : ''),
 							'$details' => $pdesc . $details,
 							'$profile' => $profile,
 							'$address' => $rr['address'],
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
index a3fa7e4c3..f00448175 100755
--- a/view/tpl/direntry_large.tpl
+++ b/view/tpl/direntry_large.tpl
@@ -13,7 +13,7 @@
 
          
 
 
-
          {{$name}}
          
+
          {{$name}}{{if $online}} {{/if}}
          
 {{if $connect}}
 
          {{$conn_label}}
          
 {{/if}}
-- 
cgit v1.2.3


From 2822e6e70a15508e0626d5fe2eace87b5013b9b6 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 20:15:57 -0800
Subject: missing file in checkin

---
 mod/online.php | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 mod/online.php

diff --git a/mod/online.php b/mod/online.php
new file mode 100644
index 000000000..c6500347a
--- /dev/null
+++ b/mod/online.php
@@ -0,0 +1,11 @@
+ false);
+	if(argc() != 2)
+		json_return_and_die($ret);
+
+	$ret = get_online_status(argv(1));
+	json_return_and_die($ret);
+} 
-- 
cgit v1.2.3


From 0013e59086080963737d6c864eca7ff852a1e9da Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 28 Jan 2014 20:19:16 -0800
Subject: chatpresence timing out too quickly

---
 mod/ping.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/ping.php b/mod/ping.php
index f067091da..e205dbea7 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -66,7 +66,7 @@ function ping_init(&$a) {
 		}
 	}
 
-	q("delete from chatpresence where cp_last < UTC_TIMESTAMP() - INTERVAL 2 MINUTE"); 
+	q("delete from chatpresence where cp_last < UTC_TIMESTAMP() - INTERVAL 3 MINUTE"); 
 
 	if((! local_user()) || ($result['invalid'])) {
 		echo json_encode($result);
-- 
cgit v1.2.3


From 9261a170eb45f0b189afb4c1a30603d0cbb8f31c Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 00:08:29 -0800
Subject: basic chatroom management backend

---
 include/chat.php            | 117 ++++++++++++++++++++++++++++++++++++++++++++
 install/htconfig.sample.php |   2 +-
 version.inc                 |   2 +-
 3 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 include/chat.php

diff --git a/include/chat.php b/include/chat.php
new file mode 100644
index 000000000..4df419294
--- /dev/null
+++ b/include/chat.php
@@ -0,0 +1,117 @@
+ false);
+
+	$name = trim($arr['name']);
+	if(! $name) {
+		$ret['message'] = t('Missing room name');
+		return $ret;
+	}
+
+	$r = q("select cr_id from chatroom where cr_uid = %d and cr_name = '%s' limit 1",
+		intval($channel['channel_id']),
+		dbesc($name)
+	);
+	if($r) {
+		$ret['message'] = t('Duplicate room name');
+		return $ret;
+	}
+
+	$created = datetime_convert();
+
+	$x = q("insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, allow_cid, allow_gid, deny_cid, deny_gid )
+		values ( %d, %d , '%s' '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+		intval($channel['account_id']),
+		intval($channel['channel_id']),
+		dbesc($name),
+		dbesc($created),
+		dbesc($created),
+		dbesc($arr['allow_cid']),
+		dbesc($arr['allow_gid']),
+		dbesc($arr['deny_cid']),
+		dbesc($arr['deny_gid'])
+	);
+	if($x)
+		$ret['success'] = true;
+
+	return $ret;
+}
+
+
+function chatroom_destroy($channel,$arr) {
+
+	$ret = array('success' => false);
+	if(intval($arr['cr_id']))
+		$sql_extra = " and cr_id = " . intval($arr['cr_id']) . " ";
+	elseif(trim($arr['cr_name']))
+		$sql_extra = " and cr_name = '" . protect_sprintf(dbesc(trim($arr['cr_name']))) . "' ";
+	else {
+		$ret['message'] = t('Invalid room specifier.');
+		return $ret;
+	}
+
+	$r = q("select * from chatroom where cr_uid = %d $sql_extra limit 1",
+		intval($channel['channel_id'])
+	);
+	if(! $r) {		
+		$ret['message'] = t('Invalid room specifier.');
+		return $ret;
+	}
+
+	q("delete from chatroom where cr_id = %d limit 1",
+		intval($r[0]['cr_id'])
+	);
+	if($r[0]['cr_id']) {
+		q("delete from chatpresence where cp_room = %d",
+			intval($r[0]['cr_id'])
+		);
+	}
+	$ret['success'] = true;
+	return $ret;
+}
+
+
+function chatroom_enter($observer_xchan,$room_id,$status) {
+	if(! $room_id || ! $observer)
+		return;
+	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
+		dbesc($observer_xchan),
+		intval($room_id)
+	);
+	if($r) {
+		q("update chatpresence set cp_status = %d and cp_last = '%s' where cp_id = %d limit 1",
+			dbesc($status),
+			dbesc(datetime_convert()),
+			intval($r[0]['cp_id'])
+		);
+		return true;
+	}
+
+	$r = q("insert into chatpresence ( cp_room, cp_xchan, cp_last, cp_status )
+		values ( %d, '%s', '%s', '%s' )",
+		intval($room_id),
+		dbesc($observer_xchan),
+		dbesc(datetime_convert()),
+		dbesc($status)
+	);
+	return $r;
+}
+
+
+function chatroom_leave($observer_xchan,$room_id,$status) {
+	if(! $room_id || ! $observer)
+		return;
+	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
+		dbesc($observer_xchan),
+		intval($room_id)
+	);
+	if($r) {
+		q("delete from chatpresence where cp_id = %d limit 1",
+			intval($r[0]['cp_id'])
+		);
+	}
+	return true;
+}
\ No newline at end of file
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 33258cf41..b23dfe3b6 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -3,7 +3,7 @@
 // If automatic system installation fails: 
 
 // Copy or rename this file to .htconfig.php in the top level 
-// Friendica directory
+// Red Matrix directory
 
 // Why .htconfig.php? Because it contains sensitive information which could
 // give somebody complete control of your database. Apache's default 
diff --git a/version.inc b/version.inc
index 3c79f0c43..36c8c7342 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-28.571
+2014-01-29.572
-- 
cgit v1.2.3


From 9f546757021305b6cfe924f38ca1af5fd5d3e69b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 01:52:23 -0800
Subject: chatroom list widget backend

---
 include/chat.php    | 9 +++++++++
 include/widgets.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/include/chat.php b/include/chat.php
index 4df419294..cb910bd62 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -114,4 +114,13 @@ function chatroom_leave($observer_xchan,$room_id,$status) {
 		);
 	}
 	return true;
+}
+
+
+function chatroom_list($uid) {
+
+	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d order by cr_name group by cp_id",
+		intval($uid)
+	);
+	return $r;
 }
\ No newline at end of file
diff --git a/include/widgets.php b/include/widgets.php
index efa350785..8b22515b1 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -576,3 +576,12 @@ function widget_menu_preview($arr) {
 	require_once('include/menu.php');
 	return menu_render(get_app()->data['menu_item']);
 }
+
+function widget_chatroom_list($arr) {
+	require_once("include/chat.php");
+	$r = chatroom_list(local_user());
+	return replace_macros(get_markup_template('chatroomlist.tpl'),array(
+		'$header' => t('Chat Rooms'),
+		'$items' => $r,
+	));
+}
\ No newline at end of file
-- 
cgit v1.2.3


From f84ba95e870ce5b63e5af4cc7be43b516d4c163d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 01:53:15 -0800
Subject: add template for chatroomlist widget

---
 view/tpl/chatroomlist.tpl | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 view/tpl/chatroomlist.tpl

diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
new file mode 100644
index 000000000..34050eef3
--- /dev/null
+++ b/view/tpl/chatroomlist.tpl
@@ -0,0 +1,11 @@
+
          
+
          {{$header}}
          
+{{$if $items}}
+
+{{for $items as $item}}
+
+{{/for}}
+
          {{$item.cr_name}}{{$item.cr_inroom}}
          
+{{/if}}
+
          
+
-- 
cgit v1.2.3


From 10b51a9471bba2a1b058eee2d362d3d2189627be Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 02:25:21 -0800
Subject: issues uncovered whilst testing the chatroom API

---
 include/chat.php | 18 ++++++++++--------
 mod/ping.php     | 10 +++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/chat.php b/include/chat.php
index cb910bd62..8011fdb5b 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -23,8 +23,8 @@ function chatroom_create($channel,$arr) {
 	$created = datetime_convert();
 
 	$x = q("insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, allow_cid, allow_gid, deny_cid, deny_gid )
-		values ( %d, %d , '%s' '%s', '%s', '%s', '%s', '%s', '%s' ) ",
-		intval($channel['account_id']),
+		values ( %d, %d , '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+		intval($channel['channel_account_id']),
 		intval($channel['channel_id']),
 		dbesc($name),
 		dbesc($created),
@@ -34,6 +34,7 @@ function chatroom_create($channel,$arr) {
 		dbesc($arr['deny_cid']),
 		dbesc($arr['deny_gid'])
 	);
+
 	if($x)
 		$ret['success'] = true;
 
@@ -74,8 +75,8 @@ function chatroom_destroy($channel,$arr) {
 }
 
 
-function chatroom_enter($observer_xchan,$room_id,$status) {
-	if(! $room_id || ! $observer)
+function chatroom_enter($observer_xchan,$room_id,$status,$client) {
+	if(! $room_id || ! $observer_xchan)
 		return;
 	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
 		dbesc($observer_xchan),
@@ -90,19 +91,20 @@ function chatroom_enter($observer_xchan,$room_id,$status) {
 		return true;
 	}
 
-	$r = q("insert into chatpresence ( cp_room, cp_xchan, cp_last, cp_status )
-		values ( %d, '%s', '%s', '%s' )",
+	$r = q("insert into chatpresence ( cp_room, cp_xchan, cp_last, cp_status, cp_client )
+		values ( %d, '%s', '%s', '%s', '%s' )",
 		intval($room_id),
 		dbesc($observer_xchan),
 		dbesc(datetime_convert()),
-		dbesc($status)
+		dbesc($status),
+		dbesc($client)
 	);
 	return $r;
 }
 
 
 function chatroom_leave($observer_xchan,$room_id,$status) {
-	if(! $room_id || ! $observer)
+	if(! $room_id || ! $observer_xchan)
 		return;
 	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
 		dbesc($observer_xchan),
diff --git a/mod/ping.php b/mod/ping.php
index e205dbea7..c3c81992f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -44,18 +44,22 @@ function ping_init(&$a) {
 	}
 
 	if(get_observer_hash() && (! $result['invalid'])) {
-		$r = q("select cp_id from chatpresence where cp_xchan = '%s'",
-			dbesc(get_observer_hash())
+		$r = q("select cp_id from chatpresence where cp_xchan = '%s' and cp_client = '%s'",
+			dbesc(get_observer_hash()),
+			dbesc($_SERVER['REMOTE_ADDR'])
 		);
+		$basic_presence = false;
 		if($r) {
 			foreach($r as $rr) {
+				if($rr['cp_id'] == 0)
+					$basic_presence = true;	
 				q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
 					dbesc(datetime_convert()),
 					intval($rr['cp_id'])
 				);
 			}
 		}
-		else {
+		if(! $basic_presence) {
 			q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
 				values( '%s', '%s', '%s', '%s' ) ",
 				dbesc(get_observer_hash()),
-- 
cgit v1.2.3


From c95f65e092e3ea3e4d312976789597ef91037b25 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 02:36:01 -0800
Subject: prevent runaway presence indication

---
 mod/ping.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index c3c81992f..2d5deb9ad 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -44,14 +44,14 @@ function ping_init(&$a) {
 	}
 
 	if(get_observer_hash() && (! $result['invalid'])) {
-		$r = q("select cp_id from chatpresence where cp_xchan = '%s' and cp_client = '%s'",
+		$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s'",
 			dbesc(get_observer_hash()),
 			dbesc($_SERVER['REMOTE_ADDR'])
 		);
 		$basic_presence = false;
 		if($r) {
 			foreach($r as $rr) {
-				if($rr['cp_id'] == 0)
+				if($rr['cp_room'] == 0)
 					$basic_presence = true;	
 				q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
 					dbesc(datetime_convert()),
-- 
cgit v1.2.3


From 6a9d43bcbe167ff3a8f9bd8a2ce93d9fc298fcdf Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 03:16:07 -0800
Subject: debug chatroom_list widget

---
 include/chat.php          | 3 ++-
 view/tpl/chatroomlist.tpl | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/chat.php b/include/chat.php
index 8011fdb5b..9d90f7970 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -121,8 +121,9 @@ function chatroom_leave($observer_xchan,$room_id,$status) {
 
 function chatroom_list($uid) {
 
-	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d order by cr_name group by cp_id",
+	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d  group by cp_id order by cr_name",
 		intval($uid)
 	);
+
 	return $r;
 }
\ No newline at end of file
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
index 34050eef3..d2cf4d7b0 100644
--- a/view/tpl/chatroomlist.tpl
+++ b/view/tpl/chatroomlist.tpl
@@ -1,10 +1,10 @@
 
          
 
          {{$header}}
          
-{{$if $items}}
+{{if $items}}
 
-{{for $items as $item}}
+{{foreach $items as $item}}
 
-{{/for}}
+{{/foreach}}
 
          {{$item.cr_name}}{{$item.cr_inroom}}
          
 {{/if}}
 
          
-- 
cgit v1.2.3


From a1e7c65d51a6472cf7fe95686883f77953d7dfd7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 03:39:32 -0800
Subject: chatroom permissions enforcement

---
 include/chat.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/chat.php b/include/chat.php
index 9d90f7970..6bcb003ff 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -76,8 +76,27 @@ function chatroom_destroy($channel,$arr) {
 
 
 function chatroom_enter($observer_xchan,$room_id,$status,$client) {
+
 	if(! $room_id || ! $observer_xchan)
 		return;
+
+	$r = q("select * from chatroom where cr_id = %d limit 1",
+		intval($room_id)
+	);
+	if(! $r)
+		return;
+	require_once('include/security.php');
+	$sql_extra = permissions_sql($r[0]['cr_uid']);
+
+	$x = q("select * from chatroom where cr_id = %d and uid = %d $sql_extra limit 1",
+			intval($room_id)
+			intval($r[0]['cr_uid'])
+	);
+	if(! $x) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
 	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
 		dbesc($observer_xchan),
 		intval($room_id)
-- 
cgit v1.2.3


From ef97a454bbccbd9f7e0e63180c365ed3227fe42c Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Wed, 29 Jan 2014 15:45:35 +0100
Subject: ping gives us now a reply. But the reply doesnt contains useful data,
 requires still some investigations

---
 mod/admin.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index e59f15c74..1a284c42f 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -478,23 +478,25 @@ function admin_page_hubloc_post(&$a){
 			intval($hublocid)
 		);
 		$hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post';
-		logger('ping hubloc_url : ' . $hublocurl , LOGGER_DEBUG);
-		logger('ping get_channel : ' . print_r($a->get_channel(),true), LOGGER_DEBUG);
+		
+		//perform ping
 		$m = zot_build_packet($a->get_channel(),'ping');
+		logger('ping message : ' . print_r($m,true), LOGGER_DEBUG);
 	        $r = zot_zot($hubloc_url,$m);
         	logger('ping answer: ' . print_r($r,true), LOGGER_DEBUG);
+		
+		//unfotunatly zping wont work, I guess return format is not correct
+		 //require_once('mod/zping.php');
+		 //$r = zping_content($hublocurl);
+        	 //logger('zping answer: ' . $r, LOGGER_DEBUG);
+		
+		//handle results and set the hubloc flags in db to make results visible
 
-	}
-
-	//if ( $_POST'' == "check" ) {
-	//	//todo
-	//}
+		//in case of repair store new pub key for tested hubloc (all channel with this hubloc) in db
+		//after repair set hubloc flags to 0
 
-	//perform ping
-	//handle results and set the hubloc flags in db to make results visible
+	}
 
-	//in case of repair store new pub key for tested hubloc (all channel with this hubloc) in db
-	//after repair set hubloc flags to 0
 
 	goaway($a->get_baseurl(true) . '/admin/hubloc' );
 	return;
-- 
cgit v1.2.3


From 5c54880ce89627ac932ae09fb85d57863b50d41c Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Wed, 29 Jan 2014 20:38:32 +0000
Subject: Make Firefox behave if an attachment points to a file with a space in
 it.

---
 mod/attach.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/attach.php b/mod/attach.php
index c52966ce0..fd40791fe 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -25,7 +25,7 @@ function attach_init(&$a) {
 		return;
 
 	header('Content-type: ' . $r['data']['filetype']);
-	header('Content-disposition: attachment; filename=' . $r['data']['filename']);
+	header('Content-disposition: attachment; filename="' . $r['data']['filename']);
 	if($r['data']['flags'] & ATTACH_FLAG_OS ) {
 		$istream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb');
 		$ostream = fopen('php://output','wb');
@@ -39,4 +39,4 @@ function attach_init(&$a) {
 		echo $r['data']['data'];
 	killme();
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 34b7b544cd9d327800ab411df724fb5e80eeb34e Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Wed, 29 Jan 2014 21:38:48 +0000
Subject: Doco - add KDE/Gnome/Davfs2 instructions

---
 doc/Cloud.md      | 21 ++++++++++++++++++--
 doc/dav_davfs2.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 doc/dav_davfs2.md

diff --git a/doc/Cloud.md b/doc/Cloud.md
index c696b292e..ae1e3c754 100644
--- a/doc/Cloud.md
+++ b/doc/Cloud.md
@@ -22,10 +22,27 @@ Your files are visible on the web at the location "cloud/$channel_nickname" to a
 
 **WebDAV access**
 
-This varies by operating system. In Windows, open the Windows Explorer (file manager) and type "$yoursite\cloud\$channel_nickname" into the address bar. Replace $yoursite with the URL to your Red Matrix hub and $channel_nickname with the nickname for your channel.
+This varies by operating system. 
+
+
+*Windows*
+
+In Windows, open the Windows Explorer (file manager) and type "$yoursite\cloud\$channel_nickname" into the address bar. Replace $yoursite with the URL to your Red Matrix hub and $channel_nickname with the nickname for your channel.
 
 You will be prompted for a username and password. For the username, you may supply either your account email address (which will select the default channel), or a channel nickname for the channel you wish to authenticate as. In either case use your account password for the password field. You will then be able to copy, drag/drop, edit, delete and otherwise work with files as if they were an attached disk drive.
 
+*Linux KDE*
+
+Simply log in to your hub as normal using Konqueror.  Once logged in, visit webdavs://$yoursite/cloud.  No further authentication is required.
+
+*Linux GNOME*
+
+Open a File browsing window (that's Nautilus), Select File > Connect to server from the menu. Type davs://$yoursite/cloud/$channel_nickname and click Connect.  You will be prompted for your username and password.  For the username, you may supply either your account email address (which will select the default channel) or a channel nickname.
+
+
+*See Also*
+
+- [Linux - Mounting the cloud as a file system](help/dav_davfs2)
 
 **Permissions**
 
@@ -33,4 +50,4 @@ When using WebDAV, the file is created with your channel's default file permissi
 
 
  
-  
\ No newline at end of file
+  
diff --git a/doc/dav_davfs2.md b/doc/dav_davfs2.md
new file mode 100644
index 000000000..546638810
--- /dev/null
+++ b/doc/dav_davfs2.md
@@ -0,0 +1,58 @@
+**Installing The Cloud as a Filesystem on Linux**
+
+To install your cloud directory as a filesystem, you first need davfs2 installed.  99% of the time, this will be included in your distributions repositories.  In Debian
+
+`apt-get install davfs2`
+
+If you want to let normal users mount the filesystem
+
+`dpkg-reconfigure davfs2`
+
+and select "yes" at the prompt.
+
+Now you need to add any user you want to be able to mount dav to the davfs2 group
+
+`usermod -aG davfs2 `
+
+Edit /etc/fstab
+
+`nano /etc/fstab`
+
+to include your cloud directory by adding
+
+`example.com/cloud/ /mount/point davfs user,noauto,uid=,file_mode=600,dir_mode=700 0 1`
+
+Where example.com is the URL of your hub, /mount/point is the location you want to mount the cloud, and  is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.
+
+For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be
+
+`example.com/cloud/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1`
+
+Now, create the mount point.
+
+`mkdir /home/bob/cloud`
+
+and also create a directory file to store your credentials
+
+`mkdir /home/bob/.davfs2`
+
+Create a file called 'secrets'
+
+`nano /home/bob/.davfs2/secrets`
+
+and add your cloud login credentials
+
+`example.com/cloud  `
+
+
+Where  and  are the username and password for your hub.
+
+Don't let this file be writeable by anyone who doesn't need it with
+
+`chmod 600 /home/bob/.davfs2/secrets`
+
+Finally, mount the drive.
+
+`mount example.com/cloud`
+
+You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves.
-- 
cgit v1.2.3


From c48c7a64c7a401c8f11ceb140309d62296ae7c6b Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Wed, 29 Jan 2014 21:42:12 +0000
Subject: Doco - add KDE/Gnome/Davfs2 instructions

---
 doc/Cloud.md      | 21 ++++++++++++++++++--
 doc/dav_davfs2.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 doc/dav_davfs2.md

diff --git a/doc/Cloud.md b/doc/Cloud.md
index c696b292e..ae1e3c754 100644
--- a/doc/Cloud.md
+++ b/doc/Cloud.md
@@ -22,10 +22,27 @@ Your files are visible on the web at the location "cloud/$channel_nickname" to a
 
 **WebDAV access**
 
-This varies by operating system. In Windows, open the Windows Explorer (file manager) and type "$yoursite\cloud\$channel_nickname" into the address bar. Replace $yoursite with the URL to your Red Matrix hub and $channel_nickname with the nickname for your channel.
+This varies by operating system. 
+
+
+*Windows*
+
+In Windows, open the Windows Explorer (file manager) and type "$yoursite\cloud\$channel_nickname" into the address bar. Replace $yoursite with the URL to your Red Matrix hub and $channel_nickname with the nickname for your channel.
 
 You will be prompted for a username and password. For the username, you may supply either your account email address (which will select the default channel), or a channel nickname for the channel you wish to authenticate as. In either case use your account password for the password field. You will then be able to copy, drag/drop, edit, delete and otherwise work with files as if they were an attached disk drive.
 
+*Linux KDE*
+
+Simply log in to your hub as normal using Konqueror.  Once logged in, visit webdavs://$yoursite/cloud.  No further authentication is required.
+
+*Linux GNOME*
+
+Open a File browsing window (that's Nautilus), Select File > Connect to server from the menu. Type davs://$yoursite/cloud/$channel_nickname and click Connect.  You will be prompted for your username and password.  For the username, you may supply either your account email address (which will select the default channel) or a channel nickname.
+
+
+*See Also*
+
+- [Linux - Mounting the cloud as a file system](help/dav_davfs2)
 
 **Permissions**
 
@@ -33,4 +50,4 @@ When using WebDAV, the file is created with your channel's default file permissi
 
 
  
-  
\ No newline at end of file
+  
diff --git a/doc/dav_davfs2.md b/doc/dav_davfs2.md
new file mode 100644
index 000000000..546638810
--- /dev/null
+++ b/doc/dav_davfs2.md
@@ -0,0 +1,58 @@
+**Installing The Cloud as a Filesystem on Linux**
+
+To install your cloud directory as a filesystem, you first need davfs2 installed.  99% of the time, this will be included in your distributions repositories.  In Debian
+
+`apt-get install davfs2`
+
+If you want to let normal users mount the filesystem
+
+`dpkg-reconfigure davfs2`
+
+and select "yes" at the prompt.
+
+Now you need to add any user you want to be able to mount dav to the davfs2 group
+
+`usermod -aG davfs2 `
+
+Edit /etc/fstab
+
+`nano /etc/fstab`
+
+to include your cloud directory by adding
+
+`example.com/cloud/ /mount/point davfs user,noauto,uid=,file_mode=600,dir_mode=700 0 1`
+
+Where example.com is the URL of your hub, /mount/point is the location you want to mount the cloud, and  is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.
+
+For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be
+
+`example.com/cloud/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1`
+
+Now, create the mount point.
+
+`mkdir /home/bob/cloud`
+
+and also create a directory file to store your credentials
+
+`mkdir /home/bob/.davfs2`
+
+Create a file called 'secrets'
+
+`nano /home/bob/.davfs2/secrets`
+
+and add your cloud login credentials
+
+`example.com/cloud  `
+
+
+Where  and  are the username and password for your hub.
+
+Don't let this file be writeable by anyone who doesn't need it with
+
+`chmod 600 /home/bob/.davfs2/secrets`
+
+Finally, mount the drive.
+
+`mount example.com/cloud`
+
+You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves.
-- 
cgit v1.2.3


From 5a5973982f6027e633917b1f0180432882dc9045 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Wed, 29 Jan 2014 22:11:36 +0000
Subject: Really fix attachments in Firefox

---
 mod/attach.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/attach.php b/mod/attach.php
index fd40791fe..d0d3296e1 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -25,7 +25,7 @@ function attach_init(&$a) {
 		return;
 
 	header('Content-type: ' . $r['data']['filetype']);
-	header('Content-disposition: attachment; filename="' . $r['data']['filename']);
+	header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"');
 	if($r['data']['flags'] & ATTACH_FLAG_OS ) {
 		$istream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb');
 		$ostream = fopen('php://output','wb');
-- 
cgit v1.2.3


From 4c289394889dc5f69a0c20ecd56806ea691e7f64 Mon Sep 17 00:00:00 2001
From: toclimb 
Date: Wed, 29 Jan 2014 23:56:05 +0100
Subject: Don't look for emoticons inside the matching angle brackets of HTML
 tags (seriously)

---
 include/text.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/text.php b/include/text.php
index a459296cb..cf68ee121 100755
--- a/include/text.php
+++ b/include/text.php
@@ -871,8 +871,8 @@ function get_mood_verbs() {
  * Returns string
  *
  * It is expected that this function will be called using HTML text.
- * We will escape text between HTML pre and code blocks from being 
- * processed. 
+ * We will escape text between HTML pre and code blocks, and HTML attributes
+ * (such as urls) from being processed.
  * 
  * At a higher level, the bbcode [nosmile] tag can be used to prevent this 
  * function from being executed by the prepare_text() routine when preparing
@@ -889,9 +889,8 @@ function smilies($s, $sample = false) {
 		|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
 		return $s;
 
-	$s = preg_replace_callback('/
          (.*?)<\/pre>/ism','smile_encode',$s);
-	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_encode',$s);
-//	$s = preg_replace_callback('/<(.*?)>/ism','smile_encode',$s);
+	$s = preg_replace_callback('{<(pre|code)>(?.*?)}ism','smile_encode',$s);
+	$s = preg_replace_callback('/<[a-z]+ (?.*?)>/ism','smile_encode',$s);
 
 	$texts =  array( 
 		'<3', 
@@ -982,20 +981,20 @@ function smilies($s, $sample = false) {
 		$s = str_replace($params['texts'],$params['icons'],$params['string']);
 	}
 
-	$s = preg_replace_callback('/
          (.*?)<\/pre>/ism','smile_decode',$s);
-	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_decode',$s);
-//	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
+	$s = preg_replace_callback(
+		'//ism',
+		function ($m) { return base64url_decode($m[1]); },
+		$s
+	);
 
 	return $s;
 
 }
 
-function smile_encode($m) {
-	return(str_replace($m[1],base64url_encode($m[1]),$m[0]));
-}
 
-function smile_decode($m) {
-	return(str_replace($m[1],base64url_decode($m[1]),$m[0]));
+function smile_encode($m) {
+	$cleartext = $m['target'];
+	return str_replace($cleartext,'',$m[0]);
 }
 
 // expand <3333 to the correct number of hearts
-- 
cgit v1.2.3


From fe2b6f3dfb4a9473905dde49b7741a6c03699c23 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Thu, 30 Jan 2014 00:01:19 +0100
Subject: add image floating to bbcode

---
 doc/bbcode.html          |  6 +++++-
 include/bbcode.php       | 50 ++++++++++++++++++++++++++++++++++++++----------
 view/tpl/item_attach.tpl |  2 +-
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/doc/bbcode.html b/doc/bbcode.html
index a24dd8b5d..d46f9d05a 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -1,5 +1,5 @@
 
          BBcode reference
          
-
          
+
          
 

          
 
            
 
          • [b]bold[/b] - bold
            
@@ -9,6 +9,10 @@
 
          • [color=red]red[/color] - red
            
 
          • [url=https://redmatrix.me]Red Matrix[/url] Red Matrix
            
 
          • [img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
            
+
          • [img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
            
+
            
+
          • [img float=right]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...

            
diff --git a/include/bbcode.php b/include/bbcode.php
index fec8750e9..57494bd7a 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -439,6 +439,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	if (strpos($Text,'[/center]') !== false) {	
 	$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","
            $1
            ",$Text);
 	}
+
 	// Check for list text
 	$Text = str_replace("[*]", "
          • ", $Text);
 
@@ -531,23 +532,52 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 			"
            " . $t_wrote . "
            $2
            ",
 			$Text);
 
-	// [img=widthxheight]image source[/img]
-	//$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $Text);
-	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $Text);
-	}
-	if (strpos($Text,'[/zmg]') !== false) {	
-		$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '', $Text);
-	}
 	// Images
 	// [img]pathtoimage[/img]
-	if (strpos($Text,'[/img]') !== false) {	
+	if (strpos($Text,'[/img]') !== false) {
 		$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text);
 	}
-	if (strpos($Text,'[/zmg]') !== false) {	
+	if (strpos($Text,'[/zmg]') !== false) {
 		$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
 	}
 
+	// [img float={left, right}]pathtoimage[/img]
+	if (strpos($Text,'[/img]') !== false) {
+		$Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/img]') !== false) {
+		$Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/zmg]') !== false) {
+		$Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/zmg]') !== false) {
+		$Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+
+	// [img=widthxheight]pathtoimage[/img]
+	if (strpos($Text,'[/img]') !== false) {
+		$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/zmg]') !== false) {
+		$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+
+	// [img=widthxheight float={left, right}]pathtoimage[/img]
+	if (strpos($Text,'[/img]') !== false) {
+		$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*) float=left\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/img]') !== false) {
+		$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*) float=right\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/zmg]') !== false) {
+		$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*) float=left\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+	if (strpos($Text,'[/zmg]') !== false) {
+		$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*) float=right\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
+	}
+
+	// crypt
 	if (strpos($Text,'[/crypt]') !== false) {	
 		$x = random_string();
 		$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
            ' . t('Encrypted content') . '
            ', $Text);
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index 25c127a15..7dc8dfd59 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,6 +1,6 @@
+
            
 
            
 {{foreach $attaches as $a}} 
 
 {{/foreach}}
-
            
 
            
-- 
cgit v1.2.3


From 4d23902d48e468e91f23c0ce767427a078f40103 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Thu, 30 Jan 2014 00:11:17 +0100
Subject: oups

---
 doc/bbcode.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bbcode.html b/doc/bbcode.html
index d46f9d05a..cb8286ad7 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -1,5 +1,5 @@
 
            BBcode reference
            
-
            
+
            
 

            
 
              
 
            • [b]bold[/b] - bold
              
-- 
cgit v1.2.3


From 75022367e5c3ecec24ec66acff162d6dd534486c Mon Sep 17 00:00:00 2001
From: marijus 
Date: Thu, 30 Jan 2014 00:15:13 +0100
Subject: minor whitespace cleanup

---
 include/bbcode.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 57494bd7a..2e2faddd6 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -439,7 +439,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	if (strpos($Text,'[/center]') !== false) {	
 	$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","
              $1
              ",$Text);
 	}
-
 	// Check for list text
 	$Text = str_replace("[*]", "
            • ", $Text);
 
-- 
cgit v1.2.3


From 677f5f641e6c37244ee67459b6fa2c7e5aea119b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 16:02:02 -0800
Subject: more testing of chatroom interfaces, also corrected a function call
 that should have been a class instantiation in reddav

---
 include/chat.php          | 4 ++--
 include/reddav.php        | 2 +-
 include/widgets.php       | 3 +++
 view/tpl/chatroomlist.tpl | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/chat.php b/include/chat.php
index 6bcb003ff..f682fe6fe 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -88,8 +88,8 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 	require_once('include/security.php');
 	$sql_extra = permissions_sql($r[0]['cr_uid']);
 
-	$x = q("select * from chatroom where cr_id = %d and uid = %d $sql_extra limit 1",
-			intval($room_id)
+	$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+			intval($room_id),
 			intval($r[0]['cr_uid'])
 	);
 	if(! $x) {
diff --git a/include/reddav.php b/include/reddav.php
index c5ef39097..e6e066770 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -628,7 +628,7 @@ function RedFileData($file, &$auth,$test = false) {
 	}
 
 	if((! $file) || ($file === '/')) {
-		return RedDirectory('/',$auth);
+		return new RedDirectory('/',$auth);
 
 	}
 
diff --git a/include/widgets.php b/include/widgets.php
index 8b22515b1..400660d11 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -580,8 +580,11 @@ function widget_menu_preview($arr) {
 function widget_chatroom_list($arr) {
 	require_once("include/chat.php");
 	$r = chatroom_list(local_user());
+	$channel = get_app()->get_channel();
 	return replace_macros(get_markup_template('chatroomlist.tpl'),array(
 		'$header' => t('Chat Rooms'),
+		'$baseurl' => z_root(),
+		'$nickname' => $channel['channel_address'],
 		'$items' => $r,
 	));
 }
\ No newline at end of file
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
index d2cf4d7b0..c26ba0c33 100644
--- a/view/tpl/chatroomlist.tpl
+++ b/view/tpl/chatroomlist.tpl
@@ -3,7 +3,7 @@
 {{if $items}}
 
 {{foreach $items as $item}}
-
+
 {{/foreach}}
 
              {{$item.cr_name}}{{$item.cr_inroom}}
              {{$item.cr_name}}{{$item.cr_inroom}}
              
 {{/if}}
-- 
cgit v1.2.3


From b8fb6a437335ce16e658f8acda632916bb28e574 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 17:09:20 -0800
Subject: more chat infrastructure

---
 include/chat.php  | 15 ++++++++------
 mod/chat.php      | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 view/tpl/chat.tpl | 18 ++++++++++++++++
 3 files changed, 89 insertions(+), 6 deletions(-)
 create mode 100644 mod/chat.php
 create mode 100644 view/tpl/chat.tpl

diff --git a/include/chat.php b/include/chat.php
index f682fe6fe..a8c3db429 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -83,8 +83,10 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 	$r = q("select * from chatroom where cr_id = %d limit 1",
 		intval($room_id)
 	);
-	if(! $r)
-		return;
+	if(! $r) {
+		notice( t('Room not found.') . EOL);
+		return false;
+	}
 	require_once('include/security.php');
 	$sql_extra = permissions_sql($r[0]['cr_uid']);
 
@@ -94,7 +96,7 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 	);
 	if(! $x) {
 		notice( t('Permission denied.') . EOL);
-		return;
+		return false;
 	}
 
 	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
@@ -122,12 +124,13 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 }
 
 
-function chatroom_leave($observer_xchan,$room_id,$status) {
+function chatroom_leave($observer_xchan,$room_id,$client) {
 	if(! $room_id || ! $observer_xchan)
 		return;
-	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
+	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d and cp_client = '%s' limit 1",
 		dbesc($observer_xchan),
-		intval($room_id)
+		intval($room_id),
+		dbesc($client)
 	);
 	if($r) {
 		q("delete from chatpresence where cp_id = %d limit 1",
diff --git a/mod/chat.php b/mod/chat.php
new file mode 100644
index 000000000..bc981b76b
--- /dev/null
+++ b/mod/chat.php
@@ -0,0 +1,62 @@
+ 1)
+		$which = argv(1);
+	if(! $which) {
+		if(local_user()) {
+			$channel = $a->get_channel();
+			if($channel && $channel['channel_address'])
+			$which = $channel['channel_address'];
+		}
+	}
+	if(! $which) {
+		notice( t('You must be logged in to see this page.') . EOL );
+		return;
+	}
+
+	$profile = 0;
+	$channel = $a->get_channel();
+
+	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+		$which = $channel['channel_address'];
+		$profile = argv(1);		
+	}
+
+	$a->page['htmlhead'] .= '' . "\r\n" ;
+
+	// Run profile_load() here to make sure the theme is set before
+	// we start loading content
+
+	profile_load($a,$which,$profile);
+
+}
+
+
+function chat_content(&$a) {
+
+	if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'chat')) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+	
+	if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
+		chatroom_leave(get_observer_hash(),$room_id,$_SERVER['REMOTE_ADDR']);
+		goaway(z_root() . '/channel/' . argv(1));
+	}
+
+
+	if(argc() > 2 && intval(argv(2))) {
+		$room_id = intval(argv(2));
+		$x = chatroom_enter(get_observer_hash(),$room_id,'online',$_SERVER['REMOTE_ADDR']);
+		if(! $x)
+			return;
+		$o = replace_macros(get_markup_template('chat.tpl'),array());
+		return $o;
+	}
+
+}
\ No newline at end of file
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
new file mode 100644
index 000000000..6378b8776
--- /dev/null
+++ b/view/tpl/chat.tpl
@@ -0,0 +1,18 @@
+
              
+
+    
              
+    
              
+
+    
              
+
+    
              
+        
              
+
+        
              
+            
+            
+        
              
+
+    
              
+
+
              
\ No newline at end of file
-- 
cgit v1.2.3


From 0d326dfb45734950159030ea02b02dec4fba55b7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 18:02:51 -0800
Subject: mod/chatsvc - ajax backend for chat

---
 mod/chatsvc.php | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 mod/chatsvc.php

diff --git a/mod/chatsvc.php b/mod/chatsvc.php
new file mode 100644
index 000000000..b8d2a9f69
--- /dev/null
+++ b/mod/chatsvc.php
@@ -0,0 +1,104 @@
+ false);
+
+	$a->data['chat']['room_id'] = intval($_REQUEST['room_id']);
+	$x = q("select cr_uid from chatroom where cr_id = %d and cr_id != 0 limit 1",
+		intval($a->data['chat']['room_id'])
+	);
+	if(! $x)
+		json_return_and_die($ret);
+
+	$a->data['chat']['uid'] = $x[0]['cr_uid'];
+
+	if(! perm_is_allowed($a->data['chat']['uid'],get_observer_hash(),'chat')) {
+        json_return_and_die($ret);
+    }
+
+}
+
+function chatsvc_post(&$a) {
+
+	$ret = array('success' => false);
+
+	$room_id = $a->data['chat']['room_id'];
+	$text = escape_tags($_REQUEST['chat_text']);
+
+
+	$sql_extra = permissions_sql($a->data['chat']['uid']);
+
+	$r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+		intval($a->data['chat']['uid']),
+		intval($a->data['chat']['room_id'])
+	);
+	if(! $r)
+		json_return_and_die($ret);
+
+	$x = q("insert into chat ( chat_room, chat_xchan, created, chat_text )
+		values( %d, '%s', '%s', '%s' )",
+		intval($a->data['chat']['room_id']),
+		dbesc(get_observer_hash()),
+		dbesc(datetime_convert()),
+		dbesc($text)		
+	);
+
+}
+
+function chatsvc_content(&$a) {
+
+	$lastseen = intval($_REQUEST['last']);
+
+	$ret = array('success' => false);
+
+	$sql_extra = permissions_sql($a->data['chat']['uid']);
+
+	$r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+		intval($a->data['chat']['uid']),
+		intval($a->data['chat']['room_id'])
+	);
+	if(! $r)
+		json_return_and_die($ret);
+
+	$inroom = array();
+
+	$r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
+		intval($a->data['chat']['room_id'])
+	);
+	if($r) {
+		foreach($r as $rr) {
+			$inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name']);		
+		}
+	}
+
+	$chats = array();
+
+	$r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d",
+		intval($a->data['chat']['room_id']),
+		intval($lastseen)
+	);
+	if($r) {
+		foreach($r as $rr) {
+			$chats[] = array(
+				'id' => $rr['chat_id'],
+				'img' => zid($rr['xchan_photo_m']), 
+				'img_type' => $rr['xchan_photo_mimetype'],
+				'name' => $rr['xchan_name'],
+				'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
+				'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
+				'text' => smilies(bbcode($rr['chat_text']))
+			);
+		}
+	}
+
+	$ret['success'] = true;
+	$ret['inroom'] = $inroom;
+	$ret['chats'] = $chats;
+
+	json_return_and_die($ret);
+
+}
+		 
\ No newline at end of file
-- 
cgit v1.2.3


From c24aa824fe49d6dc803fb58c577d2238db416f2f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 18:19:19 -0800
Subject: chat is a members only feature, there is no "guest" access.

---
 mod/chat.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mod/chat.php b/mod/chat.php
index bc981b76b..42a7808d9 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -39,20 +39,26 @@ function chat_init(&$a) {
 
 function chat_content(&$a) {
 
-	if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'chat')) {
+	$observer = get_observer_hash();
+	if(! $observer) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	if(! perm_is_allowed($a->profile['profile_uid'],$observer,'chat')) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 	
 	if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
-		chatroom_leave(get_observer_hash(),$room_id,$_SERVER['REMOTE_ADDR']);
+		chatroom_leave($observer,$room_id,$_SERVER['REMOTE_ADDR']);
 		goaway(z_root() . '/channel/' . argv(1));
 	}
 
 
 	if(argc() > 2 && intval(argv(2))) {
 		$room_id = intval(argv(2));
-		$x = chatroom_enter(get_observer_hash(),$room_id,'online',$_SERVER['REMOTE_ADDR']);
+		$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
 		if(! $x)
 			return;
 		$o = replace_macros(get_markup_template('chat.tpl'),array());
-- 
cgit v1.2.3


From 838ebbcb62aaaca8f19e338fe89c484f9d4ececd Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 18:29:03 -0800
Subject: apply service class limits (at the account level) to chatroom
 creation as chat has the potential to adversely affect system performance. In
 the future we may also want to service_class restrict the number of
 participants in a room.

---
 include/chat.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/chat.php b/include/chat.php
index a8c3db429..aef154fe6 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -20,6 +20,18 @@ function chatroom_create($channel,$arr) {
 		return $ret;
 	}
 
+	$r = q("select count(cr_id) as total from chatroom where cr_aid = %d",
+		intval($channel['channel_account_id'])
+	);
+	if($r)
+		 $limit = service_class_fetch($channel_id,'chatrooms');
+
+    if(($r) && ($limit !== false) && ($r[0]['total'] >= $limit)) {
+        $ret['message'] = upgrade_message();
+        return $ret;
+    }
+
+
 	$created = datetime_convert();
 
 	$x = q("insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, allow_cid, allow_gid, deny_cid, deny_gid )
-- 
cgit v1.2.3


From 9fdee53c9a35d584de8cacd071c6608de88a18b6 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 20:14:18 -0800
Subject: start on the ajax bits

---
 mod/chat.php      |  5 ++++-
 mod/chatsvc.php   |  2 ++
 view/tpl/chat.tpl | 33 +++++++++++++++++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/mod/chat.php b/mod/chat.php
index 42a7808d9..b8af4c1a6 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -61,7 +61,10 @@ function chat_content(&$a) {
 		$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
 		if(! $x)
 			return;
-		$o = replace_macros(get_markup_template('chat.tpl'),array());
+		$o = replace_macros(get_markup_template('chat.tpl'),array(
+			'$room_id' => $room_id,
+			'$submit' => t('Submit')
+		));
 		return $o;
 	}
 
diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index b8d2a9f69..23b95cd1c 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -4,6 +4,8 @@ require_once('include/security.php');
 
 function chatsvc_init(&$a) {
 
+//logger('chatsvc');
+
 	$ret = array('success' => false);
 
 	$a->data['chat']['room_id'] = intval($_REQUEST['room_id']);
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 6378b8776..d0f9418a0 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -8,11 +8,36 @@
     
              
         
              
 
-        
              
-            
-            
+        
+			
+            
              
+            
         
              
 
     
              
 
-
            
\ No newline at end of file
+
            
+
+
-- 
cgit v1.2.3


From 7b609782623d91c2bdf81c04cd801aaae927e9fa Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 20:40:37 -0800
Subject: back-end for changing online status and keeping presence refreshed

---
 mod/chat.php          |  3 +++
 mod/chatsvc.php       | 21 ++++++++++++++++++++-
 view/pdl/mod_chat.pdl |  3 +++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 view/pdl/mod_chat.pdl

diff --git a/mod/chat.php b/mod/chat.php
index b8af4c1a6..fa3d05364 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -67,5 +67,8 @@ function chat_content(&$a) {
 		));
 		return $o;
 	}
+	require_once('include/widgets.php');
+
+	return widget_chatroom_list(array());
 
 }
\ No newline at end of file
diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index 23b95cd1c..39161b5a7 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -29,7 +29,19 @@ function chatsvc_post(&$a) {
 
 	$room_id = $a->data['chat']['room_id'];
 	$text = escape_tags($_REQUEST['chat_text']);
-
+	$status = strip_tags($_REQUEST['status']);
+
+	if($status && $room_id) {
+		$r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
+			dbesc($status),
+			dbesc(datetime_convert()),
+			intval($room_id),
+			dbesc(get_observer_hash()),
+			dbesc($_SERVER['REMOTE_ADDR'])
+		);
+	}
+	if(! $text)
+		return;
 
 	$sql_extra = permissions_sql($a->data['chat']['uid']);
 
@@ -96,6 +108,13 @@ function chatsvc_content(&$a) {
 		}
 	}
 
+	$r = q("update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
+		dbesc(datetime_convert()),
+		intval($room_id),
+		dbesc(get_observer_hash()),
+		dbesc($_SERVER['REMOTE_ADDR'])
+	);
+
 	$ret['success'] = true;
 	$ret['inroom'] = $inroom;
 	$ret['chats'] = $chats;
diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl
new file mode 100644
index 000000000..6b1d2a15e
--- /dev/null
+++ b/view/pdl/mod_chat.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=profile][/widget]
+[/region]
-- 
cgit v1.2.3


From 080928f214c9f83879f1578e05baa6032fa2b7b8 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 29 Jan 2014 21:29:48 -0800
Subject: chatroom management front-end stuff

---
 include/widgets.php         |  3 +-
 mod/chat.php                | 73 +++++++++++++++++++++++++++++++++++++++++++++
 view/js/mod_chat.js         | 16 ++++++++++
 view/js/mod_filestorage.php | 16 ++++++++++
 view/tpl/chatroom_new.tpl   | 12 ++++++++
 5 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 view/js/mod_chat.js
 create mode 100644 view/js/mod_filestorage.php
 create mode 100644 view/tpl/chatroom_new.tpl

diff --git a/include/widgets.php b/include/widgets.php
index 400660d11..0151f7c27 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -587,4 +587,5 @@ function widget_chatroom_list($arr) {
 		'$nickname' => $channel['channel_address'],
 		'$items' => $r,
 	));
-}
\ No newline at end of file
+}
+
diff --git a/mod/chat.php b/mod/chat.php
index fa3d05364..54fa58092 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -36,6 +36,46 @@ function chat_init(&$a) {
 
 }
 
+function chat_post(&$a) {
+
+	if($_POST['room_name'])
+		$room = strip_tags(trim($_POST['room_name']));	
+
+	if((! $room) || (! local_user()))
+		return;
+
+	$channel = $a->get_channel();
+
+
+	if($_POST['action'] === 'drop') {
+		chatroom_destroy($channel,array('cr_name' => $room));
+		goaway(z_root() . '/chat/' . $channel['channel_address']);
+	}
+
+
+	$arr = array('name' => $room);
+	$arr['allow_gid']   = perms2str($_REQUEST['group_allow']);
+    $arr['allow_cid']   = perms2str($_REQUEST['contact_allow']);
+    $arr['deny_gid']    = perms2str($_REQUEST['group_deny']);
+    $arr['deny_cid']    = perms2str($_REQUEST['contact_deny']);
+
+	chatroom_create($channel,$arr);
+
+	$x = q("select cr_id from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
+		dbesc($room),
+		intval(local_user())
+	);
+
+	if($x)
+		goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']);
+
+	// that failed. Try again perhaps?
+
+	goaway(z_root() . '/chat/' . $channel['channel_address'] . '/new');
+
+
+}
+
 
 function chat_content(&$a) {
 
@@ -62,11 +102,44 @@ function chat_content(&$a) {
 		if(! $x)
 			return;
 		$o = replace_macros(get_markup_template('chat.tpl'),array(
+			'$room_name' => '', // should we get this from the API?
 			'$room_id' => $room_id,
 			'$submit' => t('Submit')
 		));
 		return $o;
 	}
+
+
+
+
+
+	if(local_user() && argc() > 2 && argv(2) === 'new') {
+
+
+		$channel = $a->get_channel();  
+		$channel_acl = array(
+			'allow_cid' => $channel['channel_allow_cid'], 
+			'allow_gid' => $channel['channel_allow_gid'], 
+			'deny_cid'  => $channel['channel_deny_cid'], 
+			'deny_gid'  => $channel['channel_deny_gid']
+		); 
+
+		require_once('include/acl_selectors.php');
+
+		$o = replace_macros(get_markup_template('chatroom_new.tpl'),array(
+			'$header' => t('New Chatroom'),
+			'$name' => array('room_name',t('Chatroom Name'),'', ''),
+			'$acl' => populate_acl($channel_acl),
+			'$submit' => t('Submit')
+		));
+		return $o;
+	}
+
+
+
+
+
+
 	require_once('include/widgets.php');
 
 	return widget_chatroom_list(array());
diff --git a/view/js/mod_chat.js b/view/js/mod_chat.js
new file mode 100644
index 000000000..82957ae44
--- /dev/null
+++ b/view/js/mod_chat.js
@@ -0,0 +1,16 @@
+$(document).ready(function() {
+
+	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+		var selstr;
+		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			selstr = $(this).text();
+			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-public').hide();
+		});
+		if(selstr == null) { 
+			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-public').show();
+		}
+
+	}).trigger('change');
+});
diff --git a/view/js/mod_filestorage.php b/view/js/mod_filestorage.php
new file mode 100644
index 000000000..82957ae44
--- /dev/null
+++ b/view/js/mod_filestorage.php
@@ -0,0 +1,16 @@
+$(document).ready(function() {
+
+	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+		var selstr;
+		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			selstr = $(this).text();
+			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-public').hide();
+		});
+		if(selstr == null) { 
+			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-public').show();
+		}
+
+	}).trigger('change');
+});
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
new file mode 100644
index 000000000..86eadb132
--- /dev/null
+++ b/view/tpl/chatroom_new.tpl
@@ -0,0 +1,12 @@
+
            {{$header}}
            
+
+
            
+{{include file="field_input.tpl" field=$name}}
+
            
+
            
+{{$acl}}
+
            
+
+
            
+
+
-- 
cgit v1.2.3


From 6c6a9b963a925d33b2cc436d877a4edc5f0d59b1 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 01:00:46 -0800
Subject: a bit more ajax work on chat and chatsvc and some fiddling with
 layouts

---
 include/chat.php  |  2 +-
 mod/chatsvc.php   |  3 ++-
 version.inc       |  2 +-
 view/tpl/chat.tpl | 35 +++++++++++++++++++++++++----------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/include/chat.php b/include/chat.php
index aef154fe6..b88c63fc3 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -155,7 +155,7 @@ function chatroom_leave($observer_xchan,$room_id,$client) {
 
 function chatroom_list($uid) {
 
-	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d  group by cp_id order by cr_name",
+	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d  group by cr_name order by cr_name",
 		intval($uid)
 	);
 
diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index 39161b5a7..d76a87462 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -59,7 +59,8 @@ function chatsvc_post(&$a) {
 		dbesc(datetime_convert()),
 		dbesc($text)		
 	);
-
+	$ret['success'] = true;
+	json_return_and_die($ret);
 }
 
 function chatsvc_content(&$a) {
diff --git a/version.inc b/version.inc
index 36c8c7342..e8ad6394a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-29.572
+2014-01-30.573
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index d0f9418a0..13862c339 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,11 +1,12 @@
-
            
+
            
 
-    
            
+    
            
     
            
 
-    
            
+    
            
 
-    
            
+	
            
+    
            
         
            
 
         
            
@@ -20,24 +21,38 @@
 
 
-- 
cgit v1.2.3


From 0a2b2a139080b41c10bbc7fc0f3b24129f2c3c38 Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Thu, 30 Jan 2014 10:39:09 +0100
Subject: attempt with fix URL for testing works

---
 include/network.php       | 12 +++++++++---
 include/zot.php           |  1 +
 index.php                 |  5 +++--
 mod/admin.php             |  7 +++++--
 view/tpl/admin_hubloc.tpl |  1 +
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/network.php b/include/network.php
index 3fe7f5400..ca6fa1bfc 100644
--- a/include/network.php
+++ b/include/network.php
@@ -78,7 +78,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 		@curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
 
 
-	// don't let curl abort the entire application
+	// dont let curl abort the entire application
 	// if it throws any errors.
 
 	$s = @curl_exec($ch);
@@ -86,7 +86,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 	$base = $s;
 	$curl_info = @curl_getinfo($ch);
 	$http_code = $curl_info['http_code'];
-//	logger('fetch_url:' . $http_code . ' data: ' . $s);
+	logger('fetch_url:' . $http_code . ' data: ' . $s);
 	$header = '';
 
 	// Pull out multiple headers, e.g. proxy and continuation headers
@@ -129,7 +129,11 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 
 
 function z_post_url($url,$params, $redirects = 0, $opts = array()) {
-
+	
+	logger('z_post_url',LOGGER_DEBUG);
+	logger('z_post_url url ' . $url ,LOGGER_DEBUG);
+	logger('z_post_url params' . $params ,LOGGER_DEBUG);
+	logger('z_post_url redirects ' . $redirects ,LOGGER_DEBUG);
 	$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
 
 	$ch = curl_init($url);
@@ -181,10 +185,12 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 	// if it throws any errors.
 
 	$s = @curl_exec($ch);
+	logger('z_post_url s ' . $s ,LOGGER_DEBUG);
 
 	$base = $s;
 	$curl_info = curl_getinfo($ch);
 	$http_code = $curl_info['http_code'];
+	logger('z_post_url http_code ' . $http_code ,LOGGER_DEBUG);
 
 	$header = '';
 
diff --git a/include/zot.php b/include/zot.php
index 7c2cfe019..de2fb4202 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -134,6 +134,7 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_
 
 
 function zot_zot($url,$data) {
+	logger('zot_zot ',LOGGER_DEBUG);
 	return z_post_url($url,array('data' => $data));
 }
 
diff --git a/index.php b/index.php
index 6ffef19cb..15fa264bd 100755
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ $a = new App;
 /**
  *
  * Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.
+ * Ignore errors. If the file doesnt exist or is empty, we are running in installation mode.
  *
  */
 
@@ -181,7 +181,8 @@ if(strlen($a->module)) {
 	 * If the site has a custom module to over-ride the standard module, use it.
 	 * Otherwise, look for the standard program module in the 'mod' directory
 	 */
-
+	logger('Index.php', LOGGER_DEBUG);
+	//logger('Index.php array ' . print_r($a,true), LOGGER_DEBUG);
 
 	if(! $a->module_loaded) {
 		if(file_exists("custom/{$a->module}.php")) {
diff --git a/mod/admin.php b/mod/admin.php
index 1a284c42f..360eddd2a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -9,7 +9,7 @@
  * @param App $a
  */
 function admin_post(&$a){
-
+	logger('admin_post', LOGGER_DEBUG);
 
 	if(!is_site_admin()) {
 		return;
@@ -74,6 +74,7 @@ function admin_post(&$a){
  */
 function admin_content(&$a) {
 
+	logger('admin_content', LOGGER_DEBUG);
 	if(!is_site_admin()) {
 		return login(false);
 	}
@@ -478,11 +479,13 @@ function admin_page_hubloc_post(&$a){
 			intval($hublocid)
 		);
 		$hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post';
+		$hublocurl = "http://fred-dev.michameer.dyndns.org/post";
 		
 		//perform ping
 		$m = zot_build_packet($a->get_channel(),'ping');
 		logger('ping message : ' . print_r($m,true), LOGGER_DEBUG);
-	        $r = zot_zot($hubloc_url,$m);
+		logger('ping  _REQUEST ' . print_r($_REQUEST,true), LOGGER_DEBUG);
+	        $r = zot_zot($hublocurl,$m);
         	logger('ping answer: ' . print_r($r,true), LOGGER_DEBUG);
 		
 		//unfotunatly zping wont work, I guess return format is not correct
diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
index ea840e1b3..06a8cdf6a 100755
--- a/view/tpl/admin_hubloc.tpl
+++ b/view/tpl/admin_hubloc.tpl
@@ -15,6 +15,7 @@
 			
 			
 			
+			
 			
 			
 			
-- 
cgit v1.2.3


From c5ac5544cb02aa3194c5cab2b3ab736a2e19e6eb Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Thu, 30 Jan 2014 11:04:20 +0100
Subject: clean up logger commands. Placed apostrophs at the end from some
 comments to keep the syntax highlighting in vi working

---
 include/network.php | 10 ++--------
 include/zot.php     |  1 -
 index.php           |  4 +---
 mod/admin.php       |  3 ---
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/include/network.php b/include/network.php
index ca6fa1bfc..1fb4beaa7 100644
--- a/include/network.php
+++ b/include/network.php
@@ -78,7 +78,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 		@curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
 
 
-	// dont let curl abort the entire application
+	// don't let curl abort the entire application'
 	// if it throws any errors.
 
 	$s = @curl_exec($ch);
@@ -86,7 +86,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 	$base = $s;
 	$curl_info = @curl_getinfo($ch);
 	$http_code = $curl_info['http_code'];
-	logger('fetch_url:' . $http_code . ' data: ' . $s);
+	//logger('fetch_url:' . $http_code . ' data: ' . $s);
 	$header = '';
 
 	// Pull out multiple headers, e.g. proxy and continuation headers
@@ -130,10 +130,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 
 function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 	
-	logger('z_post_url',LOGGER_DEBUG);
-	logger('z_post_url url ' . $url ,LOGGER_DEBUG);
-	logger('z_post_url params' . $params ,LOGGER_DEBUG);
-	logger('z_post_url redirects ' . $redirects ,LOGGER_DEBUG);
 	$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
 
 	$ch = curl_init($url);
@@ -185,12 +181,10 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 	// if it throws any errors.
 
 	$s = @curl_exec($ch);
-	logger('z_post_url s ' . $s ,LOGGER_DEBUG);
 
 	$base = $s;
 	$curl_info = curl_getinfo($ch);
 	$http_code = $curl_info['http_code'];
-	logger('z_post_url http_code ' . $http_code ,LOGGER_DEBUG);
 
 	$header = '';
 
diff --git a/include/zot.php b/include/zot.php
index de2fb4202..7c2cfe019 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -134,7 +134,6 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_
 
 
 function zot_zot($url,$data) {
-	logger('zot_zot ',LOGGER_DEBUG);
 	return z_post_url($url,array('data' => $data));
 }
 
diff --git a/index.php b/index.php
index 15fa264bd..c2421bc0e 100755
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ $a = new App;
 /**
  *
  * Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesnt exist or is empty, we are running in installation mode.
+ * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.'
  *
  */
 
@@ -181,8 +181,6 @@ if(strlen($a->module)) {
 	 * If the site has a custom module to over-ride the standard module, use it.
 	 * Otherwise, look for the standard program module in the 'mod' directory
 	 */
-	logger('Index.php', LOGGER_DEBUG);
-	//logger('Index.php array ' . print_r($a,true), LOGGER_DEBUG);
 
 	if(! $a->module_loaded) {
 		if(file_exists("custom/{$a->module}.php")) {
diff --git a/mod/admin.php b/mod/admin.php
index 360eddd2a..12b847b03 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -479,12 +479,9 @@ function admin_page_hubloc_post(&$a){
 			intval($hublocid)
 		);
 		$hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post';
-		$hublocurl = "http://fred-dev.michameer.dyndns.org/post";
 		
 		//perform ping
 		$m = zot_build_packet($a->get_channel(),'ping');
-		logger('ping message : ' . print_r($m,true), LOGGER_DEBUG);
-		logger('ping  _REQUEST ' . print_r($_REQUEST,true), LOGGER_DEBUG);
 	        $r = zot_zot($hublocurl,$m);
         	logger('ping answer: ' . print_r($r,true), LOGGER_DEBUG);
 		
-- 
cgit v1.2.3


From 48bc9b546cdc0fae23efc3756e37ce59dc81737a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 03:51:25 -0800
Subject: typo and clear chattext after submission

---
 view/tpl/chat.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 13862c339..c65c117cd 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -28,6 +28,7 @@ $('#chat-form').submit(function(ev) {
 	$('body').css('cursor','wait');
 	$.post("chatsvc", $('#chat-form').serialize(),function(data) {
 			if(chat_timer) clearTimeout(chat_timer);
+			$('#chatText').val('');
 			load_chats();
 			$('body').css('cursor','auto');
 		},'json');
@@ -40,9 +41,9 @@ function load_chats() {
 		if(data.success) {
 			update_inroom(data.inroom);
 			update_chats(data.chats);
-		});
-	}
-
+		}
+	});
+	
 	chat_timer = setTimeout(load_chats,10000);
 
 }
-- 
cgit v1.2.3


From 3bdbdbab53e76ef86b2ff4df6db708b16d216f77 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Thu, 30 Jan 2014 19:44:50 +0100
Subject: dont show an empty link to profile creation if multi_profile is not
 enabled

---
 view/tpl/profile_vcard.tpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 7a857fd67..187c3039d 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -10,8 +10,7 @@
 		
            • 
 		{{/foreach}}
 		
          • {{$profile.menu.chg_photo}}
            • 
-		
          • {{$profile.menu.cr_new}}
            • 
-				
+		{{if $profile.menu.cr_new}}
          • {{$profile.menu.cr_new}}
            • {{/if}}
 	
          
 	
          
 	{{/if}}
-- 
cgit v1.2.3


From c0f02d774a0af0f0959a7690dadb30586ee0b6b1 Mon Sep 17 00:00:00 2001
From: Michael Meer 
Date: Thu, 30 Jan 2014 20:41:40 +0100
Subject: started analysis of ping response and clean up more logger

---
 mod/admin.php | 13 +++++++++++--
 mod/post.php  | 10 +++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 12b847b03..76decae09 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -483,14 +483,23 @@ function admin_page_hubloc_post(&$a){
 		//perform ping
 		$m = zot_build_packet($a->get_channel(),'ping');
 	        $r = zot_zot($hublocurl,$m);
-        	logger('ping answer: ' . print_r($r,true), LOGGER_DEBUG);
+		//handle results and set the hubloc flags in db to make results visible
+		$r2 = $r[body];
+		$r3 = $r2[success];
+		if ( $r3[success] == True ){
+			//set HUBLOC_OFFLINE to 0
+			logger(' success = true ',LOGGER_DEBUG);
+		} else {
+			//set HUBLOC_OFFLINE to 1 
+			logger(' success = false ', LOGGER_DEBUG);
+
+		}
 		
 		//unfotunatly zping wont work, I guess return format is not correct
 		 //require_once('mod/zping.php');
 		 //$r = zping_content($hublocurl);
         	 //logger('zping answer: ' . $r, LOGGER_DEBUG);
 		
-		//handle results and set the hubloc flags in db to make results visible
 
 		//in case of repair store new pub key for tested hubloc (all channel with this hubloc) in db
 		//after repair set hubloc flags to 0
diff --git a/mod/post.php b/mod/post.php
index cce183e46..cb0dc8302 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -9,8 +9,6 @@ require_once('include/zot.php');
 
 
 function post_init(&$a) {
-	logger('POST inside',LOGGER_DEBUG);
-	logger('POST given parameter: ' . print_r($_REQUEST,true), LOGGER_DEBUG);
 
 	// Most access to this endpoint is via the post method.
 	// Here we will pick out the magic auth params which arrive
@@ -257,6 +255,11 @@ function post_init(&$a) {
 			$a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
 			info(sprintf( t('Welcome %s. Remote authentication successful.'),$x[0]['xchan_name']));
 			logger('mod_zot: auth success from ' . $x[0]['xchan_addr']); 
+			 q("update hubloc set hubloc_status =  (hubloc_status | %d ) where hubloc_id = %d ",
+                                intval(HUBLOC_WORKS),
+                                intval($x[0]['hubloc_id'])
+                        );
+
 
 		} else {
 			if($test) {
@@ -447,14 +450,12 @@ function post_init(&$a) {
 	
 function post_post(&$a) {
 
-	logger('mod_zot: ' . print_r($_REQUEST,true), LOGGER_DEBUG);
 
 	$encrypted_packet = false;
 	$ret = array('success' => false);
 
 	$data = json_decode($_REQUEST['data'],true);
 
-	logger('mod_zot: data: ' . print_r($data,true), LOGGER_DATA);
 
 	/**
 	 * Many message packets will arrive encrypted. The existence of an 'iv' element 
@@ -483,7 +484,6 @@ function post_post(&$a) {
 		$data = array('type' => 'bogus');
 	}
 
-	logger('mod_zot: decoded data: ' . print_r($data,true), LOGGER_DATA);
 
 	$msgtype = ((array_key_exists('type',$data)) ? $data['type'] : '');
 
-- 
cgit v1.2.3


From 0fae8acdefa26c19429ffef218066050d1ae825e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 14:36:56 -0800
Subject: fix basic auth with account (not channel) login

---
 include/reddav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/reddav.php b/include/reddav.php
index e6e066770..af79a0db1 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -752,7 +752,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 		}
 
 		require_once('include/auth.php');
-		$record = account_verify_password($email,$pass);
+		$record = account_verify_password($username,$password);
 		if($record && $record['account_default_channel']) {
 			$r = q("select * from channel where channel_account_id = %d and channel_id = %d limit 1",
 				intval($record['account_id']),
-- 
cgit v1.2.3


From f69bf5e5987dafa9be3a1b278f68a9d0e48aa06a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 18:57:46 -0800
Subject: more chat work - this time the ajax bits to actually show chats on
 the page

---
 view/tpl/chat.tpl | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index c65c117cd..f3f3ee5bd 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,12 +1,13 @@
-
          
+
          
 
-    
          
-    
          
+    
          
+    	
          
+	
          
 
     
          
 
 	
          
-    
          
+    
          
         
          
 
         
          
@@ -18,12 +19,23 @@
     
          
 
 
          
+
 
 
-- 
cgit v1.2.3


From 49f07bd90f7304e76c2b06d0a9616d680df6ab47 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 19:01:03 -0800
Subject: mod/ping should only update basic_presence - and clearing stale
 entries. otherwise let rooms handle presence for themselves.

---
 mod/ping.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index 2d5deb9ad..4b07fee7a 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -44,20 +44,17 @@ function ping_init(&$a) {
 	}
 
 	if(get_observer_hash() && (! $result['invalid'])) {
-		$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s'",
+		$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1",
 			dbesc(get_observer_hash()),
 			dbesc($_SERVER['REMOTE_ADDR'])
 		);
 		$basic_presence = false;
 		if($r) {
-			foreach($r as $rr) {
-				if($rr['cp_room'] == 0)
-					$basic_presence = true;	
-				q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
-					dbesc(datetime_convert()),
-					intval($rr['cp_id'])
-				);
-			}
+			$basic_presence = true;	
+			q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
+				dbesc(datetime_convert()),
+				intval($r[0]['cp_id'])
+			);
 		}
 		if(! $basic_presence) {
 			q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
-- 
cgit v1.2.3


From a1d40431f22e82b8e018dce65ced0801c40b20ff Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 20:10:47 -0800
Subject: chat expiration (default 2 hours) - but can be set on a per-chatroom
 basis

---
 boot.php             |  2 +-
 include/chat.php     | 10 ++++++++--
 install/database.sql |  4 +++-
 install/update.php   | 11 ++++++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index 7be74e64a..9048223bf 100755
--- a/boot.php
+++ b/boot.php
@@ -46,7 +46,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
 
-define ( 'DB_UPDATE_VERSION',       1094  );
+define ( 'DB_UPDATE_VERSION',       1095  );
 
 define ( 'EOL',                    '
          ' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/include/chat.php b/include/chat.php
index b88c63fc3..08fd154b5 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -31,16 +31,19 @@ function chatroom_create($channel,$arr) {
         return $ret;
     }
 
+	if(! array_key_exists('expire',$arr))
+		$arr['expire'] = 120;  // minutes, e.g. 2 hours
 
 	$created = datetime_convert();
 
-	$x = q("insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, allow_cid, allow_gid, deny_cid, deny_gid )
-		values ( %d, %d , '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+	$x = q("insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, cr_expire, allow_cid, allow_gid, deny_cid, deny_gid )
+		values ( %d, %d , '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' ) ",
 		intval($channel['channel_account_id']),
 		intval($channel['channel_id']),
 		dbesc($name),
 		dbesc($created),
 		dbesc($created),
+		intval($arr['expire']),
 		dbesc($arr['allow_cid']),
 		dbesc($arr['allow_gid']),
 		dbesc($arr['deny_cid']),
@@ -111,6 +114,9 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 		return false;
 	}
 
+	if(intval($x[0]['cr_expire']))
+		$r = q("delete from chat where created < UTC_TIMESTAMP() - INTERVAL " . intval($x[0]['cr_expire']) . " MINUTE and chat_room = " . intval($x[0]['cr_id']));
+
 	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
 		dbesc($observer_xchan),
 		intval($room_id)
diff --git a/install/database.sql b/install/database.sql
index dba03da65..c89e4cef2 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -247,6 +247,7 @@ CREATE TABLE IF NOT EXISTS `chatroom` (
   `cr_name` char(255) NOT NULL DEFAULT '',
   `cr_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `cr_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `cr_expire` int(10) unsigned NOT NULL DEFAULT '0',
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -256,7 +257,8 @@ CREATE TABLE IF NOT EXISTS `chatroom` (
   KEY `cr_uid` (`cr_uid`),
   KEY `cr_name` (`cr_name`),
   KEY `cr_created` (`cr_created`),
-  KEY `cr_edited` (`cr_edited`)
+  KEY `cr_edited` (`cr_edited`),
+  KEY `cr_expire` (`cr_expire`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `clients` (
diff --git a/install/update.php b/install/update.php
index 180b8d5a0..e8b6d37f6 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 
Date: Thu, 30 Jan 2014 21:01:09 -0800
Subject: missing string delimiters (quotes)

---
 mod/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 76decae09..01296bd29 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -484,9 +484,9 @@ function admin_page_hubloc_post(&$a){
 		$m = zot_build_packet($a->get_channel(),'ping');
 	        $r = zot_zot($hublocurl,$m);
 		//handle results and set the hubloc flags in db to make results visible
-		$r2 = $r[body];
-		$r3 = $r2[success];
-		if ( $r3[success] == True ){
+		$r2 = $r['body'];
+		$r3 = $r2['success'];
+		if ( $r3['success'] == True ){
 			//set HUBLOC_OFFLINE to 0
 			logger(' success = true ',LOGGER_DEBUG);
 		} else {
-- 
cgit v1.2.3


From aaa3c62efa2999d083063a0384b3a23b758d3380 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 30 Jan 2014 21:09:02 -0800
Subject: keep presence updated - typo was causing it to logout

---
 mod/chatsvc.php   | 2 +-
 view/tpl/chat.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index d76a87462..f32ea56ce 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -111,7 +111,7 @@ function chatsvc_content(&$a) {
 
 	$r = q("update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
 		dbesc(datetime_convert()),
-		intval($room_id),
+		intval($a->data['chat']['room_id']),
 		dbesc(get_observer_hash()),
 		dbesc($_SERVER['REMOTE_ADDR'])
 	);
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index f3f3ee5bd..19b3425da 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,6 +1,6 @@
 
          
 
-    
          
+    
          
     	
          
 	
          
 
-- 
cgit v1.2.3


From d7d2fff24b05bcb3ff3acc215e99f8f7d33d058d Mon Sep 17 00:00:00 2001
From: marijus 
Date: Fri, 31 Jan 2014 18:27:58 +0100
Subject: comment out since it is not clear if this is not implemented yet or
 obsolete

---
 view/tpl/nav.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f27afed09..048f53743 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -39,7 +39,7 @@
 			
 			
 			
@@ -51,7 +51,7 @@
 			
 			
 			
-- 
cgit v1.2.3


From af75b77253bf051b9e3f486809bbabcd3c415732 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Fri, 31 Jan 2014 18:31:14 +0100
Subject: comment out since it is not clear if this is not implemented yet or
 obsolete

---
 view/tpl/nav.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f27afed09..048f53743 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -39,7 +39,7 @@
 			
 			
 			
@@ -51,7 +51,7 @@
 			
 			
 			
-- 
cgit v1.2.3


From 902c9b158528b03e6e31f8b7f16fa4a5b16f62cd Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 31 Jan 2014 20:02:45 -0800
Subject: doc updates

---
 doc/html/acl__selectors_8php.html                  |   2 +-
 doc/html/apw_2php_2style_8php.html                 |   2 +-
 doc/html/bbcode_8php.html                          |   2 +-
 doc/html/boot_8php.html                            |  30 +-
 doc/html/chatsvc_8php.html                         | 173 ++++++++
 doc/html/chatsvc_8php.js                           |   6 +
 doc/html/datetime_8php.html                        |   2 +-
 doc/html/dba__driver_8php.html                     |   4 +-
 doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.html | 112 +++++
 doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.js   |   4 +
 doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html |   2 +
 doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.js   |   1 +
 doc/html/dir_d41ce877eb409a4791b288730010abe2.html |   6 +
 doc/html/dir_d41ce877eb409a4791b288730010abe2.js   |   3 +
 doc/html/dir_d44c64559bbebec7f509842c48db8b23.html |   2 +
 doc/html/dir_d44c64559bbebec7f509842c48db8b23.js   |   1 +
 doc/html/extract_8php.html                         |   2 +-
 doc/html/files.html                                | 444 ++++++++++----------
 doc/html/globals_0x62.html                         |   5 +-
 doc/html/globals_0x63.html                         |  33 ++
 doc/html/globals_0x67.html                         |   3 +
 doc/html/globals_0x6d.html                         |   2 +-
 doc/html/globals_0x6f.html                         |   3 +
 doc/html/globals_0x72.html                         |   3 +
 doc/html/globals_0x73.html                         |   3 -
 doc/html/globals_0x77.html                         |   3 +
 doc/html/globals_func_0x62.html                    |   5 +-
 doc/html/globals_func_0x63.html                    |  33 ++
 doc/html/globals_func_0x67.html                    |   3 +
 doc/html/globals_func_0x6d.html                    |   2 +-
 doc/html/globals_func_0x6f.html                    |   3 +
 doc/html/globals_func_0x72.html                    |   3 +
 doc/html/globals_func_0x73.html                    |   3 -
 doc/html/globals_func_0x77.html                    |   3 +
 doc/html/identity_8php.html                        |  44 +-
 doc/html/identity_8php.js                          |   2 +
 doc/html/include_2chat_8php.html                   | 277 +++++++++++++
 doc/html/include_2chat_8php.js                     |   8 +
 doc/html/include_2config_8php.html                 |   4 +-
 doc/html/include_2menu_8php.html                   |  52 +--
 doc/html/include_2menu_8php.js                     |   3 +-
 doc/html/include_2network_8php.html                |   4 +-
 doc/html/items_8php.html                           |   2 +-
 doc/html/language_8php.html                        |   4 +-
 doc/html/mod_2chat_8php.html                       | 173 ++++++++
 doc/html/mod_2chat_8php.js                         |   6 +
 doc/html/mod__filestorage_8php.html                | 112 +++++
 doc/html/navtree.js                                |  14 +-
 doc/html/navtreeindex0.js                          |  66 +--
 doc/html/navtreeindex1.js                          |  10 +-
 doc/html/navtreeindex2.js                          |  20 +-
 doc/html/navtreeindex3.js                          | 352 ++++++++--------
 doc/html/navtreeindex4.js                          | 170 ++++----
 doc/html/navtreeindex5.js                          | 444 ++++++++++----------
 doc/html/navtreeindex6.js                          | 412 +++++++++---------
 doc/html/navtreeindex7.js                          | 460 ++++++++++-----------
 doc/html/navtreeindex8.js                          | 129 +++---
 doc/html/online_8php.html                          | 137 ++++++
 doc/html/online_8php.js                            |   4 +
 doc/html/permissions_8php.html                     |   2 +-
 doc/html/php_2theme__init_8php.html                |   2 +-
 doc/html/plugin_8php.html                          |   6 +-
 doc/html/reddav_8php.html                          |   2 +-
 doc/html/search/all_62.js                          |   1 -
 doc/html/search/all_63.js                          |  18 +-
 doc/html/search/all_67.js                          |   1 +
 doc/html/search/all_6d.js                          |   3 +-
 doc/html/search/all_6f.js                          |   4 +-
 doc/html/search/all_72.js                          |   1 +
 doc/html/search/all_73.js                          |   1 -
 doc/html/search/all_77.js                          |   1 +
 doc/html/search/files_63.js                        |   5 +-
 doc/html/search/files_6d.js                        |   1 +
 doc/html/search/files_6f.js                        |   1 +
 doc/html/search/functions_62.js                    |   1 -
 doc/html/search/functions_63.js                    |  11 +
 doc/html/search/functions_67.js                    |   1 +
 doc/html/search/functions_6d.js                    |   2 +-
 doc/html/search/functions_6f.js                    |   1 +
 doc/html/search/functions_72.js                    |   1 +
 doc/html/search/functions_73.js                    |   1 -
 doc/html/search/functions_77.js                    |   1 +
 doc/html/security_8php.html                        |   2 +-
 doc/html/text_8php.html                            |  34 +-
 doc/html/text_8php.js                              |   1 -
 doc/html/typo_8php.html                            |   2 +-
 doc/html/widgets_8php.html                         |  20 +
 doc/html/widgets_8php.js                           |   1 +
 doc/html/zot_8php.html                             |   4 +-
 89 files changed, 2568 insertions(+), 1381 deletions(-)
 create mode 100644 doc/html/chatsvc_8php.html
 create mode 100644 doc/html/chatsvc_8php.js
 create mode 100644 doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.html
 create mode 100644 doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.js
 create mode 100644 doc/html/include_2chat_8php.html
 create mode 100644 doc/html/include_2chat_8php.js
 create mode 100644 doc/html/mod_2chat_8php.html
 create mode 100644 doc/html/mod_2chat_8php.js
 create mode 100644 doc/html/mod__filestorage_8php.html
 create mode 100644 doc/html/online_8php.html
 create mode 100644 doc/html/online_8php.js

diff --git a/doc/html/acl__selectors_8php.html b/doc/html/acl__selectors_8php.html
index d0d283649..bc3bbfae3 100644
--- a/doc/html/acl__selectors_8php.html
+++ b/doc/html/acl__selectors_8php.html
@@ -270,7 +270,7 @@ Functions
       
 
          
 
-
          Referenced by channel_content(), display_content(), editwebpage_content(), events_content(), filestorage_content(), mitem_content(), network_content(), photos_content(), rpost_content(), and webpages_content().
          
+
          Referenced by channel_content(), chat_content(), display_content(), editwebpage_content(), events_content(), filestorage_content(), mitem_content(), network_content(), photos_content(), rpost_content(), and webpages_content().
          
 
 
          
 
          
diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html
index 423bd9850..1c91ca1ea 100644
--- a/doc/html/apw_2php_2style_8php.html
+++ b/doc/html/apw_2php_2style_8php.html
@@ -128,7 +128,7 @@ Variables
       
 
          
 
-
          Referenced by admin_page_users(), admin_page_users_post(), all_friends(), bookmarks_menu_fetch(), build_sync_packet(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
          
+
          Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
          
 
 
          
 
          
diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html
index 21a1e3d19..c0823aa23 100644
--- a/doc/html/bbcode_8php.html
+++ b/doc/html/bbcode_8php.html
@@ -281,7 +281,7 @@ Functions
       
 
          
 
-
          Referenced by bb2diaspora(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), and tagrm_content().
          
+
          Referenced by bb2diaspora(), chatsvc_content(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), siteinfo_content(), and tagrm_content().
          
 
 
          
 
diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html
index cf222ff37..0f5ad9a59 100644
--- a/doc/html/boot_8php.html
+++ b/doc/html/boot_8php.html
@@ -200,7 +200,7 @@ Variables
  
 const ZOT_REVISION 1
  
-const DB_UPDATE_VERSION 1092
+const DB_UPDATE_VERSION 1095
  
 const EOL '<br />' . "\r\n"
  
@@ -712,7 +712,7 @@ Variables
       
 
          
 
-
          Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), attach_init(), blocks_content(), channel_init(), cloud_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(), mail_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(), profperm_content(), 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(), xref_init(), and zotfeed_init().
          
+
          Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), attach_init(), blocks_content(), channel_init(), chat_content(), chat_init(), cloud_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(), mail_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(), online_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(), profperm_content(), 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(), xref_init(), and zotfeed_init().
          
 
 
          
 
@@ -730,7 +730,7 @@ Variables
       
 
          
 
-
          Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), cloud_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(), mail_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(), profperm_content(), queue_run(), register_init(), regmod_content(), rpost_content(), 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(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().
          
+
          Referenced by App\__construct(), _well_known_init(), achievements_content(), 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(), chat_content(), chat_init(), cloud_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(), get_online_status(), group_content(), group_post(), help_content(), layouts_content(), like_content(), lockview_content(), mail_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(), online_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(), profperm_content(), queue_run(), register_init(), regmod_content(), rpost_content(), 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(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().
          
 
 
          
 
@@ -952,7 +952,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(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), dir_tagblock(), drop_item(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), 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(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), RedBrowser\htmlActionsPanel(), 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(), photos_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(), tryzrlvideo(), 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_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), 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_statuses_user_timeline(), 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(), dir_tagblock(), drop_item(), editpost_content(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), 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(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), RedBrowser\htmlActionsPanel(), 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(), photos_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(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().
          
 
 
          
 
@@ -1014,7 +1014,7 @@ Variables
       
 
          
 
-
          Referenced by advanced_profile(), attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), cloud_init(), 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(), RedBrowser\set_writeable(), 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().
          
+
          Referenced by advanced_profile(), api_statuses_user_timeline(), attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), chat_content(), chatsvc_content(), chatsvc_init(), chatsvc_post(), cloud_init(), 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(), ping_init(), prepare_body(), profile_content(), profile_sidebar(), search_content(), RedBrowser\set_writeable(), 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().
          
 
 
          
 
@@ -1032,7 +1032,7 @@ Variables
       
 
          
 
-
          Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), filestorage_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().
          
+
          Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), chat_content(), chat_post(), 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(), filestorage_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().
          
 
 
          
 
@@ -1083,7 +1083,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_post(), connedit_content(), connedit_post(), directory_content(), dirprofile_init(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), 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(), community_content(), connections_post(), connedit_content(), connedit_post(), directory_content(), dirprofile_init(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), 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().
          
 
 
          
 
@@ -1169,7 +1169,7 @@ Variables
       
 
          
 
-
          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(), cloud_init(), 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_content(), dirprofile_init(), 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(), filestorage_post(), 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(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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().
          
+
          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(), chat_content(), chat_init(), chat_post(), cloud_init(), 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_content(), dirprofile_init(), 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(), filestorage_post(), 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(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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().
          
 
 
          
 
@@ -1221,7 +1221,7 @@ Variables
       
 
          
 
-
          Referenced by achievements_content(), 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(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
          
+
          Referenced by achievements_content(), 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(), chat_content(), chat_init(), chatroom_enter(), 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(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
          
 
 
          
 
@@ -1321,7 +1321,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_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(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), 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(), group_side(), 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_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), 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(), 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(), cloud_init(), 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(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), 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(), group_side(), 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_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), 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(), 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().
          
 
 
          
 
@@ -1355,7 +1355,7 @@ Variables
       
 
          
 
-
          Referenced by allowed_public_recips(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), 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_albums_list(), photos_create_item(), photos_list_photos(), post_activity_item(), 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(), sslify(), 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_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().
          
+
          Referenced by allowed_public_recips(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), 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_albums_list(), photos_create_item(), photos_list_photos(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), 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_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().
          
 
 
          
 
@@ -2104,7 +2104,7 @@ Variables
 
          
       
-          
+          
          
         
          const DB_UPDATE_VERSION 1092const DB_UPDATE_VERSION 1095
         
          
       
          
 
          
@@ -2218,7 +2218,7 @@ Variables
       
 
          
 
-
          Referenced by achievements_content(), 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(), check_store(), common_content(), common_init(), community_content(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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(), thing_content(), thing_init(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
          
+
          Referenced by achievements_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), apps_content(), attach_init(), blocks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_keys(), check_php(), check_store(), common_content(), common_init(), community_content(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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(), thing_content(), thing_init(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
          
 
 
          
 
@@ -2363,6 +2363,8 @@ Variables
       
 
          
 
+
          Referenced by post_init().
          
+
 
          
 
 
@@ -2801,7 +2803,7 @@ Variables
       
 
          
 
-
          Referenced by RedDirectory\__construct(), Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), delete_imported_item(), deliver_run(), directory_content(), directory_run(), dirprofile_init(), expire_run(), fix_private_photos(), RedFile\get(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), 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(), RedFile\put(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().
          
+
          Referenced by RedDirectory\__construct(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), delete_imported_item(), deliver_run(), directory_content(), directory_run(), dirprofile_init(), expire_run(), fix_private_photos(), RedFile\get(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), 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(), RedFile\put(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().
          
 
 
          
 
diff --git a/doc/html/chatsvc_8php.html b/doc/html/chatsvc_8php.html
new file mode 100644
index 000000000..108ad1820
--- /dev/null
+++ b/doc/html/chatsvc_8php.html
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+The Red Matrix: mod/chatsvc.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+
          
+
+ 
+ 
+  
+  
+ 
+ 
+
          
+   
          The Red Matrix
+   
          
+  
          
+
          
+
+
+
+  
+  
+
          
+
          
+  
+  
          
+  
          
+
          
+
+
          
+
+
+
+
+
          
+
+
          
+
+
          
+  
          
+Functions  
          
+  
          
+
          chatsvc.php File Reference
            
          
+
          
+
          
+
+
+
+
+
+
+
+
+
          
+Functions
           chatsvc_init (&$a)
           
           chatsvc_post (&$a)
           
           chatsvc_content (&$a)
           
          
+
          Function Documentation
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chatsvc_content (& $a)
          
+
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chatsvc_init (& $a)
          
+
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chatsvc_post (& $a)
          
+
          
+
+
          
+
          
+
          
+
          
+
diff --git a/doc/html/chatsvc_8php.js b/doc/html/chatsvc_8php.js
new file mode 100644
index 000000000..65b3df3d1
--- /dev/null
+++ b/doc/html/chatsvc_8php.js
@@ -0,0 +1,6 @@
+var chatsvc_8php =
+[
+    [ "chatsvc_content", "chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9", null ],
+    [ "chatsvc_init", "chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116", null ],
+    [ "chatsvc_post", "chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03", null ]
+];
\ No newline at end of file
diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html
index ea802ce2c..eb7ac5c40 100644
--- a/doc/html/datetime_8php.html
+++ b/doc/html/datetime_8php.html
@@ -334,7 +334,7 @@ Functions
       
 
          
 
-
          Referenced by account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().
          
+
          Referenced by account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().
          
 
 
          
 
diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html
index 6ae602eec..8b32c3ca1 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), 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(), 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(), RedDirectory\createFile(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), 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(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), 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(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmarks_menu_fetch(), 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(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_sys_channel(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), 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(), 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(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().
          
+
          Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), 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(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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_24b9ffacd044b9b20a6b863179c605d1.html b/doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.html
new file mode 100644
index 000000000..085888ac3
--- /dev/null
+++ b/doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.html
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+The Red Matrix: view/js Directory Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+
          
+
+ 
+ 
+  
+  
+ 
+ 
+
          
+   
          The Red Matrix
+   
          
+  
          
+
          
+
+
+
+  
+
          
+
          
+  
+  
          
+  
          
+
          
+
+
          
+
+
+
+
+
          
+
+
          
+
+
          
+  
          
+
          js Directory Reference
            
          
+
          
+
          
+
+
+
+
+
          
+Files
          file  mod_filestorage.php
           
          
+
          
+
          
+
diff --git a/doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.js b/doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.js
new file mode 100644
index 000000000..b46498175
--- /dev/null
+++ b/doc/html/dir_24b9ffacd044b9b20a6b863179c605d1.js
@@ -0,0 +1,4 @@
+var dir_24b9ffacd044b9b20a6b863179c605d1 =
+[
+    [ "mod_filestorage.php", "mod__filestorage_8php.html", null ]
+];
\ No newline at end of file
diff --git a/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html b/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html
index 4aa042ef0..c4fb93560 100644
--- a/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html
+++ b/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html
@@ -104,6 +104,8 @@ $(document).ready(function(){initNavTree('dir_b2f003339c516cc00c8cadcafbe82f13.h
 
+
+
diff --git a/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.js b/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.js
index 991623ea4..9ce51a6ef 100644
--- a/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.js
+++ b/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.js
@@ -1,5 +1,6 @@
 var dir_b2f003339c516cc00c8cadcafbe82f13 =
 [
+    [ "js", "dir_24b9ffacd044b9b20a6b863179c605d1.html", "dir_24b9ffacd044b9b20a6b863179c605d1" ],
     [ "php", "dir_817f6d302394b98e59575acdb59998bc.html", "dir_817f6d302394b98e59575acdb59998bc" ],
     [ "theme", "dir_8543001e5d25368a6edede3e63efb554.html", "dir_8543001e5d25368a6edede3e63efb554" ]
 ];
\ No newline at end of file
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
index a4780b265..721315a1e 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
@@ -126,6 +126,10 @@ Files
+
+
+
+
@@ -230,6 +234,8 @@ Files
+
+
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index 17ed67b37..264f8fda7 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -11,6 +11,8 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "chanman.php", "mod_2chanman_8php.html", null ],
     [ "channel.php", "channel_8php.html", "channel_8php" ],
     [ "chanview.php", "chanview_8php.html", "chanview_8php" ],
+    [ "chat.php", "mod_2chat_8php.html", "mod_2chat_8php" ],
+    [ "chatsvc.php", "chatsvc_8php.html", "chatsvc_8php" ],
     [ "cloud.php", "cloud_8php.html", "cloud_8php" ],
     [ "common.php", "common_8php.html", "common_8php" ],
     [ "community.php", "community_8php.html", "community_8php" ],
@@ -63,6 +65,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "notify.php", "mod_2notify_8php.html", "mod_2notify_8php" ],
     [ "oembed.php", "mod_2oembed_8php.html", "mod_2oembed_8php" ],
     [ "oexchange.php", "oexchange_8php.html", "oexchange_8php" ],
+    [ "online.php", "online_8php.html", "online_8php" ],
     [ "opensearch.php", "opensearch_8php.html", "opensearch_8php" ],
     [ "page.php", "page_8php.html", "page_8php" ],
     [ "parse_url.php", "parse__url_8php.html", "parse__url_8php" ],
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
index 1f931673f..60c458b85 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -133,6 +133,8 @@ Files
+
+
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
index 3681158ec..c047455f1 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
@@ -17,6 +17,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 =
       [ "Cache", "classCache.html", null ]
     ] ],
     [ "chanman.php", "include_2chanman_8php.html", "include_2chanman_8php" ],
+    [ "chat.php", "include_2chat_8php.html", "include_2chat_8php" ],
     [ "cli_startup.php", "cli__startup_8php.html", "cli__startup_8php" ],
     [ "cli_suggest.php", "cli__suggest_8php.html", "cli__suggest_8php" ],
     [ "comanche.php", "comanche_8php.html", "comanche_8php" ],
diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html
index e853b8bfc..fe980d447 100644
--- a/doc/html/extract_8php.html
+++ b/doc/html/extract_8php.html
@@ -132,7 +132,7 @@ Variables
          
 
          
 Directories
          directory  js
           
          
 
          directory  php
          
 
           
          
 
          directory  theme
          
 
           
          
 
          file  chanview.php
          
 
           
          file  chat.php
           
          file  chatsvc.php
           
          
 
          file  cloud.php
          
 
           
          
 
          file  common.php
          
 
           
          
 
          file  oexchange.php
          
 
           
          file  online.php
           
          
 
          file  opensearch.php
          
 
           
          
 
          file  page.php
          
 
           
          
 
          file  chanman.php
          
 
           
          file  chat.php
           
          
 
          file  cli_startup.php
          
 
           
          
 
          file  cli_suggest.php
          
       
          
 
          
 
-
          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_cloudpath(), 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(), 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(), api_statuses_user_timeline(), array_sanitise(), attach_mkdir(), attach_store(), chat_post(), chatroom_create(), chatroom_destroy(), 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_cloudpath(), 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(), 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().
          
 
 
          
 
diff --git a/doc/html/files.html b/doc/html/files.html
index e9784846e..5957a0122 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -129,65 +129,66 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*bbcode.php
 |o*cache.php
 |o*chanman.php
-|o*cli_startup.php
-|o*cli_suggest.php
-|o*comanche.php
-|o*config.php
-|o*Contact.php
-|o*contact_selectors.php
-|o*contact_widgets.php
-|o*conversation.php
-|o*ConversationObject.php
-|o*cronhooks.php
-|o*crypto.php
-|o*datetime.php
-|o*deliver.php
-|o*dir_fns.php
-|o*directory.php
-|o*enotify.php
-|o*event.php
-|o*expire.php
-|o*features.php
-|o*follow.php
-|o*friendica_smarty.php
-|o*gprobe.php
-|o*group.php
-|o*html2bbcode.php
-|o*html2plain.php
-|o*identity.php
-|o*ItemObject.php
-|o*ITemplateEngine.php
-|o*items.php
-|o*language.php
-|o*menu.php
-|o*message.php
-|o*nav.php
-|o*network.php
-|o*notifier.php
-|o*notify.php
-|o*oauth.php
-|o*oembed.php
-|o*onedirsync.php
-|o*onepoll.php
-|o*page_widgets.php
-|o*permissions.php
-|o*photos.php
-|o*plugin.php
-|o*poller.php
-|o*profile_selectors.php
-|o*ProtoDriver.php
-|o*queue.php
-|o*queue_fn.php
-|o*reddav.php
-|o*security.php
-|o*session.php
-|o*socgraph.php
-|o*system_unavailable.php
-|o*taxonomy.php
-|o*template_processor.php
-|o*text.php
-|o*widgets.php
-|\*zot.php
+|o*chat.php
+|o*cli_startup.php
+|o*cli_suggest.php
+|o*comanche.php
+|o*config.php
+|o*Contact.php
+|o*contact_selectors.php
+|o*contact_widgets.php
+|o*conversation.php
+|o*ConversationObject.php
+|o*cronhooks.php
+|o*crypto.php
+|o*datetime.php
+|o*deliver.php
+|o*dir_fns.php
+|o*directory.php
+|o*enotify.php
+|o*event.php
+|o*expire.php
+|o*features.php
+|o*follow.php
+|o*friendica_smarty.php
+|o*gprobe.php
+|o*group.php
+|o*html2bbcode.php
+|o*html2plain.php
+|o*identity.php
+|o*ItemObject.php
+|o*ITemplateEngine.php
+|o*items.php
+|o*language.php
+|o*menu.php
+|o*message.php
+|o*nav.php
+|o*network.php
+|o*notifier.php
+|o*notify.php
+|o*oauth.php
+|o*oembed.php
+|o*onedirsync.php
+|o*onepoll.php
+|o*page_widgets.php
+|o*permissions.php
+|o*photos.php
+|o*plugin.php
+|o*poller.php
+|o*profile_selectors.php
+|o*ProtoDriver.php
+|o*queue.php
+|o*queue_fn.php
+|o*reddav.php
+|o*security.php
+|o*session.php
+|o*socgraph.php
+|o*system_unavailable.php
+|o*taxonomy.php
+|o*template_processor.php
+|o*text.php
+|o*widgets.php
+|\*zot.php
 o+mod
 |o*_well_known.php
 |o*achievements.php
@@ -200,121 +201,124 @@ $(document).ready(function(){initNavTree('files.html','');});
 |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
-|o*dirprofile.php
-|o*dirsearch.php
-|o*display.php
-|o*editblock.php
-|o*editlayout.php
-|o*editpost.php
-|o*editwebpage.php
-|o*events.php
-|o*fbrowser.php
-|o*feed.php
-|o*filer.php
-|o*filerm.php
-|o*filestorage.php
-|o*follow.php
-|o*fsuggest.php
-|o*group.php
-|o*help.php
-|o*home.php
-|o*hostxrd.php
-|o*import.php
-|o*invite.php
-|o*item.php
-|o*layouts.php
-|o*like.php
-|o*lockview.php
-|o*login.php
-|o*lostpass.php
-|o*magic.php
-|o*mail.php
-|o*manage.php
-|o*match.php
-|o*menu.php
-|o*message.php
-|o*mitem.php
-|o*mood.php
-|o*msearch.php
-|o*network.php
-|o*new_channel.php
-|o*notes.php
-|o*notifications.php
-|o*notify.php
-|o*oembed.php
-|o*oexchange.php
-|o*opensearch.php
-|o*page.php
-|o*parse_url.php
-|o*photo.php
-|o*photos.php
-|o*php.php
-|o*ping.php
-|o*poco.php
-|o*poke.php
-|o*post.php
-|o*pretheme.php
-|o*probe.php
-|o*profile.php
-|o*profile_photo.php
-|o*profiles.php
-|o*profperm.php
-|o*pubsites.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*sslify.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*xref.php
-|o*zfinger.php
-|o*zotfeed.php
-|\*zping.php
+|o*chat.php
+|o*chatsvc.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
+|o*dirprofile.php
+|o*dirsearch.php
+|o*display.php
+|o*editblock.php
+|o*editlayout.php
+|o*editpost.php
+|o*editwebpage.php
+|o*events.php
+|o*fbrowser.php
+|o*feed.php
+|o*filer.php
+|o*filerm.php
+|o*filestorage.php
+|o*follow.php
+|o*fsuggest.php
+|o*group.php
+|o*help.php
+|o*home.php
+|o*hostxrd.php
+|o*import.php
+|o*invite.php
+|o*item.php
+|o*layouts.php
+|o*like.php
+|o*lockview.php
+|o*login.php
+|o*lostpass.php
+|o*magic.php
+|o*mail.php
+|o*manage.php
+|o*match.php
+|o*menu.php
+|o*message.php
+|o*mitem.php
+|o*mood.php
+|o*msearch.php
+|o*network.php
+|o*new_channel.php
+|o*notes.php
+|o*notifications.php
+|o*notify.php
+|o*oembed.php
+|o*oexchange.php
+|o*online.php
+|o*opensearch.php
+|o*page.php
+|o*parse_url.php
+|o*photo.php
+|o*photos.php
+|o*php.php
+|o*ping.php
+|o*poco.php
+|o*poke.php
+|o*post.php
+|o*pretheme.php
+|o*probe.php
+|o*profile.php
+|o*profile_photo.php
+|o*profiles.php
+|o*profperm.php
+|o*pubsites.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*sslify.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*xref.php
+|o*zfinger.php
+|o*zotfeed.php
+|\*zping.php
 o+util
 |o+fpostit
 ||\*fpostit.php
@@ -332,51 +336,53 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*typohelper.php
 |\*updatetpl.py
 o+view
-|o+php
-||o*default.php
-||o*full.php
-||o*minimal.php
-||o*mod_import.php
-||o*none.php
-||\*theme_init.php
-|\+theme
-| o+apw
-| |o+php
-| ||o*config.php
-| ||o*style.php
-| ||\*theme.php
-| |\+schema
-| | o*darkness.php
-| | o*darknessleftaside.php
-| | o*darknessrightaside.php
-| | o*greenthumbnails.php
-| | o*minimalisticdarkness.php
-| | o*olddefault.php
-| | o*passion.php
-| | o*passionwide.php
-| | o*pine.php
-| | o*redbasic.php
-| | \*widedarkness.php
-| o+blogga
-| |o+php
-| ||o*config.php
-| ||o*default.php
-| ||o*theme.php
-| ||\*theme_init.php
-| |\+view
-| | \+theme
-| |  \+blog
-| |   o*config.php
-| |   o*default.php
-| |   \*theme.php
-| \+redbasic
-|  o+php
-|  |o*config.php
-|  |o*style.php
-|  |o*theme.php
-|  |\*theme_init.php
-|  \+schema
-|   \*dark.php
+|o+js
+||\*mod_filestorage.php
+|o+php
+||o*default.php
+||o*full.php
+||o*minimal.php
+||o*mod_import.php
+||o*none.php
+||\*theme_init.php
+|\+theme
+| o+apw
+| |o+php
+| ||o*config.php
+| ||o*style.php
+| ||\*theme.php
+| |\+schema
+| | o*darkness.php
+| | o*darknessleftaside.php
+| | o*darknessrightaside.php
+| | o*greenthumbnails.php
+| | o*minimalisticdarkness.php
+| | o*olddefault.php
+| | o*passion.php
+| | o*passionwide.php
+| | o*pine.php
+| | o*redbasic.php
+| | \*widedarkness.php
+| o+blogga
+| |o+php
+| ||o*config.php
+| ||o*default.php
+| ||o*theme.php
+| ||\*theme_init.php
+| |\+view
+| | \+theme
+| |  \+blog
+| |   o*config.php
+| |   o*default.php
+| |   \*theme.php
+| \+redbasic
+|  o+php
+|  |o*config.php
+|  |o*style.php
+|  |o*theme.php
+|  |\*theme_init.php
+|  \+schema
+|   \*dark.php
 \*boot.php
 
 
diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html
index 6d06af0a4..829720890 100644
--- a/doc/html/globals_0x62.html
+++ b/doc/html/globals_0x62.html
@@ -196,7 +196,7 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
 : blocks.php
 
          • 
 
        • blog_init()
-: theme.php
+: theme.php
 
          • 
 
        • blog_install()
 : theme.php
@@ -213,9 +213,6 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
 
        • blogtheme_imgurl()
 : theme.php
 
          • 
-
        • bookmarks_menu_fetch()
-: menu.php
-
          • 
 
        • breaklines()
 : html2plain.php
 
          • 
diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html
index eaefb6b94..1e9987b2f 100644
--- a/doc/html/globals_0x63.html
+++ b/doc/html/globals_0x63.html
@@ -195,6 +195,39 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
 
        • chanview_content()
 : chanview.php
 
          • 
+
        • chat_content()
+: chat.php
+
          • 
+
        • chat_init()
+: chat.php
+
          • 
+
        • chat_post()
+: chat.php
+
          • 
+
        • chatroom_create()
+: chat.php
+
          • 
+
        • chatroom_destroy()
+: chat.php
+
          • 
+
        • chatroom_enter()
+: chat.php
+
          • 
+
        • chatroom_leave()
+: chat.php
+
          • 
+
        • chatroom_list()
+: chat.php
+
          • 
+
        • chatsvc_content()
+: chatsvc.php
+
          • 
+
        • chatsvc_init()
+: chatsvc.php
+
          • 
+
        • chatsvc_post()
+: chatsvc.php
+
          • 
 
        • check_account_admin()
 : account.php
 
          • 
diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html
index 128e4ff68..74e4658a5 100644
--- a/doc/html/globals_0x67.html
+++ b/doc/html/globals_0x67.html
@@ -249,6 +249,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 
        • get_observer_hash()
 : boot.php
 
          • 
+
        • get_online_status()
+: identity.php
+
          • 
 
        • get_pconfig()
 : config.php
 
          • 
diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html
index fe1f177e7..d3434fc10 100644
--- a/doc/html/globals_0x6d.html
+++ b/doc/html/globals_0x6d.html
@@ -244,7 +244,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
 : boot.php
 
 
        • menu_list()
-: menu.php
+: menu.php
 
          • 
 
        • menu_post()
 : menu.php
diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html
index b2ee6bc3a..aeb5a4429 100644
--- a/doc/html/globals_0x6f.html
+++ b/doc/html/globals_0x6f.html
@@ -192,6 +192,9 @@ $(document).ready(function(){initNavTree('globals_0x6f.html','');});
 
        • onepoll_run()
 : onepoll.php
 
          • 
+
        • online_init()
+: online.php
+
          • 
 
        • opensearch_init()
 : opensearch.php
 
          • 
diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html
index 147b9d5a1..015a6a582 100644
--- a/doc/html/globals_0x72.html
+++ b/doc/html/globals_0x72.html
@@ -249,6 +249,9 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
 
        • reltoabs()
 : text.php
 
          • 
+
        • remote_online_status()
+: identity.php
+
          • 
 
        • remote_user()
 : boot.php
 
          • 
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index 25f4a2a3d..b62a96af4 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -237,9 +237,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 
        • sitelist_init()
 : sitelist.php
 
          • 
-
        • smile_decode()
-: text.php
-
          • 
 
        • smile_encode()
 : text.php
 
          • 
diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html
index da5be2e74..f74429e9e 100644
--- a/doc/html/globals_0x77.html
+++ b/doc/html/globals_0x77.html
@@ -180,6 +180,9 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
 
        • widget_categories()
 : widgets.php
 
          • 
+
        • widget_chatroom_list()
+: widgets.php
+
          • 
 
        • widget_collections()
 : widgets.php
 
          • 
diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html
index 0c3cc4bec..3bf6aae6d 100644
--- a/doc/html/globals_func_0x62.html
+++ b/doc/html/globals_func_0x62.html
@@ -195,7 +195,7 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
 : blocks.php
 
 
        • blog_init()
-: theme.php
+: theme.php
 
          • 
 
        • blog_install()
 : theme.php
@@ -212,9 +212,6 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
 
        • blogtheme_imgurl()
 : theme.php
 
          • 
-
        • bookmarks_menu_fetch()
-: menu.php
-
          • 
 
        • breaklines()
 : html2plain.php
 
          • 
diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html
index d0f872eec..01cfcc622 100644
--- a/doc/html/globals_func_0x63.html
+++ b/doc/html/globals_func_0x63.html
@@ -194,6 +194,39 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
 
        • chanview_content()
 : chanview.php
 
          • 
+
        • chat_content()
+: chat.php
+
          • 
+
        • chat_init()
+: chat.php
+
          • 
+
        • chat_post()
+: chat.php
+
          • 
+
        • chatroom_create()
+: chat.php
+
          • 
+
        • chatroom_destroy()
+: chat.php
+
          • 
+
        • chatroom_enter()
+: chat.php
+
          • 
+
        • chatroom_leave()
+: chat.php
+
          • 
+
        • chatroom_list()
+: chat.php
+
          • 
+
        • chatsvc_content()
+: chatsvc.php
+
          • 
+
        • chatsvc_init()
+: chatsvc.php
+
          • 
+
        • chatsvc_post()
+: chatsvc.php
+
          • 
 
        • check_account_admin()
 : account.php
 
          • 
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html
index f67e4bb28..643036d3c 100644
--- a/doc/html/globals_func_0x67.html
+++ b/doc/html/globals_func_0x67.html
@@ -248,6 +248,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
 
        • get_observer_hash()
 : boot.php
 
          • 
+
        • get_online_status()
+: identity.php
+
          • 
 
        • get_pconfig()
 : config.php
 
          • 
diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html
index d8cd1849c..c90133798 100644
--- a/doc/html/globals_func_0x6d.html
+++ b/doc/html/globals_func_0x6d.html
@@ -210,7 +210,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
 : menu.php
 
 
        • menu_list()
-: menu.php
+: menu.php
 
          • 
 
        • menu_post()
 : menu.php
diff --git a/doc/html/globals_func_0x6f.html b/doc/html/globals_func_0x6f.html
index 002e257c6..be0dbed34 100644
--- a/doc/html/globals_func_0x6f.html
+++ b/doc/html/globals_func_0x6f.html
@@ -191,6 +191,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6f.html','');});
 
        • onepoll_run()
 : onepoll.php
 
          • 
+
        • online_init()
+: online.php
+
          • 
 
        • opensearch_init()
 : opensearch.php
 
          • 
diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html
index 98b284dfa..a51f073e6 100644
--- a/doc/html/globals_func_0x72.html
+++ b/doc/html/globals_func_0x72.html
@@ -227,6 +227,9 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
 
        • reltoabs()
 : text.php
 
          • 
+
        • remote_online_status()
+: identity.php
+
          • 
 
        • remote_user()
 : boot.php
 
          • 
diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html
index 1f3aca686..608695ca5 100644
--- a/doc/html/globals_func_0x73.html
+++ b/doc/html/globals_func_0x73.html
@@ -236,9 +236,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
 
        • sitelist_init()
 : sitelist.php
 
          • 
-
        • smile_decode()
-: text.php
-
          • 
 
        • smile_encode()
 : text.php
 
          • 
diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html
index 31af26a40..860b694e2 100644
--- a/doc/html/globals_func_0x77.html
+++ b/doc/html/globals_func_0x77.html
@@ -176,6 +176,9 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
 
        • widget_categories()
 : widgets.php
 
          • 
+
        • widget_chatroom_list()
+: widgets.php
+
          • 
 
        • widget_collections()
 : widgets.php
 
          • 
diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html
index 93673bb26..f6af0a794 100644
--- a/doc/html/identity_8php.html
+++ b/doc/html/identity_8php.html
@@ -156,6 +156,10 @@ Functions
  
  is_member ($s)
  
+ get_online_status ($nick)
+ 
+ remote_online_status ($webbie)
+ 
 
 
          Function Documentation
          
 
@@ -325,6 +329,24 @@ Functions
 
 
          Referenced by nav(), and zid().
          
 
+
+
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          get_online_status ( $nick)
          
+
          
+
+
          Referenced by online_init(), and profile_load().
          
+
 
          
 
          
 
@@ -530,7 +552,7 @@ Functions
 
          The channel default theme is also selected for use, unless over-riden elsewhere. 
          
 
          load/reload current theme info
          
 
-
          Referenced by achievements_content(), blocks_content(), channel_init(), cloud_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().
          
+
          Referenced by achievements_content(), blocks_content(), channel_init(), chat_init(), cloud_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().
          
 
 
 
@@ -570,6 +592,24 @@ Functions
 
 
          Referenced by profile_create_sidebar(), widget_fullprofile(), and widget_profile().
          
 
+
+
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          remote_online_status ( $webbie)
          
+
          
+
+
          Referenced by dirprofile_init().
          
+
 
          
 
          
 
@@ -677,7 +717,7 @@ Functions
 
          Returns
          string
          
 
          'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else 
          
 
-
          Referenced by chanview_content(), conversation(), dirprofile_init(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), oembed_fetch_url(), tryzrlaudio(), tryzrlvideo(), and viewconnections_content().
          
+
          Referenced by chanview_content(), chatsvc_content(), conversation(), dirprofile_init(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), oembed_fetch_url(), tryzrlaudio(), tryzrlvideo(), and viewconnections_content().
          
 
 
 
diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js
index 873f46450..c9091d29b 100644
--- a/doc/html/identity_8php.js
+++ b/doc/html/identity_8php.js
@@ -9,6 +9,7 @@ var identity_8php =
     [ "get_events", "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ],
     [ "get_my_address", "identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ],
     [ "get_my_url", "identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec", null ],
+    [ "get_online_status", "identity_8php.html#a332df795f684788002f5a6424abacfd7", null ],
     [ "get_sys_channel", "identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51", null ],
     [ "get_theme_uid", "identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ],
     [ "identity_basic_export", "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03", null ],
@@ -18,6 +19,7 @@ var identity_8php =
     [ "profile_create_sidebar", "identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ],
     [ "profile_load", "identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ],
     [ "profile_sidebar", "identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ],
+    [ "remote_online_status", "identity_8php.html#a47d6f53216f23a3484061793bef29854", null ],
     [ "set_default_login_identity", "identity_8php.html#a78151baf4407a8482d2681a91a9c486b", null ],
     [ "validate_channelname", "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58", null ],
     [ "zid", "identity_8php.html#a5b815330f3d177ab383af37a6c12e532", null ],
diff --git a/doc/html/include_2chat_8php.html b/doc/html/include_2chat_8php.html
new file mode 100644
index 000000000..7040528d6
--- /dev/null
+++ b/doc/html/include_2chat_8php.html
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+The Red Matrix: include/chat.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+
          
+
+ 
+ 
+  
+  
+ 
+ 
+
          
+   
          The Red Matrix
+   
          
+  
          
+
          
+
+
+
+  
+  
+
          
+
          
+  
+  
          
+  
          
+
          
+
+
          
+
+
+
+
+
          
+
+
          
+
+
          
+  
          
+Functions  
          
+  
          
+
          chat.php File Reference
            
          
+
          
+
          
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+Functions
           chatroom_create ($channel, $arr)
           
           chatroom_destroy ($channel, $arr)
           
           chatroom_enter ($observer_xchan, $room_id, $status, $client)
           
           chatroom_leave ($observer_xchan, $room_id, $client)
           
           chatroom_list ($uid)
           
          
+
          Function Documentation
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
          chatroom_create ( $channel, 
           $arr 
          )
          
+
          
+
+
          Referenced by chat_post().
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
          chatroom_destroy ( $channel, 
           $arr 
          )
          
+
          
+
+
          Referenced by chat_post().
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
          chatroom_enter ( $observer_xchan, 
           $room_id, 
           $status, 
           $client 
          )
          
+
          
+
+
          Referenced by chat_content().
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
          chatroom_leave ( $observer_xchan, 
           $room_id, 
           $client 
          )
          
+
          
+
+
          Referenced by chat_content().
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chatroom_list ( $uid)
          
+
          
+
+
          Referenced by widget_chatroom_list().
          
+
+
          
+
          
+
          
+
          
+
diff --git a/doc/html/include_2chat_8php.js b/doc/html/include_2chat_8php.js
new file mode 100644
index 000000000..c8934cc36
--- /dev/null
+++ b/doc/html/include_2chat_8php.js
@@ -0,0 +1,8 @@
+var include_2chat_8php =
+[
+    [ "chatroom_create", "include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422", null ],
+    [ "chatroom_destroy", "include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639", null ],
+    [ "chatroom_enter", "include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91", null ],
+    [ "chatroom_leave", "include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f", null ],
+    [ "chatroom_list", "include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a", null ]
+];
\ No newline at end of file
diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html
index c7cafcc36..5a1f4cc8c 100644
--- a/doc/html/include_2config_8php.html
+++ b/doc/html/include_2config_8php.html
@@ -256,7 +256,7 @@ Functions
       
 
          
 
-
          Referenced by account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), 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(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), RedFile\put(), 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 account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), RedFile\put(), 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(), home_init(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), 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(), App\build_pagehead(), change_channel(), channel_content(), chanview_content(), community_content(), connect_content(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), 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().
          
 
 
          
 
diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html
index baf3b92f7..4308e6884 100644
--- a/doc/html/include_2menu_8php.html
+++ b/doc/html/include_2menu_8php.html
@@ -114,16 +114,14 @@ $(document).ready(function(){initNavTree('include_2menu_8php.html','');});
 Functions
  menu_fetch ($name, $uid, $observer_xchan)
  
- bookmarks_menu_fetch ($uid, $observer_xchan, $flags=MENU_BOOKMARK)
- 
  menu_render ($menu)
  
  menu_fetch_id ($menu_id, $channel_id)
  
  menu_create ($arr)
  
- menu_list ($channel_id)
- 
+ menu_list ($channel_id, $flags=0)
+ 
  menu_edit ($arr)
  
  menu_delete ($menu_name, $uid)
@@ -138,38 +136,6 @@ Functions
  
 
 
          Function Documentation
          
-
-
          
-
          
-      
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
          bookmarks_menu_fetch ( $uid, 
           $observer_xchan, 
           $flags = MENU_BOOKMARK 
          )
          
-
          
-
-
          
-
          
 
 
          
 
          
@@ -424,7 +390,7 @@ Functions
 
 
          
 
          
-
+
 
          
 
          
       
@@ -432,8 +398,18 @@ Functions
-          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
          
           
          menu_list 
           (
            $channel_id)$channel_id, 
          
            $flags = 0 
          )
         
          
       
          
 
          
diff --git a/doc/html/include_2menu_8php.js b/doc/html/include_2menu_8php.js
index 2f2bb4b73..11134c4b7 100644
--- a/doc/html/include_2menu_8php.js
+++ b/doc/html/include_2menu_8php.js
@@ -1,6 +1,5 @@
 var include_2menu_8php =
 [
-    [ "bookmarks_menu_fetch", "include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc", null ],
     [ "menu_add_item", "include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8", null ],
     [ "menu_create", "include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98", null ],
     [ "menu_del_item", "include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a", null ],
@@ -10,6 +9,6 @@ var include_2menu_8php =
     [ "menu_edit_item", "include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa", null ],
     [ "menu_fetch", "include_2menu_8php.html#a68ebbf492470c930f652013656f9071d", null ],
     [ "menu_fetch_id", "include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7", null ],
-    [ "menu_list", "include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b", null ],
+    [ "menu_list", "include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10", null ],
     [ "menu_render", "include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html
index 337fc9051..81ee1ed1f 100644
--- a/doc/html/include_2network_8php.html
+++ b/doc/html/include_2network_8php.html
@@ -385,7 +385,7 @@ Functions
       
 
          
 
-
          Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), dirsearch_content(), new_channel_init(), notes_init(), oexchange_content(), post_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().
          
+
          Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), chatsvc_content(), chatsvc_init(), chatsvc_post(), dirsearch_content(), new_channel_init(), notes_init(), oexchange_content(), online_init(), post_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().
          
 
 
          
 
          
@@ -651,7 +651,7 @@ Functions
 
 
          Returns
          array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content 
          
 
-
          Referenced by check_htaccess(), directory_content(), dirprofile_init(), import_post(), import_profile_photo(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), scale_external_images(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().
          
+
          Referenced by check_htaccess(), directory_content(), dirprofile_init(), import_post(), import_profile_photo(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().
          
 
 
 
diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html
index 1cba27d43..a17e9cc15 100644
--- a/doc/html/items_8php.html
+++ b/doc/html/items_8php.html
@@ -1269,7 +1269,7 @@ Functions
       
 
          
 
-
          Referenced by get_feed_for().
          
+
          Referenced by api_statuses_user_timeline(), and get_feed_for().
          
 
 
          
 
diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html
index c9615c7f0..5c8c1eb46 100644
--- a/doc/html/language_8php.html
+++ b/doc/html/language_8php.html
@@ -183,7 +183,7 @@ Functions
 
          Get the language setting directly from system variables, bypassing get_config() as database may not yet be configured.
          
 
          If possible, we use the value from the browser. 
          
 
-
          Referenced by authenticate_success(), and get_best_language().
          
+
          Referenced by get_best_language().
          
 
 
 
@@ -280,7 +280,7 @@ Functions
       
 
          
 
-
          Referenced by achievements_content(), 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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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().
          
+
          Referenced by achievements_content(), 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(), bbcode(), blocks_content(), blogtheme_form(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), 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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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_2chat_8php.html b/doc/html/mod_2chat_8php.html
new file mode 100644
index 000000000..283c554d2
--- /dev/null
+++ b/doc/html/mod_2chat_8php.html
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+The Red Matrix: mod/chat.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+
          
+
+ 
+ 
+  
+  
+ 
+ 
+
          
+   
          The Red Matrix
+   
          
+  
          
+
          
+
+
+
+  
+  
+
          
+
          
+  
+  
          
+  
          
+
          
+
+
          
+
+
+
+
+
          
+
+
          
+
+
          
+  
          
+Functions  
          
+  
          
+
          chat.php File Reference
            
          
+
          
+
          
+
+
+
+
+
+
+
+
+
          
+Functions
           chat_init (&$a)
           
           chat_post (&$a)
           
           chat_content (&$a)
           
          
+
          Function Documentation
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chat_content (& $a)
          
+
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chat_init (& $a)
          
+
          
+
+
          
+
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          chat_post (& $a)
          
+
          
+
+
          
+
          
+
          
+
          
+
diff --git a/doc/html/mod_2chat_8php.js b/doc/html/mod_2chat_8php.js
new file mode 100644
index 000000000..73a2b18d6
--- /dev/null
+++ b/doc/html/mod_2chat_8php.js
@@ -0,0 +1,6 @@
+var mod_2chat_8php =
+[
+    [ "chat_content", "mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f", null ],
+    [ "chat_init", "mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e", null ],
+    [ "chat_post", "mod_2chat_8php.html#a999d594745597c656c9760253ae297ad", null ]
+];
\ No newline at end of file
diff --git a/doc/html/mod__filestorage_8php.html b/doc/html/mod__filestorage_8php.html
new file mode 100644
index 000000000..d1bfc3b26
--- /dev/null
+++ b/doc/html/mod__filestorage_8php.html
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+The Red Matrix: view/js/mod_filestorage.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+
          
+
+ 
+ 
+  
+  
+ 
+ 
+
          
+   
          The Red Matrix
+   
          
+  
          
+
          
+
+
+
+  
+  
+
          
+
          
+  
+  
          
+  
          
+
          
+
+
          
+
+
+
+
+
          
+
+
          
+
+
          
+  
          
+
          mod_filestorage.php File Reference
            
          
+
          
+
          
+
          
+
          
+
diff --git a/doc/html/navtree.js b/doc/html/navtree.js
index 3eb466368..9d558eb94 100644
--- a/doc/html/navtree.js
+++ b/doc/html/navtree.js
@@ -37,13 +37,13 @@ var NAVTREEINDEX =
 [
 "BaseObject_8php.html",
 "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688",
-"classConversation.html#ae81221251307e315f566a11f921ce0a9",
-"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf",
-"functions_func.html",
-"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571",
-"opensearch_8php.html",
-"share_8php.html",
-"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165"
+"classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3",
+"comanche_8php.html",
+"functions_0x72.html",
+"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5",
+"notes_8php.html#a4dbd7b1f906440746af48b484d66535a",
+"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586",
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f"
 ];
 
 var SYNCONMSG = 'click to disable panel synchronisation';
diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js
index ffdfa6227..c67149936 100644
--- a/doc/html/navtreeindex0.js
+++ b/doc/html/navtreeindex0.js
@@ -1,26 +1,26 @@
 var NAVTREEINDEX0 =
 {
 "BaseObject_8php.html":[5,0,0,8],
-"Contact_8php.html":[5,0,0,17],
-"Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[5,0,0,17,2],
-"Contact_8php.html#a186162051a5127069cc851d78740f205":[5,0,0,17,4],
-"Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,17,8],
-"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,17,10],
-"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,17,13],
-"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,17,12],
-"Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc":[5,0,0,17,6],
-"Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258":[5,0,0,17,5],
-"Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960":[5,0,0,17,14],
-"Contact_8php.html#a6e64de7db60b7243dce45fb6347636ff":[5,0,0,17,3],
-"Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71":[5,0,0,17,9],
-"Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e":[5,0,0,17,7],
-"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,17,11],
-"Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[5,0,0,17,1],
-"Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[5,0,0,17,0],
-"ConversationObject_8php.html":[5,0,0,21],
-"ITemplateEngine_8php.html":[5,0,0,40],
-"ItemObject_8php.html":[5,0,0,39],
-"ProtoDriver_8php.html":[5,0,0,59],
+"Contact_8php.html":[5,0,0,18],
+"Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[5,0,0,18,2],
+"Contact_8php.html#a186162051a5127069cc851d78740f205":[5,0,0,18,4],
+"Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,18,8],
+"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,18,10],
+"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,18,13],
+"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,18,12],
+"Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc":[5,0,0,18,6],
+"Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258":[5,0,0,18,5],
+"Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960":[5,0,0,18,14],
+"Contact_8php.html#a6e64de7db60b7243dce45fb6347636ff":[5,0,0,18,3],
+"Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71":[5,0,0,18,9],
+"Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e":[5,0,0,18,7],
+"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,18,11],
+"Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[5,0,0,18,1],
+"Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[5,0,0,18,0],
+"ConversationObject_8php.html":[5,0,0,22],
+"ITemplateEngine_8php.html":[5,0,0,41],
+"ItemObject_8php.html":[5,0,0,40],
+"ProtoDriver_8php.html":[5,0,0,60],
 "__well__known_8php.html":[5,0,1,0],
 "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[5,0,1,0,0],
 "account_8php.html":[5,0,0,2],
@@ -67,11 +67,11 @@ var NAVTREEINDEX0 =
 "annotated.html":[4,0],
 "apps_8php.html":[5,0,1,5],
 "apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c":[5,0,1,5,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],
-"apw_2php_2theme_8php.html":[5,0,3,1,0,0,2],
-"apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89":[5,0,3,1,0,0,2,0],
+"apw_2php_2style_8php.html":[5,0,3,2,0,0,1],
+"apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,2,0,0,1,0],
+"apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,2,0,0,1,1],
+"apw_2php_2theme_8php.html":[5,0,3,2,0,0,2],
+"apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89":[5,0,3,2,0,0,2,0],
 "auth_8php.html":[5,0,0,7],
 "auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee":[5,0,0,7,0],
 "auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5":[5,0,0,7,2],
@@ -101,14 +101,14 @@ var NAVTREEINDEX0 =
 "bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8":[5,0,0,10,11],
 "blocks_8php.html":[5,0,1,7],
 "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,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],
-"blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5":[5,0,3,1,1,1,0,0,2,3],
-"blogga_2view_2theme_2blog_2theme_8php.html#a3e77dbe111f330c64a1ff6c741cd515c":[5,0,3,1,1,1,0,0,2,2],
-"blogga_2view_2theme_2blog_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b":[5,0,3,1,1,1,0,0,2,0],
-"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],
+"blogga_2php_2theme_8php.html":[5,0,3,2,1,0,2],
+"blogga_2php_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b":[5,0,3,2,1,0,2,0],
+"blogga_2view_2theme_2blog_2theme_8php.html":[5,0,3,2,1,1,0,0,2],
+"blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5":[5,0,3,2,1,1,0,0,2,3],
+"blogga_2view_2theme_2blog_2theme_8php.html#a3e77dbe111f330c64a1ff6c741cd515c":[5,0,3,2,1,1,0,0,2,2],
+"blogga_2view_2theme_2blog_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b":[5,0,3,2,1,1,0,0,2,0],
+"blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae":[5,0,3,2,1,1,0,0,2,1],
+"blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec":[5,0,3,2,1,1,0,0,2,4],
 "boot_8php.html":[5,0,4],
 "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,130],
 "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,34],
diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js
index 0c2c55806..589b3e524 100644
--- a/doc/html/navtreeindex1.js
+++ b/doc/html/navtreeindex1.js
@@ -137,6 +137,10 @@ var NAVTREEINDEX1 =
 "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],
+"chatsvc_8php.html":[5,0,1,12],
+"chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116":[5,0,1,12,1],
+"chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9":[5,0,1,12,0],
+"chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03":[5,0,1,12,2],
 "classApp.html":[4,0,5],
 "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3":[4,0,5,56],
 "classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,40],
@@ -245,9 +249,5 @@ var NAVTREEINDEX1 =
 "classConversation.html#a8335cdd43f1836e3c255638e61a09e16":[4,0,8,1],
 "classConversation.html#a8748445aa26047ebed5141f3c3cbc244":[4,0,8,16],
 "classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd":[4,0,8,3],
-"classConversation.html#a8898bddc1e8990e81dab9a13a532cc93":[4,0,8,12],
-"classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3":[4,0,8,8],
-"classConversation.html#aa95c1a62af38bdfba7add9549bec083b":[4,0,8,13],
-"classConversation.html#adf25ce023b69a166c63c6e84e02c136a":[4,0,8,9],
-"classConversation.html#ae3d4190142e12b57051f11f2911f77a0":[4,0,8,4]
+"classConversation.html#a8898bddc1e8990e81dab9a13a532cc93":[4,0,8,12]
 };
diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index 3d78c394d..9735aefbf 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -1,5 +1,9 @@
 var NAVTREEINDEX2 =
 {
+"classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3":[4,0,8,8],
+"classConversation.html#aa95c1a62af38bdfba7add9549bec083b":[4,0,8,13],
+"classConversation.html#adf25ce023b69a166c63c6e84e02c136a":[4,0,8,9],
+"classConversation.html#ae3d4190142e12b57051f11f2911f77a0":[4,0,8,4],
 "classConversation.html#ae81221251307e315f566a11f921ce0a9":[4,0,8,21],
 "classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae":[4,0,8,18],
 "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0],
@@ -240,14 +244,10 @@ var NAVTREEINDEX2 =
 "classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb":[4,0,21,9],
 "classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207":[4,0,21,1],
 "classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393":[4,0,21,3],
-"cli__startup_8php.html":[5,0,0,13],
-"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#a1b79a6fe0454bc76673ad9aef55bf02d":[5,0,1,11,0],
-"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],
-"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,15,1]
+"cli__startup_8php.html":[5,0,0,14],
+"cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,14,0],
+"cli__suggest_8php.html":[5,0,0,15],
+"cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,15,0],
+"cloud_8php.html":[5,0,1,13],
+"cloud_8php.html#a1b79a6fe0454bc76673ad9aef55bf02d":[5,0,1,13,0]
 };
diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index 9172e91b1..157cb4625 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,100 +1,104 @@
 var NAVTREEINDEX3 =
 {
-"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,15,3],
-"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,15,0],
-"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,3],
-"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,15,0],
-"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,15,2],
-"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,15,1],
-"connedit_8php.html":[5,0,1,16],
-"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[5,0,1,16,3],
-"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[5,0,1,16,2],
-"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[5,0,1,16,0],
-"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[5,0,1,16,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,17],
-"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,17,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],
-"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,20,22],
-"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,20,6],
-"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,20,17],
-"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,20,15],
-"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,20,23],
-"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,20,8],
-"conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4":[5,0,0,20,14],
-"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,20,13],
-"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,20,21],
-"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,20,19],
-"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,20,10],
-"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,20,4],
-"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,20,2],
-"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,20,20],
-"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,20,0],
-"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,20,1],
-"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,20,11],
-"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,20,5],
-"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,20,18],
-"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,20,12],
-"conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81":[5,0,0,20,3],
-"cronhooks_8php.html":[5,0,0,22],
-"cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,22,0],
-"crypto_8php.html":[5,0,0,23],
-"crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5":[5,0,0,23,5],
-"crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[5,0,0,23,2],
-"crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c":[5,0,0,23,4],
-"crypto_8php.html#a5c61821d205f95f127114159cbffa764":[5,0,0,23,1],
-"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[5,0,0,23,9],
-"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,23,6],
-"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,23,10],
-"crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[5,0,0,23,0],
-"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,23,8],
-"crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,23,3],
-"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,23,7],
-"dark_8php.html":[5,0,3,1,2,1,0],
-"darkness_8php.html":[5,0,3,1,0,1,0],
-"darknessleftaside_8php.html":[5,0,3,1,0,1,1],
-"darknessrightaside_8php.html":[5,0,3,1,0,1,2],
-"datetime_8php.html":[5,0,0,24],
-"datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,24,6],
-"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,24,11],
-"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,24,5],
-"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,24,3],
-"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,24,10],
-"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,24,7],
-"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,24,9],
-"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,24,12],
-"datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,0,24,13],
-"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,24,8],
-"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,24,0],
-"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,24,2],
-"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,24,4],
-"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,24,1],
+"comanche_8php.html":[5,0,0,16],
+"comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,16,4],
+"comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,16,2],
+"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,16,1],
+"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,16,3],
+"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,16,0],
+"comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f":[5,0,0,16,6],
+"comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,16,5],
+"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,16,7],
+"common_8php.html":[5,0,1,14],
+"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,14,0],
+"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,14,1],
+"community_8php.html":[5,0,1,15],
+"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,15,0],
+"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,15,1],
+"connect_8php.html":[5,0,1,16],
+"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,16,2],
+"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,16,0],
+"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,16,1],
+"connections_8php.html":[5,0,1,17],
+"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,17,3],
+"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,17,0],
+"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,17,2],
+"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,17,1],
+"connedit_8php.html":[5,0,1,18],
+"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[5,0,1,18,3],
+"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[5,0,1,18,2],
+"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[5,0,1,18,0],
+"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[5,0,1,18,1],
+"contact__selectors_8php.html":[5,0,0,19],
+"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,19,1],
+"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,19,0],
+"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,19,3],
+"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,19,2],
+"contact__widgets_8php.html":[5,0,0,20],
+"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,20,0],
+"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,20,2],
+"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,20,1],
+"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,20,3],
+"contactgroup_8php.html":[5,0,1,19],
+"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,19,0],
+"conversation_8php.html":[5,0,0,21],
+"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,21,7],
+"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,21,9],
+"conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,0,21,16],
+"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,21,22],
+"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,21,6],
+"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,21,17],
+"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,21,15],
+"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,21,23],
+"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,21,8],
+"conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4":[5,0,0,21,14],
+"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,21,13],
+"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,21,21],
+"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,21,19],
+"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,21,10],
+"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,21,4],
+"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,21,2],
+"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,21,20],
+"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,21,0],
+"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,21,1],
+"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,21,11],
+"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,21,5],
+"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,21,18],
+"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,21,12],
+"conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81":[5,0,0,21,3],
+"cronhooks_8php.html":[5,0,0,23],
+"cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,23,0],
+"crypto_8php.html":[5,0,0,24],
+"crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5":[5,0,0,24,5],
+"crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[5,0,0,24,2],
+"crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c":[5,0,0,24,4],
+"crypto_8php.html#a5c61821d205f95f127114159cbffa764":[5,0,0,24,1],
+"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[5,0,0,24,9],
+"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,24,6],
+"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,24,10],
+"crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[5,0,0,24,0],
+"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,24,8],
+"crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,24,3],
+"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,24,7],
+"dark_8php.html":[5,0,3,2,2,1,0],
+"darkness_8php.html":[5,0,3,2,0,1,0],
+"darknessleftaside_8php.html":[5,0,3,2,0,1,1],
+"darknessrightaside_8php.html":[5,0,3,2,0,1,2],
+"datetime_8php.html":[5,0,0,25],
+"datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,25,6],
+"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,25,11],
+"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,25,5],
+"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,25,3],
+"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,25,10],
+"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,25,7],
+"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,25,9],
+"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,25,12],
+"datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,0,25,13],
+"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,25,8],
+"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,25,0],
+"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,25,2],
+"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,25,4],
+"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,25,1],
 "db__update_8php.html":[5,0,2,2],
 "dba__driver_8php.html":[5,0,0,0,0],
 "dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f":[5,0,0,0,0,8],
@@ -107,47 +111,48 @@ var NAVTREEINDEX3 =
 "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4],
 "dba__mysql_8php.html":[5,0,0,0,1],
 "dba__mysqli_8php.html":[5,0,0,0,2],
-"delegate_8php.html":[5,0,1,18],
-"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,18,0],
-"deliver_8php.html":[5,0,0,25],
-"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,25,0],
-"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,2,0],
-"dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[5,0,3,1,0,1],
+"delegate_8php.html":[5,0,1,20],
+"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,20,0],
+"deliver_8php.html":[5,0,0,26],
+"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,26,0],
+"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,2,2,0],
+"dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[5,0,3,2,0,1],
 "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0],
 "dir_21bc5169ff11430004758be31dcfc6c4.html":[5,0,0,0],
 "dir_23ec12649285f9fabf3a6b7380226c28.html":[5,0,2],
+"dir_24b9ffacd044b9b20a6b863179c605d1.html":[5,0,3,0],
 "dir_25f74a9991dbbca1b52a94e358ca73c1.html":[5,0,2,1,0],
-"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[5,0,3,1,2,1],
-"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[5,0,3,1,2],
-"dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html":[5,0,3,1,1,1,0],
+"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[5,0,3,2,2,1],
+"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[5,0,3,2,2],
+"dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html":[5,0,3,2,1,1,0],
 "dir_720432dea4a717197ae070dbc42b8f20.html":[5,0,2,1],
-"dir_817f6d302394b98e59575acdb59998bc.html":[5,0,3,0],
-"dir_8543001e5d25368a6edede3e63efb554.html":[5,0,3,1],
-"dir_922c77e958c99a98db92d38a3a349bf2.html":[5,0,3,1,1],
-"dir_92d6b429199666aa3765c8a934db5e14.html":[5,0,3,1,1,1],
-"dir__fns_8php.html":[5,0,0,26],
-"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,26,5],
-"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,26,4],
-"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,26,2],
-"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,26,3],
-"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[5,0,0,26,0],
-"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[5,0,0,26,1],
-"dir_a8a0005c2b8590c535262d232c22afab.html":[5,0,3,1,1,1,0,0],
+"dir_817f6d302394b98e59575acdb59998bc.html":[5,0,3,1],
+"dir_8543001e5d25368a6edede3e63efb554.html":[5,0,3,2],
+"dir_922c77e958c99a98db92d38a3a349bf2.html":[5,0,3,2,1],
+"dir_92d6b429199666aa3765c8a934db5e14.html":[5,0,3,2,1,1],
+"dir__fns_8php.html":[5,0,0,27],
+"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,27,5],
+"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,27,4],
+"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,27,2],
+"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,27,3],
+"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[5,0,0,27,0],
+"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[5,0,0,27,1],
+"dir_a8a0005c2b8590c535262d232c22afab.html":[5,0,3,2,1,1,0,0],
 "dir_aae29906d7bfc07d076125f669c8352e.html":[5,0,0,1],
 "dir_b2f003339c516cc00c8cadcafbe82f13.html":[5,0,3],
-"dir_c02447ad39a5307c81c64e880ec9e8d3.html":[5,0,3,1,1,0],
-"dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[5,0,3,1,0,0],
+"dir_c02447ad39a5307c81c64e880ec9e8d3.html":[5,0,3,2,1,0],
+"dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[5,0,3,2,0,0],
 "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1],
 "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0],
-"dir_d520c5cf583201d9437764f209363c22.html":[5,0,3,1,0],
-"dirprofile_8php.html":[5,0,1,20],
-"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[5,0,1,20,0],
-"dirsearch_8php.html":[5,0,1,21],
-"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,21,1],
-"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,21,2],
-"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,21,0],
-"display_8php.html":[5,0,1,22],
-"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,22,0],
+"dir_d520c5cf583201d9437764f209363c22.html":[5,0,3,2,0],
+"dirprofile_8php.html":[5,0,1,22],
+"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[5,0,1,22,0],
+"dirsearch_8php.html":[5,0,1,23],
+"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,23,1],
+"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,23,2],
+"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,23,0],
+"display_8php.html":[5,0,1,24],
+"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,24,0],
 "docblox__errorchecker_8php.html":[5,0,2,3],
 "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,3,3],
 "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,3,2],
@@ -160,49 +165,49 @@ var NAVTREEINDEX3 =
 "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,3,4],
 "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,3,1],
 "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,3,10],
-"editblock_8php.html":[5,0,1,23],
-"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,23,0],
-"editlayout_8php.html":[5,0,1,24],
-"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,24,0],
-"editpost_8php.html":[5,0,1,25],
-"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,25,0],
-"editwebpage_8php.html":[5,0,1,26],
-"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,26,0],
-"enotify_8php.html":[5,0,0,28],
-"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,28,1],
-"event_8php.html":[5,0,0,29],
-"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[5,0,0,29,6],
-"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[5,0,0,29,0],
-"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[5,0,0,29,1],
-"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[5,0,0,29,5],
-"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,29,2],
-"event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,29,3],
-"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,29,4],
-"events_8php.html":[5,0,1,27],
-"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,27,0],
-"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,27,1],
-"expire_8php.html":[5,0,0,30],
-"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,30,0],
+"editblock_8php.html":[5,0,1,25],
+"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,25,0],
+"editlayout_8php.html":[5,0,1,26],
+"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,26,0],
+"editpost_8php.html":[5,0,1,27],
+"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,27,0],
+"editwebpage_8php.html":[5,0,1,28],
+"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,28,0],
+"enotify_8php.html":[5,0,0,29],
+"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,29,1],
+"event_8php.html":[5,0,0,30],
+"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[5,0,0,30,6],
+"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[5,0,0,30,0],
+"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[5,0,0,30,1],
+"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[5,0,0,30,5],
+"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,30,2],
+"event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,30,3],
+"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,30,4],
+"events_8php.html":[5,0,1,29],
+"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,29,0],
+"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,29,1],
+"expire_8php.html":[5,0,0,31],
+"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,31,0],
 "extract_8php.html":[5,0,2,4],
 "extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44":[5,0,2,4,3],
 "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,4,2],
 "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,4,0],
 "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,4,1],
-"fbrowser_8php.html":[5,0,1,28],
-"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,28,0],
-"features_8php.html":[5,0,0,31],
-"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,31,0],
-"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,31,1],
-"feed_8php.html":[5,0,1,29],
-"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,29,0],
-"filer_8php.html":[5,0,1,30],
-"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,30,0],
-"filerm_8php.html":[5,0,1,31],
-"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,31,0],
+"fbrowser_8php.html":[5,0,1,30],
+"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,30,0],
+"features_8php.html":[5,0,0,32],
+"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,32,0],
+"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,32,1],
+"feed_8php.html":[5,0,1,31],
+"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,31,0],
+"filer_8php.html":[5,0,1,32],
+"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,32,0],
+"filerm_8php.html":[5,0,1,33],
+"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,33,0],
 "files.html":[5,0],
-"filestorage_8php.html":[5,0,1,32],
-"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,32,0],
-"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[5,0,1,32,1],
+"filestorage_8php.html":[5,0,1,34],
+"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,34,0],
+"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[5,0,1,34,1],
 "fpostit_8php.html":[5,0,2,0,0],
 "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0],
 "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[5,0,2,0,0,1],
@@ -222,12 +227,12 @@ var NAVTREEINDEX3 =
 "friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[5,0,2,5,7],
 "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,5,4],
 "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,5,3],
-"friendica__smarty_8php.html":[5,0,0,33],
-"fsuggest_8php.html":[5,0,1,34],
-"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,34,1],
-"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,34,0],
-"full_8php.html":[5,0,3,0,1],
-"full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0],
+"friendica__smarty_8php.html":[5,0,0,34],
+"fsuggest_8php.html":[5,0,1,36],
+"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,36,1],
+"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,36,0],
+"full_8php.html":[5,0,3,1,1],
+"full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,1,1,0],
 "functions.html":[4,3,0],
 "functions.html":[4,3,0,0],
 "functions_0x5f.html":[4,3,0,1],
@@ -244,10 +249,5 @@ var NAVTREEINDEX3 =
 "functions_0x6e.html":[4,3,0,12],
 "functions_0x6f.html":[4,3,0,13],
 "functions_0x70.html":[4,3,0,14],
-"functions_0x71.html":[4,3,0,15],
-"functions_0x72.html":[4,3,0,16],
-"functions_0x73.html":[4,3,0,17],
-"functions_0x74.html":[4,3,0,18],
-"functions_0x76.html":[4,3,0,19],
-"functions_func.html":[4,3,1]
+"functions_0x71.html":[4,3,0,15]
 };
diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index b9cfd47e0..ffadab93e 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,10 @@
 var NAVTREEINDEX4 =
 {
+"functions_0x72.html":[4,3,0,16],
+"functions_0x73.html":[4,3,0,17],
+"functions_0x74.html":[4,3,0,18],
+"functions_0x76.html":[4,3,0,19],
+"functions_func.html":[4,3,1],
 "functions_func.html":[4,3,1,0],
 "functions_func_0x61.html":[4,3,1,1],
 "functions_func_0x62.html":[4,3,1,2],
@@ -20,8 +25,8 @@ var NAVTREEINDEX4 =
 "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],
@@ -48,8 +53,8 @@ var NAVTREEINDEX4 =
 "globals_0x77.html":[5,1,0,24],
 "globals_0x78.html":[5,1,0,25],
 "globals_0x7a.html":[5,1,0,26],
-"globals_func.html":[5,1,1,0],
 "globals_func.html":[5,1,1],
+"globals_func.html":[5,1,1,0],
 "globals_func_0x61.html":[5,1,1,1],
 "globals_func_0x62.html":[5,1,1,2],
 "globals_func_0x63.html":[5,1,1,3],
@@ -98,54 +103,56 @@ var NAVTREEINDEX4 =
 "globals_vars_0x77.html":[5,1,2,19],
 "globals_vars_0x78.html":[5,1,2,20],
 "globals_vars_0x7a.html":[5,1,2,21],
-"gprobe_8php.html":[5,0,0,34],
-"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,34,0],
-"greenthumbnails_8php.html":[5,0,3,1,0,1,3],
-"help_8php.html":[5,0,1,36],
-"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,36,1],
-"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,36,0],
+"gprobe_8php.html":[5,0,0,35],
+"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,35,0],
+"greenthumbnails_8php.html":[5,0,3,2,0,1,3],
+"help_8php.html":[5,0,1,38],
+"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,38,1],
+"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,38,0],
 "hierarchy.html":[4,2],
-"home_8php.html":[5,0,1,37],
-"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,37,0],
-"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,37,1],
-"hostxrd_8php.html":[5,0,1,38],
-"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,38,0],
-"html2bbcode_8php.html":[5,0,0,36],
-"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,36,3],
-"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,36,1],
-"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,36,0],
-"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,36,2],
-"html2plain_8php.html":[5,0,0,37],
-"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,37,0],
-"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,37,3],
-"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,37,2],
-"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,37,1],
-"identity_8php.html":[5,0,0,38],
-"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,38,3],
-"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,38,2],
-"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,11],
-"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,38,17],
-"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,38,16],
-"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,38,7],
-"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,38,20],
-"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,38,21],
-"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,38,1],
-"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,18],
-"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,38,14],
-"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,10],
-"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,38,9],
-"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,38,5],
-"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,12],
-"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,38,4],
-"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,38,15],
-"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,38,13],
-"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,38,6],
-"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,19],
-"import_8php.html":[5,0,1,39],
-"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,39,1],
-"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,39,0],
+"home_8php.html":[5,0,1,39],
+"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,39,0],
+"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,39,1],
+"hostxrd_8php.html":[5,0,1,40],
+"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,40,0],
+"html2bbcode_8php.html":[5,0,0,37],
+"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,37,3],
+"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,37,1],
+"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,37,0],
+"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,37,2],
+"html2plain_8php.html":[5,0,0,38],
+"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,38,0],
+"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,38,3],
+"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,38,2],
+"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,38,1],
+"identity_8php.html":[5,0,0,39],
+"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,39,3],
+"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,39,9],
+"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,39,2],
+"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,39,12],
+"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,39,18],
+"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,39,17],
+"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,39,19],
+"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,39,7],
+"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,39,22],
+"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,39,23],
+"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,39,1],
+"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,39,20],
+"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,39,15],
+"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,39,8],
+"identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,39,0],
+"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,39,11],
+"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,39,10],
+"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,39,5],
+"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,39,13],
+"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,39,4],
+"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,39,16],
+"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,39,14],
+"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,39,6],
+"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,39,21],
+"import_8php.html":[5,0,1,41],
+"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,41,1],
+"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,41,0],
 "include_2api_8php.html":[5,0,0,5],
 "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12],
 "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5],
@@ -214,40 +221,33 @@ var NAVTREEINDEX4 =
 "include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,11],
 "include_2chanman_8php.html":[5,0,0,12],
 "include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[5,0,0,12,0],
-"include_2config_8php.html":[5,0,0,16],
-"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,16,7],
-"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,16,0],
-"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,16,9],
-"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,16,11],
-"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,16,1],
-"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,16,2],
-"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,16,6],
-"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,16,8],
-"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,16,5],
-"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,16,10],
-"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,16,3],
-"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,16,4],
-"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,16,12],
-"include_2directory_8php.html":[5,0,0,27],
-"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,27,0],
-"include_2follow_8php.html":[5,0,0,32],
-"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,32,0],
-"include_2group_8php.html":[5,0,0,35],
-"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,35,2],
-"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,35,10],
-"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,35,1],
-"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,35,0],
-"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#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,35,9],
-"include_2menu_8php.html":[5,0,0,43],
-"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,43,2],
-"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,43,4],
-"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,43,9],
-"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,43,8]
+"include_2chat_8php.html":[5,0,0,13],
+"include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[5,0,0,13,3],
+"include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639":[5,0,0,13,1],
+"include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91":[5,0,0,13,2],
+"include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422":[5,0,0,13,0],
+"include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a":[5,0,0,13,4],
+"include_2config_8php.html":[5,0,0,17],
+"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,17,7],
+"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,17,0],
+"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,17,9],
+"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,17,11],
+"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,17,1],
+"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,17,2],
+"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,17,6],
+"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,17,8],
+"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,17,5],
+"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,17,10],
+"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,17,3],
+"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,17,4],
+"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,17,12],
+"include_2directory_8php.html":[5,0,0,28],
+"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,28,0],
+"include_2follow_8php.html":[5,0,0,33],
+"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,33,0],
+"include_2group_8php.html":[5,0,0,36],
+"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,36,2],
+"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,36,10],
+"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,36,1],
+"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,36,0]
 };
diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js
index 7711618c0..78f28bd09 100644
--- a/doc/html/navtreeindex5.js
+++ b/doc/html/navtreeindex5.js
@@ -1,175 +1,187 @@
 var NAVTREEINDEX5 =
 {
-"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,43,6],
-"include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc":[5,0,0,43,0],
-"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,43,11],
-"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,43,3],
-"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,43,7],
-"include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b":[5,0,0,43,10],
-"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,43,5],
-"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,43,1],
-"include_2message_8php.html":[5,0,0,44],
-"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,44,2],
-"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,44,1],
-"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,44,3],
-"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[5,0,0,44,4],
-"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,44,0],
-"include_2network_8php.html":[5,0,0,46],
-"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,46,5],
-"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,46,10],
-"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,46,4],
-"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,46,9],
-"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,46,8],
-"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,46,13],
-"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,46,7],
-"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,46,14],
-"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,46,12],
-"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,46,6],
-"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,46,19],
-"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,46,16],
-"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,46,17],
-"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,46,18],
-"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,46,2],
-"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,46,0],
-"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,46,3],
-"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,15],
-"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,11],
-"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,1],
-"include_2notify_8php.html":[5,0,0,48],
-"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,48,0],
-"include_2oembed_8php.html":[5,0,0,50],
-"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,50,5],
-"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_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],
+"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,36,6],
+"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,36,7],
+"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,36,4],
+"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[5,0,0,36,8],
+"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,36,5],
+"include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[5,0,0,36,11],
+"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,36,3],
+"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,36,9],
+"include_2menu_8php.html":[5,0,0,44],
+"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,44,1],
+"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,44,3],
+"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,44,8],
+"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,44,7],
+"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,44,5],
+"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,44,10],
+"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,44,2],
+"include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10":[5,0,0,44,9],
+"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,44,6],
+"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,44,4],
+"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,44,0],
+"include_2message_8php.html":[5,0,0,45],
+"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,45,2],
+"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,45,1],
+"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,45,3],
+"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[5,0,0,45,4],
+"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,45,0],
+"include_2network_8php.html":[5,0,0,47],
+"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,47,5],
+"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,47,10],
+"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,47,4],
+"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,47,9],
+"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,47,8],
+"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,47,13],
+"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,47,7],
+"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,47,14],
+"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,47,12],
+"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,47,6],
+"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,47,19],
+"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,47,16],
+"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,47,17],
+"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,47,18],
+"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,47,2],
+"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,47,0],
+"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,47,3],
+"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,47,15],
+"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,47,11],
+"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,47,1],
+"include_2notify_8php.html":[5,0,0,49],
+"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,49,0],
+"include_2oembed_8php.html":[5,0,0,51],
+"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,51,5],
+"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,51,7],
+"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,51,1],
+"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,51,4],
+"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,51,3],
+"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,51,6],
+"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,51,0],
+"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,51,2],
+"include_2photos_8php.html":[5,0,0,56],
+"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,56,0],
+"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,56,2],
+"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,56,1],
+"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,56,7],
+"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,56,3],
+"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,56,6],
+"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,56,5],
+"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,56,4],
 "index.html":[],
 "interfaceITemplateEngine.html":[4,0,18],
 "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1],
 "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0],
-"invite_8php.html":[5,0,1,40],
-"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,40,0],
-"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,40,1],
-"item_8php.html":[5,0,1,41],
-"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,41,0],
-"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,41,3],
-"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,41,5],
-"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,41,4],
-"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,41,1],
-"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[5,0,1,41,2],
-"items_8php.html":[5,0,0,41],
-"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,54],
-"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,41,2],
-"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,41,6],
-"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,41,27],
-"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,41,7],
-"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,41,32],
-"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,41,36],
-"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,41,24],
-"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,41,4],
-"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,41,31],
-"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,41,38],
-"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,41,3],
-"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,41,13],
-"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,41,53],
-"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,41,20],
-"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,41,0],
-"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,41,44],
-"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,41,47],
-"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,41,29],
-"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,41,19],
-"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,41,12],
-"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,41,17],
-"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,41,37],
-"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,41,15],
-"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,41,35],
-"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,41,40],
-"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,41,33],
-"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,41,42],
-"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,41,16],
-"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,41,11],
-"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,41,5],
-"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,41,51],
-"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,41,26],
-"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,41,10],
-"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,41,30],
-"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,41,52],
-"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,41,9],
-"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,41,21],
-"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,41,8],
-"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,41,28],
-"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,41,48],
-"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,41,49],
-"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,41,25],
-"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,41,45],
-"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,41,1],
-"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,41,43],
-"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,41,18],
-"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,41,39],
-"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,41,46],
-"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,41,50],
-"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,41,23],
-"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,41,34],
-"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,41,41],
-"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,41,14],
-"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,41,22],
-"language_8php.html":[5,0,0,42],
-"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,42,6],
-"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,42,0],
-"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,42,4],
-"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,42,3],
-"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,42,1],
-"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,42,7],
-"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,42,5],
-"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,42,2],
-"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,42,8],
-"layouts_8php.html":[5,0,1,42],
-"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,42,0],
-"like_8php.html":[5,0,1,43],
-"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,43,0],
-"lockview_8php.html":[5,0,1,44],
-"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,44,0],
-"login_8php.html":[5,0,1,45],
-"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,45,0],
-"lostpass_8php.html":[5,0,1,46],
-"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,46,0],
-"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,46,1],
-"magic_8php.html":[5,0,1,47],
-"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,47,0],
-"mail_8php.html":[5,0,1,48],
-"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[5,0,1,48,0],
-"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[5,0,1,48,1],
-"manage_8php.html":[5,0,1,49],
-"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,49,0],
-"match_8php.html":[5,0,1,50],
-"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,50,0],
+"invite_8php.html":[5,0,1,42],
+"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,42,0],
+"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,42,1],
+"item_8php.html":[5,0,1,43],
+"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,43,0],
+"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,43,3],
+"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,43,5],
+"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,43,4],
+"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,43,1],
+"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[5,0,1,43,2],
+"items_8php.html":[5,0,0,42],
+"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,42,54],
+"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,42,2],
+"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,42,6],
+"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,42,27],
+"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,42,7],
+"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,42,32],
+"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,42,36],
+"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,42,24],
+"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,42,4],
+"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,42,31],
+"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,42,38],
+"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,42,3],
+"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,42,13],
+"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,42,53],
+"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,42,20],
+"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,42,0],
+"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,42,44],
+"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,42,47],
+"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,42,29],
+"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,42,19],
+"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,42,12],
+"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,42,17],
+"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,42,37],
+"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,42,15],
+"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,42,35],
+"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,42,40],
+"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,42,33],
+"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,42,42],
+"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,42,16],
+"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,42,11],
+"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,42,5],
+"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,42,51],
+"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,42,26],
+"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,42,10],
+"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,42,30],
+"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,42,52],
+"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,42,9],
+"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,42,21],
+"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,42,8],
+"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,42,28],
+"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,42,48],
+"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,42,49],
+"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,42,25],
+"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,42,45],
+"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,42,1],
+"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,42,43],
+"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,42,18],
+"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,42,39],
+"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,42,46],
+"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,42,50],
+"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,42,23],
+"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,42,34],
+"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,42,41],
+"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,42,14],
+"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,42,22],
+"language_8php.html":[5,0,0,43],
+"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,43,6],
+"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,43,0],
+"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,43,4],
+"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,43,3],
+"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,43,1],
+"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,43,7],
+"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,43,5],
+"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,43,2],
+"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,43,8],
+"layouts_8php.html":[5,0,1,44],
+"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,44,0],
+"like_8php.html":[5,0,1,45],
+"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,45,0],
+"lockview_8php.html":[5,0,1,46],
+"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,46,0],
+"login_8php.html":[5,0,1,47],
+"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,47,0],
+"lostpass_8php.html":[5,0,1,48],
+"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,48,0],
+"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,48,1],
+"magic_8php.html":[5,0,1,49],
+"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,49,0],
+"mail_8php.html":[5,0,1,50],
+"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[5,0,1,50,0],
+"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[5,0,1,50,1],
+"manage_8php.html":[5,0,1,51],
+"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,51,0],
+"match_8php.html":[5,0,1,52],
+"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,52,0],
 "md_README.html":[2],
 "md_config.html":[0],
 "md_fresh.html":[1],
-"minimal_8php.html":[5,0,3,0,2],
-"minimalisticdarkness_8php.html":[5,0,3,1,0,1,4],
-"minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f":[5,0,3,1,0,1,4,4],
-"minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead":[5,0,3,1,0,1,4,3],
-"minimalisticdarkness_8php.html#a5795120b4b324bc4ca83f1e6fdce7d57":[5,0,3,1,0,1,4,5],
-"minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,1,0,1,4,0],
-"minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,1,0,1,4,2],
-"minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,1,0,1,4,1],
-"mitem_8php.html":[5,0,1,53],
-"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,53,2],
-"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,53,0],
-"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,53,1],
+"minimal_8php.html":[5,0,3,1,2],
+"minimalisticdarkness_8php.html":[5,0,3,2,0,1,4],
+"minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f":[5,0,3,2,0,1,4,4],
+"minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead":[5,0,3,2,0,1,4,3],
+"minimalisticdarkness_8php.html#a5795120b4b324bc4ca83f1e6fdce7d57":[5,0,3,2,0,1,4,5],
+"minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,2,0,1,4,0],
+"minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,2,0,1,4,2],
+"minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,2,0,1,4,1],
+"mitem_8php.html":[5,0,1,55],
+"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,55,2],
+"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,55,0],
+"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,55,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],
@@ -177,39 +189,44 @@ var NAVTREEINDEX5 =
 "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_2directory_8php.html":[5,0,1,19],
-"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,19,1],
-"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,19,0],
-"mod_2follow_8php.html":[5,0,1,33],
-"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,33,1],
-"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,33,0],
-"mod_2group_8php.html":[5,0,1,35],
-"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,35,0],
-"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,35,1],
-"mod_2menu_8php.html":[5,0,1,51],
-"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,51,0],
-"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,51,1],
-"mod_2message_8php.html":[5,0,1,52],
-"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[5,0,1,52,0],
-"mod_2network_8php.html":[5,0,1,56],
-"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,56,1],
-"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,56,0],
-"mod_2notify_8php.html":[5,0,1,60],
-"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,60,1],
-"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,60,0],
-"mod_2oembed_8php.html":[5,0,1,61],
-"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,61,0],
-"mod_2photos_8php.html":[5,0,1,67],
-"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,67,2],
-"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,67,0],
-"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,67,1],
-"mod__import_8php.html":[5,0,3,0,3],
-"mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,3,0],
-"mood_8php.html":[5,0,1,54],
-"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,54,0],
-"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,54,1],
-"msearch_8php.html":[5,0,1,55],
-"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,55,0],
+"mod_2chat_8php.html":[5,0,1,11],
+"mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f":[5,0,1,11,0],
+"mod_2chat_8php.html#a999d594745597c656c9760253ae297ad":[5,0,1,11,2],
+"mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e":[5,0,1,11,1],
+"mod_2directory_8php.html":[5,0,1,21],
+"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,21,1],
+"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,21,0],
+"mod_2follow_8php.html":[5,0,1,35],
+"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,35,1],
+"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,35,0],
+"mod_2group_8php.html":[5,0,1,37],
+"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,37,0],
+"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,37,1],
+"mod_2menu_8php.html":[5,0,1,53],
+"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,53,0],
+"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,53,1],
+"mod_2message_8php.html":[5,0,1,54],
+"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[5,0,1,54,0],
+"mod_2network_8php.html":[5,0,1,58],
+"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,58,1],
+"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,58,0],
+"mod_2notify_8php.html":[5,0,1,62],
+"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,62,1],
+"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,62,0],
+"mod_2oembed_8php.html":[5,0,1,63],
+"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,63,0],
+"mod_2photos_8php.html":[5,0,1,70],
+"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,70,2],
+"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,70,0],
+"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,70,1],
+"mod__filestorage_8php.html":[5,0,3,0,0],
+"mod__import_8php.html":[5,0,3,1,3],
+"mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,1,3,0],
+"mood_8php.html":[5,0,1,56],
+"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,56,0],
+"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,56,1],
+"msearch_8php.html":[5,0,1,57],
+"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,57,0],
 "namespaceFriendica.html":[3,0,1],
 "namespaceFriendica.html":[4,0,1],
 "namespaceacl__selectors.html":[4,0,0],
@@ -224,30 +241,13 @@ var NAVTREEINDEX5 =
 "namespaceupdatetpl.html":[3,0,3],
 "namespaceutil.html":[4,0,4],
 "namespaceutil.html":[3,0,4],
-"nav_8php.html":[5,0,0,45],
-"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,45,0],
-"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,45,1],
-"new__channel_8php.html":[5,0,1,57],
-"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,57,2],
-"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,57,1],
-"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,57,0],
-"none_8php.html":[5,0,3,0,4],
-"notes_8php.html":[5,0,1,58],
-"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,58,0],
-"notifications_8php.html":[5,0,1,59],
-"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,59,1],
-"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,59,0],
-"notifier_8php.html":[5,0,0,47],
-"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,47,0],
-"oauth_8php.html":[5,0,0,49],
-"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,49,3],
-"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,49,2],
-"oexchange_8php.html":[5,0,1,62],
-"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,62,0],
-"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,62,1],
-"olddefault_8php.html":[5,0,3,1,0,1,5],
-"onedirsync_8php.html":[5,0,0,51],
-"onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,51,0],
-"onepoll_8php.html":[5,0,0,52],
-"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,52,0]
+"nav_8php.html":[5,0,0,46],
+"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,46,0],
+"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,46,1],
+"new__channel_8php.html":[5,0,1,59],
+"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,59,2],
+"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,59,1],
+"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,59,0],
+"none_8php.html":[5,0,3,1,4],
+"notes_8php.html":[5,0,1,60]
 };
diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index 9e73739f5..d7b3c75f1 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -1,29 +1,48 @@
 var NAVTREEINDEX6 =
 {
-"opensearch_8php.html":[5,0,1,63],
-"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,63,0],
-"page_8php.html":[5,0,1,64],
-"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,64,1],
-"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,64,0],
-"page__widgets_8php.html":[5,0,0,53],
-"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,53,1],
-"page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,53,0],
+"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,60,0],
+"notifications_8php.html":[5,0,1,61],
+"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,61,1],
+"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,61,0],
+"notifier_8php.html":[5,0,0,48],
+"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,48,0],
+"oauth_8php.html":[5,0,0,50],
+"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,50,3],
+"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,50,2],
+"oexchange_8php.html":[5,0,1,64],
+"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,64,0],
+"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,64,1],
+"olddefault_8php.html":[5,0,3,2,0,1,5],
+"onedirsync_8php.html":[5,0,0,52],
+"onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,52,0],
+"onepoll_8php.html":[5,0,0,53],
+"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,53,0],
+"online_8php.html":[5,0,1,65],
+"online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[5,0,1,65,0],
+"opensearch_8php.html":[5,0,1,66],
+"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,66,0],
+"page_8php.html":[5,0,1,67],
+"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,67,1],
+"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,67,0],
+"page__widgets_8php.html":[5,0,0,54],
+"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,54,1],
+"page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,54,0],
 "pages.html":[],
-"parse__url_8php.html":[5,0,1,65],
-"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,65,2],
-"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,65,3],
-"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,65,1],
-"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,65,0],
-"passion_8php.html":[5,0,3,1,0,1,6],
-"passionwide_8php.html":[5,0,3,1,0,1,7],
-"permissions_8php.html":[5,0,0,54],
-"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,54,2],
-"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,54,0],
-"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,54,3],
-"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,54,4],
-"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,54,1],
-"photo_8php.html":[5,0,1,66],
-"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,66,0],
+"parse__url_8php.html":[5,0,1,68],
+"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,68,2],
+"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,68,3],
+"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,68,1],
+"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,68,0],
+"passion_8php.html":[5,0,3,2,0,1,6],
+"passionwide_8php.html":[5,0,3,2,0,1,7],
+"permissions_8php.html":[5,0,0,55],
+"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,55,2],
+"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,55,0],
+"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,55,3],
+"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,55,4],
+"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,55,1],
+"photo_8php.html":[5,0,1,69],
+"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,69,0],
 "photo__driver_8php.html":[5,0,0,1,0],
 "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2],
 "photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[5,0,0,1,0,1],
@@ -40,58 +59,58 @@ var NAVTREEINDEX6 =
 "php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,6,1],
 "php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,6,4],
 "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,5],
-"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,5,0],
-"php_8php.html":[5,0,1,68],
-"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,68,0],
-"pine_8php.html":[5,0,3,1,0,1,8],
-"ping_8php.html":[5,0,1,69],
-"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,69,0],
-"plugin_8php.html":[5,0,0,56],
-"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,21],
-"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,24],
-"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,56,20],
-"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,56,8],
-"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,16],
-"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,18],
-"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,56,7],
-"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,15],
-"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,56,13],
-"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,28],
-"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,56,9],
-"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,26],
-"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,56,11],
-"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,23],
-"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,27],
-"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,56,4],
-"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,56,0],
-"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,56,29],
-"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,56,1],
-"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,56,25],
-"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,56,22],
-"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,56,12],
-"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,56,17],
-"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,56,3],
-"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,56,6],
-"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,56,2],
-"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,56,14],
-"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,56,10],
-"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,19],
-"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,56,5],
+"php_2default_8php.html":[5,0,3,1,0],
+"php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,0,0],
+"php_2theme__init_8php.html":[5,0,3,1,5],
+"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,1,5,0],
+"php_8php.html":[5,0,1,71],
+"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,71,0],
+"pine_8php.html":[5,0,3,2,0,1,8],
+"ping_8php.html":[5,0,1,72],
+"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,72,0],
+"plugin_8php.html":[5,0,0,57],
+"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,57,21],
+"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,57,24],
+"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,57,20],
+"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,57,8],
+"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,57,16],
+"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,57,18],
+"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,57,7],
+"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,57,15],
+"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,57,13],
+"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,57,28],
+"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,57,9],
+"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,57,26],
+"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,57,11],
+"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,57,23],
+"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,57,27],
+"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,57,4],
+"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,57,0],
+"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,57,29],
+"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,57,1],
+"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,57,25],
+"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,57,22],
+"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,57,12],
+"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,57,17],
+"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,57,3],
+"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,57,6],
+"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,57,2],
+"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,57,14],
+"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,57,10],
+"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,57,19],
+"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,57,5],
 "po2php_8php.html":[5,0,2,7],
 "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0],
-"poco_8php.html":[5,0,1,70],
-"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,70,0],
-"poke_8php.html":[5,0,1,71],
-"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,71,1],
-"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,71,0],
-"poller_8php.html":[5,0,0,57],
-"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,57,0],
-"post_8php.html":[5,0,1,72],
-"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,72,0],
-"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,72,1],
+"poco_8php.html":[5,0,1,73],
+"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,73,0],
+"poke_8php.html":[5,0,1,74],
+"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,74,1],
+"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,74,0],
+"poller_8php.html":[5,0,0,58],
+"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,58,0],
+"post_8php.html":[5,0,1,75],
+"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,75,0],
+"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,75,1],
 "post__to__red_8php.html":[5,0,2,1,0,0],
 "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823":[5,0,2,1,0,0,16],
 "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,0,12],
@@ -117,137 +136,118 @@ var NAVTREEINDEX6 =
 "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,0,18],
 "post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,0,23],
 "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,0,11],
-"pretheme_8php.html":[5,0,1,73],
-"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,73,0],
-"probe_8php.html":[5,0,1,74],
-"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,74,0],
-"profile_8php.html":[5,0,1,75],
-"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,75,0],
-"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,75,1],
-"profile__photo_8php.html":[5,0,1,76],
-"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,76,0],
-"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,76,1],
-"profile__selectors_8php.html":[5,0,0,58],
-"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,58,2],
-"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,58,1],
-"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,58,0],
-"profiles_8php.html":[5,0,1,77],
-"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,77,1],
-"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,77,0],
-"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,77,2],
-"profperm_8php.html":[5,0,1,78],
-"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,78,1],
-"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,78,0],
-"pubsites_8php.html":[5,0,1,79],
-"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,79,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,80],
-"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,80,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],
-"redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,1,2,0,1,2],
-"redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473":[5,0,3,1,2,0,1,5],
-"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,2,0,1,23],
-"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,1,2,0,1,9],
-"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,1,2,0,1,8],
-"redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,1,2,0,1,0],
-"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,1,2,0,1,21],
-"redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,1,2,0,1,4],
-"redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d":[5,0,3,1,2,0,1,24],
-"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,2,0,1,15],
-"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,2,0,1,6],
-"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,1,2,0,1,19],
-"redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb":[5,0,3,1,2,0,1,22],
-"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,2,0,1,17],
-"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,2,0,1,26],
-"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,2,0,1,10],
-"redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c":[5,0,3,1,2,0,1,13],
-"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,2,0,1,18],
-"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,1,2,0,1,25],
-"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,1,2,0,1,11],
-"redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158":[5,0,3,1,2,0,1,14],
-"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,1,2,0,1,20],
-"redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8":[5,0,3,1,2,0,1,3],
-"redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0":[5,0,3,1,2,0,1,1],
-"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,2,0,1,7],
-"redbasic_2php_2theme_8php.html":[5,0,3,1,2,0,2],
-"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],
-"reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[5,0,0,62,5],
-"reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[5,0,0,62,6],
-"reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[5,0,0,62,4],
-"register_8php.html":[5,0,1,81],
-"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,81,0],
-"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,81,2],
-"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,81,1],
-"regmod_8php.html":[5,0,1,82],
-"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,82,0],
-"removeme_8php.html":[5,0,1,83],
-"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,83,0],
-"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,83,1],
-"rmagic_8php.html":[5,0,1,84],
-"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,84,0],
-"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,84,2],
-"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,84,1],
-"rpost_8php.html":[5,0,1,85],
-"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,85,0],
-"rsd__xml_8php.html":[5,0,1,86],
-"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,86,0],
-"search_8php.html":[5,0,1,87],
-"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,87,0],
-"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,87,1],
-"search__ac_8php.html":[5,0,1,88],
-"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,88,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],
-"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,63,4],
-"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,63,5],
-"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,63,1],
-"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,63,7],
-"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,63,3],
-"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,63,9],
-"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,63,6],
-"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,63,0],
-"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,63,10],
-"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,63,8],
-"session_8php.html":[5,0,0,64],
-"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,64,4],
-"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,64,0],
-"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,64,1],
-"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,64,8],
-"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,64,5],
-"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,64,7],
-"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,64,6],
-"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,89],
-"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,89,0],
-"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,89,1],
-"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,89,2],
-"setup_8php.html":[5,0,1,90],
-"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,90,2],
-"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,90,14],
-"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,90,5],
-"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,90,13],
-"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,90,10],
-"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,90,3],
-"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,90,1],
-"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,90,8],
-"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,90,12],
-"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,90,4],
-"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,90,7],
-"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,90,11],
-"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,90,9],
-"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,90,16],
-"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,90,0],
-"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,90,15],
-"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,90,6]
+"pretheme_8php.html":[5,0,1,76],
+"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,76,0],
+"probe_8php.html":[5,0,1,77],
+"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,77,0],
+"profile_8php.html":[5,0,1,78],
+"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,78,0],
+"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,78,1],
+"profile__photo_8php.html":[5,0,1,79],
+"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,79,0],
+"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,79,1],
+"profile__selectors_8php.html":[5,0,0,59],
+"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,59,2],
+"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,59,1],
+"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,59,0],
+"profiles_8php.html":[5,0,1,80],
+"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,80,1],
+"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,80,0],
+"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,80,2],
+"profperm_8php.html":[5,0,1,81],
+"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,81,1],
+"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,81,0],
+"pubsites_8php.html":[5,0,1,82],
+"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,82,0],
+"queue_8php.html":[5,0,0,61],
+"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,61,0],
+"queue__fn_8php.html":[5,0,0,62],
+"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,62,1],
+"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,62,0],
+"randprof_8php.html":[5,0,1,83],
+"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,83,0],
+"redbasic_2php_2style_8php.html":[5,0,3,2,2,0,1],
+"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,2,2,0,1,12],
+"redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4":[5,0,3,2,2,0,1,16],
+"redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,2,2,0,1,2],
+"redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473":[5,0,3,2,2,0,1,5],
+"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,2,2,0,1,23],
+"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,2,2,0,1,9],
+"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,2,2,0,1,8],
+"redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,2,2,0,1,0],
+"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,2,2,0,1,21],
+"redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,2,2,0,1,4],
+"redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d":[5,0,3,2,2,0,1,24],
+"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,2,2,0,1,15],
+"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,2,2,0,1,6],
+"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,2,2,0,1,19],
+"redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb":[5,0,3,2,2,0,1,22],
+"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,2,2,0,1,17],
+"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,2,2,0,1,26],
+"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,2,2,0,1,10],
+"redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c":[5,0,3,2,2,0,1,13],
+"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,2,2,0,1,18],
+"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,2,2,0,1,25],
+"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,2,2,0,1,11],
+"redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158":[5,0,3,2,2,0,1,14],
+"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,2,2,0,1,20],
+"redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8":[5,0,3,2,2,0,1,3],
+"redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0":[5,0,3,2,2,0,1,1],
+"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,2,2,0,1,7],
+"redbasic_2php_2theme_8php.html":[5,0,3,2,2,0,2],
+"redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,2,2,0,2,0],
+"redbasic_8php.html":[5,0,3,2,0,1,9],
+"reddav_8php.html":[5,0,0,63],
+"reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[5,0,0,63,5],
+"reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[5,0,0,63,6],
+"reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[5,0,0,63,4],
+"register_8php.html":[5,0,1,84],
+"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,84,0],
+"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,84,2],
+"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,84,1],
+"regmod_8php.html":[5,0,1,85],
+"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,85,0],
+"removeme_8php.html":[5,0,1,86],
+"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,86,0],
+"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,86,1],
+"rmagic_8php.html":[5,0,1,87],
+"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,87,0],
+"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,87,2],
+"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,87,1],
+"rpost_8php.html":[5,0,1,88],
+"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,88,0],
+"rsd__xml_8php.html":[5,0,1,89],
+"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,89,0],
+"search_8php.html":[5,0,1,90],
+"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,90,0],
+"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,90,1],
+"search__ac_8php.html":[5,0,1,91],
+"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,91,0],
+"security_8php.html":[5,0,0,64],
+"security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,64,11],
+"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,64,2],
+"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,64,4],
+"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,64,5],
+"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,64,1],
+"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,64,7],
+"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,64,3],
+"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,64,9],
+"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,64,6],
+"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,64,0],
+"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,64,10],
+"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,64,8],
+"session_8php.html":[5,0,0,65],
+"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,65,4],
+"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,65,0],
+"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,65,1],
+"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,65,8],
+"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,65,5],
+"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,65,7],
+"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,65,6],
+"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,65,3],
+"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,65,9],
+"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,65,2],
+"settings_8php.html":[5,0,1,92],
+"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,92,0],
+"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,92,1]
 };
diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js
index 3edb82cc6..1c985bd0e 100644
--- a/doc/html/navtreeindex7.js
+++ b/doc/html/navtreeindex7.js
@@ -1,171 +1,189 @@
 var NAVTREEINDEX7 =
 {
-"share_8php.html":[5,0,1,91],
-"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,91,0],
-"siteinfo_8php.html":[5,0,1,92],
-"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,92,1],
-"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,92,0],
-"sitelist_8php.html":[5,0,1,93],
-"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,93,0],
-"smilies_8php.html":[5,0,1,94],
-"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,94,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],
-"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,65,7],
-"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,65,8],
-"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,65,1],
-"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,65,4],
-"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,95],
-"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,95,0],
-"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,95,1],
-"sslify_8php.html":[5,0,1,96],
-"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,96,0],
-"starred_8php.html":[5,0,1,97],
-"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,97,0],
-"subthread_8php.html":[5,0,1,98],
-"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,98,0],
-"suggest_8php.html":[5,0,1,99],
-"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,99,0],
-"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,99,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,100],
-"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,100,0],
-"tagrm_8php.html":[5,0,1,101],
-"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,101,1],
-"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,101,0],
-"taxonomy_8php.html":[5,0,0,67],
-"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,67,9],
-"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,67,0],
-"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,67,2],
-"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,10],
-"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,67,1],
-"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[5,0,0,67,7],
-"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,67,14],
-"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,67,13],
-"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,67,11],
-"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,67,12],
-"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,67,5],
-"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[5,0,0,67,8],
-"template__processor_8php.html":[5,0,0,68],
-"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,68,3],
-"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,68,1],
-"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,68,2],
-"text_8php.html":[5,0,0,69],
-"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,69,39],
-"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,69,45],
-"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,69,6],
-"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,69,16],
-"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,69,11],
-"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,69,44],
-"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,69,5],
-"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,69,79],
-"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,69,32],
-"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,69,35],
-"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,69,49],
-"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,69,52],
-"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,69,46],
-"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,69,47],
-"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,69,42],
-"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,69,4],
-"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,69,87],
-"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,76],
-"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,69,48],
-"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,69,10],
-"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,69,89],
-"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,69,23],
-"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,69,84],
-"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,69,73],
-"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,69,82],
-"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,69,30],
-"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,69,41],
-"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,69,72],
-"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,69,7],
-"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,69,85],
-"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,33],
-"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,71],
-"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,69,31],
-"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,69,43],
-"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,69,61],
-"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,69,50],
-"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,69,24],
-"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,69,60],
-"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,69,81],
-"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,69,9],
-"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,69,14],
-"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,69,80],
-"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,69,40],
-"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,69,27],
-"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,69,77],
-"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,69,1],
-"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,69,34],
-"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,69,26],
-"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,69,78],
-"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,69,8],
-"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,69,68],
-"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,69,74],
-"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,69,15],
-"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,69,20],
-"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,69,59],
-"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,69,19],
-"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,69,3],
-"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,69,54],
-"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,69,65],
-"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,69,63],
-"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,69,67],
-"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,69,29],
-"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,69,17],
-"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,69,55],
-"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,69,36],
-"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,69,28],
-"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,69,88],
-"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,69,69],
-"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,69,83],
-"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,69,86],
-"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,69,56],
-"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,69,37],
-"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,69,70],
-"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,69,21],
-"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,69,2],
-"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,69,13],
-"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,69,64],
-"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,69,51],
-"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,69,38],
-"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,69,66],
-"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,69,18],
-"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,69,57],
-"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,69,25],
-"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,69,0],
-"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,69,75],
-"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,69,62],
-"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,69,22],
-"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,69,12],
-"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,69,58],
-"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,69,53],
-"theme_2blogga_2php_2default_8php.html":[5,0,3,1,1,0,1],
-"theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[5,0,3,1,1,0,1,2],
-"theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,1,1,0,1,0],
-"theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527":[5,0,3,1,1,0,1,1],
-"theme_2blogga_2php_2theme__init_8php.html":[5,0,3,1,1,0,3],
-"theme_2blogga_2view_2theme_2blog_2default_8php.html":[5,0,3,1,1,1,0,0,1],
-"theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[5,0,3,1,1,1,0,0,1,2],
-"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,102],
-"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,102,0],
-"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,102,1],
-"toggle__mobile_8php.html":[5,0,1,103],
-"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,103,0],
-"toggle__safesearch_8php.html":[5,0,1,104],
-"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,104,0],
+"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,92,2],
+"setup_8php.html":[5,0,1,93],
+"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,93,2],
+"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,93,14],
+"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,93,5],
+"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,93,13],
+"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,93,10],
+"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,93,3],
+"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,93,1],
+"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,93,8],
+"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,93,12],
+"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,93,4],
+"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,93,7],
+"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,93,11],
+"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,93,9],
+"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,93,16],
+"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,93,0],
+"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,93,15],
+"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,93,6],
+"share_8php.html":[5,0,1,94],
+"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,94,0],
+"siteinfo_8php.html":[5,0,1,95],
+"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,95,1],
+"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,95,0],
+"sitelist_8php.html":[5,0,1,96],
+"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,96,0],
+"smilies_8php.html":[5,0,1,97],
+"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,97,0],
+"socgraph_8php.html":[5,0,0,66],
+"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,66,0],
+"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,66,6],
+"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,66,7],
+"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,66,8],
+"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,66,1],
+"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,66,4],
+"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,66,2],
+"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,66,5],
+"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,66,3],
+"sources_8php.html":[5,0,1,98],
+"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,98,0],
+"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,98,1],
+"sslify_8php.html":[5,0,1,99],
+"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,99,0],
+"starred_8php.html":[5,0,1,100],
+"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,100,0],
+"subthread_8php.html":[5,0,1,101],
+"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,101,0],
+"suggest_8php.html":[5,0,1,102],
+"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,102,0],
+"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,102,1],
+"system__unavailable_8php.html":[5,0,0,67],
+"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0],
+"tagger_8php.html":[5,0,1,103],
+"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,103,0],
+"tagrm_8php.html":[5,0,1,104],
+"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,104,1],
+"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,104,0],
+"taxonomy_8php.html":[5,0,0,68],
+"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,68,9],
+"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,68,0],
+"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,68,2],
+"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,68,6],
+"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,68,4],
+"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,68,3],
+"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,68,10],
+"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,68,1],
+"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[5,0,0,68,7],
+"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,68,14],
+"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,68,13],
+"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,68,11],
+"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,68,12],
+"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,68,5],
+"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[5,0,0,68,8],
+"template__processor_8php.html":[5,0,0,69],
+"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,69,3],
+"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,69,1],
+"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,69,2],
+"text_8php.html":[5,0,0,70],
+"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,70,39],
+"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,70,45],
+"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,70,6],
+"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,70,16],
+"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,70,11],
+"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,70,44],
+"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,70,5],
+"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,70,78],
+"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,70,32],
+"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,70,35],
+"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,70,49],
+"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,70,52],
+"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,70,46],
+"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,70,47],
+"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,70,42],
+"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,70,4],
+"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,70,86],
+"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,70,75],
+"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,70,48],
+"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,70,10],
+"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,70,88],
+"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,70,23],
+"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,70,83],
+"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,70,72],
+"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,70,81],
+"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,70,30],
+"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,70,41],
+"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,70,71],
+"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,70,7],
+"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,70,84],
+"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,70,33],
+"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,70,70],
+"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,70,31],
+"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,70,43],
+"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,70,61],
+"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,70,50],
+"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,70,24],
+"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,70,60],
+"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,70,80],
+"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,70,9],
+"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,70,14],
+"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,70,79],
+"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,70,40],
+"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,70,27],
+"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,70,76],
+"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,70,1],
+"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,70,34],
+"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,70,26],
+"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,70,77],
+"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,70,8],
+"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,70,68],
+"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,70,73],
+"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,70,15],
+"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,70,20],
+"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,70,59],
+"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,70,19],
+"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,70,3],
+"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,70,54],
+"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,70,65],
+"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,70,63],
+"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,70,67],
+"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,70,29],
+"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,70,17],
+"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,70,55],
+"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,70,36],
+"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,70,28],
+"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,70,87],
+"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,70,69],
+"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,70,82],
+"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,70,85],
+"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,70,56],
+"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,70,37],
+"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,70,21],
+"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,70,2],
+"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,70,13],
+"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,70,64],
+"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,70,51],
+"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,70,38],
+"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,70,66],
+"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,70,18],
+"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,70,57],
+"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,70,25],
+"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,70,0],
+"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,70,74],
+"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,70,62],
+"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,70,22],
+"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,70,12],
+"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,70,58],
+"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,70,53],
+"theme_2blogga_2php_2default_8php.html":[5,0,3,2,1,0,1],
+"theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[5,0,3,2,1,0,1,2],
+"theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,2,1,0,1,0],
+"theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527":[5,0,3,2,1,0,1,1],
+"theme_2blogga_2php_2theme__init_8php.html":[5,0,3,2,1,0,3],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html":[5,0,3,2,1,1,0,0,1],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[5,0,3,2,1,1,0,0,1,2],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539":[5,0,3,2,1,1,0,0,1,1],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,2,1,1,0,0,1,0],
+"theme_2redbasic_2php_2theme__init_8php.html":[5,0,3,2,2,0,3],
+"thing_8php.html":[5,0,1,105],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,105,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,105,1],
+"toggle__mobile_8php.html":[5,0,1,106],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,106,0],
+"toggle__safesearch_8php.html":[5,0,1,107],
+"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,107,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],
@@ -179,18 +197,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,105],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,105,0],
-"update__channel_8php.html":[5,0,1,106],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,106,0],
-"update__community_8php.html":[5,0,1,107],
-"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,107,0],
-"update__display_8php.html":[5,0,1,108],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,108,0],
-"update__network_8php.html":[5,0,1,109],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,109,0],
-"update__search_8php.html":[5,0,1,110],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,110,0],
+"uexport_8php.html":[5,0,1,108],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,108,0],
+"update__channel_8php.html":[5,0,1,109],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,109,0],
+"update__community_8php.html":[5,0,1,110],
+"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,110,0],
+"update__display_8php.html":[5,0,1,111],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,111,0],
+"update__network_8php.html":[5,0,1,112],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,112,0],
+"update__search_8php.html":[5,0,1,113],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,113,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],
@@ -198,56 +216,38 @@ var NAVTREEINDEX7 =
 "updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[5,0,2,11,3],
 "updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[5,0,2,11,0],
 "updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[5,0,2,11,4],
-"view_2theme_2apw_2php_2config_8php.html":[5,0,3,1,0,0,0],
-"view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec":[5,0,3,1,0,0,0,0],
-"view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,0,0,0,1],
-"view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,0,0,0,2],
-"view_2theme_2blogga_2php_2config_8php.html":[5,0,3,1,1,0,0],
-"view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[5,0,3,1,1,0,0,1],
-"view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[5,0,3,1,1,0,0,0],
-"view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,3],
-"view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,4],
-"view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[5,0,3,1,1,0,0,2],
-"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html":[5,0,3,1,1,1,0,0,0],
-"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[5,0,3,1,1,1,0,0,0,1],
-"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[5,0,3,1,1,1,0,0,0,0],
-"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,1,0,0,0,3],
-"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,1,0,0,0,4],
-"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[5,0,3,1,1,1,0,0,0,2],
-"view_2theme_2redbasic_2php_2config_8php.html":[5,0,3,1,2,0,0],
-"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,111],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,111,0],
-"viewconnections_8php.html":[5,0,1,112],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,112,1],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,112,0],
-"viewsrc_8php.html":[5,0,1,113],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,113,0],
-"vote_8php.html":[5,0,1,114],
-"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,114,2],
-"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,114,0],
-"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,114,1],
-"wall__attach_8php.html":[5,0,1,115],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,115,0],
-"wall__upload_8php.html":[5,0,1,116],
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,116,0],
-"webfinger_8php.html":[5,0,1,117],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,117,0],
-"webpages_8php.html":[5,0,1,118],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,118,0],
-"wfinger_8php.html":[5,0,1,119],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,119,0],
-"widedarkness_8php.html":[5,0,3,1,0,1,10],
-"widgets_8php.html":[5,0,0,70],
-"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,70,7],
-"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,70,19],
-"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[5,0,0,70,4],
-"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[5,0,0,70,5],
-"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[5,0,0,70,13],
-"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,70,14],
-"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,70,8],
-"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,70,20],
-"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,70,15]
+"view_2theme_2apw_2php_2config_8php.html":[5,0,3,2,0,0,0],
+"view_2theme_2apw_2php_2config_8php.html#a8b51951a70e1c1324be71345a61d70ec":[5,0,3,2,0,0,0,0],
+"view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,2,0,0,0,1],
+"view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,2,0,0,0,2],
+"view_2theme_2blogga_2php_2config_8php.html":[5,0,3,2,1,0,0],
+"view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[5,0,3,2,1,0,0,1],
+"view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[5,0,3,2,1,0,0,0],
+"view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,2,1,0,0,3],
+"view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,2,1,0,0,4],
+"view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[5,0,3,2,1,0,0,2],
+"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html":[5,0,3,2,1,1,0,0,0],
+"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53":[5,0,3,2,1,1,0,0,0,1],
+"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27":[5,0,3,2,1,1,0,0,0,0],
+"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,2,1,1,0,0,0,3],
+"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,2,1,1,0,0,0,4],
+"view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b":[5,0,3,2,1,1,0,0,0,2],
+"view_2theme_2redbasic_2php_2config_8php.html":[5,0,3,2,2,0,0],
+"view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[5,0,3,2,2,0,0,0],
+"view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,2,2,0,0,1],
+"view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,2,2,0,0,2],
+"view_8php.html":[5,0,1,114],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,114,0],
+"viewconnections_8php.html":[5,0,1,115],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,115,1],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,115,0],
+"viewsrc_8php.html":[5,0,1,116],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,116,0],
+"vote_8php.html":[5,0,1,117],
+"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,117,2],
+"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,117,0],
+"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,117,1],
+"wall__attach_8php.html":[5,0,1,118],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,118,0],
+"wall__upload_8php.html":[5,0,1,119]
 };
diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js
index 147258fa5..bd7393825 100644
--- a/doc/html/navtreeindex8.js
+++ b/doc/html/navtreeindex8.js
@@ -1,58 +1,77 @@
 var NAVTREEINDEX8 =
 {
-"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,11],
-"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,70,1],
-"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,17],
-"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,70,6],
-"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,70,3],
-"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,70,18],
-"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,70,16],
-"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,70,22],
-"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,70,10],
-"widgets_8php.html#add9b24d3304e529a7975e96122315554":[5,0,0,70,0],
-"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[5,0,0,70,9],
-"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,70,21],
-"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,70,2],
-"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,70,12],
-"xchan_8php.html":[5,0,1,120],
-"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,120,0],
-"xrd_8php.html":[5,0,1,121],
-"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,121,0],
-"xref_8php.html":[5,0,1,122],
-"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,122,0],
-"zfinger_8php.html":[5,0,1,123],
-"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,123,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],
-"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,71,15],
-"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,71,10],
-"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,71,17],
-"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,71,5],
-"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,71,21],
-"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,71,8],
-"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,71,26],
-"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,71,18],
-"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,71,0],
-"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,71,25],
-"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,71,3],
-"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,71,24],
-"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,71,19],
-"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,71,12],
-"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,71,11],
-"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,71,14],
-"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,71,23],
-"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,71,16],
-"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,71,27],
-"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,71,9],
-"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,71,1],
-"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[5,0,0,71,4],
-"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,71,2],
-"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,124],
-"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,124,0],
-"zping_8php.html":[5,0,1,125],
-"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,125,0]
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,119,0],
+"webfinger_8php.html":[5,0,1,120],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,120,0],
+"webpages_8php.html":[5,0,1,121],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,121,0],
+"wfinger_8php.html":[5,0,1,122],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,122,0],
+"widedarkness_8php.html":[5,0,3,2,0,1,10],
+"widgets_8php.html":[5,0,0,71],
+"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,71,8],
+"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,71,20],
+"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[5,0,0,71,5],
+"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[5,0,0,71,6],
+"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[5,0,0,71,14],
+"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,71,15],
+"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[5,0,0,71,3],
+"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,71,9],
+"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,71,21],
+"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,71,16],
+"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,71,12],
+"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,71,1],
+"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,71,18],
+"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,71,7],
+"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,71,4],
+"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,71,19],
+"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,71,17],
+"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,71,23],
+"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,71,11],
+"widgets_8php.html#add9b24d3304e529a7975e96122315554":[5,0,0,71,0],
+"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[5,0,0,71,10],
+"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,71,22],
+"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,71,2],
+"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,71,13],
+"xchan_8php.html":[5,0,1,123],
+"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,123,0],
+"xrd_8php.html":[5,0,1,124],
+"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,124,0],
+"xref_8php.html":[5,0,1,125],
+"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,125,0],
+"zfinger_8php.html":[5,0,1,126],
+"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,126,0],
+"zot_8php.html":[5,0,0,72],
+"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,72,13],
+"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,72,7],
+"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,72,15],
+"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,72,10],
+"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,72,17],
+"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,72,5],
+"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,72,21],
+"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,72,8],
+"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,72,26],
+"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,72,18],
+"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,72,0],
+"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,72,25],
+"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3],
+"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,24],
+"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,19],
+"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,12],
+"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,11],
+"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,72,14],
+"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,72,23],
+"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,72,16],
+"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,72,27],
+"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,72,9],
+"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,72,1],
+"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[5,0,0,72,4],
+"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,72,2],
+"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,72,20],
+"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,72,22],
+"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,72,6],
+"zotfeed_8php.html":[5,0,1,127],
+"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,127,0],
+"zping_8php.html":[5,0,1,128],
+"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,128,0]
 };
diff --git a/doc/html/online_8php.html b/doc/html/online_8php.html
new file mode 100644
index 000000000..12f732c7c
--- /dev/null
+++ b/doc/html/online_8php.html
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+The Red Matrix: mod/online.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
          
+
          
+
+ 
+ 
+  
+  
+ 
+ 
+
          
+   
          The Red Matrix
+   
          
+  
          
+
          
+
+
+
+  
+  
+
          
+
          
+  
+  
          
+  
          
+
          
+
+
          
+
+
+
+
+
          
+
+
          
+
+
          
+  
          
+Functions  
          
+  
          
+
          online.php File Reference
            
          
+
          
+
          
+
+
+
+
+
          
+Functions
           online_init (&$a)
           
          
+
          Function Documentation
          
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          online_init (& $a)
          
+
          
+
+
          
+
          
+
          
+
          
+
diff --git a/doc/html/online_8php.js b/doc/html/online_8php.js
new file mode 100644
index 000000000..cd680468b
--- /dev/null
+++ b/doc/html/online_8php.js
@@ -0,0 +1,4 @@
+var online_8php =
+[
+    [ "online_init", "online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7", null ]
+];
\ No newline at end of file
diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html
index 2d4740310..0ef2b0014 100644
--- a/doc/html/permissions_8php.html
+++ b/doc/html/permissions_8php.html
@@ -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(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\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(), RedChannelList(), Conversation\set_mode(), RedBrowser\set_writeable(), RedFile\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), widget_photo_albums(), 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(), chat_content(), chatsvc_init(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\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(), RedChannelList(), Conversation\set_mode(), RedBrowser\set_writeable(), RedFile\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), widget_photo_albums(), z_readdir(), and zot_feed().
          
 
 
          
 
diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html
index b2af22595..876ea1a88 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(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), 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(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_chatroom_list(), 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 0525ddcc1..dda7d0fea 100644
--- a/doc/html/plugin_8php.html
+++ b/doc/html/plugin_8php.html
@@ -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(), 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(), dirprofile_init(), 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(), mail_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().
          
+
          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(), chat_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(), dirprofile_init(), 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(), mail_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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().
          
 
 
          
 
@@ -691,7 +691,7 @@ Functions
       
 
          
 
-
          Referenced by attach_store(), RedDirectory\createFile(), filestorage_content(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().
          
+
          Referenced by attach_store(), chatroom_create(), RedDirectory\createFile(), filestorage_content(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().
          
 
 
          
 
@@ -841,7 +841,7 @@ Functions
       
 
          
 
-
          Referenced by attach_store(), identity_check_service_class(), item_check_service_class(), new_contact(), and photo_upload().
          
+
          Referenced by attach_store(), chatroom_create(), identity_check_service_class(), item_check_service_class(), new_contact(), and photo_upload().
          
 
 
          
 
diff --git a/doc/html/reddav_8php.html b/doc/html/reddav_8php.html
index cc869593c..c987f8a0f 100644
--- a/doc/html/reddav_8php.html
+++ b/doc/html/reddav_8php.html
@@ -208,7 +208,7 @@ Functions
       
 
          
 
-
          Referenced by RedDirectory\childExists(), and RedDirectory\getChild().
          
+
          Referenced by RedDirectory\childExists(), cloud_init(), and RedDirectory\getChild().
          
 
 
          
 
diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index 1ab2883a1..31549e04d 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -28,7 +28,6 @@ var searchData=
   ['blogtheme_5fdisplay_5fitem',['blogtheme_display_item',['../blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5',1,'theme.php']]],
   ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]],
   ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]],
-  ['bookmarks_5fmenu_5ffetch',['bookmarks_menu_fetch',['../include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc',1,'menu.php']]],
   ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]],
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js
index 85352b434..85b76b594 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',['../include_2chanman_8php.html',1,'']]],
   ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]],
+  ['chanman_2ephp',['chanman.php',['../include_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']]],
@@ -24,6 +24,20 @@ var searchData=
   ['channelx_5fby_5fnick',['channelx_by_nick',['../Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e',1,'Contact.php']]],
   ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]],
   ['chanview_5fcontent',['chanview_content',['../chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b',1,'chanview.php']]],
+  ['chat_2ephp',['chat.php',['../mod_2chat_8php.html',1,'']]],
+  ['chat_2ephp',['chat.php',['../include_2chat_8php.html',1,'']]],
+  ['chat_5fcontent',['chat_content',['../mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f',1,'chat.php']]],
+  ['chat_5finit',['chat_init',['../mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e',1,'chat.php']]],
+  ['chat_5fpost',['chat_post',['../mod_2chat_8php.html#a999d594745597c656c9760253ae297ad',1,'chat.php']]],
+  ['chatroom_5fcreate',['chatroom_create',['../include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422',1,'chat.php']]],
+  ['chatroom_5fdestroy',['chatroom_destroy',['../include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639',1,'chat.php']]],
+  ['chatroom_5fenter',['chatroom_enter',['../include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91',1,'chat.php']]],
+  ['chatroom_5fleave',['chatroom_leave',['../include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f',1,'chat.php']]],
+  ['chatroom_5flist',['chatroom_list',['../include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a',1,'chat.php']]],
+  ['chatsvc_2ephp',['chatsvc.php',['../chatsvc_8php.html',1,'']]],
+  ['chatsvc_5fcontent',['chatsvc_content',['../chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9',1,'chatsvc.php']]],
+  ['chatsvc_5finit',['chatsvc_init',['../chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116',1,'chatsvc.php']]],
+  ['chatsvc_5fpost',['chatsvc_post',['../chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03',1,'chatsvc.php']]],
   ['check_5faccount_5fadmin',['check_account_admin',['../account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f',1,'account.php']]],
   ['check_5faccount_5femail',['check_account_email',['../account_8php.html#ae052bd5558847bd38e89c213561a9771',1,'account.php']]],
   ['check_5faccount_5finvite',['check_account_invite',['../account_8php.html#aaff7720423417a4333697894ffd9ddeb',1,'account.php']]],
@@ -86,8 +100,8 @@ var searchData=
   ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2blogga_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html',1,'']]],
-  ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]],
+  ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]],
   ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]],
   ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]],
   ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index e4e6a3fc7..fdbda8062 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -56,6 +56,7 @@ var searchData=
   ['get_5fmy_5furl',['get_my_url',['../identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec',1,'identity.php']]],
   ['get_5fobserver',['get_observer',['../classApp.html#a1ad3bb1b68439b3b7cbe630918e618d2',1,'App\get_observer()'],['../classConversation.html#ae3d4190142e12b57051f11f2911f77a0',1,'Conversation\get_observer()']]],
   ['get_5fobserver_5fhash',['get_observer_hash',['../boot_8php.html#a623e49c79943f3e7bdb770d021683cf7',1,'boot.php']]],
+  ['get_5fonline_5fstatus',['get_online_status',['../identity_8php.html#a332df795f684788002f5a6424abacfd7',1,'identity.php']]],
   ['get_5fowner_5fname',['get_owner_name',['../classItem.html#a67892aa23d19f4431bb2e5f43c74000e',1,'Item']]],
   ['get_5fowner_5fphoto',['get_owner_photo',['../classItem.html#aa541bc4290e51bfd688d6921bebabc73',1,'Item']]],
   ['get_5fowner_5furl',['get_owner_url',['../classItem.html#a9f2d219da712390f59012fc32a342074',1,'Item']]],
diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js
index 25710fc72..00f9338c1 100644
--- a/doc/html/search/all_6d.js
+++ b/doc/html/search/all_6d.js
@@ -39,7 +39,7 @@ var searchData=
   ['menu_5ffetch_5fid',['menu_fetch_id',['../include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7',1,'menu.php']]],
   ['menu_5fitem_5fnewwin',['MENU_ITEM_NEWWIN',['../boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5',1,'boot.php']]],
   ['menu_5fitem_5fzid',['MENU_ITEM_ZID',['../boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53',1,'boot.php']]],
-  ['menu_5flist',['menu_list',['../include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b',1,'menu.php']]],
+  ['menu_5flist',['menu_list',['../include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10',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']]],
   ['menu_5fsystem',['MENU_SYSTEM',['../boot_8php.html#a718a801b0be6cbaef5e519516da12721',1,'boot.php']]],
@@ -55,6 +55,7 @@ var searchData=
   ['mitem_5fcontent',['mitem_content',['../mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e',1,'mitem.php']]],
   ['mitem_5finit',['mitem_init',['../mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518',1,'mitem.php']]],
   ['mitem_5fpost',['mitem_post',['../mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1',1,'mitem.php']]],
+  ['mod_5ffilestorage_2ephp',['mod_filestorage.php',['../mod__filestorage_8php.html',1,'']]],
   ['mod_5fimport_2ephp',['mod_import.php',['../mod__import_8php.html',1,'']]],
   ['mood_2ephp',['mood.php',['../mood_8php.html',1,'']]],
   ['mood_5fcontent',['mood_content',['../mood_8php.html#a721b9b6703b3234a005641c92d409b8f',1,'mood.php']]],
diff --git a/doc/html/search/all_6f.js b/doc/html/search/all_6f.js
index a87eb552b..cc701412c 100644
--- a/doc/html/search/all_6f.js
+++ b/doc/html/search/all_6f.js
@@ -6,8 +6,8 @@ var searchData=
   ['obj_5fverbs',['obj_verbs',['../taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce',1,'taxonomy.php']]],
   ['oe_5fbuild_5fxpath',['oe_build_xpath',['../include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319',1,'oembed.php']]],
   ['oe_5fget_5finner_5fhtml',['oe_get_inner_html',['../include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487',1,'oembed.php']]],
-  ['oembed_2ephp',['oembed.php',['../include_2oembed_8php.html',1,'']]],
   ['oembed_2ephp',['oembed.php',['../mod_2oembed_8php.html',1,'']]],
+  ['oembed_2ephp',['oembed.php',['../include_2oembed_8php.html',1,'']]],
   ['oembed_5fbbcode2html',['oembed_bbcode2html',['../include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2',1,'oembed.php']]],
   ['oembed_5ffetch_5furl',['oembed_fetch_url',['../include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2',1,'oembed.php']]],
   ['oembed_5fformat_5fobject',['oembed_format_object',['../include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3',1,'oembed.php']]],
@@ -23,6 +23,8 @@ var searchData=
   ['onedirsync_5frun',['onedirsync_run',['../onedirsync_8php.html#a411aedd47c57476099647961e6a86691',1,'onedirsync.php']]],
   ['onepoll_2ephp',['onepoll.php',['../onepoll_8php.html',1,'']]],
   ['onepoll_5frun',['onepoll_run',['../onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d',1,'onepoll.php']]],
+  ['online_2ephp',['online.php',['../online_8php.html',1,'']]],
+  ['online_5finit',['online_init',['../online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7',1,'online.php']]],
   ['opensearch_2ephp',['opensearch.php',['../opensearch_8php.html',1,'']]],
   ['opensearch_5finit',['opensearch_init',['../opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9',1,'opensearch.php']]],
   ['orient',['orient',['../classphoto__driver.html#a4de5bac8daea8f291a33c80788019d0d',1,'photo_driver']]],
diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js
index 781e0fc82..f34f62728 100644
--- a/doc/html/search/all_72.js
+++ b/doc/html/search/all_72.js
@@ -48,6 +48,7 @@ var searchData=
   ['relative_5fdate',['relative_date',['../datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82',1,'datetime.php']]],
   ['reload_5fplugins',['reload_plugins',['../plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025',1,'plugin.php']]],
   ['reltoabs',['reltoabs',['../text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2',1,'text.php']]],
+  ['remote_5fonline_5fstatus',['remote_online_status',['../identity_8php.html#a47d6f53216f23a3484061793bef29854',1,'identity.php']]],
   ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
   ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]],
   ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 7a16cc846..9aa06121e 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -72,7 +72,6 @@ var searchData=
   ['siteinfo_5finit',['siteinfo_init',['../siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0',1,'siteinfo.php']]],
   ['sitelist_2ephp',['sitelist.php',['../sitelist_8php.html',1,'']]],
   ['sitelist_5finit',['sitelist_init',['../sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1',1,'sitelist.php']]],
-  ['smile_5fdecode',['smile_decode',['../text_8php.html#aca0f589be74fab1a460c57e88dad9779',1,'text.php']]],
   ['smile_5fencode',['smile_encode',['../text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6',1,'text.php']]],
   ['smilies',['smilies',['../text_8php.html#a3d225b253bb9e0f2498c11647d927b0b',1,'text.php']]],
   ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js
index 9301e9453..2f2a98361 100644
--- a/doc/html/search/all_77.js
+++ b/doc/html/search/all_77.js
@@ -18,6 +18,7 @@ var searchData=
   ['widget_5faffinity',['widget_affinity',['../widgets_8php.html#add9b24d3304e529a7975e96122315554',1,'widgets.php']]],
   ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]],
   ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]],
+  ['widget_5fchatroom_5flist',['widget_chatroom_list',['../widgets_8php.html#a47c72aac42058ea086c9ef8651c259da',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_5fdirsafemode',['widget_dirsafemode',['../widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091',1,'widgets.php']]],
diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js
index ab4e4cdd3..26f023b9a 100644
--- a/doc/html/search/files_63.js
+++ b/doc/html/search/files_63.js
@@ -5,6 +5,9 @@ var searchData=
   ['chanman_2ephp',['chanman.php',['../include_2chanman_8php.html',1,'']]],
   ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]],
   ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]],
+  ['chat_2ephp',['chat.php',['../mod_2chat_8php.html',1,'']]],
+  ['chat_2ephp',['chat.php',['../include_2chat_8php.html',1,'']]],
+  ['chatsvc_2ephp',['chatsvc.php',['../chatsvc_8php.html',1,'']]],
   ['cli_5fstartup_2ephp',['cli_startup.php',['../cli__startup_8php.html',1,'']]],
   ['cli_5fsuggest_2ephp',['cli_suggest.php',['../cli__suggest_8php.html',1,'']]],
   ['cloud_2ephp',['cloud.php',['../cloud_8php.html',1,'']]],
@@ -12,10 +15,10 @@ var searchData=
   ['common_2ephp',['common.php',['../common_8php.html',1,'']]],
   ['community_2ephp',['community.php',['../community_8php.html',1,'']]],
   ['config_2emd',['config.md',['../config_8md.html',1,'']]],
+  ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]],
-  ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]],
   ['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,'']]],
diff --git a/doc/html/search/files_6d.js b/doc/html/search/files_6d.js
index 1b8fc71cd..7176d95a6 100644
--- a/doc/html/search/files_6d.js
+++ b/doc/html/search/files_6d.js
@@ -11,6 +11,7 @@ var searchData=
   ['minimal_2ephp',['minimal.php',['../minimal_8php.html',1,'']]],
   ['minimalisticdarkness_2ephp',['minimalisticdarkness.php',['../minimalisticdarkness_8php.html',1,'']]],
   ['mitem_2ephp',['mitem.php',['../mitem_8php.html',1,'']]],
+  ['mod_5ffilestorage_2ephp',['mod_filestorage.php',['../mod__filestorage_8php.html',1,'']]],
   ['mod_5fimport_2ephp',['mod_import.php',['../mod__import_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_6f.js b/doc/html/search/files_6f.js
index 2cc921a73..4d739b50a 100644
--- a/doc/html/search/files_6f.js
+++ b/doc/html/search/files_6f.js
@@ -7,5 +7,6 @@ var searchData=
   ['olddefault_2ephp',['olddefault.php',['../olddefault_8php.html',1,'']]],
   ['onedirsync_2ephp',['onedirsync.php',['../onedirsync_8php.html',1,'']]],
   ['onepoll_2ephp',['onepoll.php',['../onepoll_8php.html',1,'']]],
+  ['online_2ephp',['online.php',['../online_8php.html',1,'']]],
   ['opensearch_2ephp',['opensearch.php',['../opensearch_8php.html',1,'']]]
 ];
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 71a07a373..d28b1f6c4 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -23,7 +23,6 @@ var searchData=
   ['blogtheme_5fdisplay_5fitem',['blogtheme_display_item',['../blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5',1,'theme.php']]],
   ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]],
   ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]],
-  ['bookmarks_5fmenu_5ffetch',['bookmarks_menu_fetch',['../include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc',1,'menu.php']]],
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
   ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js
index 271be6b7e..4feee718e 100644
--- a/doc/html/search/functions_63.js
+++ b/doc/html/search/functions_63.js
@@ -18,6 +18,17 @@ var searchData=
   ['channelx_5fby_5fn',['channelx_by_n',['../Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc',1,'Contact.php']]],
   ['channelx_5fby_5fnick',['channelx_by_nick',['../Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e',1,'Contact.php']]],
   ['chanview_5fcontent',['chanview_content',['../chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b',1,'chanview.php']]],
+  ['chat_5fcontent',['chat_content',['../mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f',1,'chat.php']]],
+  ['chat_5finit',['chat_init',['../mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e',1,'chat.php']]],
+  ['chat_5fpost',['chat_post',['../mod_2chat_8php.html#a999d594745597c656c9760253ae297ad',1,'chat.php']]],
+  ['chatroom_5fcreate',['chatroom_create',['../include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422',1,'chat.php']]],
+  ['chatroom_5fdestroy',['chatroom_destroy',['../include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639',1,'chat.php']]],
+  ['chatroom_5fenter',['chatroom_enter',['../include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91',1,'chat.php']]],
+  ['chatroom_5fleave',['chatroom_leave',['../include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f',1,'chat.php']]],
+  ['chatroom_5flist',['chatroom_list',['../include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a',1,'chat.php']]],
+  ['chatsvc_5fcontent',['chatsvc_content',['../chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9',1,'chatsvc.php']]],
+  ['chatsvc_5finit',['chatsvc_init',['../chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116',1,'chatsvc.php']]],
+  ['chatsvc_5fpost',['chatsvc_post',['../chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03',1,'chatsvc.php']]],
   ['check_5faccount_5fadmin',['check_account_admin',['../account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f',1,'account.php']]],
   ['check_5faccount_5femail',['check_account_email',['../account_8php.html#ae052bd5558847bd38e89c213561a9771',1,'account.php']]],
   ['check_5faccount_5finvite',['check_account_invite',['../account_8php.html#aaff7720423417a4333697894ffd9ddeb',1,'account.php']]],
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 36c34ffd7..7f2e95beb 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -56,6 +56,7 @@ var searchData=
   ['get_5fmy_5furl',['get_my_url',['../identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec',1,'identity.php']]],
   ['get_5fobserver',['get_observer',['../classApp.html#a1ad3bb1b68439b3b7cbe630918e618d2',1,'App\get_observer()'],['../classConversation.html#ae3d4190142e12b57051f11f2911f77a0',1,'Conversation\get_observer()']]],
   ['get_5fobserver_5fhash',['get_observer_hash',['../boot_8php.html#a623e49c79943f3e7bdb770d021683cf7',1,'boot.php']]],
+  ['get_5fonline_5fstatus',['get_online_status',['../identity_8php.html#a332df795f684788002f5a6424abacfd7',1,'identity.php']]],
   ['get_5fowner_5fname',['get_owner_name',['../classItem.html#a67892aa23d19f4431bb2e5f43c74000e',1,'Item']]],
   ['get_5fowner_5fphoto',['get_owner_photo',['../classItem.html#aa541bc4290e51bfd688d6921bebabc73',1,'Item']]],
   ['get_5fowner_5furl',['get_owner_url',['../classItem.html#a9f2d219da712390f59012fc32a342074',1,'Item']]],
diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js
index 4ceedb978..ca6ed3181 100644
--- a/doc/html/search/functions_6d.js
+++ b/doc/html/search/functions_6d.js
@@ -22,7 +22,7 @@ var searchData=
   ['menu_5fedit_5fitem',['menu_edit_item',['../include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa',1,'menu.php']]],
   ['menu_5ffetch',['menu_fetch',['../include_2menu_8php.html#a68ebbf492470c930f652013656f9071d',1,'menu.php']]],
   ['menu_5ffetch_5fid',['menu_fetch_id',['../include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7',1,'menu.php']]],
-  ['menu_5flist',['menu_list',['../include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b',1,'menu.php']]],
+  ['menu_5flist',['menu_list',['../include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10',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_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]],
diff --git a/doc/html/search/functions_6f.js b/doc/html/search/functions_6f.js
index 33c7a2134..f88e8a3f3 100644
--- a/doc/html/search/functions_6f.js
+++ b/doc/html/search/functions_6f.js
@@ -16,6 +16,7 @@ var searchData=
   ['oexchange_5finit',['oexchange_init',['../oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59',1,'oexchange.php']]],
   ['onedirsync_5frun',['onedirsync_run',['../onedirsync_8php.html#a411aedd47c57476099647961e6a86691',1,'onedirsync.php']]],
   ['onepoll_5frun',['onepoll_run',['../onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d',1,'onepoll.php']]],
+  ['online_5finit',['online_init',['../online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7',1,'online.php']]],
   ['opensearch_5finit',['opensearch_init',['../opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9',1,'opensearch.php']]],
   ['orient',['orient',['../classphoto__driver.html#a4de5bac8daea8f291a33c80788019d0d',1,'photo_driver']]]
 ];
diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js
index a37fda950..308939021 100644
--- a/doc/html/search/functions_72.js
+++ b/doc/html/search/functions_72.js
@@ -29,6 +29,7 @@ var searchData=
   ['relative_5fdate',['relative_date',['../datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82',1,'datetime.php']]],
   ['reload_5fplugins',['reload_plugins',['../plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025',1,'plugin.php']]],
   ['reltoabs',['reltoabs',['../text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2',1,'text.php']]],
+  ['remote_5fonline_5fstatus',['remote_online_status',['../identity_8php.html#a47d6f53216f23a3484061793bef29854',1,'identity.php']]],
   ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
   ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]],
   ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index ab1a2ac62..d1b480134 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -63,7 +63,6 @@ var searchData=
   ['siteinfo_5fcontent',['siteinfo_content',['../siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656',1,'siteinfo.php']]],
   ['siteinfo_5finit',['siteinfo_init',['../siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0',1,'siteinfo.php']]],
   ['sitelist_5finit',['sitelist_init',['../sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1',1,'sitelist.php']]],
-  ['smile_5fdecode',['smile_decode',['../text_8php.html#aca0f589be74fab1a460c57e88dad9779',1,'text.php']]],
   ['smile_5fencode',['smile_encode',['../text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6',1,'text.php']]],
   ['smilies',['smilies',['../text_8php.html#a3d225b253bb9e0f2498c11647d927b0b',1,'text.php']]],
   ['smilies_5fcontent',['smilies_content',['../smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f',1,'smilies.php']]],
diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js
index 90b12c339..b7d1c9ca2 100644
--- a/doc/html/search/functions_77.js
+++ b/doc/html/search/functions_77.js
@@ -11,6 +11,7 @@ var searchData=
   ['widget_5faffinity',['widget_affinity',['../widgets_8php.html#add9b24d3304e529a7975e96122315554',1,'widgets.php']]],
   ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]],
   ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]],
+  ['widget_5fchatroom_5flist',['widget_chatroom_list',['../widgets_8php.html#a47c72aac42058ea086c9ef8651c259da',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_5fdirsafemode',['widget_dirsafemode',['../widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091',1,'widgets.php']]],
diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html
index e2c19b6b5..654e4e2b2 100644
--- a/doc/html/security_8php.html
+++ b/doc/html/security_8php.html
@@ -399,7 +399,7 @@ Functions
 
          Profile owner - everything is visible
          
 
          Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.
          
 
-
          Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), bookmarks_menu_fetch(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedCollectionData(), RedFileData(), and z_readdir().
          
+
          Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), chatroom_enter(), chatsvc_content(), chatsvc_post(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedCollectionData(), RedFileData(), and z_readdir().
          
 
 
 
diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html
index f7b4d5a41..a45d9d25b 100644
--- a/doc/html/text_8php.html
+++ b/doc/html/text_8php.html
@@ -191,8 +191,6 @@ Functions
  
  smile_encode ($m)
  
- smile_decode ($m)
- 
  preg_heart ($x)
  
  day_translate ($s)
@@ -451,7 +449,7 @@ Variables
       
 
          
 
-
          Referenced by aes_unencapsulate(), get_atom_elements(), get_item_elements(), import_post(), import_site(), import_xchan(), oembed_init(), post_init(), post_post(), smile_decode(), zfinger_init(), and zot_register_hub().
          
+
          Referenced by aes_unencapsulate(), get_atom_elements(), get_item_elements(), import_post(), import_site(), import_xchan(), oembed_init(), post_init(), post_post(), smilies(), zfinger_init(), and zot_register_hub().
          
 
 
          
 
@@ -688,7 +686,7 @@ Variables
 
 
          Returns
          string 
          
 
-
          Referenced by admin_page_logs(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().
          
+
          Referenced by admin_page_logs(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().
          
 
 
 
@@ -1289,7 +1287,7 @@ Variables
       
 
          
 
-
          Referenced by RedDirectory\__construct(), RedFile\__construct(), 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(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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 RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), 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(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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().
          
 
 
          
 
@@ -1506,7 +1504,7 @@ Variables
       
 
          
 
-
          Referenced by events_post(), filestorage_post(), item_post(), menu_add_item(), menu_edit_item(), photo_upload(), photos_post(), and settings_post().
          
+
          Referenced by chat_post(), events_post(), filestorage_post(), item_post(), menu_add_item(), menu_edit_item(), photo_upload(), photos_post(), and settings_post().
          
 
 
          
 
@@ -1647,7 +1645,7 @@ Variables
       
 
          
 
-
          Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().
          
+
          Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), chatroom_destroy(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().
          
 
 
          
 
@@ -1774,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(), 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(), dirprofile_init(), 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(), mail_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(), 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().
          
+
          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(), chat_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(), dirprofile_init(), 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(), mail_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(), 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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().
          
 
 
 
@@ -1888,22 +1886,6 @@ Variables
 
 
          Referenced by widget_savedsearch().
          
 
-
-
-
-
          
-
          
-      
-        
-          
-          
-          
-          
-          
-        
-      
          smile_decode ( $m)
          
-
          
-
 
          
 
          
 
@@ -1949,10 +1931,10 @@ Variables
 
          Description: Replaces text emoticons with graphical images
          
 
          : string $s
          
 
          Returns string
          
-
          It is expected that this function will be called using HTML text. We will escape text between HTML pre and code blocks from being processed.
          
+
          It is expected that this function will be called using HTML text. We will escape text between HTML pre and code blocks, and HTML attributes (such as urls) from being processed.
          
 
          At a higher level, the bbcode [nosmile] tag can be used to prevent this function from being executed by the prepare_text() routine when preparing bbcode source for HTML display 
          
 
-
          Referenced by mail_content(), message_content(), and smilies_content().
          
+
          Referenced by chatsvc_content(), mail_content(), message_content(), and smilies_content().
          
 
 
 
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js
index 65a33574e..c3be5dc91 100644
--- a/doc/html/text_8php.js
+++ b/doc/html/text_8php.js
@@ -70,7 +70,6 @@ var text_8php =
     [ "sanitise_acl", "text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c", null ],
     [ "search", "text_8php.html#a876e94892867019935b348b573299352", null ],
     [ "searchbox", "text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447", null ],
-    [ "smile_decode", "text_8php.html#aca0f589be74fab1a460c57e88dad9779", null ],
     [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ],
     [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ],
     [ "sslify", "text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9", null ],
diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html
index 354ea916c..e574d7de3 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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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().
          
+
          Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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 d3e9c1b08..50582fe01 100644
--- a/doc/html/widgets_8php.html
+++ b/doc/html/widgets_8php.html
@@ -158,6 +158,8 @@ Functions
  
  widget_menu_preview ($arr)
  
+ widget_chatroom_list ($arr)
+ 
 
 
          Function Documentation
          
 
@@ -206,6 +208,24 @@ Functions
       
 
          
 
+
          
+
+
+
          
+
          
+      
+        
+          
+          
+          
+          
+          
+        
+      
          widget_chatroom_list ( $arr)
          
+
          
+
+
          Referenced by chat_content().
          
+
 
          
 
          
 
diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js
index 65afb6aae..30270e8c7 100644
--- a/doc/html/widgets_8php.js
+++ b/doc/html/widgets_8php.js
@@ -3,6 +3,7 @@ var widgets_8php =
     [ "widget_affinity", "widgets_8php.html#add9b24d3304e529a7975e96122315554", null ],
     [ "widget_archive", "widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65", null ],
     [ "widget_categories", "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b", null ],
+    [ "widget_chatroom_list", "widgets_8php.html#a47c72aac42058ea086c9ef8651c259da", null ],
     [ "widget_collections", "widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f", null ],
     [ "widget_design_tools", "widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b", null ],
     [ "widget_dirsafemode", "widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091", null ],
diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html
index b9e8c7180..e1b1e559b 100644
--- a/doc/html/zot_8php.html
+++ b/doc/html/zot_8php.html
@@ -748,7 +748,7 @@ Functions
 
 
          Returns
          string json encoded zot packet 
          
 
-
          Referenced by build_sync_packet(), directory_run(), notifier_run(), post_init(), and zping_content().
          
+
          Referenced by admin_page_hubloc_post(), build_sync_packet(), directory_run(), notifier_run(), post_init(), and zping_content().
          
 
 
 
@@ -1092,7 +1092,7 @@ which will be processed and delivered before this function ultimately returns.
 
 
          Returns
          : array => see z_post_url for returned data format 
          
 
-
          Referenced by deliver_run(), directory_run(), notifier_run(), post_init(), queue_run(), zot_fetch(), and zping_content().
          
+
          Referenced by admin_page_hubloc_post(), deliver_run(), directory_run(), notifier_run(), post_init(), queue_run(), zot_fetch(), and zping_content().
          
 
 
 
-- 
cgit v1.2.3


From bd691300a77fbe511641eb5f707980cc1209dac7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 31 Jan 2014 20:02:59 -0800
Subject: provide some interesting new options to channel sources

---
 include/items.php |    4 +-
 mod/sources.php   |    7 +
 util/messages.po  | 3125 +++++++++++++++++++++++++++--------------------------
 version.inc       |    2 +-
 4 files changed, 1597 insertions(+), 1541 deletions(-)

diff --git a/include/items.php b/include/items.php
index 2fe923303..a74c3d460 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2466,7 +2466,7 @@ function check_item_source($uid,$item) {
 		return false;
 	
 
-	$r = q("select * from source where src_channel_id = %d and src_xchan = '%s' limit 1",
+	$r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' || src_xchan = '*' ) limit 1",
 		intval($uid),
 		dbesc(($item['source_xchan']) ?  $item['source_xchan'] : $item['owner_xchan'])
 	);
@@ -2502,7 +2502,7 @@ function check_item_source($uid,$item) {
 		foreach($words as $word) {
 			if(substr($word,0,1) === '#' && $tags) {
 				foreach($tags as $t)
-					if($t['type'] == TERM_HASHTAG && substr($t,1) === $word)
+					if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*')))
 						return true;
 			}
 			if(stristr($text,$word) !== false)
diff --git a/mod/sources.php b/mod/sources.php
index 87bab60df..f4b36508f 100644
--- a/mod/sources.php
+++ b/mod/sources.php
@@ -12,9 +12,13 @@ function sources_post(&$a) {
 	$abook = intval($_REQUEST['abook']);
 	$words = $_REQUEST['words'];
 	$frequency = $_REQUEST['frequency'];
+	$name = $_REQUEST['name'];
 
 	$channel = $a->get_channel();
 
+	if($name == '*')
+		$xchan = '*';
+
 	if($abook) {
 		$r = q("select abook_xchan from abook where abook_id = %d and abook_channel = %d limit 1",
 			intval($abook),
@@ -74,6 +78,9 @@ function sources_content(&$a) {
 		);
 		if($r) {
 			for($x = 0; $x < count($r); $x ++) {
+				if($r[$x]['src_xchan'] == '*') {
+					$r[$x]['xchan_name'] = t('*');
+				}
 				$r[$x]['src_patt'] = htmlspecialchars($r[$x]['src_patt'], ENT_COMPAT,'UTF-8');
 			}
 		}
diff --git a/util/messages.po b/util/messages.po
index 328875302..67adad228 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-01-24.567\n"
+"Project-Id-Version: 2014-01-31.574\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-24 00:03-0800\n"
+"POT-Creation-Date: 2014-01-31 00:02-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -52,10 +52,6 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/api.php:973
-msgid "Public Timeline"
-msgstr ""
-
 #: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420
 msgid "Logout"
 msgstr ""
@@ -72,7 +68,7 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/nav.php:76 ../../include/conversation.php:932
+#: ../../include/nav.php:76 ../../include/conversation.php:933
 #: ../../mod/connedit.php:309 ../../mod/connedit.php:423
 msgid "View Profile"
 msgstr ""
@@ -89,7 +85,7 @@ msgstr ""
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:79 ../../include/conversation.php:1474
+#: ../../include/nav.php:79 ../../include/conversation.php:1475
 #: ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
@@ -236,7 +232,7 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../include/nav.php:171 ../../include/conversation.php:1492
+#: ../../include/nav.php:171 ../../include/conversation.php:1493
 #: ../../mod/events.php:354
 msgid "Events"
 msgstr ""
@@ -262,7 +258,7 @@ msgid "Manage Your Channels"
 msgstr ""
 
 #: ../../include/nav.php:177 ../../include/widgets.php:487
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
 msgid "Settings"
 msgstr ""
 
@@ -278,7 +274,7 @@ msgstr ""
 msgid "Manage/Edit Friends and Connections"
 msgstr ""
 
-#: ../../include/nav.php:186 ../../mod/admin.php:111
+#: ../../include/nav.php:186 ../../mod/admin.php:112
 msgid "Admin"
 msgstr ""
 
@@ -294,10 +290,63 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/Contact.php:104 ../../include/identity.php:625
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr ""
+
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr ""
+
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr ""
+
+#: ../../include/chat.php:102
+msgid "Room not found."
+msgstr ""
+
+#: ../../include/chat.php:113 ../../include/photos.php:15
+#: ../../include/attach.php:97 ../../include/attach.php:128
+#: ../../include/attach.php:184 ../../include/attach.php:199
+#: ../../include/attach.php:232 ../../include/attach.php:246
+#: ../../include/attach.php:267 ../../include/attach.php:462
+#: ../../include/attach.php:540 ../../include/items.php:3454
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../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/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:522
+#: ../../mod/chat.php:84 ../../mod/chat.php:89 ../../mod/viewsrc.php:12
+#: ../../mod/menu.php:40 ../../mod/connections.php:167
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
+#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/manage.php:6
+#: ../../mod/settings.php:486 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:347
+msgid "Permission denied."
+msgstr ""
+
+#: ../../include/Contact.php:104 ../../include/identity.php:628
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
 #: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:166
+#: ../../mod/dirprofile.php:170
 msgid "Connect"
 msgstr ""
 
@@ -369,8 +418,8 @@ msgstr ""
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:691
-#: ../../mod/admin.php:700 ../../boot.php:1423
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1423
 msgid "Email"
 msgstr ""
 
@@ -476,6 +525,10 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr ""
+
 #: ../../include/event.php:11 ../../include/bb2diaspora.php:433
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
@@ -488,2049 +541,2032 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/identity.php:676
+#: ../../include/event.php:40 ../../include/identity.php:679
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:108
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
 msgid "Location:"
 msgstr ""
 
-#: ../../include/text.php:315
-msgid "prev"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:537
+#: ../../include/bbcode.php:540 ../../include/bbcode.php:545
+#: ../../include/bbcode.php:548 ../../include/bbcode.php:551
+#: ../../include/bbcode.php:554 ../../include/bbcode.php:559
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:567
+#: ../../include/bbcode.php:570 ../../include/bbcode.php:573
+#: ../../include/bbcode.php:576
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/text.php:317
-msgid "first"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:582
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/text.php:346
-msgid "last"
+#: ../../include/bbcode.php:170
+msgid "QR code"
 msgstr ""
 
-#: ../../include/text.php:349
-msgid "next"
+#: ../../include/bbcode.php:213
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/text.php:361
-msgid "older"
+#: ../../include/bbcode.php:215
+msgid "post"
 msgstr ""
 
-#: ../../include/text.php:363
-msgid "newer"
+#: ../../include/bbcode.php:505 ../../include/bbcode.php:525
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/text.php:654
-msgid "No connections"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/text.php:665
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:677
-msgid "View Connections"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
+#: ../../mod/photos.php:972 ../../mod/photos.php:1059
+msgid "Comment"
 msgstr ""
 
-#: ../../include/text.php:738 ../../include/text.php:752
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
+#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125
+#: ../../include/ItemObject.php:270
+msgid "show more"
 msgstr ""
 
-#: ../../include/text.php:818
-msgid "poke"
+#: ../../include/js_strings.php:8
+msgid "show fewer"
 msgstr ""
 
-#: ../../include/text.php:818 ../../include/conversation.php:240
-msgid "poked"
+#: ../../include/js_strings.php:9
+msgid "Password too short"
 msgstr ""
 
-#: ../../include/text.php:819
-msgid "ping"
+#: ../../include/js_strings.php:10
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../../include/text.php:819
-msgid "pinged"
+#: ../../include/js_strings.php:11 ../../mod/photos.php:39
+msgid "everybody"
 msgstr ""
 
-#: ../../include/text.php:820
-msgid "prod"
+#: ../../include/js_strings.php:12
+msgid "Secret Passphrase"
 msgstr ""
 
-#: ../../include/text.php:820
-msgid "prodded"
+#: ../../include/js_strings.php:13
+msgid "Passphrase hint"
 msgstr ""
 
-#: ../../include/text.php:821
-msgid "slap"
+#: ../../include/js_strings.php:15
+msgid "timeago.prefixAgo"
 msgstr ""
 
-#: ../../include/text.php:821
-msgid "slapped"
+#: ../../include/js_strings.php:16
+msgid "timeago.suffixAgo"
 msgstr ""
 
-#: ../../include/text.php:822
-msgid "finger"
+#: ../../include/js_strings.php:17
+msgid "ago"
 msgstr ""
 
-#: ../../include/text.php:822
-msgid "fingered"
+#: ../../include/js_strings.php:18
+msgid "from now"
 msgstr ""
 
-#: ../../include/text.php:823
-msgid "rebuff"
+#: ../../include/js_strings.php:19
+msgid "less than a minute"
 msgstr ""
 
-#: ../../include/text.php:823
-msgid "rebuffed"
+#: ../../include/js_strings.php:20
+msgid "about a minute"
 msgstr ""
 
-#: ../../include/text.php:835
-msgid "happy"
+#: ../../include/js_strings.php:21
+#, php-format
+msgid "%d minutes"
 msgstr ""
 
-#: ../../include/text.php:836
-msgid "sad"
+#: ../../include/js_strings.php:22
+msgid "about an hour"
 msgstr ""
 
-#: ../../include/text.php:837
-msgid "mellow"
+#: ../../include/js_strings.php:23
+#, php-format
+msgid "about %d hours"
 msgstr ""
 
-#: ../../include/text.php:838
-msgid "tired"
+#: ../../include/js_strings.php:24
+msgid "a day"
 msgstr ""
 
-#: ../../include/text.php:839
-msgid "perky"
+#: ../../include/js_strings.php:25
+#, php-format
+msgid "%d days"
 msgstr ""
 
-#: ../../include/text.php:840
-msgid "angry"
+#: ../../include/js_strings.php:26
+msgid "about a month"
 msgstr ""
 
-#: ../../include/text.php:841
-msgid "stupified"
+#: ../../include/js_strings.php:27
+#, php-format
+msgid "%d months"
 msgstr ""
 
-#: ../../include/text.php:842
-msgid "puzzled"
+#: ../../include/js_strings.php:28
+msgid "about a year"
 msgstr ""
 
-#: ../../include/text.php:843
-msgid "interested"
+#: ../../include/js_strings.php:29
+#, php-format
+msgid "%d years"
 msgstr ""
 
-#: ../../include/text.php:844
-msgid "bitter"
+#: ../../include/js_strings.php:30
+msgid " "
 msgstr ""
 
-#: ../../include/text.php:845
-msgid "cheerful"
+#: ../../include/js_strings.php:31
+msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/text.php:846
-msgid "alive"
+#: ../../include/message.php:18
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/text.php:847
-msgid "annoyed"
+#: ../../include/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/text.php:848
-msgid "anxious"
+#: ../../include/message.php:42
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/text.php:849
-msgid "cranky"
+#: ../../include/message.php:143
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/text.php:850
-msgid "disturbed"
+#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/text.php:851
-msgid "frustrated"
+#: ../../include/identity.php:29 ../../mod/item.php:1150
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/text.php:852
-msgid "motivated"
+#: ../../include/identity.php:62
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/text.php:853
-msgid "relaxed"
+#: ../../include/identity.php:64
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/text.php:854
-msgid "surprised"
+#: ../../include/identity.php:143
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Monday"
+#: ../../include/identity.php:153
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Tuesday"
+#: ../../include/identity.php:167
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Wednesday"
+#: ../../include/identity.php:226
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Thursday"
+#: ../../include/identity.php:285
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Friday"
+#: ../../include/identity.php:310 ../../include/profile_selectors.php:42
+#: ../../include/widgets.php:373 ../../mod/connedit.php:389
+msgid "Friends"
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Saturday"
+#: ../../include/identity.php:477
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/text.php:1016
-msgid "Sunday"
+#: ../../include/identity.php:489
+msgid " Sorry, you don't have the permission to view this profile. "
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "January"
+#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40
+#: ../../mod/blocks.php:10 ../../mod/profile.php:16
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "February"
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "March"
+#: ../../include/identity.php:648
+msgid "Profiles"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "April"
+#: ../../include/identity.php:648
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "May"
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "June"
+#: ../../include/identity.php:652
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "July"
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
+msgid "Profile Image"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "August"
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "September"
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "October"
+#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../mod/directory.php:158
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "November"
+#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../mod/directory.php:160
+msgid "Status:"
 msgstr ""
 
-#: ../../include/text.php:1020
-msgid "December"
+#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../mod/directory.php:162
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/text.php:1098
-msgid "unknown.???"
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "bytes"
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:256
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/text.php:1134
-msgid "remove category"
+#: ../../include/identity.php:753 ../../include/identity.php:833
+msgid "F d"
 msgstr ""
 
-#: ../../include/text.php:1156
-msgid "remove from file"
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:278
+msgid "[today]"
 msgstr ""
 
-#: ../../include/text.php:1214 ../../include/text.php:1226
-msgid "Click to open/close"
+#: ../../include/identity.php:810
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/text.php:1402 ../../mod/events.php:332
-msgid "link to source"
+#: ../../include/identity.php:811
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/text.php:1421
-msgid "Select a page layout: "
+#: ../../include/identity.php:866
+msgid "[No description]"
 msgstr ""
 
-#: ../../include/text.php:1424 ../../include/text.php:1489
-msgid "default"
+#: ../../include/identity.php:884
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/text.php:1460
-msgid "Page content type: "
+#: ../../include/identity.php:885
+msgid "Events this week:"
 msgstr ""
 
-#: ../../include/text.php:1501
-msgid "Select an alternate language"
+#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../mod/profperm.php:107
+msgid "Profile"
 msgstr ""
 
-#: ../../include/text.php:1653 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
+#: ../../include/identity.php:906 ../../mod/settings.php:916
+msgid "Full Name:"
 msgstr ""
 
-#: ../../include/text.php:1656 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
+#: ../../include/identity.php:913
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/text.php:1659 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
+#: ../../include/identity.php:914
+msgid "j F"
 msgstr ""
 
-#: ../../include/text.php:1661 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
+#: ../../include/identity.php:921
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/text.php:1666
-msgid "activity"
+#: ../../include/identity.php:925
+msgid "Age:"
 msgstr ""
 
-#: ../../include/text.php:1928
-msgid "Design"
+#: ../../include/identity.php:934
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/text.php:1930
-msgid "Blocks"
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/text.php:1931
-msgid "Menus"
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
+msgid "Hometown:"
 msgstr ""
 
-#: ../../include/text.php:1932
-msgid "Layouts"
+#: ../../include/identity.php:943
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/text.php:1933
-msgid "Pages"
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
+#: ../../include/identity.php:947
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
-#: ../../mod/photos.php:968 ../../mod/photos.php:1055
-msgid "Comment"
+#: ../../include/identity.php:949 ../../mod/directory.php:164
+msgid "About:"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125
-#: ../../include/ItemObject.php:270
-msgid "show more"
+#: ../../include/identity.php:951
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/js_strings.php:8
-msgid "show fewer"
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/js_strings.php:9
-msgid "Password too short"
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/js_strings.php:10
-msgid "Passwords do not match"
+#: ../../include/identity.php:958
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/js_strings.php:11 ../../mod/photos.php:39
-msgid "everybody"
+#: ../../include/identity.php:960
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/js_strings.php:12
-msgid "Secret Passphrase"
+#: ../../include/identity.php:962
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/js_strings.php:13
-msgid "Passphrase hint"
+#: ../../include/identity.php:964
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/js_strings.php:15
-msgid "timeago.prefixAgo"
+#: ../../include/identity.php:966
+msgid "Television:"
 msgstr ""
 
-#: ../../include/js_strings.php:16
-msgid "timeago.suffixAgo"
+#: ../../include/identity.php:968
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/js_strings.php:17
-msgid "ago"
+#: ../../include/identity.php:970
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/js_strings.php:18
-msgid "from now"
+#: ../../include/identity.php:972
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/js_strings.php:19
-msgid "less than a minute"
+#: ../../include/identity.php:974
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/js_strings.php:20
-msgid "about a minute"
+#: ../../include/reddav.php:1018
+msgid "Edit File properties"
 msgstr ""
 
-#: ../../include/js_strings.php:21
-#, php-format
-msgid "%d minutes"
+#: ../../include/oembed.php:157
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/js_strings.php:22
-msgid "about an hour"
+#: ../../include/oembed.php:166
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/js_strings.php:23
-#, php-format
-msgid "about %d hours"
+#: ../../include/features.php:23
+msgid "General Features"
 msgstr ""
 
-#: ../../include/js_strings.php:24
-msgid "a day"
+#: ../../include/features.php:25
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/js_strings.php:25
-#, php-format
-msgid "%d days"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/js_strings.php:26
-msgid "about a month"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/js_strings.php:27
-#, php-format
-msgid "%d months"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/js_strings.php:28
-msgid "about a year"
+#: ../../include/features.php:27
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/js_strings.php:29
-#, php-format
-msgid "%d years"
+#: ../../include/features.php:27
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/js_strings.php:30
-msgid " "
+#: ../../include/features.php:28
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/js_strings.php:31
-msgid "timeago.numbers"
+#: ../../include/features.php:28
+msgid "Enables a tool to store notes and reminders"
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/features.php:33
+msgid "Extended Identity Sharing"
 msgstr ""
 
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/features.php:33
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
 msgstr ""
 
-#: ../../include/message.php:42
-msgid "Unable to determine sender."
+#: ../../include/features.php:34
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/message.php:143
-msgid "Stored post could not be verified."
+#: ../../include/features.php:34
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
-#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674
-#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
-#: ../../mod/profile_photo.php:336
-msgid "Profile Photos"
+#: ../../include/features.php:35
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/network.php:640
-msgid "view full size"
+#: ../../include/features.php:35
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/identity.php:29 ../../mod/item.php:1150
-msgid "Unable to obtain identity information from database"
+#: ../../include/features.php:40
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/identity.php:62
-msgid "Empty name"
+#: ../../include/features.php:41
+msgid "Richtext Editor"
 msgstr ""
 
-#: ../../include/identity.php:64
-msgid "Name too long"
+#: ../../include/features.php:41
+msgid "Enable richtext editor"
 msgstr ""
 
-#: ../../include/identity.php:143
-msgid "No account identifier"
+#: ../../include/features.php:42
+msgid "Post Preview"
 msgstr ""
 
-#: ../../include/identity.php:153
-msgid "Nickname is required."
+#: ../../include/features.php:42
+msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/identity.php:167
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/features.php:43 ../../include/widgets.php:476
+#: ../../mod/sources.php:81
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/identity.php:226
-msgid "Unable to retrieve created identity"
+#: ../../include/features.php:43
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/identity.php:285
-msgid "Default Profile"
+#: ../../include/features.php:44
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/identity.php:310 ../../include/profile_selectors.php:42
-#: ../../include/widgets.php:373 ../../mod/connedit.php:389
-msgid "Friends"
+#: ../../include/features.php:44
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/identity.php:477
-msgid "Requested channel is not available."
+#: ../../include/features.php:49
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/identity.php:489
-msgid " Sorry, you don't have the permission to view this profile. "
+#: ../../include/features.php:50
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
-#: ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40
-#: ../../mod/blocks.php:10 ../../mod/profile.php:16
-msgid "Requested profile is not available."
+#: ../../include/features.php:50
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/identity.php:639 ../../mod/profiles.php:603
-msgid "Change profile photo"
+#: ../../include/features.php:51
+msgid "Collections Filter"
 msgstr ""
 
-#: ../../include/identity.php:645
-msgid "Profiles"
+#: ../../include/features.php:51
+msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/identity.php:645
-msgid "Manage/edit profiles"
+#: ../../include/features.php:52 ../../include/widgets.php:252
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/identity.php:646 ../../mod/profiles.php:604
-msgid "Create New Profile"
+#: ../../include/features.php:52
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/identity.php:649
-msgid "Edit Profile"
+#: ../../include/features.php:53
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/identity.php:660 ../../mod/profiles.php:615
-msgid "Profile Image"
+#: ../../include/features.php:53
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:618
-msgid "visible to everybody"
+#: ../../include/features.php:54
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/identity.php:664 ../../mod/profiles.php:619
-msgid "Edit visibility"
+#: ../../include/features.php:54
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/identity.php:678 ../../include/identity.php:903
-#: ../../mod/directory.php:158
-msgid "Gender:"
+#: ../../include/features.php:55
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/identity.php:679 ../../include/identity.php:923
-#: ../../mod/directory.php:160
-msgid "Status:"
+#: ../../include/features.php:55
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/identity.php:680 ../../include/identity.php:934
-#: ../../mod/directory.php:162
-msgid "Homepage:"
+#: ../../include/features.php:56
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/identity.php:747 ../../include/identity.php:827
-#: ../../mod/ping.php:230
-msgid "g A l F d"
+#: ../../include/features.php:56
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/identity.php:748 ../../include/identity.php:828
-msgid "F d"
+#: ../../include/features.php:61
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/identity.php:793 ../../include/identity.php:868
-#: ../../mod/ping.php:252
-msgid "[today]"
+#: ../../include/features.php:63
+msgid "Edit Sent Posts"
 msgstr ""
 
-#: ../../include/identity.php:805
-msgid "Birthday Reminders"
+#: ../../include/features.php:63
+msgid "Edit and correct posts and comments after sending"
 msgstr ""
 
-#: ../../include/identity.php:806
-msgid "Birthdays this week:"
+#: ../../include/features.php:64
+msgid "Tagging"
 msgstr ""
 
-#: ../../include/identity.php:861
-msgid "[No description]"
+#: ../../include/features.php:64
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/identity.php:879
-msgid "Event Reminders"
+#: ../../include/features.php:65
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/identity.php:880
-msgid "Events this week:"
+#: ../../include/features.php:65
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/identity.php:893 ../../include/identity.php:977
-#: ../../mod/profperm.php:107
-msgid "Profile"
+#: ../../include/features.php:66 ../../include/widgets.php:283
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/identity.php:901 ../../mod/settings.php:911
-msgid "Full Name:"
+#: ../../include/features.php:66
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/identity.php:908
-msgid "j F, Y"
+#: ../../include/features.php:67
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/identity.php:909
-msgid "j F"
+#: ../../include/features.php:67
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/identity.php:916
-msgid "Birthday:"
+#: ../../include/features.php:68
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/identity.php:920
-msgid "Age:"
+#: ../../include/features.php:68
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/identity.php:929
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/features.php:69
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/identity.php:932 ../../mod/profiles.php:526
-msgid "Sexual Preference:"
+#: ../../include/features.php:69
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/identity.php:936 ../../mod/profiles.php:528
-msgid "Hometown:"
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/identity.php:938
-msgid "Tags:"
+#: ../../include/group.php:223
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/identity.php:940 ../../mod/profiles.php:529
-msgid "Political Views:"
+#: ../../include/group.php:242 ../../mod/admin.php:750
+msgid "All Channels"
 msgstr ""
 
-#: ../../include/identity.php:942
-msgid "Religion:"
+#: ../../include/group.php:264
+msgid "edit"
 msgstr ""
 
-#: ../../include/identity.php:944 ../../mod/directory.php:164
-msgid "About:"
+#: ../../include/group.php:285
+msgid "Collections"
 msgstr ""
 
-#: ../../include/identity.php:946
-msgid "Hobbies/Interests:"
+#: ../../include/group.php:286
+msgid "Edit collection"
 msgstr ""
 
-#: ../../include/identity.php:948 ../../mod/profiles.php:532
-msgid "Likes:"
+#: ../../include/group.php:287
+msgid "Create a new collection"
 msgstr ""
 
-#: ../../include/identity.php:950 ../../mod/profiles.php:533
-msgid "Dislikes:"
+#: ../../include/group.php:288
+msgid "Channels not in any collection"
 msgstr ""
 
-#: ../../include/identity.php:953
-msgid "Contact information and Social Networks:"
+#: ../../include/group.php:290 ../../include/widgets.php:253
+msgid "add"
 msgstr ""
 
-#: ../../include/identity.php:955
-msgid "My other channels:"
+#: ../../include/notify.php:23
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/identity.php:957
-msgid "Musical interests:"
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/identity.php:959
-msgid "Books, literature:"
+#: ../../include/photos.php:89
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/identity.php:961
-msgid "Television:"
+#: ../../include/photos.php:96
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/identity.php:963
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/identity.php:965
-msgid "Love/Romance:"
+#: ../../include/photos.php:185
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/identity.php:967
-msgid "Work/employment:"
+#: ../../include/photos.php:302 ../../include/conversation.php:1478
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/identity.php:969
-msgid "School/education:"
+#: ../../include/photos.php:306 ../../mod/photos.php:690
+#: ../../mod/photos.php:1169
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/reddav.php:1018
-msgid "Edit File properties"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
 msgstr ""
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:553
-#: ../../include/bbcode.php:556
-msgid "Image/photo"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
 msgstr ""
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:561
-msgid "Encrypted content"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/bbcode.php:170
-msgid "QR code"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/bbcode.php:215
-msgid "post"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/bbcode.php:513 ../../include/bbcode.php:533
-msgid "$1 wrote:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/oembed.php:157
-msgid "Embedded content"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/oembed.php:166
-msgid "Embedding disabled"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/features.php:21
-msgid "General Features"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/features.php:23
-msgid "Content Expiration"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/features.php:23
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/features.php:24
-msgid "Multiple Profiles"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
 msgstr ""
 
-#: ../../include/features.php:24
-msgid "Ability to create multiple profiles"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Web Pages"
+#: ../../include/profile_selectors.php:23
+msgid "Males"
 msgstr ""
 
-#: ../../include/features.php:25
-msgid "Provide managed web pages on your channel"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
 msgstr ""
 
-#: ../../include/features.php:26
-msgid "Private Notes"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
 msgstr ""
 
-#: ../../include/features.php:26
-msgid "Enables a tool to store notes and reminders"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/features.php:31
-msgid "Extended Identity Sharing"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/features.php:31
-msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/features.php:32
-msgid "Expert Mode"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/features.php:32
-msgid "Enable Expert Mode to provide advanced configuration options"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/features.php:33
-msgid "Premium Channel"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/features.php:33
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/features.php:38
-msgid "Post Composition Features"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/features.php:39
-msgid "Richtext Editor"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/features.php:39
-msgid "Enable richtext editor"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Post Preview"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Allow previewing posts and comments before publishing them"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/features.php:41 ../../include/widgets.php:476
-#: ../../mod/sources.php:81
-msgid "Channel Sources"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/features.php:42
-msgid "Even More Encryption"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/features.php:42
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Network and Stream Filtering"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Search by Date"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "Ability to select posts by date ranges"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Collections Filter"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Enable widget to display Network posts only from selected collections"
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
 msgstr ""
 
-#: ../../include/features.php:50 ../../include/widgets.php:252
-msgid "Saved Searches"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Save search terms for re-use"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Network Personal Tab"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Network New Tab"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Enable tab to display all new Network activity"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Affinity Tool"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Suggest Channels"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Show channel suggestions"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Post/Comment Tools"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Edit Sent Posts"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Edit and correct posts and comments after sending"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/features.php:62
-msgid "Tagging"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/features.php:62
-msgid "Ability to tag existing posts"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Post Categories"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Add categories to your posts"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/features.php:64 ../../include/widgets.php:283
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Ability to file posts under folders"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Dislike Posts"
+#: ../../include/attach.php:179 ../../include/attach.php:227
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Ability to dislike posts/comments"
+#: ../../include/attach.php:280
+msgid "No source file."
 msgstr ""
 
-#: ../../include/features.php:66
-msgid "Star Posts"
+#: ../../include/attach.php:297
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/features.php:66
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/attach.php:315
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/features.php:67
-msgid "Tag Cloud"
+#: ../../include/attach.php:326
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/features.php:67
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/attach.php:338
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/attach.php:422
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/group.php:223
-msgid "Default privacy group for new contacts"
+#: ../../include/attach.php:434
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/group.php:242 ../../mod/admin.php:700
-msgid "All Channels"
+#: ../../include/attach.php:478 ../../include/attach.php:495
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/group.php:264
-msgid "edit"
+#: ../../include/attach.php:545
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/group.php:285
-msgid "Collections"
+#: ../../include/attach.php:563
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/group.php:286
-msgid "Edit collection"
+#: ../../include/attach.php:588
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/group.php:287
-msgid "Create a new collection"
+#: ../../include/attach.php:633
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/group.php:288
-msgid "Channels not in any collection"
+#: ../../include/attach.php:637
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/group.php:290 ../../include/widgets.php:253
-msgid "add"
+#: ../../include/taxonomy.php:210
+msgid "Tags"
 msgstr ""
 
-#: ../../include/notify.php:23
-msgid "created a new post"
+#: ../../include/taxonomy.php:227
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/notify.php:24
-#, php-format
-msgid "commented on %s's post"
+#: ../../include/taxonomy.php:252
+msgid "have"
 msgstr ""
 
-#: ../../include/photos.php:15 ../../include/attach.php:97
-#: ../../include/attach.php:128 ../../include/attach.php:184
-#: ../../include/attach.php:199 ../../include/attach.php:232
-#: ../../include/attach.php:246 ../../include/attach.php:267
-#: ../../include/attach.php:462 ../../include/attach.php:540
-#: ../../include/items.php:3454 ../../mod/common.php:35
-#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257
-#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../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/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:522 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../mod/connections.php:167
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
-#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76
-#: ../../mod/filestorage.php:99 ../../mod/manage.php:6
-#: ../../mod/settings.php:484 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348
-msgid "Permission denied."
+#: ../../include/taxonomy.php:252
+msgid "has"
 msgstr ""
 
-#: ../../include/photos.php:89
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/taxonomy.php:253
+msgid "want"
 msgstr ""
 
-#: ../../include/photos.php:96
-msgid "Image file is empty."
+#: ../../include/taxonomy.php:253
+msgid "wants"
 msgstr ""
 
-#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
-msgid "Unable to process image"
+#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
+msgid "like"
 msgstr ""
 
-#: ../../include/photos.php:185
-msgid "Photo storage failed."
+#: ../../include/taxonomy.php:254
+msgid "likes"
 msgstr ""
 
-#: ../../include/photos.php:302 ../../include/conversation.php:1477
-msgid "Photo Albums"
+#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
+msgid "dislike"
 msgstr ""
 
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1165
-msgid "Upload New Photos"
+#: ../../include/taxonomy.php:255
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
+#: ../../include/auth.php:76
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
+#: ../../include/auth.php:188
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
+#: ../../include/auth.php:203
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
+#: ../../include/account.php:64
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
+#: ../../include/account.php:273
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
+#: ../../include/account.php:275 ../../include/account.php:302
+#: ../../include/account.php:359
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
+#: ../../include/account.php:297
+msgid "your registration password"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../include/account.php:300 ../../include/account.php:357
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
+#: ../../include/account.php:366
+msgid "Account approved."
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
+#: ../../include/account.php:400
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
+#: ../../include/enotify.php:40
+msgid "Red Matrix Notification"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
+#: ../../include/enotify.php:41
+msgid "redmatrix"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
+#: ../../include/enotify.php:43
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
+#: ../../include/enotify.php:45
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s "
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
+#: ../../include/enotify.php:87
+msgid "a private message"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
+#: ../../include/enotify.php:150
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
+#: ../../include/enotify.php:159
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
+#: ../../include/enotify.php:170
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
+#: ../../include/enotify.php:171
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
+#: ../../include/enotify.php:174 ../../include/enotify.php:189
+#: ../../include/enotify.php:215 ../../include/enotify.php:234
+#: ../../include/enotify.php:248
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
+#: ../../include/enotify.php:180
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
+#: ../../include/enotify.php:208
+#, php-format
+msgid "[Red:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
+#: ../../include/enotify.php:209
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
+#: ../../include/enotify.php:210
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
+#: ../../include/enotify.php:223
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
+#: ../../include/enotify.php:224
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
+#: ../../include/enotify.php:243
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
+#: ../../include/enotify.php:255
+msgid "[Red:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
+#: ../../include/enotify.php:256
+#, php-format
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
+#: ../../include/enotify.php:261 ../../include/enotify.php:280
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/attach.php:179 ../../include/attach.php:227
-msgid "Item was not found."
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/attach.php:280
-msgid "No source file."
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/attach.php:297
-msgid "Cannot locate file to replace"
+#: ../../include/enotify.php:278
+msgid "Name:"
 msgstr ""
 
-#: ../../include/attach.php:315
-msgid "Cannot locate file to revise/update"
+#: ../../include/enotify.php:279
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/attach.php:326
+#: ../../include/enotify.php:282
 #, php-format
-msgid "File exceeds size limit of %d"
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/attach.php:338
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
 msgstr ""
 
-#: ../../include/attach.php:422
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/attach.php:434
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/widgets.php:123 ../../mod/connections.php:236
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/attach.php:478 ../../include/attach.php:495
-msgid "Path not available."
+#: ../../include/widgets.php:124
+msgid "See more..."
 msgstr ""
 
-#: ../../include/attach.php:545
-msgid "Empty pathname"
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/attach.php:563
-msgid "duplicate filename or path"
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/attach.php:588
-msgid "Path not found."
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
 msgstr ""
 
-#: ../../include/attach.php:633
-msgid "mkdir failed."
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/attach.php:637
-msgid "database storage failed."
+#: ../../include/widgets.php:171
+msgid "Notes"
 msgstr ""
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
+#: ../../include/widgets.php:173 ../../include/text.php:738
+#: ../../include/text.php:752 ../../mod/filer.php:36
+msgid "Save"
 msgstr ""
 
-#: ../../include/taxonomy.php:227
-msgid "Keywords"
+#: ../../include/widgets.php:243
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/taxonomy.php:252
-msgid "have"
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
 msgstr ""
 
-#: ../../include/taxonomy.php:252
-msgid "has"
+#: ../../include/widgets.php:318 ../../include/items.php:3575
+msgid "Archives"
 msgstr ""
 
-#: ../../include/taxonomy.php:253
-msgid "want"
+#: ../../include/widgets.php:370
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/taxonomy.php:253
-msgid "wants"
+#: ../../include/widgets.php:371 ../../mod/connedit.php:386
+msgid "Me"
 msgstr ""
 
-#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
-msgid "like"
+#: ../../include/widgets.php:372 ../../mod/connedit.php:388
+msgid "Best Friends"
 msgstr ""
 
-#: ../../include/taxonomy.php:254
-msgid "likes"
+#: ../../include/widgets.php:374
+msgid "Co-workers"
 msgstr ""
 
-#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
-msgid "dislike"
+#: ../../include/widgets.php:375 ../../mod/connedit.php:390
+msgid "Former Friends"
 msgstr ""
 
-#: ../../include/taxonomy.php:255
-msgid "dislikes"
+#: ../../include/widgets.php:376 ../../mod/connedit.php:391
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/auth.php:76
-msgid "Logged out."
+#: ../../include/widgets.php:377
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/auth.php:188
-msgid "Failed authentication"
+#: ../../include/widgets.php:409
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/auth.php:203
-msgid "Login failed."
+#: ../../include/widgets.php:415
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
+#: ../../include/widgets.php:421
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
+#: ../../include/widgets.php:427
+msgid "Feature settings"
 msgstr ""
 
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
+#: ../../include/widgets.php:433
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/account.php:64
-msgid "An invitation is required."
+#: ../../include/widgets.php:439
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
+#: ../../include/widgets.php:445
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/account.php:119
-msgid "Please enter the required information."
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
 msgstr ""
 
-#: ../../include/account.php:187
-msgid "Failed to store account information."
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/account.php:273
-#, php-format
-msgid "Registration request at %s"
+#: ../../include/widgets.php:504
+msgid "Check Mail"
 msgstr ""
 
-#: ../../include/account.php:275 ../../include/account.php:302
-#: ../../include/account.php:359
-msgid "Administrator"
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/account.php:297
-msgid "your registration password"
+#: ../../include/api.php:974
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/account.php:300 ../../include/account.php:357
+#: ../../include/contact_widgets.php:14
 #, php-format
-msgid "Registration details for %s"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:20
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/account.php:366
-msgid "Account approved."
+#: ../../include/contact_widgets.php:21
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/account.php:400
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../include/contact_widgets.php:22
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
+#: ../../include/contact_widgets.php:23
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
+#: ../../mod/directory.php:211 ../../mod/connections.php:355
+msgid "Find"
 msgstr ""
 
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
+#: ../../include/contact_widgets.php:27
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/dir_fns.php:30
-msgid "Enable Safe Search"
+#: ../../include/contact_widgets.php:28
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../include/contact_widgets.php:120
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr ""
+
+#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
+#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
+#: ../../mod/layouts.php:102 ../../mod/filestorage.php:170
+#: ../../mod/settings.php:571 ../../mod/editlayout.php:106
+#: ../../mod/editpost.php:103 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
+msgid "Edit"
 msgstr ""
 
-#: ../../include/dir_fns.php:32
-msgid "Disable Safe Search"
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/dir_fns.php:34
-msgid "Safe Mode"
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/enotify.php:40
-msgid "Red Matrix Notification"
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/enotify.php:41
-msgid "redmatrix"
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/enotify.php:43
-msgid "Thank You,"
+#: ../../include/follow.php:26
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/enotify.php:45
-#, php-format
-msgid "%s Administrator"
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
 msgstr ""
 
-#: ../../include/enotify.php:80
-#, php-format
-msgid "%s "
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
 msgstr ""
 
-#: ../../include/enotify.php:84
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/enotify.php:86
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/follow.php:129
+msgid "local account not found."
 msgstr ""
 
-#: ../../include/enotify.php:87
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/enotify.php:87
-msgid "a private message"
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
 msgstr ""
 
-#: ../../include/enotify.php:88
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
 msgstr ""
 
-#: ../../include/enotify.php:142
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
 msgstr ""
 
-#: ../../include/enotify.php:150
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
 msgstr ""
 
-#: ../../include/enotify.php:159
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
 msgstr ""
 
-#: ../../include/enotify.php:170
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
 msgstr ""
 
-#: ../../include/enotify.php:171
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../include/enotify.php:174 ../../include/enotify.php:189
-#: ../../include/enotify.php:215 ../../include/enotify.php:234
-#: ../../include/enotify.php:248
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/enotify.php:180
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
 msgstr ""
 
-#: ../../include/enotify.php:182
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
 msgstr ""
 
-#: ../../include/enotify.php:208
-#, php-format
-msgid "[Red:Notify] %s tagged you"
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
 msgstr ""
 
-#: ../../include/enotify.php:209
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
 msgstr ""
 
-#: ../../include/enotify.php:210
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
 msgstr ""
 
-#: ../../include/enotify.php:223
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
+#: ../../include/permissions.php:27
+msgid "Requires compatible chat plugin"
 msgstr ""
 
-#: ../../include/enotify.php:224
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
 msgstr ""
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
 msgstr ""
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
 msgstr ""
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
 msgstr ""
 
-#: ../../include/enotify.php:243
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/permissions.php:32
+msgid "Can administer my channel resources"
 msgstr ""
 
-#: ../../include/enotify.php:255
-msgid "[Red:Notify] Introduction received"
+#: ../../include/permissions.php:32
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/enotify.php:256
-#, php-format
-msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
 msgstr ""
 
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../index.php:346
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/enotify.php:261 ../../include/enotify.php:280
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: ../../include/items.php:3748 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Friend suggestion received"
+#: ../../include/items.php:3763
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/enotify.php:271
+#: ../../include/items.php:3770
 #, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/enotify.php:272
+#: ../../include/items.php:3781
 #, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/enotify.php:278
-msgid "Name:"
+#: ../../include/items.php:3784
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/enotify.php:279
-msgid "Photo:"
+#: ../../include/security.php:280
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/enotify.php:282
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/text.php:315
+msgid "prev"
 msgstr ""
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
+#: ../../include/text.php:317
+msgid "first"
 msgstr ""
 
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
+#: ../../include/text.php:346
+msgid "last"
 msgstr ""
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:236
-msgid "Suggestions"
+#: ../../include/text.php:349
+msgid "next"
 msgstr ""
 
-#: ../../include/widgets.php:124
-msgid "See more..."
+#: ../../include/text.php:361
+msgid "older"
 msgstr ""
 
-#: ../../include/widgets.php:146
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/text.php:363
+msgid "newer"
 msgstr ""
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
+#: ../../include/text.php:654
+msgid "No connections"
 msgstr ""
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
-msgstr ""
+#: ../../include/text.php:665
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/text.php:677
+msgid "View Connections"
 msgstr ""
 
-#: ../../include/widgets.php:171
-msgid "Notes"
+#: ../../include/text.php:818
+msgid "poke"
 msgstr ""
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
+#: ../../include/text.php:818 ../../include/conversation.php:240
+msgid "poked"
 msgstr ""
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
+#: ../../include/text.php:819
+msgid "ping"
 msgstr ""
 
-#: ../../include/widgets.php:318 ../../include/items.php:3575
-msgid "Archives"
+#: ../../include/text.php:819
+msgid "pinged"
 msgstr ""
 
-#: ../../include/widgets.php:370
-msgid "Refresh"
+#: ../../include/text.php:820
+msgid "prod"
 msgstr ""
 
-#: ../../include/widgets.php:371 ../../mod/connedit.php:386
-msgid "Me"
+#: ../../include/text.php:820
+msgid "prodded"
 msgstr ""
 
-#: ../../include/widgets.php:372 ../../mod/connedit.php:388
-msgid "Best Friends"
+#: ../../include/text.php:821
+msgid "slap"
 msgstr ""
 
-#: ../../include/widgets.php:374
-msgid "Co-workers"
+#: ../../include/text.php:821
+msgid "slapped"
 msgstr ""
 
-#: ../../include/widgets.php:375 ../../mod/connedit.php:390
-msgid "Former Friends"
+#: ../../include/text.php:822
+msgid "finger"
 msgstr ""
 
-#: ../../include/widgets.php:376 ../../mod/connedit.php:391
-msgid "Acquaintances"
+#: ../../include/text.php:822
+msgid "fingered"
 msgstr ""
 
-#: ../../include/widgets.php:377
-msgid "Everybody"
+#: ../../include/text.php:823
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/widgets.php:409
-msgid "Account settings"
+#: ../../include/text.php:823
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/widgets.php:415
-msgid "Channel settings"
+#: ../../include/text.php:835
+msgid "happy"
 msgstr ""
 
-#: ../../include/widgets.php:421
-msgid "Additional features"
+#: ../../include/text.php:836
+msgid "sad"
 msgstr ""
 
-#: ../../include/widgets.php:427
-msgid "Feature settings"
+#: ../../include/text.php:837
+msgid "mellow"
 msgstr ""
 
-#: ../../include/widgets.php:433
-msgid "Display settings"
+#: ../../include/text.php:838
+msgid "tired"
 msgstr ""
 
-#: ../../include/widgets.php:439
-msgid "Connected apps"
+#: ../../include/text.php:839
+msgid "perky"
 msgstr ""
 
-#: ../../include/widgets.php:445
-msgid "Export channel"
+#: ../../include/text.php:840
+msgid "angry"
 msgstr ""
 
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
+#: ../../include/text.php:841
+msgid "stupified"
 msgstr ""
 
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
+#: ../../include/text.php:842
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/widgets.php:504
-msgid "Check Mail"
+#: ../../include/text.php:843
+msgid "interested"
 msgstr ""
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:20
-msgid "Find Channels"
+#: ../../include/text.php:844
+msgid "bitter"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter name or interest"
+#: ../../include/text.php:845
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Connect/Follow"
+#: ../../include/text.php:846
+msgid "alive"
 msgstr ""
 
-#: ../../include/contact_widgets.php:23
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/text.php:847
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:355
-msgid "Find"
+#: ../../include/text.php:848
+msgid "anxious"
 msgstr ""
 
-#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
-msgid "Channel Suggestions"
+#: ../../include/text.php:849
+msgid "cranky"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Random Profile"
+#: ../../include/text.php:850
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/contact_widgets.php:28
-msgid "Invite Friends"
+#: ../../include/text.php:851
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/contact_widgets.php:120
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:852
+msgid "motivated"
+msgstr ""
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
+#: ../../include/text.php:853
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
-#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:171
-#: ../../mod/settings.php:569 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:98 ../../mod/blocks.php:93
-#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
-msgid "Edit"
+#: ../../include/text.php:854
+msgid "surprised"
 msgstr ""
 
-#: ../../include/plugin.php:475 ../../include/plugin.php:477
-msgid "Click here to upgrade."
+#: ../../include/text.php:1017
+msgid "Monday"
 msgstr ""
 
-#: ../../include/plugin.php:483
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/text.php:1017
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/plugin.php:488
-msgid "This action is not available under your subscription plan."
+#: ../../include/text.php:1017
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
+#: ../../include/text.php:1017
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/follow.php:26
-msgid "Channel location missing."
+#: ../../include/text.php:1017
+msgid "Friday"
 msgstr ""
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
+#: ../../include/text.php:1017
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
+#: ../../include/text.php:1017
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
+#: ../../include/text.php:1021
+msgid "January"
 msgstr ""
 
-#: ../../include/follow.php:129
-msgid "local account not found."
+#: ../../include/text.php:1021
+msgid "February"
 msgstr ""
 
-#: ../../include/follow.php:138
-msgid "Cannot connect to yourself."
+#: ../../include/text.php:1021
+msgid "March"
 msgstr ""
 
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
+#: ../../include/text.php:1021
+msgid "April"
 msgstr ""
 
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
+#: ../../include/text.php:1021
+msgid "May"
 msgstr ""
 
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
+#: ../../include/text.php:1021
+msgid "June"
 msgstr ""
 
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
+#: ../../include/text.php:1021
+msgid "July"
 msgstr ""
 
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
+#: ../../include/text.php:1021
+msgid "August"
 msgstr ""
 
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
+#: ../../include/text.php:1021
+msgid "September"
 msgstr ""
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
+#: ../../include/text.php:1021
+msgid "October"
 msgstr ""
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/text.php:1021
+msgid "November"
 msgstr ""
 
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
+#: ../../include/text.php:1021
+msgid "December"
 msgstr ""
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
+#: ../../include/text.php:1099
+msgid "unknown.???"
 msgstr ""
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
+#: ../../include/text.php:1100
+msgid "bytes"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/text.php:1135
+msgid "remove category"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/text.php:1157
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
+#: ../../include/text.php:1215 ../../include/text.php:1227
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
+#: ../../include/text.php:1403 ../../mod/events.php:332
+msgid "link to source"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
+#: ../../include/text.php:1422
+msgid "Select a page layout: "
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
+#: ../../include/text.php:1425 ../../include/text.php:1490
+msgid "default"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Can source my \"public\" posts in derived channels"
+#: ../../include/text.php:1461
+msgid "Page content type: "
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/text.php:1502
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/permissions.php:32
-msgid "Can administer my channel resources"
+#: ../../include/text.php:1654 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
 msgstr ""
 
-#: ../../include/permissions.php:32
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/text.php:1657 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
 msgstr ""
 
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
-#: ../../view/theme/apw/php/config.php:176
-msgid "Default"
+#: ../../include/text.php:1660 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
 msgstr ""
 
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:347
-msgid "Permission denied"
+#: ../../include/text.php:1662 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
 msgstr ""
 
-#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:150
-#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18
-#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
-msgid "Item not found."
+#: ../../include/text.php:1667
+msgid "activity"
 msgstr ""
 
-#: ../../include/items.php:3743 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
+#: ../../include/text.php:1929
+msgid "Design"
 msgstr ""
 
-#: ../../include/items.php:3758
-msgid "Collection is empty."
+#: ../../include/text.php:1931
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/items.php:3765
-#, php-format
-msgid "Collection: %s"
+#: ../../include/text.php:1932
+msgid "Menus"
 msgstr ""
 
-#: ../../include/items.php:3776
-#, php-format
-msgid "Connection: %s"
+#: ../../include/text.php:1933
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/items.php:3779
-msgid "Connection not found."
+#: ../../include/text.php:1934
+msgid "Pages"
 msgstr ""
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:841
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
 msgid "Private Message"
 msgstr ""
 
 #: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695
-#: ../../mod/group.php:176 ../../mod/photos.php:1019
-#: ../../mod/filestorage.php:172 ../../mod/settings.php:570
+#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:745
+#: ../../mod/group.php:176 ../../mod/photos.php:1023
+#: ../../mod/filestorage.php:171 ../../mod/settings.php:572
 msgid "Delete"
 msgstr ""
 
@@ -2566,11 +2602,11 @@ msgstr ""
 msgid "add tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:951
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:176 ../../mod/photos.php:952
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -2613,15 +2649,15 @@ msgstr ""
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:221
+#: ../../include/ItemObject.php:221 ../../include/conversation.php:690
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:248 ../../include/conversation.php:706
-#: ../../include/conversation.php:1119 ../../mod/photos.php:950
+#: ../../include/ItemObject.php:248 ../../include/conversation.php:707
+#: ../../include/conversation.php:1120 ../../mod/photos.php:954
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153
+#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:153
 #: ../../mod/editblock.php:129
 msgid "Please wait"
 msgstr ""
@@ -2633,8 +2669,8 @@ msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:966
-#: ../../mod/photos.php:1053
+#: ../../include/ItemObject.php:534 ../../mod/photos.php:970
+#: ../../mod/photos.php:1057
 msgid "This is you"
 msgstr ""
 
@@ -2642,16 +2678,17 @@ msgstr ""
 #: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
 #: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
 #: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828
-#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1056
-#: ../../mod/profiles.php:506 ../../mod/filestorage.php:132
-#: ../../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/mail.php:223 ../../mod/mail.php:335
-#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142
+#: ../../mod/admin.php:431 ../../mod/admin.php:738 ../../mod/admin.php:878
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1164 ../../mod/group.php:81
+#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:933
+#: ../../mod/photos.php:973 ../../mod/photos.php:1060 ../../mod/chat.php:107
+#: ../../mod/chat.php:133 ../../mod/profiles.php:506
+#: ../../mod/filestorage.php:131 ../../mod/import.php:387
+#: ../../mod/settings.php:509 ../../mod/settings.php:621
+#: ../../mod/settings.php:649 ../../mod/settings.php:673
+#: ../../mod/settings.php:744 ../../mod/settings.php:908
+#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/poke.php:166
+#: ../../mod/fsuggest.php:108 ../../mod/mood.php:142
 #: ../../view/theme/redbasic/php/config.php:85
 #: ../../view/theme/apw/php/config.php:231
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2691,36 +2728,18 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../include/ItemObject.php:546 ../../include/conversation.php:1082
-#: ../../mod/webpages.php:122 ../../mod/photos.php:970
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127
+#: ../../include/ItemObject.php:546 ../../include/conversation.php:1083
+#: ../../mod/webpages.php:122 ../../mod/photos.php:974
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:132
 #: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
 msgid "Preview"
 msgstr ""
 
-#: ../../include/ItemObject.php:549 ../../include/conversation.php:1146
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135
+#: ../../include/ItemObject.php:549 ../../include/conversation.php:1147
+#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:140
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/security.php:49
-msgid "Welcome "
-msgstr ""
-
-#: ../../include/security.php:50
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: ../../include/security.php:53
-msgid "Welcome back "
-msgstr ""
-
-#: ../../include/security.php:363
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
 #: ../../include/conversation.php:123
 msgid "channel"
 msgstr ""
@@ -2763,344 +2782,344 @@ msgstr ""
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:704
+#: ../../include/conversation.php:705
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:833
+#: ../../include/conversation.php:834
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:838
 msgid "Loading..."
 msgstr ""
 
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:839
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:929
+#: ../../include/conversation.php:930
 msgid "View Source"
 msgstr ""
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:931
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:932
 msgid "View Status"
 msgstr ""
 
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:934
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:935
 msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:936
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:937
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:938
 msgid "Poke"
 msgstr ""
 
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1003
+#: ../../include/conversation.php:1004
 #, php-format
 msgid "%2$d people like this."
 msgid_plural "%2$d people like this."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1005
+#: ../../include/conversation.php:1006
 #, php-format
 msgid "%2$d people don't like this."
 msgid_plural "%2$d people don't like this."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1011
+#: ../../include/conversation.php:1012
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1014
+#: ../../include/conversation.php:1015
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1065
+#: ../../include/conversation.php:1066
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/conversation.php:1066 ../../mod/mail.php:171
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
 #: ../../mod/mail.php:269
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1068
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1069
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1069
+#: ../../include/conversation.php:1070
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1070 ../../mod/filer.php:35
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1072
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1072 ../../mod/mail.php:172
+#: ../../include/conversation.php:1073 ../../mod/mail.php:172
 #: ../../mod/mail.php:270 ../../mod/editpost.php:52
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/conversation.php:1096 ../../mod/photos.php:949
+#: ../../include/conversation.php:1097 ../../mod/photos.php:953
 msgid "Share"
 msgstr ""
 
-#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
 msgid "Page link title"
 msgstr ""
 
-#: ../../include/conversation.php:1100 ../../mod/mail.php:219
+#: ../../include/conversation.php:1101 ../../mod/mail.php:219
 #: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145
+#: ../../mod/editpost.php:104 ../../mod/editwebpage.php:145
 #: ../../mod/editblock.php:121
 msgid "Upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1101
+#: ../../include/conversation.php:1102
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1102 ../../mod/mail.php:220
+#: ../../include/conversation.php:1103 ../../mod/mail.php:220
 #: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146
+#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:146
 #: ../../mod/editblock.php:122
 msgid "Attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1104
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1104 ../../mod/mail.php:221
+#: ../../include/conversation.php:1105 ../../mod/mail.php:221
 #: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147
+#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:147
 #: ../../mod/editblock.php:123
 msgid "Insert web link"
 msgstr ""
 
-#: ../../include/conversation.php:1105
+#: ../../include/conversation.php:1106
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1107
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1108
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1108
+#: ../../include/conversation.php:1109
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1109
+#: ../../include/conversation.php:1110
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:113
+#: ../../mod/editpost.php:110 ../../mod/editwebpage.php:151
 #: ../../mod/editblock.php:127
 msgid "Set your location"
 msgstr ""
 
-#: ../../include/conversation.php:1111
+#: ../../include/conversation.php:1112
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:114
+#: ../../mod/editpost.php:111 ../../mod/editwebpage.php:152
 #: ../../mod/editblock.php:128
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1114
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169
+#: ../../include/conversation.php:1116 ../../mod/editlayout.php:127
+#: ../../mod/editpost.php:124 ../../mod/editwebpage.php:169
 #: ../../mod/editblock.php:142
 msgid "Set title"
 msgstr ""
 
-#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171
+#: ../../include/conversation.php:1119 ../../mod/editlayout.php:130
+#: ../../mod/editpost.php:126 ../../mod/editwebpage.php:171
 #: ../../mod/editblock.php:145
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154
+#: ../../include/conversation.php:1121 ../../mod/editlayout.php:116
+#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:154
 #: ../../mod/editblock.php:130
 msgid "Permission settings"
 msgstr ""
 
-#: ../../include/conversation.php:1121
+#: ../../include/conversation.php:1122
 msgid "permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164
+#: ../../include/conversation.php:1130 ../../mod/editlayout.php:124
+#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:164
 #: ../../mod/editblock.php:139
 msgid "Public post"
 msgstr ""
 
-#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172
+#: ../../include/conversation.php:1132 ../../mod/editlayout.php:131
+#: ../../mod/editpost.php:127 ../../mod/editwebpage.php:172
 #: ../../mod/editblock.php:146
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:226
+#: ../../include/conversation.php:1145 ../../mod/mail.php:226
 #: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182
+#: ../../mod/editpost.php:138 ../../mod/editwebpage.php:182
 #: ../../mod/editblock.php:156
 msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/conversation.php:1148 ../../mod/editpost.php:136
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:508
-#: ../../mod/settings.php:534 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/settings.php:510
+#: ../../mod/settings.php:536 ../../mod/editpost.php:143
 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr ""
 
-#: ../../include/conversation.php:1380
+#: ../../include/conversation.php:1381
 msgid "Commented Order"
 msgstr ""
 
-#: ../../include/conversation.php:1383
+#: ../../include/conversation.php:1384
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/conversation.php:1386
+#: ../../include/conversation.php:1387
 msgid "Posted Order"
 msgstr ""
 
-#: ../../include/conversation.php:1389
+#: ../../include/conversation.php:1390
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1394
 msgid "Personal"
 msgstr ""
 
-#: ../../include/conversation.php:1396
+#: ../../include/conversation.php:1397
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/conversation.php:1399 ../../mod/menu.php:57
+#: ../../include/conversation.php:1400 ../../mod/menu.php:57
 #: ../../mod/connections.php:209
 msgid "New"
 msgstr ""
 
-#: ../../include/conversation.php:1402
+#: ../../include/conversation.php:1403
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/conversation.php:1409
+#: ../../include/conversation.php:1410
 msgid "Starred"
 msgstr ""
 
-#: ../../include/conversation.php:1412
+#: ../../include/conversation.php:1413
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1419
+#: ../../include/conversation.php:1420
 msgid "Spam"
 msgstr ""
 
-#: ../../include/conversation.php:1422
+#: ../../include/conversation.php:1423
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1453
+#: ../../include/conversation.php:1454
 msgid "Channel"
 msgstr ""
 
-#: ../../include/conversation.php:1456
+#: ../../include/conversation.php:1457
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1465
+#: ../../include/conversation.php:1466
 msgid "About"
 msgstr ""
 
-#: ../../include/conversation.php:1468
+#: ../../include/conversation.php:1469
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1483 ../../mod/fbrowser.php:114
+#: ../../include/conversation.php:1484 ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr ""
 
-#: ../../include/conversation.php:1486
+#: ../../include/conversation.php:1487
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1496
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../include/conversation.php:1502
+#: ../../include/conversation.php:1503
 msgid "Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1506
 msgid "Manage Webpages"
 msgstr ""
 
@@ -3328,7 +3347,7 @@ msgid ""
 "com"
 msgstr ""
 
-#: ../../mod/cloud.php:88
+#: ../../mod/cloud.php:112
 msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
 msgstr ""
 
@@ -3428,12 +3447,12 @@ msgid "View recent posts and comments"
 msgstr ""
 
 #: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:747
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:746
 msgid "Block"
 msgstr ""
 
@@ -3679,13 +3698,13 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
 msgid "No"
 msgstr ""
 
@@ -3707,7 +3726,7 @@ msgid "Channel not found."
 msgstr ""
 
 #: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100
-#: ../../index.php:227
+#: ../../index.php:226
 msgid "Page not found."
 msgstr ""
 
@@ -4059,7 +4078,7 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr ""
 
@@ -4259,521 +4278,531 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:87 ../../mod/admin.php:419
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:687 ../../mod/admin.php:699
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:785 ../../mod/admin.php:827
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:990 ../../mod/admin.php:1026
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:479
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
 msgid "Server"
 msgstr ""
 
-#: ../../mod/admin.php:92
+#: ../../mod/admin.php:93
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1113
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:112
+#: ../../mod/admin.php:113
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../mod/admin.php:114
+#: ../../mod/admin.php:115
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:188
+#: ../../mod/admin.php:189
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:478
-#: ../../mod/admin.php:686 ../../mod/admin.php:784 ../../mod/admin.php:826
-#: ../../mod/admin.php:989 ../../mod/admin.php:1025 ../../mod/admin.php:1112
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:194
+#: ../../mod/admin.php:195
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:197
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:482
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:200
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:201 ../../mod/admin.php:483
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:350
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:371 ../../mod/settings.php:700
+#: ../../mod/admin.php:379 ../../mod/settings.php:702
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:381
 msgid "No special theme for accessibility"
 msgstr ""
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:409
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:410
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:411
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:416
 msgid "Private"
 msgstr ""
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:417
 msgid "Paid Access"
 msgstr ""
 
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:418
 msgid "Free Access"
 msgstr ""
 
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:419
 msgid "Tiered Access"
 msgstr ""
 
-#: ../../mod/admin.php:421 ../../mod/register.php:189
+#: ../../mod/admin.php:432 ../../mod/register.php:189
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:433
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:434
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:435
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:439
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:440
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr ""
+
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr ""
+
+#: ../../mod/admin.php:442
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
 msgid "Accessibility system theme"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
 msgid "Accessibility theme"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
 msgid "Channel to use for this website's static pages"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
 msgid "Site Channel"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
 msgid "Access policy"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "No login on Homepage"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Check to hide the login form from your sites homepage when visitors arrive "
 "who are not logged in (e.g. when you put the content of the homepage in via "
 "the site channel)."
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:520
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:477 ../../mod/admin.php:700
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:548
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:558
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:561
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:565
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:568
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:583
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:587
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:589
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:590
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:616
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:623
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:654
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:665
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:739
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:740
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:741
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:742
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:743
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:744
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:752
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:703
+#: ../../mod/admin.php:753
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:744
+#: ../../mod/admin.php:794
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:748
+#: ../../mod/admin.php:798
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:758 ../../mod/admin.php:960
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:962
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:786 ../../mod/admin.php:991
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:794 ../../mod/admin.php:1001
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:974
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:983
+#: ../../mod/admin.php:1033
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1031
+#: ../../mod/admin.php:1081
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1082
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1059
+#: ../../mod/admin.php:1109
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1165
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1171
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1173
 msgid "Log level"
 msgstr ""
 
@@ -4798,7 +4827,7 @@ msgid "Unable to add menu element."
 msgstr ""
 
 #: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:177
+#: ../../mod/dirprofile.php:181
 msgid "Not found."
 msgstr ""
 
@@ -4846,7 +4875,7 @@ msgstr ""
 msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:930
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:937
 msgid "(click to open/close)"
 msgstr ""
 
@@ -4958,7 +4987,7 @@ msgstr ""
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:159 ../../mod/photos.php:934
 msgid "Delete Photo"
 msgstr ""
 
@@ -4996,13 +5025,13 @@ msgstr ""
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:603 ../../mod/photos.php:925
-#: ../../mod/filestorage.php:125
+#: ../../mod/photos.php:603 ../../mod/photos.php:929
+#: ../../mod/filestorage.php:124
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1101
-#: ../../mod/photos.php:1116
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1105
+#: ../../mod/photos.php:1120
 msgid "Contact Photos"
 msgstr ""
 
@@ -5018,7 +5047,7 @@ msgstr ""
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:729 ../../mod/photos.php:1148
+#: ../../mod/photos.php:729 ../../mod/photos.php:1152
 msgid "View Photo"
 msgstr ""
 
@@ -5030,50 +5059,62 @@ msgstr ""
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:835
+#: ../../mod/photos.php:837
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:859
+#: ../../mod/photos.php:861
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:917
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:915
+#: ../../mod/photos.php:919
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:916
+#: ../../mod/photos.php:920
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:918
+#: ../../mod/photos.php:922
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:925
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:923
+#: ../../mod/photos.php:927
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:927
+#: ../../mod/photos.php:931
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1154
+#: ../../mod/photos.php:1158
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1163
+#: ../../mod/photos.php:1167
 msgid "Recent Photos"
 msgstr ""
 
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr ""
+
+#: ../../mod/chat.php:130
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../mod/chat.php:131
+msgid "Chatroom Name"
+msgstr ""
+
 #: ../../mod/filer.php:35
 msgid "- select -"
 msgstr ""
@@ -5160,11 +5201,11 @@ msgid "Welcome to %s"
 msgstr ""
 
 #: ../../mod/directory.php:143 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:95
+#: ../../mod/dirprofile.php:98
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:98
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
 msgid "Gender: "
 msgstr ""
 
@@ -5277,7 +5318,7 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:68 ../../index.php:224
+#: ../../mod/help.php:68 ../../index.php:223
 msgid "Not Found"
 msgstr ""
 
@@ -5336,6 +5377,53 @@ msgstr ""
 msgid "This site is not a directory server"
 msgstr ""
 
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/siteinfo.php:94
+msgid "Red"
+msgstr ""
+
+#: ../../mod/siteinfo.php:95
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr ""
+
+#: ../../mod/siteinfo.php:98
+msgid "Running at web location"
+msgstr ""
+
+#: ../../mod/siteinfo.php:99
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr ""
+
+#: ../../mod/siteinfo.php:100
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../mod/siteinfo.php:103
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
+"librelist - dot com"
+msgstr ""
+
+#: ../../mod/siteinfo.php:104
+msgid "Site Administrators"
+msgstr ""
+
 #: ../../mod/lockview.php:34
 msgid "Remote privacy information not available."
 msgstr ""
@@ -5633,43 +5721,43 @@ msgstr ""
 msgid "Permission Denied."
 msgstr ""
 
-#: ../../mod/filestorage.php:86
+#: ../../mod/filestorage.php:85
 msgid "File not found."
 msgstr ""
 
-#: ../../mod/filestorage.php:120
+#: ../../mod/filestorage.php:119
 msgid "Edit file permissions"
 msgstr ""
 
-#: ../../mod/filestorage.php:127
+#: ../../mod/filestorage.php:126
 msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../mod/filestorage.php:128
+#: ../../mod/filestorage.php:127
 msgid "Return to file list"
 msgstr ""
 
-#: ../../mod/filestorage.php:130
+#: ../../mod/filestorage.php:129
 msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../mod/filestorage.php:131
+#: ../../mod/filestorage.php:130
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../mod/filestorage.php:168
+#: ../../mod/filestorage.php:167
 msgid "Download"
 msgstr ""
 
-#: ../../mod/filestorage.php:174
+#: ../../mod/filestorage.php:173
 msgid "Used: "
 msgstr ""
 
-#: ../../mod/filestorage.php:175
+#: ../../mod/filestorage.php:174
 msgid "[directory]"
 msgstr ""
 
-#: ../../mod/filestorage.php:177
+#: ../../mod/filestorage.php:176
 msgid "Limit: "
 msgstr ""
 
@@ -5888,7 +5976,7 @@ msgstr ""
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:533
+#: ../../mod/settings.php:79 ../../mod/settings.php:535
 msgid "Update"
 msgstr ""
 
@@ -5920,333 +6008,341 @@ msgstr ""
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:437
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:506 ../../mod/settings.php:532
-#: ../../mod/settings.php:568
+#: ../../mod/settings.php:508 ../../mod/settings.php:534
+#: ../../mod/settings.php:570
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:509 ../../mod/settings.php:535
+#: ../../mod/settings.php:511 ../../mod/settings.php:537
 msgid "Name"
 msgstr ""
 
-#: ../../mod/settings.php:509
+#: ../../mod/settings.php:511
 msgid "Name of application"
 msgstr ""
 
-#: ../../mod/settings.php:510 ../../mod/settings.php:536
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:510 ../../mod/settings.php:511
+#: ../../mod/settings.php:512 ../../mod/settings.php:513
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/settings.php:511 ../../mod/settings.php:537
+#: ../../mod/settings.php:513 ../../mod/settings.php:539
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:514 ../../mod/settings.php:540
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:512
+#: ../../mod/settings.php:514
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/settings.php:513 ../../mod/settings.php:539
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:513
+#: ../../mod/settings.php:515
 msgid "Optional"
 msgstr ""
 
-#: ../../mod/settings.php:524
+#: ../../mod/settings.php:526
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:567
+#: ../../mod/settings.php:569
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:571
+#: ../../mod/settings.php:573
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:572
+#: ../../mod/settings.php:574
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:573
+#: ../../mod/settings.php:575
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:586
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:594
 msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:617
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:618
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:619
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:620 ../../mod/settings.php:912
+#: ../../mod/settings.php:622 ../../mod/settings.php:917
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:623
 msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:624
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:645
+#: ../../mod/settings.php:647
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:672
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:740
+#: ../../mod/settings.php:742
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:748
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:749
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:752
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:788
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:789
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:790
 msgid "Anybody in your address book"
 msgstr ""
 
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:791
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:792
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/settings.php:791
+#: ../../mod/settings.php:793
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:870
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:875
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288
+#: ../../mod/settings.php:879 ../../mod/profile_photo.php:288
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:879
+#: ../../mod/settings.php:884
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:906
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:915
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:918
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:914
+#: ../../mod/settings.php:919
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:920
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
 msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
 msgid "This channel publishes adult content."
 msgstr ""
 
-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:924
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:926
+msgid "Hide my online presence"
+msgstr ""
+
+#: ../../mod/settings.php:926
+msgid "Prevents showing if you are available for chat"
+msgstr ""
+
+#: ../../mod/settings.php:928
 msgid "Quick Privacy Settings:"
 msgstr ""
 
-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:929
 msgid "Very Public - extremely permissive"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:930
 msgid "Typical - default public, privacy when desired"
 msgstr ""
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:931
 msgid "Private - default private, rarely open or public"
 msgstr ""
 
-#: ../../mod/settings.php:925
+#: ../../mod/settings.php:932
 msgid "Blocked - default blocked to/from everybody"
 msgstr ""
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:936
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:951
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:952
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:953
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:954
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:955
 msgid "making an interesting profile change"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:956
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:957
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:958
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:959
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:960
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:961
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:962
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:963
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:964
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:967
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:968
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -6337,17 +6433,17 @@ msgstr ""
 msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/editlayout.php:110 ../../mod/editpost.php:102
+#: ../../mod/editlayout.php:110 ../../mod/editpost.php:107
 #: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editlayout.php:111 ../../mod/editpost.php:103
+#: ../../mod/editlayout.php:111 ../../mod/editpost.php:108
 #: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editlayout.php:112 ../../mod/editpost.php:104
+#: ../../mod/editlayout.php:112 ../../mod/editpost.php:109
 #: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
@@ -6508,10 +6604,6 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr ""
-
 #: ../../mod/channel.php:85
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
@@ -6573,49 +6665,6 @@ msgstr ""
 msgid "Visible To"
 msgstr ""
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr ""
-
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/siteinfo.php:92
-msgid "Red"
-msgstr ""
-
-#: ../../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:96
-msgid "Running at web location"
-msgstr ""
-
-#: ../../mod/siteinfo.php:97
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr ""
-
-#: ../../mod/siteinfo.php:98
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/siteinfo.php:101
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
-"librelist - dot com"
-msgstr ""
-
 #: ../../mod/suggest.php:35
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
@@ -6799,39 +6848,39 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../mod/ping.php:160
+#: ../../mod/ping.php:186
 msgid "sent you a private message"
 msgstr ""
 
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:244
 msgid "added your channel"
 msgstr ""
 
-#: ../../mod/ping.php:262
+#: ../../mod/ping.php:288
 msgid "posted an event"
 msgstr ""
 
-#: ../../mod/dirprofile.php:111
+#: ../../mod/dirprofile.php:114
 msgid "Status: "
 msgstr ""
 
-#: ../../mod/dirprofile.php:112
+#: ../../mod/dirprofile.php:115
 msgid "Sexual Preference: "
 msgstr ""
 
-#: ../../mod/dirprofile.php:114
+#: ../../mod/dirprofile.php:117
 msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/dirprofile.php:115
+#: ../../mod/dirprofile.php:118
 msgid "Hometown: "
 msgstr ""
 
-#: ../../mod/dirprofile.php:117
+#: ../../mod/dirprofile.php:120
 msgid "About: "
 msgstr ""
 
-#: ../../mod/dirprofile.php:164
+#: ../../mod/dirprofile.php:168
 msgid "Keywords: "
 msgstr ""
 
diff --git a/version.inc b/version.inc
index e8ad6394a..44da03a50 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-30.573
+2014-01-31.574
-- 
cgit v1.2.3


From 33f3cd3d4a5935422f5ef910390263c6928e5c57 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 31 Jan 2014 20:48:26 -0800
Subject: chat formatting/style improvements

---
 view/tpl/chat.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 19b3425da..420430550 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -65,7 +65,7 @@ function update_inroom(inroom) {
 	var count = inroom.length;
 	$.each( inroom, function(index, item) {
 		var newNode = document.createElement('div');
-		$(newNode).html('' + item.name + '');
+		$(newNode).html('' + item.name + '
          ' + item.name + '
          ');
 		html.appendChild(newNode); 		
 	});
 	$('#chatUsers').html(html);	
@@ -77,8 +77,10 @@ function update_chats(chats) {
 	$.each( chats, function(index, item) {
 		last_chat = item.id;
 		var newNode = document.createElement('div');
-		$(newNode).html('
          ' + item.name + '
          ' + item.text + '
          ');
+		$(newNode).html('
          ' + item.name + '
          ' + item.name + ' ' + item.localtime + '
          ' + item.text + '
          ');
 		$('#chatLineHolder').append(newNode);
+		$(".autotime").timeago();
+
 		});
 	var elem = document.getElementById('chatTopBar');
 	elem.scrollTop = elem.scrollHeight;
-- 
cgit v1.2.3


From d14afc0ee442a2ba4013c193fa80917026bb6111 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 1 Feb 2014 00:54:20 -0800
Subject: provide the room name for the room you're in.

---
 mod/chat.php      | 9 ++++++++-
 version.inc       | 2 +-
 view/tpl/chat.tpl | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mod/chat.php b/mod/chat.php
index 54fa58092..612878cb2 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -101,8 +101,15 @@ function chat_content(&$a) {
 		$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
 		if(! $x)
 			return;
+		$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+			intval($room_id),
+			intval($a->profile['profile_uid'])
+		);
+		if($x) {
+			$room_name = $x[0]['cr_name'];
+		}
 		$o = replace_macros(get_markup_template('chat.tpl'),array(
-			'$room_name' => '', // should we get this from the API?
+			'$room_name' => $room_name,
 			'$room_id' => $room_id,
 			'$submit' => t('Submit')
 		));
diff --git a/version.inc b/version.inc
index 44da03a50..a3517ab74 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-31.574
+2014-02-01.575
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 420430550..eda1f83af 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,3 +1,4 @@
+
          {{$room_name}}
          
 
          
 
     
          
-- 
cgit v1.2.3


From 94e59d47705f30cab039c01e2ba2bc079496938e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 1 Feb 2014 01:00:26 -0800
Subject: status indication

---
 mod/chatsvc.php   | 12 +++++++++++-
 view/tpl/chat.tpl |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index f32ea56ce..0a69834f0 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -85,7 +85,17 @@ function chatsvc_content(&$a) {
 	);
 	if($r) {
 		foreach($r as $rr) {
-			$inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name']);		
+			switch($rr['cp_status']) {
+				case 'away':
+					$status = t('Away');
+					break;
+				case 'online':
+				default:
+					$status = t('Online');
+					break;
+			}
+
+			$inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name'], status => $status);		
 		}
 	}
 
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index eda1f83af..0ebe879a1 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -66,7 +66,7 @@ function update_inroom(inroom) {
 	var count = inroom.length;
 	$.each( inroom, function(index, item) {
 		var newNode = document.createElement('div');
-		$(newNode).html('' + item.name + '
          ' + item.name + '
          ');
+		$(newNode).html('' + item.name + ' ' + item.status + '
          ' + item.name + '
          ');
 		html.appendChild(newNode); 		
 	});
 	$('#chatUsers').html(html);	
-- 
cgit v1.2.3


From 94d874c0b2b5e719af3aa676d015307bab514b6a Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Sat, 1 Feb 2014 11:55:36 +0000
Subject: Doc - Make TOS include work.

---
 doc/TermsOfService.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TermsOfService.md b/doc/TermsOfService.md
index 3586b5d82..41e9c0de7 100644
--- a/doc/TermsOfService.md
+++ b/doc/TermsOfService.md
@@ -1,4 +1,4 @@
 Terms of Service
 ================
 
-#include SiteTOS;
+#include doc/SiteTOS.md;
-- 
cgit v1.2.3


From 30aeb42bed0b4bb6bf90c16674565ee5d7a26945 Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Sat, 1 Feb 2014 23:28:27 +0100
Subject: Press return to post chat posts- SHIFT-RETURN creates line break

on mobile devices keep default behavior
---
 view/tpl/chat.tpl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 0ebe879a1..a0c18f8d6 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -89,3 +89,20 @@ function update_chats(chats) {
 }
 
 
+
-- 
cgit v1.2.3


From a2761213e025d55f96803847712db10ac5f8e78c Mon Sep 17 00:00:00 2001
From: Tazman DeVille 
Date: Sun, 2 Feb 2014 04:26:56 +0100
Subject: link colour options

---
 view/theme/redbasic/css/style.css          | 6 +++---
 view/theme/redbasic/php/config.php         | 3 +++
 view/theme/redbasic/php/style.php          | 3 +++
 view/theme/redbasic/tpl/theme_settings.tpl | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 02832b5f0..c4eddc179 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -40,11 +40,11 @@ abbr {
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
 	font-weight: bold;
-	color: #0080FF; 
+	color: #7b0000; 
 	text-decoration: none; 
 }
 
-a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
+a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; }
 
 .fakelink {
 	cursor: pointer;
@@ -2449,4 +2449,4 @@ img.mail-list-sender-photo {
 .online-now {
 	color: red;
 	cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 20355197f..d6adf5381 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -7,6 +7,7 @@ function theme_content(&$a) {
 
 	$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
 	$arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' );
+	$arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' );
 	$arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' );
 	$arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
 	$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
@@ -33,6 +34,7 @@ function theme_post(&$a) {
 	if (isset($_POST['redbasic-settings-submit'])) {
 		set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
 		set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']);
+		set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
 		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
 		set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']);
 		set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
@@ -88,6 +90,7 @@ if(feature_enabled(local_user(),'expert'))
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
 		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours),
+		'$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours),
 		'$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']),
 		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']),
 		'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9956ccd31..85420fbaf 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -63,6 +63,8 @@
 			$nav_bg_3 = "#f00";
 			$nav_bg_4 = "#b00";
 		}
+	if (! $link_colour)
+		$link_colour = "#7b0000";
 	if (! $banner_colour)
 		$banner_colour = "fff";
 	if (! $bgcolour)
@@ -141,6 +143,7 @@ $options = array (
 '$nav_bg_2' => $nav_bg_2,
 '$nav_bg_3' => $nav_bg_3,
 '$nav_bg_4' => $nav_bg_4,
+'$link_colour' => $link_colour,
 '$banner_colour' => $banner_colour,
 '$search_background' => $search_background,
 '$bgcolour' => $bgcolour,
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index e0f546896..ca05986a2 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -6,6 +6,7 @@
 {{if $expert}}
 {{include file="field_select.tpl" field=$nav_colour}}
 {{include file="field_input.tpl" field=$banner_colour}}
+{{include file="field_input.tpl" field=$link_colour}}
 {{include file="field_input.tpl" field=$bgcolour}}
 {{include file="field_input.tpl" field=$background_image}}
 {{include file="field_input.tpl" field=$item_colour}}
-- 
cgit v1.2.3


From bd8378339117f307c73e176e80a3417c8fb2a3f4 Mon Sep 17 00:00:00 2001
From: Tazman DeVille 
Date: Sun, 2 Feb 2014 04:32:43 +0100
Subject: link colours

---
 view/theme/redbasic/php/style.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 85420fbaf..35fe54fe4 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -10,6 +10,7 @@
 // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme
 // wants to implement that
 	    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");	
+	    $link_colour = get_pconfig($uid, "redbasic", "link_colour");	
 
 // Load the owners pconfig
 		$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
-- 
cgit v1.2.3


From 2c75210fdbb316d13ad27950b14302266fff9a8e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 1 Feb 2014 20:07:47 -0800
Subject: config: don't try to unserialise an array

---
 include/config.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/config.php b/include/config.php
index bccf0737f..8d98d56fa 100644
--- a/include/config.php
+++ b/include/config.php
@@ -65,7 +65,7 @@ function get_config($family, $key) {
 		if(! array_key_exists($key,$a->config[$family])) {
 			return false;		
 		}
-		return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) 
+		return ((! is_array($a->config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) 
 			? unserialize($a->config[$family][$key])
 			: $a->config[$family][$key]
 		);
@@ -174,8 +174,8 @@ function get_pconfig($uid,$family, $key, $instore = false) {
 
 	if((! array_key_exists($family,$a->config[$uid])) || (! array_key_exists($key,$a->config[$uid][$family])))
 		return false;
-
-	return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) 
+		
+	return ((! is_array($a->config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) 
 		? unserialize($a->config[$uid][$family][$key])
 		: $a->config[$uid][$family][$key]
 	);
@@ -304,7 +304,7 @@ function get_xconfig($xchan,$family, $key) {
 	if((! array_key_exists($family,$a->config[$xchan])) || (! array_key_exists($key,$a->config[$xchan][$family])))
 		return false;
 
-	return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) 
+	return ((! is_array($a->config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) 
 		? unserialize($a->config[$xchan][$family][$key])
 		: $a->config[$xchan][$family][$key]
 	);
-- 
cgit v1.2.3


From de412abe88a697f08755f09694fd16f9230482cb Mon Sep 17 00:00:00 2001
From: Tazman DeVille 
Date: Sun, 2 Feb 2014 05:19:29 +0100
Subject: user configured link colour

---
 view/theme/redbasic/css/style.css | 2 +-
 view/theme/redbasic/php/style.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c4eddc179..1a36c1c43 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -40,7 +40,7 @@ abbr {
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
 	font-weight: bold;
-	color: #7b0000; 
+	color: $link_colour; 
 	text-decoration: none; 
 }
 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 35fe54fe4..fcb762891 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -10,10 +10,10 @@
 // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme
 // wants to implement that
 	    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");	
-	    $link_colour = get_pconfig($uid, "redbasic", "link_colour");	
 
 // Load the owners pconfig
 		$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
+	    $link_colour = get_pconfig($uid, "redbasic", "link_colour");	
 		$schema = get_pconfig($uid,'redbasic','schema');
 	    $bgcolour = get_pconfig($uid, "redbasic", "background_colour");	
 	    $background_image = get_pconfig($uid, "redbasic", "background_image");	
-- 
cgit v1.2.3


From 61cc4de2255b344e9f607ae9fa545f45d7423b56 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 1 Feb 2014 21:03:21 -0800
Subject: provide donation options on siteinfo page

---
 mod/siteinfo.php      | 18 +++++++++++++++++-
 view/tpl/siteinfo.tpl |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 37cba02ec..14ef17516 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -90,6 +90,21 @@ function siteinfo_content(&$a) {
 
 		$admininfo = bbcode(get_config('system','admininfo'));
 
+	$donate = <<< EOT
+
          The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
          
+
          
+
          or
          
+
+

          
+
+
+
          Recurring Donation Options
          
+
          
+
          
+EOT;
+
+
+
 	$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
                 '$title' => t('Red'),
 		'$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'),
@@ -100,7 +115,8 @@ function siteinfo_content(&$a) {
 		'$bug_text' => t('Bug reports and issues: please visit'),
 		'$bug_link_url' => 'https://github.com/friendica/red/issues',
 		'$bug_link_text' => 'redmatrix issues',
-		'$contact' => t('Suggestions, praise, donations, etc. - please email "redmatrix" at librelist - dot com'),
+		'$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
+		'$donate' => $donate,
 		'$adminlabel' => t('Site Administrators'),
 		'$admininfo' => $admininfo,
 		'$plugins_text' => $plugins_text,
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index 4baa1969b..d956a7228 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -14,3 +14,4 @@
 {{if $plugins_list}}
    
          {{$plugins_list}}
          
 {{/if}}
+
          {{$donate}}
          
-- 
cgit v1.2.3


From 17436f060f54e1c218296bce0bdc7b05abe4ee33 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 1 Feb 2014 21:12:26 -0800
Subject: fix default link color

---
 view/theme/redbasic/css/style.css | 2 +-
 view/theme/redbasic/php/style.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1a36c1c43..fe6d24f18 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -44,7 +44,7 @@ a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
 	text-decoration: none; 
 }
 
-a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; }
+a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 
 .fakelink {
 	cursor: pointer;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index fcb762891..981aaddb2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -65,7 +65,7 @@
 			$nav_bg_4 = "#b00";
 		}
 	if (! $link_colour)
-		$link_colour = "#7b0000";
+		$link_colour = "#0080FF";
 	if (! $banner_colour)
 		$banner_colour = "fff";
 	if (! $bgcolour)
-- 
cgit v1.2.3


From 6b15e57cdbb1b525528f1e67aaa071d0ef4e6e25 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 02:43:36 -0800
Subject: add epub mimetype (application/epub+zip)

---
 include/attach.php | 1 +
 version.inc        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/attach.php b/include/attach.php
index dbc489a2d..af1159957 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -26,6 +26,7 @@ function z_mime_content_type($filename) {
 		'xml' => 'application/xml',
 		'swf' => 'application/x-shockwave-flash',
 		'flv' => 'video/x-flv',
+		'epub' => 'application/epub+zip',
 
 		// images
 		'png' => 'image/png',
diff --git a/version.inc b/version.inc
index a3517ab74..4b99b62b1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-01.575
+2014-02-02.576
-- 
cgit v1.2.3


From e83419b53e27078867f8449f476d87b064b9d502 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 03:43:52 -0800
Subject: add links to change chat status and leave room

---
 include/chat.php  |  8 +++++---
 mod/chat.php      | 10 ++++++++--
 mod/chatsvc.php   | 32 +++++++++++++++++++++-----------
 view/tpl/chat.tpl |  2 ++
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/include/chat.php b/include/chat.php
index 08fd154b5..5af3a3a9a 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -122,10 +122,10 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 		intval($room_id)
 	);
 	if($r) {
-		q("update chatpresence set cp_status = %d and cp_last = '%s' where cp_id = %d limit 1",
-			dbesc($status),
+		q("update chatpresence set cp_last = '%s' where cp_id = %d and cp_client = '%s' limit 1",
 			dbesc(datetime_convert()),
-			intval($r[0]['cp_id'])
+			intval($r[0]['cp_id']),
+			dbesc($client)
 		);
 		return true;
 	}
@@ -145,6 +145,7 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 function chatroom_leave($observer_xchan,$room_id,$client) {
 	if(! $room_id || ! $observer_xchan)
 		return;
+
 	$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d and cp_client = '%s' limit 1",
 		dbesc($observer_xchan),
 		intval($room_id),
@@ -155,6 +156,7 @@ function chatroom_leave($observer_xchan,$room_id,$client) {
 			intval($r[0]['cp_id'])
 		);
 	}
+
 	return true;
 }
 
diff --git a/mod/chat.php b/mod/chat.php
index 612878cb2..e79973aef 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -91,7 +91,7 @@ function chat_content(&$a) {
 	}
 	
 	if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
-		chatroom_leave($observer,$room_id,$_SERVER['REMOTE_ADDR']);
+		chatroom_leave($observer,argv(2),$_SERVER['REMOTE_ADDR']);
 		goaway(z_root() . '/channel/' . argv(1));
 	}
 
@@ -111,7 +111,13 @@ function chat_content(&$a) {
 		$o = replace_macros(get_markup_template('chat.tpl'),array(
 			'$room_name' => $room_name,
 			'$room_id' => $room_id,
-			'$submit' => t('Submit')
+			'$baseurl' => z_root(),
+			'$nickname' => argv(1),
+			'$submit' => t('Submit'),
+			'$leave' => t('Leave Room'),
+			'$away' => t('I am away right now'),
+			'$online' => t('I am online')
+
 		));
 		return $o;
 	}
diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index 0a69834f0..bbe616c48 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -29,17 +29,6 @@ function chatsvc_post(&$a) {
 
 	$room_id = $a->data['chat']['room_id'];
 	$text = escape_tags($_REQUEST['chat_text']);
-	$status = strip_tags($_REQUEST['status']);
-
-	if($status && $room_id) {
-		$r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
-			dbesc($status),
-			dbesc(datetime_convert()),
-			intval($room_id),
-			dbesc(get_observer_hash()),
-			dbesc($_SERVER['REMOTE_ADDR'])
-		);
-	}
 	if(! $text)
 		return;
 
@@ -65,6 +54,27 @@ function chatsvc_post(&$a) {
 
 function chatsvc_content(&$a) {
 
+	$status = strip_tags($_REQUEST['status']);
+	$room_id = intval($a->data['chat']['room_id']);
+
+	if($status && $room_id) {
+
+		$x = q("select channel_address from channel where channel_id = %d limit 1",
+			intval($a->data['chat']['uid'])
+		);			
+
+		$r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
+			dbesc($status),
+			dbesc(datetime_convert()),
+			intval($room_id),
+			dbesc(get_observer_hash()),
+			dbesc($_SERVER['REMOTE_ADDR'])
+		);
+
+		goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id);		
+	}
+
+
 	$lastseen = intval($_REQUEST['last']);
 
 	$ret = array('success' => false);
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index a0c18f8d6..dba6a777f 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -17,6 +17,8 @@
             
         
 
+		{{$leave}} | {{$away}} | {{$online}}
+
     
          
 
 
          
-- 
cgit v1.2.3


From a2fa1a162d9526987539479b22a328e5298954e8 Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Sun, 2 Feb 2014 13:59:20 +0100
Subject: Other not so elegant way of detecting touch screen devices

But at least it seems to work
---
 view/tpl/chat.tpl | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index a0c18f8d6..5c96e79fe 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -91,8 +91,19 @@ function update_chats(chats) {
 
 ';
-	/* emulate JS cookie if cookies are not accepted */
-	if ($_GET['JS'] == 1) {
-		$_COOKIE['jsAvailable'] = 1;
+
+
+if(! $install) {
+	/* set JS cookie */
+	if($_COOKIE['jsAvailable'] != 1) {
+		$a->page['content'] .= '';
+		/* emulate JS cookie if cookies are not accepted */
+		if ($_GET['JS'] == 1) {
+			$_COOKIE['jsAvailable'] = 1;
+		}
 	}
+	call_hooks('page_content_top',$a->page['content']);
 }
 
 
-if(! $install)
-	call_hooks('page_content_top',$a->page['content']);
+
 
 /**
  * Call module functions
diff --git a/mod/setup.php b/mod/setup.php
index ca5566578..14572699e 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -373,7 +373,10 @@ function check_php(&$phpath, &$checks) {
 	if (strlen($phpath)){
 		$passed = file_exists($phpath);
 	} else {
-		$phpath = trim(shell_exec('which php'));
+		if(is_windows())
+			$phpath = trim(shell_exec('where php'));
+		else
+			$phpath = trim(shell_exec('which php'));
 		$passed = strlen($phpath);
 	}
 	$help = "";
-- 
cgit v1.2.3


From 02e4527de682042562dccac83899ef562c4b1e05 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 14:09:09 -0800
Subject: better check for setup module

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index a9264fee7..0012798a6 100755
--- a/index.php
+++ b/index.php
@@ -244,7 +244,7 @@ if(! x($a->page,'content'))
 
 
 
-if(! $install) {
+if(! ($a->module === 'setup')) {
 	/* set JS cookie */
 	if($_COOKIE['jsAvailable'] != 1) {
 		$a->page['content'] .= '';
-- 
cgit v1.2.3


From 67899677db8bde044284aaec6237559a68a27b6a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 15:50:07 -0800
Subject: make chat honour the pause key (but we still need to ping the server
 to maintain the in_room status), also the recent change to pull css out of
 the template file used classes instead of ids so none of the styles were
 sticking

---
 mod/chatsvc.php       | 94 +++++++++++++++++++++++++++------------------------
 view/css/mod_chat.css |  8 ++---
 view/tpl/chat.tpl     |  4 +--
 3 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index bbe616c48..e6590f57a 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -56,6 +56,7 @@ function chatsvc_content(&$a) {
 
 	$status = strip_tags($_REQUEST['status']);
 	$room_id = intval($a->data['chat']['room_id']);
+	$stopped = ((x($_REQUEST,'stopped') && intval($_REQUEST['stopped'])) ? true : false);
 
 	if($status && $room_id) {
 
@@ -74,58 +75,60 @@ function chatsvc_content(&$a) {
 		goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id);		
 	}
 
+	if(! $stopped) {
 
-	$lastseen = intval($_REQUEST['last']);
+		$lastseen = intval($_REQUEST['last']);
 
-	$ret = array('success' => false);
+		$ret = array('success' => false);
 
-	$sql_extra = permissions_sql($a->data['chat']['uid']);
+		$sql_extra = permissions_sql($a->data['chat']['uid']);
 
-	$r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
-		intval($a->data['chat']['uid']),
-		intval($a->data['chat']['room_id'])
-	);
-	if(! $r)
-		json_return_and_die($ret);
+		$r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+			intval($a->data['chat']['uid']),
+			intval($a->data['chat']['room_id'])
+		);
+		if(! $r)
+			json_return_and_die($ret);
 
-	$inroom = array();
+		$inroom = array();
 
-	$r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
-		intval($a->data['chat']['room_id'])
-	);
-	if($r) {
-		foreach($r as $rr) {
-			switch($rr['cp_status']) {
-				case 'away':
-					$status = t('Away');
-					break;
-				case 'online':
-				default:
-					$status = t('Online');
-					break;
+		$r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
+			intval($a->data['chat']['room_id'])
+		);
+		if($r) {
+			foreach($r as $rr) {
+				switch($rr['cp_status']) {
+					case 'away':
+						$status = t('Away');
+						break;
+					case 'online':
+					default:
+						$status = t('Online');
+						break;
+				}
+	
+				$inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name'], status => $status);	
 			}
-
-			$inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name'], status => $status);		
 		}
-	}
 
-	$chats = array();
+		$chats = array();
 
-	$r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d",
-		intval($a->data['chat']['room_id']),
-		intval($lastseen)
-	);
-	if($r) {
-		foreach($r as $rr) {
-			$chats[] = array(
-				'id' => $rr['chat_id'],
-				'img' => zid($rr['xchan_photo_m']), 
-				'img_type' => $rr['xchan_photo_mimetype'],
-				'name' => $rr['xchan_name'],
-				'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
-				'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
-				'text' => smilies(bbcode($rr['chat_text']))
-			);
+		$r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d",
+			intval($a->data['chat']['room_id']),
+			intval($lastseen)
+		);
+		if($r) {
+			foreach($r as $rr) {
+				$chats[] = array(
+					'id' => $rr['chat_id'],
+					'img' => zid($rr['xchan_photo_m']), 
+					'img_type' => $rr['xchan_photo_mimetype'],
+					'name' => $rr['xchan_name'],
+					'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
+					'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
+					'text' => smilies(bbcode($rr['chat_text']))
+				);
+			}
 		}
 	}
 
@@ -137,9 +140,10 @@ function chatsvc_content(&$a) {
 	);
 
 	$ret['success'] = true;
-	$ret['inroom'] = $inroom;
-	$ret['chats'] = $chats;
-
+	if(! $stopped) {
+		$ret['inroom'] = $inroom;
+		$ret['chats'] = $chats;
+	}
 	json_return_and_die($ret);
 
 }
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 7f33f2c48..ce6e59af1 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -1,23 +1,23 @@
- .chatContainer {
+ #chatContainer {
 	 height: 100%;
 	 width: 100%;
  }
  
- .chatTopBar {
+ #chatTopBar {
 	 float: left;
 	 height: 400px;
 	 width: 650px;
 	 overflow-y: auto;
  }
  
- .chatUsers {
+ #chatUsers {
 	 float: right;
 	 width: 120px;
 	 height: 100%;
 	 border: 1px solid #000;
  }
  
- .chatBottomBar {
+ #chatBottomBar {
 	 position: relative;
 	 bottom: 0;
 	 height: 150px;
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index eb98063fa..e4cd1d20b 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -47,8 +47,8 @@ $('#chat-form').submit(function(ev) {
 
 function load_chats() {
 
-	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat,function(data) {
-		if(data.success) {
+	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
+		if(data.success && (! stopped)) {
 			update_inroom(data.inroom);
 			update_chats(data.chats);
 		}
-- 
cgit v1.2.3


From abb68e846d828995f6ba016246143ba3d6f04181 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 16:02:04 -0800
Subject: remove the text "requires compatible chat plugin"

---
 include/permissions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/permissions.php b/include/permissions.php
index 45ea7c3eb..1b11dfb87 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -24,7 +24,7 @@ function get_perms() {
 		'post_mail'     => array('channel_w_mail',    intval(PERMS_W_MAIL),    false, t('Can send me private mail messages'), ''),
 		'post_photos'   => array('channel_w_photos',  intval(PERMS_W_PHOTOS),  false, t('Can post photos to my photo albums'), ''),
 		'tag_deliver'   => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post @mentions'), t('Advanced - useful for creating group forum channels')),
-		'chat'          => array('channel_w_chat',    intval(PERMS_W_CHAT),    false, t('Can chat with me (when available)'), t('Requires compatible chat plugin')),
+		'chat'          => array('channel_w_chat',    intval(PERMS_W_CHAT),    false, t('Can chat with me (when available)'), t('')),
 		'write_storage' => array('channel_w_storage',   intval(PERMS_W_STORAGE),   false, t('Can write to my "public" file storage'), ''),
 		'write_pages' => array('channel_w_pages',   intval(PERMS_W_PAGES),   false, t('Can edit my "public" pages'), ''),
 
-- 
cgit v1.2.3


From 2768262f9386e063efb4d7e276c5a7108c40d44b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 16:49:09 -0800
Subject: Add switch to allow menus to be used as bookmark collections

---
 include/menu.php      | 2 +-
 mod/menu.php          | 4 ++++
 view/tpl/menuedit.tpl | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/menu.php b/include/menu.php
index d69c5d0d3..be9831951 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -152,7 +152,7 @@ function menu_edit($arr) {
 		return false;
 	}
 
-	return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d,
+	return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d
 		where menu_id = %d and menu_channel_id = %d limit 1", 
  		dbesc($menu_name),
 		dbesc($menu_desc),
diff --git a/mod/menu.php b/mod/menu.php
index 47eed6484..3d6b9939c 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -8,6 +8,8 @@ function menu_post(&$a) {
 		return;
 
 	$_REQUEST['menu_channel_id'] = local_user();
+	if($_REQUEST['menu_bookmark'])
+		$_REQUEST['menu_flags'] = MENU_BOOKMARK;
 
 	$menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
 	if($menu_id) {
@@ -76,6 +78,7 @@ function menu_content(&$a) {
 				'$header' => t('New Menu'),
 				'$menu_name' => array('menu_name', t('Menu name'), '', t('Must be unique, only seen by you'), '*'),
 				'$menu_desc' => array('menu_desc', t('Menu title'), '', t('Menu title as seen by others'), ''),
+				'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), 0 , t('Menu can be used to store saved bookmarks'), ''),
 				'$submit' => t('Create')
 			));
 			return $o;
@@ -104,6 +107,7 @@ function menu_content(&$a) {
 					'$editcontents' => t('Edit menu contents'),
 					'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
 					'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
+					'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu can be used to store saved bookmarks'), ''),
 					'$submit' => t('Modify')
 				));
 				return $o;
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index ea9e775e2..324dbe426 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -13,7 +13,7 @@
 
 {{include file="field_input.tpl" field=$menu_name}} 
 {{include file="field_input.tpl" field=$menu_desc}}
-
+{{include file="field_checkbox.tpl" field=$menu_bookmark}}
 
          
 
 
          
-- 
cgit v1.2.3


From 3eed73d5195bbf736e2e243b512155b6933108a1 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 16:51:11 -0800
Subject: minor text change "can" -> "may"

---
 mod/menu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/menu.php b/mod/menu.php
index 3d6b9939c..dd8fe8300 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -78,7 +78,7 @@ function menu_content(&$a) {
 				'$header' => t('New Menu'),
 				'$menu_name' => array('menu_name', t('Menu name'), '', t('Must be unique, only seen by you'), '*'),
 				'$menu_desc' => array('menu_desc', t('Menu title'), '', t('Menu title as seen by others'), ''),
-				'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), 0 , t('Menu can be used to store saved bookmarks'), ''),
+				'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), 0 , t('Menu may be used to store saved bookmarks'), ''),
 				'$submit' => t('Create')
 			));
 			return $o;
@@ -107,7 +107,7 @@ function menu_content(&$a) {
 					'$editcontents' => t('Edit menu contents'),
 					'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
 					'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
-					'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu can be used to store saved bookmarks'), ''),
+					'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), ''),
 					'$submit' => t('Modify')
 				));
 				return $o;
-- 
cgit v1.2.3


From d2b55f5eeab330b08410424d96211f40050d7a1f Mon Sep 17 00:00:00 2001
From: Tazman DeVille 
Date: Mon, 3 Feb 2014 02:06:07 +0100
Subject: added Thomas' additional navbar colours from APW to redbasic

---
 view/theme/redbasic/php/config.php | 14 +++++++++++---
 view/theme/redbasic/php/style.php  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index d6adf5381..68a72fffd 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -74,9 +74,17 @@ function redbasic_form(&$a, $arr) {
 		
 		$nav_colours = array (
 		  '' => t('Scheme Default'),
-		  'red' => t('red'),
-		  'black' => t('black'),	
-		  'silver' => t('silver'),	
+		'red' => 'red',	
+		'pink' => 'pink',
+		'green' => 'green',
+		'blue' => 'blue',
+		'purple' => 'purple',
+		'black' => 'black',
+		'orange' => 'orange',
+		'brown' => 'brown',
+		'grey' => 'grey',
+		'gold' => 'gold',
+		'silver' => t('silver'),	
 		);
 
 if(feature_enabled(local_user(),'expert')) 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 981aaddb2..aec27961e 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -133,6 +133,38 @@
 					$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
 					$search_background = '#EEEEEE';
 		}
+		if($nav_colour === "pink") {
+		      $nav_bg_1 = $nav_bg_3 = "#FFC1CA";
+		      $nav_bg_2 = $nav_bg_4 = "#FFC1CA";
+	}
+		if($nav_colour === "green") {
+		      $nav_bg_1 = $nav_bg_3 = "#5CD65C";
+		      $nav_bg_2 = $nav_bg_4 = "#5CD65C";
+	}
+		if($nav_colour === "blue") {
+		      $nav_bg_1 = $nav_bg_3 = "#1872a2";
+		      $nav_bg_2 = $nav_bg_4 = "#1872a2";
+	}
+		if($nav_colour === "purple") {
+		      $nav_bg_1 = $nav_bg_3 = "#551A8B";
+		      $nav_bg_2 = $nav_bg_4 = "#551A8B";
+	}
+		if($nav_colour === "orange") {
+		      $nav_bg_1 = $nav_bg_3 = "#FF3D0D";
+		      $nav_bg_2 = $nav_bg_4 = "#FF3D0D";
+	}	
+		if($nav_colour === "brown") {
+		      $nav_bg_1 = $nav_bg_3 = "#330000";
+		      $nav_bg_2 = $nav_bg_4 = "#330000";
+	}
+		if($nav_colour === "grey") {
+		      $nav_bg_1 = $nav_bg_3 = "#2e2f2e";
+		      $nav_bg_2 = $nav_bg_4 = "#2e2f2e";
+	}
+		if($nav_colour === "gold") {
+		      $nav_bg_1 = $nav_bg_3 = "#FFAA00";
+		      $nav_bg_2 = $nav_bg_4 = "#FFAA00";
+	}
 
 		
 // Apply the settings
-- 
cgit v1.2.3


From ee1580427e9a1bc4e2b86906f7b42d3071ed516d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 17:54:36 -0800
Subject: don't draw attention to advanced permissions and their corresponding
 complexity and clearly mark the simple permissions which people are
 encouraged to use.

---
 mod/connedit.php          |  8 ++++----
 mod/settings.php          | 10 ++++++----
 view/css/mod_connedit.css | 14 ++++++++++++++
 view/css/mod_settings.css | 14 ++++++++++++++
 view/tpl/abook_edit.tpl   | 37 ++++++++++++++++++++++---------------
 view/tpl/settings.tpl     |  3 ++-
 6 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/mod/connedit.php b/mod/connedit.php
index e2d4b861c..b7101fcab 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -442,13 +442,13 @@ function connedit_content(&$a) {
 			'$perms'          => $perms,
 			'$forum'          => t('Forum Members'),
 			'$soapbox'        => t('Soapbox'),
-			'$full'           => t('Full Sharing'),
-			'$cautious'       => t('Cautious Sharing'),
+			'$full'           => t('Full Sharing (typical social network permissions)'),
+			'$cautious'       => t('Cautious Sharing '),
 			'$follow'         => t('Follow Only'),
 			'$permlbl'        => t('Individual Permissions'),
-			'$permnote'       => t('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.'),
+			'$permnote'       => t('Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'),
 			'$advanced'       => t('Advanced Permissions'),
-			'$quick'          => t('Quick Links'),
+			'$quick'          => t('Simple Permissions (select one and submit)'),
 			'$common_link'    => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
 			'$all_friends'    => $all_friends,
 			'$relation_text'  => $relation_text,
diff --git a/mod/settings.php b/mod/settings.php
index 7ff76cd3e..c0e8122cb 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -923,15 +923,17 @@ function settings_content(&$a) {
 
 			'$h_prv' 	=> t('Security and Privacy Settings'),
 
-			'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents showing if you are available for chat')),
+			'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')),
 
-			'$lbl_pmacro' => t('Quick Privacy Settings:'),
-			'$pmacro3'    => t('Very Public - extremely permissive'),
-			'$pmacro2'    => t('Typical - default public, privacy when desired'),
+			'$lbl_pmacro' => t('Simple Privacy Settings:'),
+			'$pmacro3'    => t('Very Public - extremely permissive (use with caution)'),
+			'$pmacro2'    => t('Typical - default public, privacy when desired (similar to social network permissions)'),
 			'$pmacro1'    => t('Private - default private, rarely open or public'),
 			'$pmacro0'    => t('Blocked - default blocked to/from everybody'),
 			'$permiss_arr' => $permiss,
 
+			'$lbl_p2macro' => t('Advanced Privacy Settings'),
+
 			'$maxreq' 	=> array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
 			'$permissions' => t('Default Post Permissions'),
 			'$permdesc' => t("\x28click to open/close\x29"),
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index c460fec28..f6da96433 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -135,3 +135,17 @@
 .contact-entry-end {
 	clear: both;
 }
+
+#abook-advanced-panel, #abook-advanced {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+#abook-advanced-panel:hover, #abook-advanced:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+#abook-advanced {
+	margin-top: 15px;
+}
\ No newline at end of file
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 601cb2e0e..2049d9bc6 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,3 +1,17 @@
+#settings-permissions-wrapper, #settings-perm-advanced {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+#settings-permissions-wrapper:hover, #settings-perm-advanced:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+#settings-perm-advanced {
+	margin-top: 15px;
+}
+
 #settings-permissions-wrapper .field {
 	margin-bottom: 10px;
 }
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 590213fd3..265a1a953 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -31,6 +31,22 @@
 
 
 
+
+{{if $is_pending}}
+
          
+{{include file="field_checkbox.tpl" field=$unapproved}}
+
          
+{{/if}}
+
+{{if $multiprofs }}
+
          
+
          {{$lbl_vis1}}
          
+
          {{$lbl_vis2}}
          
+
+{{$profile_select}}
+
          
+{{/if}}
+
 
          {{$permlbl}}
          
 
          {{$permnote}}
          
 
@@ -38,20 +54,16 @@
 
 
 
-{{if $noperms}}
+{{* {{if $noperms}}
 
          {{$noperms}}
          
 
          {{$noperm_desc}}
          
 {{/if}}
+*}}
 
 
-{{if $is_pending}}
-
          
-{{include file="field_checkbox.tpl" field=$unapproved}}
-
          
-{{/if}}
 
 
          
-{{$quick}}
+
          {{$quick}}
          
 
            
 {{if $self}}
 
          • {{$forum}}
            • 
@@ -62,6 +74,9 @@
 
          • {{$follow}}
            • 
 
          
 
+
+
+
 
 
 
          
@@ -76,14 +91,6 @@
 
 
          
 
-{{if $multiprofs }}
-
          
-
          {{$lbl_vis1}}
          
-
          {{$lbl_vis2}}
          
-
-{{$profile_select}}
-
          
-{{/if}}
 
 
 
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index b1a4f956d..ab5bb02cc 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -25,7 +25,7 @@
 {{include file="field_checkbox.tpl" field=$hide_presence}}
 
 
-
          {{$lbl_pmacro}}
          
+
          {{$lbl_pmacro}}
          
 
 
 
+
          {{$lbl_p2macro}}
          
 
 
          
 {{foreach $permiss_arr as $permit}}
-- 
cgit v1.2.3


From 38bce48f288244c967d325639e033e0602fa0bcc Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 18:06:15 -0800
Subject: wordsmithing

---
 mod/settings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index c0e8122cb..543bef5ed 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -926,10 +926,10 @@ function settings_content(&$a) {
 			'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')),
 
 			'$lbl_pmacro' => t('Simple Privacy Settings:'),
-			'$pmacro3'    => t('Very Public - extremely permissive (use with caution)'),
-			'$pmacro2'    => t('Typical - default public, privacy when desired (similar to social network permissions)'),
-			'$pmacro1'    => t('Private - default private, rarely open or public'),
-			'$pmacro0'    => t('Blocked - default blocked to/from everybody'),
+			'$pmacro3'    => t('Very Public - extremely permissive (should be used with caution)'),
+			'$pmacro2'    => t('Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)'),
+			'$pmacro1'    => t('Private - default private, never open or public'),
+			'$pmacro0'    => t('Blocked - default blocked to/from everybody'),
 			'$permiss_arr' => $permiss,
 
 			'$lbl_p2macro' => t('Advanced Privacy Settings'),
-- 
cgit v1.2.3


From baf3b052f645d7826ada25a05c742d1e5d4a0b51 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 18:18:22 -0800
Subject: don't load any configs from DB if installing - especially in
 style.pcss

---
 boot.php                          |  1 +
 index.php                         | 10 +++++-----
 view/theme/redbasic/php/style.php |  6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index 8460d76c6..c58580312 100755
--- a/boot.php
+++ b/boot.php
@@ -576,6 +576,7 @@ function startup() {
 
 class App {
 
+	public  $install    = false;           // true if we are installing the software
 		
 	public  $account    = null;            // account record of the logged-in account
 	public  $channel    = null;            // channel record of the current channel of the logged-in account
diff --git a/index.php b/index.php
index 0012798a6..736918661 100755
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@ $a = new App;
  *
  */
 
-$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
+$a->install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
 
 @include(".htconfig.php");
 
@@ -38,8 +38,8 @@ $a->language = get_best_language();
 
 require_once("include/dba/dba_driver.php");
 
-if(! $install) {
-	$db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $install);
+if(! $a->install) {
+	$db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $a->install);
     	    unset($db_host, $db_port, $db_user, $db_pass, $db_data);
 
 	/**
@@ -91,7 +91,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($a->language);
 }
 
-if((x($_GET,'zid')) && (! $install)) {
+if((x($_GET,'zid')) && (! $a->install)) {
 	$a->query_string = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/is','',$a->query_string);
 	if(! local_user()) {
 		$_SESSION['my_address'] = $_GET['zid'];
@@ -116,7 +116,7 @@ if(! x($_SESSION,'sysmsg_info'))
  */
 
 
-if($install) {
+if($a->install) {
 	/* Allow an exception for the view module so that pcss will be interpreted during installation */
 	if($a->module != 'view')
 		$a->module = 'setup';
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index aec27961e..8d5c23a03 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,5 +1,7 @@
 install) {
+	// Get the UID of the channel owner
 	$uid = get_theme_uid();
 
 	if($uid)
@@ -32,6 +34,8 @@
 		$top_photo=get_pconfig($uid,'redbasic','top_photo');
 		$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
 
+}
+
 // Now load the scheme.  If a value is changed above, we'll keep the settings
 // If not, we'll keep those defined by the schema
 // Setting $scheme to '' wasn't working for some reason, so we'll check it's
-- 
cgit v1.2.3


From 54acf5aeace18b9b0fa0531251e6f135fcb4d906 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 18:57:21 -0800
Subject: cleanup in preparation for new page

---
 assets/home.html | 199 +------------------------------------------------------
 1 file changed, 3 insertions(+), 196 deletions(-)

diff --git a/assets/home.html b/assets/home.html
index 8751f8485..c7f9c852c 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -1,4 +1,5 @@
 
+
 
-
-
-
-
-    
 
 
-
          
-
          
-
          
-
          
-
 
-
          
-Imagine
          
+
          
 
-
          
-
          
-
          Let's imagine a new internet. One that allows you to publish, communicate and share freely; yet the things you publish are only visible to those you choose. Period. Let's also imagine that this internet doesn't force you to remember a unique password for every site you wish to be involved with. Your website and your friends' websites connect together and they all just know who you are - yet what else they know about you is under your control.
-
          
-
          
-
-
-
          
 
          
 
          
-ma·trix: something within or from which something else originates, develops, or takes form 
+Dream it. Do it.
 
          
-
          
-
-
          
-
          Imagine if you had an internet where the people using it could create new services and communicate freely and privately - and where you didn't need a different account on every website in the network in order to use each website. Where you had your own space and could share anything you wanted with anybody you wanted, any time you wanted. Where the things you share in private stay private instead of being under constant surveillance from advertising corporations and government intelligence agencies.
-
          
-
          
-
-
-
-
          
-
-
          
-
-
-
          
-Decentralise
-Identity
-Freedom
-Access Control
-Privacy
-Got Zot?
-
          
-
-
          
-
          
-
          
-
          Decentralised
          
-
          
-
-
          
-
          
-
          
-
          
-
          
-
          Nomadic Identity
          
-
          
-
-
          
-
          
-
          
-
-
          
-
          
-
          Freedom
          
-
          
-
-
          
-
          
-
          
-
          
-
          
-
          Access Control
          
-
          
-
-
          
-
          
-
          
-
          
-
          
-
          
-
          
-
          Got Zot?
          
-
          
-
          
-
          
-
          
-
          
-
          Privacy
          
-
          Privacy and encryption to suit your needs.
          
-
          
-
          
-
          
-
-
-
-
          
-
-
          Decentralise. Build a more robust network.
          
-
          
-
          
-Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now.  
-
          
-
          
-The Red Matrix is a decentralised network where the people using it are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. 
-
          
-
          
-And the Red Matrix has Got Zot. 
-
          
-
          
-So what the heck is Zot? I'm glad you asked...
-
          
-
          
-
-
          
-
          
-
-
          Your identity is your own. One identity across the network.
          
-
          
-
-
          
-Zot is a revolutionary protocol which provides decentralised communications and identity management across the matrix. The resulting platform can provide web services comparable to those offered by large corporate providers, but without the large corporate provider and their associated privacy issues. Communications and social networking are an integral part of the matrix. Any channel (and any services provided by that channel) can make full use of feature-rich social communications on a global scale. 
-
          
-
          
-We use the full power of the matrix to offer friend suggestions and directory services. You can also perform other things which would typically only be possibly on a centralised provider - such as "wall to wall" posts and private/multiple profiles and web content which can be tailored to the viewer. You won't find these features at all on other decentralised communication services. The difference is that Zot also provides decentralised identity services. This is what separates the men from the boys, and what makes life in the matrix so awesome.   
-
          
-
          
-
-
          
-
          
-Zot's identity layer is unique. It's like OpenID on steroids. It provides invisible single sign-on across all sites in the matrix; as well as nomadic identity so that your communications with friends, family, and business partners won't be affected by the loss of your primary communication node - either temporarily or permanently. The important bits of your identity and relationships can be backed up to a thumb drive and may appear at any node in the matrix at any time - with all your friends and preferences intact. These nomadic instances are kept in sync so any instance can take over if another one is compromised or damaged. This protects you against not only major system failure, but also temporary site overloads and governmental manipulation. You cannot be silenced. You cannot be removed from the matrix. 
-
          
-
          
-As you browse the matrix viewing channels and their unique content, you are seamlessly authenticated as you go, even across completely different server hubs. No password dialogues. Nothing to type. You're just greeted by name on every new site you visit. How does Zot do that? We call it "magic-auth" because it really is technology that is so advanced as to be indistinguishable from magic. You login only once on your home hub (or any nomadic backup hub you have chosen). This allows you to access any authenticated services provided anywhere in the matrix - such as shopping and access to private information. This is just like the services offered by large corporate providers with huge user databases; however you can be a member of this community and a server on this network using a "plug computer" like a Rasberry Pi. Your password isn't stored on a thousand different sites where it can be stolen and used to clean out your bank accounts.
-
          
-
          
-
          
-
          
-
-
          You control your data. Red Matrix enforces your permissions.
          
-
          
-
-
          
-Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create.
-
          
-
          
-Example: you want a photo to be visible to your family and three select friends, but not your work colleagues. In the matrix this is easy. Even if your family members, work colleagues, and friends all have accounts on different hubs.
-
          
-
          
-Currently the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control.
-
          
-
          
-Again, this type of control is available on large corporate providers, because they own the user database. Within the matrix, there is no need for a huge user database on your machine - because the matrix is your user database and for all intents and purposes has infinite capacity and is spread amongst hundreds, and potentially millions of computers. Access can be granted or denied for any resource, to any channel or any group of channels; anywhere within the matrix. They do not need to have an account on your hub.
-
           
-
          
-
          
-
          
-
-
          
-
-
          Reclaim your privacy. Red Matrix is built for you, not governments and corporations.
          
-
          
-
          
-Your communications may be public or private - and we allow your private communications to be as private as you wish them to be. Private communications comprise not only fully encrypted transport, but also encrypted storage to help protect against accidental snooping and disclosure by rogue system administrators and internet service providers. 
-
          
-
          
-Want more? You can fully encrypt your messages "end to end" using your choice of encryption ciphers and using a passphrase that only you and the recipient(s) know - in addition to our standard multi-layer encryption. 
-
          
-
          
-Want more? Our end to end encryption is pluggable. You can define your own chain of multiple encryption steps with multiple keys, and include algorithms known only to you and the recipient. At some point even the US National Security Agency will have to throw up their hands. There won't be enough computational power available in the universe to decode your private message. 
-
           
-
          
-We also provide optional message expiration as a standard feature. When the expiration date/time passes, your message is removed from the network.
-
           
-
          
-
          
-
          
-
-
-
-
             
-
-
          
-
-
          
-
          
-
          
-
-	
-    
 
 
-- 
cgit v1.2.3


From 5cc6efe21f51f5e3696b5f047a74186e957a7780 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 20:14:57 -0800
Subject: changed order of the privacy macros so that the dangerous settings
 come last and the preferred settings come first

---
 view/tpl/settings.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index ab5bb02cc..c4b89a543 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -27,9 +27,9 @@
 
 
          {{$lbl_pmacro}}
          
 
 
-- 
cgit v1.2.3


From c7cad26b4187736065d02876c3a260309a5c6691 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 20:22:41 -0800
Subject: more wordsmithing

---
 mod/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/settings.php b/mod/settings.php
index 543bef5ed..38b1d6fdf 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -919,7 +919,7 @@ function settings_content(&$a) {
 			'$defloc'	=> array('defloc', t('Default Post Location:'), $defloc, ''),
 			'$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_user(),'system','use_browser_location')) ? 1 : ''), ''),
 		
-			'$adult'    => array('adult', t('Adult Content'), $adult_flag, t('This channel publishes adult content.')),
+			'$adult'    => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)')),
 
 			'$h_prv' 	=> t('Security and Privacy Settings'),
 
-- 
cgit v1.2.3


From ee42079685dd4df721b1090bdaa0d86316e3358a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 2 Feb 2014 21:25:52 -0800
Subject: The problem with a lot of packages is that it's easier to re-write
 them than to re-use them.

---
 include/spam.php                          | 35 +++++++++++++++++++++++++++++++
 library/spam/b8/storage/storage_frndc.php |  8 +++----
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 include/spam.php

diff --git a/include/spam.php b/include/spam.php
new file mode 100644
index 000000000..8b158b7ae
--- /dev/null
+++ b/include/spam.php
@@ -0,0 +1,35 @@
+ 2)
+				$ret[] = substr($y,0,64);
+		}
+	}
+	return $ret;
+}
+
+
+
+function get_words($uid,$list) {
+
+	stringify($list,true);
+
+	$r = q("select * from spam where term in ( " . $list . ") and uid = %d",
+		intval($uid)
+	);
+
+	return $r;
+}
+
diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index 62909d471..f211d4431 100644
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -205,7 +205,7 @@ class b8_storage_frndc extends b8_storage_base
 			foreach($to_create as $term) {
 				if(strlen($sql))
 					$sql .= ',';
-				$sql .= sprintf("(term,datetime,uid) values('%s','%s',%d)",
+				$sql .= sprintf("(term,date,uid) values('%s','%s',%d)",
 					dbesc(str_tolower($term))
 					dbesc(datetime_convert()),
 					intval($uid)
@@ -280,16 +280,16 @@ class b8_storage_frndc extends b8_storage_base
 
 			$result = q('
 				DELETE FROM ' . $this->config['table_name'] . '
-				WHERE token IN ("' . implode('", "', $this->_deletes) . '") AND uid = ' . $this->uid);
+				WHERE term IN ("' . implode('", "', $this->_deletes) . '") AND uid = ' . $this->uid);
 
 			$this->_deletes = array();
 
 		}
 
 		if(count($this->_puts) > 0) {
-
+//fixme
 			$result = q('
-				INSERT INTO ' . $this->config['table_name'] . '(token, count, uid)
+				INSERT INTO ' . $this->config['table_name'] . '(term, count, uid)
 				VALUES ' . implode(', ', $this->_puts));
 
 			$this->_puts = array();
-- 
cgit v1.2.3


From 6c91580716524e03d68d6d3c95f0fa38b91a1362 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 3 Feb 2014 02:21:06 -0800
Subject: code cleanup - remove some unused functions

---
 include/text.php | 36 ------------------------------------
 version.inc      |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/include/text.php b/include/text.php
index 1eef4e37a..a72989147 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1516,20 +1516,6 @@ function return_bytes ($size_str) {
     }
 }
 
-function generate_user_guid() {
-	$found = true;
-	do {
-		$guid = random_string(16);
-		$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
-			dbesc($guid)
-		);
-		if(! count($x))
-			$found = false;
-	} while ($found == true );
-	return $guid;
-}
-
-
 
 function base64url_encode($s, $strip_padding = true) {
 
@@ -1547,23 +1533,6 @@ function base64url_decode($s) {
 		logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
 		return $s;
 	}
-
-/*
- *  // Placeholder for new rev of salmon which strips base64 padding.
- *  // PHP base64_decode handles the un-padded input without requiring this step
- *  // Uncomment if you find you need it.
- *
- *	$l = strlen($s);
- *	if(! strpos($s,'=')) {
- *		$m = $l % 4;
- *		if($m == 2)
- *			$s .= '==';
- *		if($m == 3)
- *			$s .= '=';
- *	}
- *
- */
-
 	return base64_decode(strtr($s,'-_','+/'));
 }
 
@@ -1668,11 +1637,6 @@ function item_post_type($item) {
 }
 
 
-function normalise_openid($s) {
-	return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
-}
-
-
 function undo_post_tagging($s) {
 	$matches = null;
 	$cnt = preg_match_all('/([@#])\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
diff --git a/version.inc b/version.inc
index 4b99b62b1..09dce8eca 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-02.576
+2014-02-03.577
-- 
cgit v1.2.3


From c4d088459634d8148620a27c56ba06b33814668f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 3 Feb 2014 14:03:43 -0800
Subject: accept new connection broke yesterday

---
 boot.php                | 1 +
 mod/connections.php     | 2 ++
 mod/connedit.php        | 5 ++++-
 view/tpl/abook_edit.tpl | 6 +++---
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index c58580312..18a4ff888 100755
--- a/boot.php
+++ b/boot.php
@@ -398,6 +398,7 @@ define ( 'TERM_PCATEGORY',    4 );
 define ( 'TERM_FILE',         5 );
 define ( 'TERM_SAVEDSEARCH',  6 );
 define ( 'TERM_THING',        7 );
+define ( 'TERM_BOOKMARK',     8 );
 
 define ( 'TERM_OBJ_POST',    1 );
 define ( 'TERM_OBJ_PHOTO',   2 );
diff --git a/mod/connections.php b/mod/connections.php
index 2119c69c7..3da9cec74 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -74,6 +74,7 @@ function connections_post(&$a) {
 	$abook_flags = $orig_record[0]['abook_flags'];
 	$new_friend = false;
 
+
 	if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
 		$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
 		$new_friend = true;
@@ -88,6 +89,7 @@ function connections_post(&$a) {
 		intval($contact_id),
 		intval(local_user())
 	);
+
 	if($r)
 		info( t('Connection updated.') . EOL);
 	else
diff --git a/mod/connedit.php b/mod/connedit.php
index b7101fcab..3f507cc3b 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -32,7 +32,7 @@ function connedit_init(&$a) {
 }
 
 function connedit_post(&$a) {
-	
+
 	if(! local_user())
 		return;
 
@@ -86,6 +86,8 @@ function connedit_post(&$a) {
 	$abook_flags = $orig_record[0]['abook_flags'];
 	$new_friend = false;
 
+
+
 	if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
 		$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
 		$new_friend = true;
@@ -100,6 +102,7 @@ function connedit_post(&$a) {
 		intval($contact_id),
 		intval(local_user())
 	);
+
 	if($r)
 		info( t('Connection updated.') . EOL);
 	else
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 265a1a953..274d0d5de 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -30,6 +30,9 @@
 {{/if}}
 
 
+
          
+
+
 
 
 {{if $is_pending}}
@@ -50,9 +53,6 @@
 
          {{$permlbl}}
          
 
          {{$permnote}}
          
 
-
-
-
 
 {{* {{if $noperms}}
 
          {{$noperms}}
          
-- 
cgit v1.2.3


From 876f5d4de09f6215c3e65146460027d0dd244bc8 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 3 Feb 2014 19:38:15 -0800
Subject: transmit, receive, and parse bookmarks

---
 include/items.php | 10 ++++++++--
 include/text.php  | 14 +++++++++++++-
 mod/item.php      | 21 ++++++++++++++++-----
 mod/page.php      |  4 ++--
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/include/items.php b/include/items.php
index a74c3d460..7b11a1c3c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -822,7 +822,7 @@ function encode_item_xchan($xchan) {
 function encode_item_terms($terms) {
 	$ret = array();	
 
-	$allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY );
+	$allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY, TERM_BOOKMARK );
 
 	if($terms) {
 		foreach($terms as $term) {
@@ -834,7 +834,7 @@ function encode_item_terms($terms) {
 }
 
 function termtype($t) {
-	$types = array('unknown','hashtag','mention','category','private_category','file','search');
+	$types = array('unknown','hashtag','mention','category','private_category','file','search','thing','bookmark');
 	return(($types[$t]) ? $types[$t] : 'unknown');
 }
 
@@ -865,6 +865,12 @@ function decode_tags($t) {
 				case 'search':
 					$tag['type'] = TERM_SEARCH;
 					break;
+				case 'thing':
+					$tag['type'] = TERM_THING;
+					break;
+				case 'bookmark':
+					$tag['type'] = TERM_BOOKMARK;
+					break;
 				default:
 				case 'unknown':
 					$tag['type'] = TERM_UNKNOWN;
diff --git a/include/text.php b/include/text.php
index a72989147..37ce54f25 100755
--- a/include/text.php
+++ b/include/text.php
@@ -593,7 +593,7 @@ function get_tags($s) {
 			if(substr($mtch,-1,1) === '.')
 				$mtch = substr($mtch,0,-1);
 			// ignore strictly numeric tags like #1
-			if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
+			if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^'))
 				continue;
 			// try not to catch url fragments
 			if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))
@@ -601,6 +601,18 @@ function get_tags($s) {
 			$ret[] = $mtch;
 		}
 	}
+
+	// bookmarks
+
+	if(preg_match_all('/#\^\[(url|zrl)=(.*?)\](.*?)\[\/(url|zrl)\]/',$s,$match,PREG_SET_ORDER)) {
+		foreach($match as $mtch) {
+			$ret[] = $mtch[0];
+		}
+	}
+
+
+	// logger('get_tags: ' . print_r($ret,true));
+
 	return $ret;
 }
 
diff --git a/mod/item.php b/mod/item.php
index 6d421009b..88bf46a9f 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -887,13 +887,24 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
 	$replaced = false;
 	$r = null;
 
-	$termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN);
-	$termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype);
+
+	$termtype = ((strpos($tag,'#') === 0)   ? TERM_HASHTAG : TERM_UNKNOWN);
+	$termtype = ((strpos($tag,'@') === 0)   ? TERM_MENTION : $termtype);
+	$termtype = ((strpos($tag,'#^[') === 0) ? TERM_BOOKMARK : $termtype);
+	
 
 	//is it a hash tag? 
 	if(strpos($tag,'#') === 0) {
-		// if the tag is replaced...
-		if(strpos($tag,'[zrl=')) {
+		if(strpos($tag,'#^[') === 0) {
+			if(preg_match('/#\^\[(url|zrl)=(.*?)\](.*?)\[\/(url|zrl)\]/',$tag,$match)) {
+				$basetag = $match[3];
+				$url = $match[2];
+				$replaced = true;
+
+			}
+		}
+		// if the tag is already replaced...
+		elseif(strpos($tag,'[zrl=')) {
 			//...do nothing
 			return $replaced;
 		}
@@ -904,7 +915,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
 			$body = str_replace($tag,$newtag,$body);
 			$replaced = true;
 		}
-		else {
+		if(! $replaced) {
 			//base tag has the tags name only
 			$basetag = str_replace('_',' ',substr($tag,1));
 			//create text for link
diff --git a/mod/page.php b/mod/page.php
index 56592116f..df17dbf52 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -38,7 +38,7 @@ function page_content(&$a) {
 
 	$channel_address = argv(1);
 	$page_id = argv(2);
-dbg(1);
+
 	$u = q("select channel_id from channel where channel_address = '%s' limit 1",
 		dbesc($channel_address)
 	);
@@ -63,7 +63,7 @@ dbg(1);
 		dbesc($page_id),
 		intval(ITEM_WEBPAGE)
 	);
-dbg(0);
+
 	if(! $r) {
 
 		// Check again with no permissions clause to see if it is a permissions issue
-- 
cgit v1.2.3


From 9ce3dac479672413eed9c42241cc5d4c40349b27 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 3 Feb 2014 19:54:32 -0800
Subject: some tagging fixes - including old bugs which were never reported

---
 include/text.php | 8 ++++----
 mod/item.php     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/text.php b/include/text.php
index 37ce54f25..dc7d94b6d 100755
--- a/include/text.php
+++ b/include/text.php
@@ -442,7 +442,7 @@ function item_message_id() {
 
 		$mid = $hash . '@' . get_app()->get_hostname();
 
-		$r = q("SELECT `id` FROM `item` WHERE `mid` = '%s' LIMIT 1",
+		$r = q("SELECT id FROM item WHERE mid = '%s' LIMIT 1",
 			dbesc($mid));
 		if(count($r))
 			$dups = true;
@@ -459,7 +459,7 @@ function photo_new_resource() {
 	do {
 		$found = false;
 		$resource = hash('md5',uniqid(mt_rand(),true));
-		$r = q("SELECT `id` FROM `photo` WHERE `resource_id` = '%s' LIMIT 1",
+		$r = q("SELECT id FROM photo WHERE resource_id = '%s' LIMIT 1",
 			dbesc($resource)
 		);
 		if(count($r))
@@ -1651,10 +1651,10 @@ function item_post_type($item) {
 
 function undo_post_tagging($s) {
 	$matches = null;
-	$cnt = preg_match_all('/([@#])\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
+	$cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $mtch) {
-			$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+			$s = str_replace($mtch[0], $mtch[1] . $mtch[2] . str_replace(' ','_',$mtch[4]),$s);
 		}
 	}
 	return $s;
diff --git a/mod/item.php b/mod/item.php
index 88bf46a9f..68bb75897 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -972,7 +972,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
 			$newname = str_replace('_',' ',$name);
 
 			//select someone from this user's contacts by name
-			$r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash  
+			$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash  
 				WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
 					dbesc($newname),
 					intval($profile_uid)
@@ -980,7 +980,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
 
 			if(! $r) {
 				//select someone by attag or nick and the name passed in
-				$r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash  
+				$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash  
 					WHERE xchan_addr like ('%s') AND abook_channel = %d LIMIT 1",
 						dbesc($newname . '@%'),
 						intval($profile_uid)
-- 
cgit v1.2.3


From 1572403e980b013e211de1d317631551dfe5f304 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 3 Feb 2014 20:44:42 -0800
Subject: photo tagging somewhat working - but can't remove photo tags until we
 update tagrm

---
 mod/photos.php          | 26 ++++++++++++++++++++++----
 view/tpl/photo_view.tpl |  8 +++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index c299fe778..6798cb002 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -763,7 +763,7 @@ function photos_content(&$a) {
 
 			/* Check again - this time without specifying permissions */
 
-			$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' 
+			$ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' 
 				and ( photo_flags = %d or photo_flags = %d )
 				LIMIT 1",
 				intval($owner_uid),
@@ -875,6 +875,9 @@ function photos_content(&$a) {
 
 		if($linked_items) {
 
+			xchan_query($linked_items);
+			$linked_items = fetch_post_tags($linked_items,true);
+
 			$link_item = $linked_items[0];
 
 			$r = q("select * from item where parent_mid = '%s' 
@@ -890,6 +893,21 @@ function photos_content(&$a) {
 				$r = conv_sort($r,'commented');
 			}
 
+
+
+			$tags = array();
+			if($link_item['term']) {
+				$cnt = 0;
+				foreach($link_item['term'] as $t)
+					$tags[$cnt] = array(0 => format_term_for_display($t));
+					if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+						$tags[$cnt][1] = 'tagrm?f=&item=' . $link_item['id'];
+						$tags[$cnt][2] = t('Remove');
+					}
+					$cnt ++;
+			}
+
+
 			if((local_user()) && (local_user() == $link_item['uid'])) {
 				q("UPDATE `item` SET item_flags = (item_flags ^ %d) WHERE parent = %d and uid = %d and (item_flags & %d)",
 					intval(ITEM_UNSEEN),
@@ -925,7 +943,6 @@ function photos_content(&$a) {
 				'capt_label' => t('Caption'),
 				'caption' => $caption_e,
 				'tag_label' => t('Add a Tag'),
-				'tags' => $link_item['tag'],
 				'permissions' => t('Permissions'),
 				'aclselect' => $aclselect_e,
 				'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
@@ -1067,10 +1084,10 @@ function photos_content(&$a) {
 		}
 		
 		$album_e = array($album_link,$ph[0]['album']);
-		$tags_e = $tags;
 		$like_e = $like;
 		$dislike_e = $dislike;
 
+
 		$photo_tpl = get_markup_template('photo_view.tpl');
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $ph[0]['id'],
@@ -1081,7 +1098,8 @@ function photos_content(&$a) {
 			'$prevlink' => $prevlink,
 			'$nextlink' => $nextlink,
 			'$desc' => $ph[0]['description'],
-			'$tags' => $tags_e,
+			'$tag_hdr' => t('In This Photo:'),
+			'$tags' => $tags,
 			'$edit' => $edit,	
 			'$likebuttons' => $likebuttons,
 			'$like' => $like_e,
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 93e9abfa5..8c19d39d7 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -14,10 +14,12 @@
 
          
 
          {{$desc}}
          
 {{if $tags}}
-
          {{$tags.0}}
          
-
          {{$tags.1}}
          
+
          {{$tag_hdr}}
          
+{{foreach $tags as $t}}
+
          {{$t.0}}
          
+{{if $edit}}{{/if}}
+{{/foreach}}
 {{/if}}
-{{if $tags.2}}{{/if}}
 
 {{if $edit}}
 
-- 
cgit v1.2.3


From 7ff2c018c5bdf761ea9ba03fdd06ec46c1e9f4e5 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff 
Date: Tue, 4 Feb 2014 07:50:32 +0100
Subject: DE: update to the strings

---
 view/de/messages.po | 4195 ++++++++++++++++++++++++++-------------------------
 view/de/strings.php |  225 +--
 2 files changed, 2237 insertions(+), 2183 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 68f1e0dd5..bcaad338a 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 02:30-0800\n"
-"PO-Revision-Date: 2014-01-25 06:22+0000\n"
+"POT-Creation-Date: 2014-01-31 00:02-0800\n"
+"PO-Revision-Date: 2014-02-04 06:40+0000\n"
 "Last-Translator: bavatar \n"
 "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -64,10 +64,6 @@ msgstr "Besuche %1$s's %2$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 
-#: ../../include/api.php:973
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
-
 #: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420
 msgid "Logout"
 msgstr "Abmelden"
@@ -84,7 +80,7 @@ msgstr "Home"
 msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
-#: ../../include/nav.php:76 ../../include/conversation.php:932
+#: ../../include/nav.php:76 ../../include/conversation.php:933
 #: ../../mod/connedit.php:309 ../../mod/connedit.php:423
 msgid "View Profile"
 msgstr "Profil ansehen"
@@ -101,7 +97,7 @@ msgstr "Profile bearbeiten"
 msgid "Manage/Edit Profiles"
 msgstr "Verwalte/Bearbeite Profile"
 
-#: ../../include/nav.php:79 ../../include/conversation.php:1473
+#: ../../include/nav.php:79 ../../include/conversation.php:1475
 #: ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Fotos"
@@ -248,7 +244,7 @@ msgstr "Ausgang"
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../../include/nav.php:171 ../../include/conversation.php:1491
+#: ../../include/nav.php:171 ../../include/conversation.php:1493
 #: ../../mod/events.php:354
 msgid "Events"
 msgstr "Veranstaltungen"
@@ -274,7 +270,7 @@ msgid "Manage Your Channels"
 msgstr "Verwalte Deine Kanäle"
 
 #: ../../include/nav.php:177 ../../include/widgets.php:487
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -290,7 +286,7 @@ msgstr "Verbindungen"
 msgid "Manage/Edit Friends and Connections"
 msgstr "Verwalte/Bearbeite Freunde und Verbindungen"
 
-#: ../../include/nav.php:186 ../../mod/admin.php:111
+#: ../../include/nav.php:186 ../../mod/admin.php:112
 msgid "Admin"
 msgstr "Admin"
 
@@ -306,10 +302,63 @@ msgstr "Nichts Neues hier"
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../../include/Contact.php:104 ../../include/identity.php:625
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr "Der Chatraum hat keinen Namen"
+
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr "Name des Chatraums bereits vergeben"
+
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr "Ungültiger Raumbezeichner."
+
+#: ../../include/chat.php:102
+msgid "Room not found."
+msgstr "Chatraum konnte nicht gefunden werden."
+
+#: ../../include/chat.php:113 ../../include/photos.php:15
+#: ../../include/attach.php:97 ../../include/attach.php:128
+#: ../../include/attach.php:184 ../../include/attach.php:199
+#: ../../include/attach.php:232 ../../include/attach.php:246
+#: ../../include/attach.php:267 ../../include/attach.php:462
+#: ../../include/attach.php:540 ../../include/items.php:3454
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../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/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:522
+#: ../../mod/chat.php:84 ../../mod/chat.php:89 ../../mod/viewsrc.php:12
+#: ../../mod/menu.php:40 ../../mod/connections.php:167
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
+#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/manage.php:6
+#: ../../mod/settings.php:486 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:347
+msgid "Permission denied."
+msgstr "Zugang verweigert"
+
+#: ../../include/Contact.php:104 ../../include/identity.php:628
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
 #: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:166
+#: ../../mod/dirprofile.php:170
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -381,8 +430,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:691
-#: ../../mod/admin.php:700 ../../boot.php:1423
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1423
 msgid "Email"
 msgstr "E-Mail"
 
@@ -488,6 +537,10 @@ msgstr "vor %1$d %2$s"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"
 
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
+
 #: ../../include/event.php:11 ../../include/bb2diaspora.php:433
 msgid "l F d, Y \\@ g:i A"
 msgstr "l, d. F Y\\\\, H:i"
@@ -500,2051 +553,2034 @@ msgstr "Beginnt:"
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/event.php:40 ../../include/identity.php:676
+#: ../../include/event.php:40 ../../include/identity.php:679
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:108
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
 msgid "Location:"
 msgstr "Ort:"
 
-#: ../../include/text.php:315
-msgid "prev"
-msgstr "vorherige"
-
-#: ../../include/text.php:317
-msgid "first"
-msgstr "erste"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:537
+#: ../../include/bbcode.php:540 ../../include/bbcode.php:545
+#: ../../include/bbcode.php:548 ../../include/bbcode.php:551
+#: ../../include/bbcode.php:554 ../../include/bbcode.php:559
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:567
+#: ../../include/bbcode.php:570 ../../include/bbcode.php:573
+#: ../../include/bbcode.php:576
+msgid "Image/photo"
+msgstr "Bild/Foto"
 
-#: ../../include/text.php:346
-msgid "last"
-msgstr "letzte"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:582
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/text.php:349
-msgid "next"
-msgstr "nächste"
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR Code"
 
-#: ../../include/text.php:361
-msgid "older"
-msgstr "älter"
+#: ../../include/bbcode.php:213
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
-#: ../../include/text.php:363
-msgid "newer"
-msgstr "neuer"
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "Beitrag"
 
-#: ../../include/text.php:654
-msgid "No connections"
-msgstr "Keine Verbindungen"
+#: ../../include/bbcode.php:505 ../../include/bbcode.php:525
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
 
-#: ../../include/text.php:665
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Verbindung"
-msgstr[1] "%d Verbindungen"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Dieses Element löschen?"
 
-#: ../../include/text.php:677
-msgid "View Connections"
-msgstr "Zeige Verbindungen"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
+#: ../../mod/photos.php:972 ../../mod/photos.php:1059
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../../include/text.php:738 ../../include/text.php:752
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Speichern"
+#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125
+#: ../../include/ItemObject.php:270
+msgid "show more"
+msgstr "mehr zeigen"
 
-#: ../../include/text.php:818
-msgid "poke"
-msgstr "anstupsen"
+#: ../../include/js_strings.php:8
+msgid "show fewer"
+msgstr "Zeige weniger"
 
-#: ../../include/text.php:818 ../../include/conversation.php:240
-msgid "poked"
-msgstr "stupste"
+#: ../../include/js_strings.php:9
+msgid "Password too short"
+msgstr "Kennwort zu kurz"
 
-#: ../../include/text.php:819
-msgid "ping"
-msgstr "anpingen"
+#: ../../include/js_strings.php:10
+msgid "Passwords do not match"
+msgstr "Kennwörter stimmen nicht überein"
 
-#: ../../include/text.php:819
-msgid "pinged"
-msgstr "pingte"
+#: ../../include/js_strings.php:11 ../../mod/photos.php:39
+msgid "everybody"
+msgstr "alle"
 
-#: ../../include/text.php:820
-msgid "prod"
-msgstr "knuffen"
+#: ../../include/js_strings.php:12
+msgid "Secret Passphrase"
+msgstr "geheime Passwort-Phrase"
 
-#: ../../include/text.php:820
-msgid "prodded"
-msgstr "knuffte"
+#: ../../include/js_strings.php:13
+msgid "Passphrase hint"
+msgstr "Hinweis zur Phrase"
 
-#: ../../include/text.php:821
-msgid "slap"
-msgstr "ohrfeigen"
+#: ../../include/js_strings.php:15
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
 
-#: ../../include/text.php:821
-msgid "slapped"
-msgstr "ohrfeigte"
+#: ../../include/js_strings.php:16
+msgid "timeago.suffixAgo"
+msgstr "timeago.suffixAgo"
 
-#: ../../include/text.php:822
-msgid "finger"
-msgstr "befummeln"
+#: ../../include/js_strings.php:17
+msgid "ago"
+msgstr "her"
 
-#: ../../include/text.php:822
-msgid "fingered"
-msgstr "befummelte"
+#: ../../include/js_strings.php:18
+msgid "from now"
+msgstr "von jetzt"
 
-#: ../../include/text.php:823
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
+#: ../../include/js_strings.php:19
+msgid "less than a minute"
+msgstr "weniger als eine Minute"
 
-#: ../../include/text.php:823
-msgid "rebuffed"
-msgstr "abfuhrerteilte"
+#: ../../include/js_strings.php:20
+msgid "about a minute"
+msgstr "ungefähr eine Minute"
 
-#: ../../include/text.php:835
-msgid "happy"
-msgstr "glücklich"
+#: ../../include/js_strings.php:21
+#, php-format
+msgid "%d minutes"
+msgstr "%d Minuten"
 
-#: ../../include/text.php:836
-msgid "sad"
-msgstr "traurig"
+#: ../../include/js_strings.php:22
+msgid "about an hour"
+msgstr "ungefähr eine Stunde"
 
-#: ../../include/text.php:837
-msgid "mellow"
-msgstr "sanft"
+#: ../../include/js_strings.php:23
+#, php-format
+msgid "about %d hours"
+msgstr "ungefähr %d Stunden"
 
-#: ../../include/text.php:838
-msgid "tired"
-msgstr "müde"
+#: ../../include/js_strings.php:24
+msgid "a day"
+msgstr "ein Tag"
 
-#: ../../include/text.php:839
-msgid "perky"
-msgstr "frech"
+#: ../../include/js_strings.php:25
+#, php-format
+msgid "%d days"
+msgstr "%d Tage"
 
-#: ../../include/text.php:840
-msgid "angry"
-msgstr "sauer"
+#: ../../include/js_strings.php:26
+msgid "about a month"
+msgstr "ungefähr ein Monat"
 
-#: ../../include/text.php:841
-msgid "stupified"
-msgstr "verblüfft"
+#: ../../include/js_strings.php:27
+#, php-format
+msgid "%d months"
+msgstr "%d Monate"
 
-#: ../../include/text.php:842
-msgid "puzzled"
-msgstr "verwirrt"
+#: ../../include/js_strings.php:28
+msgid "about a year"
+msgstr "ungefähr ein Jahr"
 
-#: ../../include/text.php:843
-msgid "interested"
-msgstr "interessiert"
+#: ../../include/js_strings.php:29
+#, php-format
+msgid "%d years"
+msgstr "%d Jahre"
 
-#: ../../include/text.php:844
-msgid "bitter"
-msgstr "verbittert"
+#: ../../include/js_strings.php:30
+msgid " "
+msgstr " "
 
-#: ../../include/text.php:845
-msgid "cheerful"
-msgstr "fröhlich"
+#: ../../include/js_strings.php:31
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
 
-#: ../../include/text.php:846
-msgid "alive"
-msgstr "lebendig"
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "Kein Empfänger angegeben"
 
-#: ../../include/text.php:847
-msgid "annoyed"
-msgstr "verärgert"
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[no subject]"
 
-#: ../../include/text.php:848
-msgid "anxious"
-msgstr "unruhig"
+#: ../../include/message.php:42
+msgid "Unable to determine sender."
+msgstr "Kann Absender nicht bestimmen."
 
-#: ../../include/text.php:849
-msgid "cranky"
-msgstr "schrullig"
+#: ../../include/message.php:143
+msgid "Stored post could not be verified."
+msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 
-#: ../../include/text.php:850
-msgid "disturbed"
-msgstr "verstört"
+#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336
+msgid "Profile Photos"
+msgstr "Profilfotos"
 
-#: ../../include/text.php:851
-msgid "frustrated"
-msgstr "frustriert"
+#: ../../include/identity.php:29 ../../mod/item.php:1150
+msgid "Unable to obtain identity information from database"
+msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
-#: ../../include/text.php:852
-msgid "motivated"
-msgstr "motiviert"
+#: ../../include/identity.php:62
+msgid "Empty name"
+msgstr "Namensfeld leer"
 
-#: ../../include/text.php:853
-msgid "relaxed"
-msgstr "entspannt"
+#: ../../include/identity.php:64
+msgid "Name too long"
+msgstr "Name ist zu lang"
 
-#: ../../include/text.php:854
-msgid "surprised"
-msgstr "überrascht"
+#: ../../include/identity.php:143
+msgid "No account identifier"
+msgstr "Keine Account-Kennung"
 
-#: ../../include/text.php:1016
-msgid "Monday"
-msgstr "Montag"
+#: ../../include/identity.php:153
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
 
-#: ../../include/text.php:1016
-msgid "Tuesday"
-msgstr "Dienstag"
+#: ../../include/identity.php:167
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/text.php:1016
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: ../../include/identity.php:226
+msgid "Unable to retrieve created identity"
+msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/text.php:1016
-msgid "Thursday"
-msgstr "Donnerstag"
+#: ../../include/identity.php:285
+msgid "Default Profile"
+msgstr "Standard-Profil"
 
-#: ../../include/text.php:1016
-msgid "Friday"
-msgstr "Freitag"
+#: ../../include/identity.php:310 ../../include/profile_selectors.php:42
+#: ../../include/widgets.php:373 ../../mod/connedit.php:389
+msgid "Friends"
+msgstr "Freunde"
 
-#: ../../include/text.php:1016
-msgid "Saturday"
-msgstr "Samstag"
+#: ../../include/identity.php:477
+msgid "Requested channel is not available."
+msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../include/text.php:1016
-msgid "Sunday"
-msgstr "Sonntag"
+#: ../../include/identity.php:489
+msgid " Sorry, you don't have the permission to view this profile. "
+msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
 
-#: ../../include/text.php:1020
-msgid "January"
-msgstr "Januar"
+#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40
+#: ../../mod/blocks.php:10 ../../mod/profile.php:16
+msgid "Requested profile is not available."
+msgstr "Erwünschte Profil ist nicht verfügbar."
 
-#: ../../include/text.php:1020
-msgid "February"
-msgstr "Februar"
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
+msgid "Change profile photo"
+msgstr "Ändere das Profilfoto"
 
-#: ../../include/text.php:1020
-msgid "March"
-msgstr "März"
+#: ../../include/identity.php:648
+msgid "Profiles"
+msgstr "Profile"
 
-#: ../../include/text.php:1020
-msgid "April"
-msgstr "April"
+#: ../../include/identity.php:648
+msgid "Manage/edit profiles"
+msgstr "Verwalte/Bearbeite Profile"
 
-#: ../../include/text.php:1020
-msgid "May"
-msgstr "Mai"
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
+msgid "Create New Profile"
+msgstr "Neues Profil erstellen"
 
-#: ../../include/text.php:1020
-msgid "June"
-msgstr "Juni"
+#: ../../include/identity.php:652
+msgid "Edit Profile"
+msgstr "Profile bearbeiten"
 
-#: ../../include/text.php:1020
-msgid "July"
-msgstr "Juli"
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
+msgid "Profile Image"
+msgstr "Profilfoto:"
 
-#: ../../include/text.php:1020
-msgid "August"
-msgstr "August"
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
+msgid "visible to everybody"
+msgstr "sichtbar für jeden"
 
-#: ../../include/text.php:1020
-msgid "September"
-msgstr "September"
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
+msgid "Edit visibility"
+msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../include/text.php:1020
-msgid "October"
-msgstr "Oktober"
+#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../mod/directory.php:158
+msgid "Gender:"
+msgstr "Geschlecht:"
 
-#: ../../include/text.php:1020
-msgid "November"
-msgstr "November"
+#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../mod/directory.php:160
+msgid "Status:"
+msgstr "Status:"
 
-#: ../../include/text.php:1020
-msgid "December"
-msgstr "Dezember"
+#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../mod/directory.php:162
+msgid "Homepage:"
+msgstr "Homepage:"
 
-#: ../../include/text.php:1098
-msgid "unknown.???"
-msgstr "unbekannt.???"
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
+msgstr "gerade online"
 
-#: ../../include/text.php:1099
-msgid "bytes"
-msgstr "Bytes"
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:256
+msgid "g A l F d"
+msgstr "l, d. F G \\\\U\\\\h\\\\r"
 
-#: ../../include/text.php:1134
-msgid "remove category"
-msgstr "Kategorie entfernen"
+#: ../../include/identity.php:753 ../../include/identity.php:833
+msgid "F d"
+msgstr "d. F"
 
-#: ../../include/text.php:1156
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:278
+msgid "[today]"
+msgstr "[Heute]"
 
-#: ../../include/text.php:1214 ../../include/text.php:1226
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
+#: ../../include/identity.php:810
+msgid "Birthday Reminders"
+msgstr "Geburtstags Erinnerungen"
 
-#: ../../include/text.php:1402 ../../mod/events.php:332
-msgid "link to source"
-msgstr "Link zum Originalbeitrag"
+#: ../../include/identity.php:811
+msgid "Birthdays this week:"
+msgstr "Geburtstage in dieser Woche:"
 
-#: ../../include/text.php:1421
-msgid "Select a page layout: "
-msgstr "Ein Seiten-Layout auswählen"
+#: ../../include/identity.php:866
+msgid "[No description]"
+msgstr "[Keine Beschreibung]"
 
-#: ../../include/text.php:1424 ../../include/text.php:1489
-msgid "default"
-msgstr "Standard"
+#: ../../include/identity.php:884
+msgid "Event Reminders"
+msgstr "Veranstaltungs- Erinnerungen"
 
-#: ../../include/text.php:1460
-msgid "Page content type: "
-msgstr "Content-Typ der Seite"
+#: ../../include/identity.php:885
+msgid "Events this week:"
+msgstr "Veranstaltungen in dieser Woche:"
 
-#: ../../include/text.php:1501
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
+#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../mod/profperm.php:107
+msgid "Profile"
+msgstr "Profil"
 
-#: ../../include/text.php:1653 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
-msgstr "Foto"
+#: ../../include/identity.php:906 ../../mod/settings.php:916
+msgid "Full Name:"
+msgstr "Voller Name:"
 
-#: ../../include/text.php:1656 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr "Ereignis"
+#: ../../include/identity.php:913
+msgid "j F, Y"
+msgstr "j F, Y"
 
-#: ../../include/text.php:1659 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
-msgstr "Status"
+#: ../../include/identity.php:914
+msgid "j F"
+msgstr "j F"
 
-#: ../../include/text.php:1661 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr "Kommentar"
+#: ../../include/identity.php:921
+msgid "Birthday:"
+msgstr "Geburtstag:"
 
-#: ../../include/text.php:1666
-msgid "activity"
-msgstr "Aktivität"
+#: ../../include/identity.php:925
+msgid "Age:"
+msgstr "Alter:"
 
-#: ../../include/text.php:1928
-msgid "Design"
-msgstr "Design"
+#: ../../include/identity.php:934
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "für %1$d %2$s"
 
-#: ../../include/text.php:1930
-msgid "Blocks"
-msgstr "Blöcke"
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
+msgid "Sexual Preference:"
+msgstr "Sexuelle Orientierung:"
 
-#: ../../include/text.php:1931
-msgid "Menus"
-msgstr "Menüs"
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
+msgid "Hometown:"
+msgstr "Heimatstadt:"
 
-#: ../../include/text.php:1932
-msgid "Layouts"
-msgstr "Layouts"
+#: ../../include/identity.php:943
+msgid "Tags:"
+msgstr "Schlagworte:"
 
-#: ../../include/text.php:1933
-msgid "Pages"
-msgstr "Seiten"
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr "Dieses Element löschen?"
+#: ../../include/identity.php:947
+msgid "Religion:"
+msgstr "Religion:"
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
-#: ../../mod/photos.php:968 ../../mod/photos.php:1055
-msgid "Comment"
-msgstr "Kommentar"
+#: ../../include/identity.php:949 ../../mod/directory.php:164
+msgid "About:"
+msgstr "Über:"
 
-#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125
-#: ../../include/ItemObject.php:270
-msgid "show more"
-msgstr "mehr zeigen"
+#: ../../include/identity.php:951
+msgid "Hobbies/Interests:"
+msgstr "Hobbys/Interessen:"
 
-#: ../../include/js_strings.php:8
-msgid "show fewer"
-msgstr "Zeige weniger"
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
+msgid "Likes:"
+msgstr "Gefällt-mir:"
 
-#: ../../include/js_strings.php:9
-msgid "Password too short"
-msgstr "Kennwort zu kurz"
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
+msgid "Dislikes:"
+msgstr "Gefällt-mir-nicht:"
 
-#: ../../include/js_strings.php:10
-msgid "Passwords do not match"
-msgstr "Kennwörter stimmen nicht überein"
+#: ../../include/identity.php:958
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/js_strings.php:11 ../../mod/photos.php:39
-msgid "everybody"
-msgstr "alle"
+#: ../../include/identity.php:960
+msgid "My other channels:"
+msgstr "Meine anderen Kanäle:"
 
-#: ../../include/js_strings.php:12
-msgid "Secret Passphrase"
-msgstr "geheime Passwort-Phrase"
+#: ../../include/identity.php:962
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
 
-#: ../../include/js_strings.php:13
-msgid "Passphrase hint"
-msgstr "Hinweis zur Phrase"
+#: ../../include/identity.php:964
+msgid "Books, literature:"
+msgstr "Bücher, Literatur:"
 
-#: ../../include/js_strings.php:15
-msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+#: ../../include/identity.php:966
+msgid "Television:"
+msgstr "Fernsehen:"
 
-#: ../../include/js_strings.php:16
-msgid "timeago.suffixAgo"
-msgstr "timeago.suffixAgo"
+#: ../../include/identity.php:968
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/js_strings.php:17
-msgid "ago"
-msgstr "her"
+#: ../../include/identity.php:970
+msgid "Love/Romance:"
+msgstr "Liebe/Romantik:"
 
-#: ../../include/js_strings.php:18
-msgid "from now"
-msgstr "von jetzt"
+#: ../../include/identity.php:972
+msgid "Work/employment:"
+msgstr "Arbeit/Anstellung:"
 
-#: ../../include/js_strings.php:19
-msgid "less than a minute"
-msgstr "weniger als eine Minute"
+#: ../../include/identity.php:974
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
 
-#: ../../include/js_strings.php:20
-msgid "about a minute"
-msgstr "ungefähr eine Minute"
+#: ../../include/reddav.php:1018
+msgid "Edit File properties"
+msgstr "Dateieigenschaften ändern"
 
-#: ../../include/js_strings.php:21
-#, php-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+#: ../../include/oembed.php:157
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
 
-#: ../../include/js_strings.php:22
-msgid "about an hour"
-msgstr "ungefähr eine Stunde"
+#: ../../include/oembed.php:166
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
 
-#: ../../include/js_strings.php:23
-#, php-format
-msgid "about %d hours"
-msgstr "ungefähr %d Stunden"
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr "Allgemeine Funktionen"
 
-#: ../../include/js_strings.php:24
-msgid "a day"
-msgstr "ein Tag"
+#: ../../include/features.php:25
+msgid "Content Expiration"
+msgstr "Verfall von Inhalten"
 
-#: ../../include/js_strings.php:25
-#, php-format
-msgid "%d days"
-msgstr "%d Tage"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
 
-#: ../../include/js_strings.php:26
-msgid "about a month"
-msgstr "ungefähr ein Monat"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
+msgstr "Mehrfachprofile"
 
-#: ../../include/js_strings.php:27
-#, php-format
-msgid "%d months"
-msgstr "%d Monate"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
+msgstr "Mehrfachprofile anlegen können"
 
-#: ../../include/js_strings.php:28
-msgid "about a year"
-msgstr "ungefähr ein Jahr"
+#: ../../include/features.php:27
+msgid "Web Pages"
+msgstr "Webseiten"
 
-#: ../../include/js_strings.php:29
-#, php-format
-msgid "%d years"
-msgstr "%d Jahre"
+#: ../../include/features.php:27
+msgid "Provide managed web pages on your channel"
+msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
 
-#: ../../include/js_strings.php:30
-msgid " "
-msgstr " "
+#: ../../include/features.php:28
+msgid "Private Notes"
+msgstr "private Notizen"
 
-#: ../../include/js_strings.php:31
-msgid "timeago.numbers"
-msgstr "timeago.numbers"
+#: ../../include/features.php:28
+msgid "Enables a tool to store notes and reminders"
+msgstr "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Kein Empfänger angegeben"
+#: ../../include/features.php:33
+msgid "Extended Identity Sharing"
+msgstr "Erweitertes Teilen von Identitäten"
 
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[no subject]"
+#: ../../include/features.php:33
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
+msgstr "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt."
 
-#: ../../include/message.php:42
-msgid "Unable to determine sender."
-msgstr "Kann Absender nicht bestimmen."
+#: ../../include/features.php:34
+msgid "Expert Mode"
+msgstr "Expertenmodus"
 
-#: ../../include/message.php:143
-msgid "Stored post could not be verified."
-msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+#: ../../include/features.php:34
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen"
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
-#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674
-#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
-#: ../../mod/profile_photo.php:336
-msgid "Profile Photos"
-msgstr "Profilfotos"
+#: ../../include/features.php:35
+msgid "Premium Channel"
+msgstr "Premium-Kanal"
 
-#: ../../include/network.php:640
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
+#: ../../include/features.php:35
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen"
 
-#: ../../include/identity.php:29 ../../mod/item.php:1150
-msgid "Unable to obtain identity information from database"
-msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
+#: ../../include/features.php:40
+msgid "Post Composition Features"
+msgstr "Nachbearbeitungsfunktionen"
 
-#: ../../include/identity.php:62
-msgid "Empty name"
-msgstr "Namensfeld leer"
+#: ../../include/features.php:41
+msgid "Richtext Editor"
+msgstr "Formatierungseditor"
 
-#: ../../include/identity.php:64
-msgid "Name too long"
-msgstr "Name ist zu lang"
+#: ../../include/features.php:41
+msgid "Enable richtext editor"
+msgstr "Aktiviere Formatierungseditor"
 
-#: ../../include/identity.php:143
-msgid "No account identifier"
-msgstr "Keine Account-Kennung"
+#: ../../include/features.php:42
+msgid "Post Preview"
+msgstr "Voransicht"
 
-#: ../../include/identity.php:153
-msgid "Nickname is required."
-msgstr "Spitzname ist erforderlich."
+#: ../../include/features.php:42
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
 
-#: ../../include/identity.php:167
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
+#: ../../include/features.php:43 ../../include/widgets.php:476
+#: ../../mod/sources.php:81
+msgid "Channel Sources"
+msgstr "Kanal Quellen"
 
-#: ../../include/identity.php:226
-msgid "Unable to retrieve created identity"
-msgstr "Kann die erstellte Identität nicht empfangen"
+#: ../../include/features.php:43
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."
 
-#: ../../include/identity.php:285
-msgid "Default Profile"
-msgstr "Standard-Profil"
+#: ../../include/features.php:44
+msgid "Even More Encryption"
+msgstr "Noch mehr Verschlüsselung"
 
-#: ../../include/identity.php:310 ../../include/profile_selectors.php:42
-#: ../../include/widgets.php:373 ../../mod/connedit.php:389
-msgid "Friends"
-msgstr "Freunde"
+#: ../../include/features.php:44
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"
 
-#: ../../include/identity.php:477
-msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
+#: ../../include/features.php:49
+msgid "Network and Stream Filtering"
+msgstr "Netzwerk- und Stream-Filter"
 
-#: ../../include/identity.php:489
-msgid " Sorry, you don't have the permission to view this profile. "
-msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
+#: ../../include/features.php:50
+msgid "Search by Date"
+msgstr "Suche nach Datum"
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
-#: ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40
-#: ../../mod/blocks.php:10 ../../mod/profile.php:16
-msgid "Requested profile is not available."
-msgstr "Erwünschte Profil ist nicht verfügbar."
+#: ../../include/features.php:50
+msgid "Ability to select posts by date ranges"
+msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
 
-#: ../../include/identity.php:639 ../../mod/profiles.php:615
-msgid "Change profile photo"
-msgstr "Ändere das Profilfoto"
+#: ../../include/features.php:51
+msgid "Collections Filter"
+msgstr "Filter für Sammlung"
 
-#: ../../include/identity.php:645
-msgid "Profiles"
-msgstr "Profile"
+#: ../../include/features.php:51
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
 
-#: ../../include/identity.php:645
-msgid "Manage/edit profiles"
-msgstr "Verwalte/Bearbeite Profile"
+#: ../../include/features.php:52 ../../include/widgets.php:252
+msgid "Saved Searches"
+msgstr "Gesicherte Suchanfragen"
 
-#: ../../include/identity.php:646 ../../mod/profiles.php:616
-msgid "Create New Profile"
-msgstr "Neues Profil erstellen"
+#: ../../include/features.php:52
+msgid "Save search terms for re-use"
+msgstr "Gesicherte Suchbegriffe zur Wiederverwendung"
 
-#: ../../include/identity.php:649
-msgid "Edit Profile"
-msgstr "Profile bearbeiten"
+#: ../../include/features.php:53
+msgid "Network Personal Tab"
+msgstr "Persönlicher Netzwerkreiter"
 
-#: ../../include/identity.php:660 ../../mod/profiles.php:627
-msgid "Profile Image"
-msgstr "Profilfoto:"
+#: ../../include/features.php:53
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:630
-msgid "visible to everybody"
-msgstr "sichtbar für jeden"
+#: ../../include/features.php:54
+msgid "Network New Tab"
+msgstr "Netzwerkreiter Neu"
 
-#: ../../include/identity.php:664 ../../mod/profiles.php:631
-msgid "Edit visibility"
-msgstr "Sichtbarkeit bearbeiten"
+#: ../../include/features.php:54
+msgid "Enable tab to display all new Network activity"
+msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"
 
-#: ../../include/identity.php:678 ../../include/identity.php:903
-#: ../../mod/directory.php:158
-msgid "Gender:"
-msgstr "Geschlecht:"
+#: ../../include/features.php:55
+msgid "Affinity Tool"
+msgstr "Beziehungs-Tool"
 
-#: ../../include/identity.php:679 ../../include/identity.php:923
-#: ../../mod/directory.php:160
-msgid "Status:"
-msgstr "Status:"
+#: ../../include/features.php:55
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
 
-#: ../../include/identity.php:680 ../../include/identity.php:934
-#: ../../mod/directory.php:162
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../../include/features.php:56
+msgid "Suggest Channels"
+msgstr "Kanäle Vorschlagen"
 
-#: ../../include/identity.php:747 ../../include/identity.php:827
-#: ../../mod/ping.php:230
-msgid "g A l F d"
-msgstr "l, d. F G \\\\U\\\\h\\\\r"
+#: ../../include/features.php:56
+msgid "Show channel suggestions"
+msgstr "Kanal-Vorschläge anzeigen"
 
-#: ../../include/identity.php:748 ../../include/identity.php:828
-msgid "F d"
-msgstr "d. F"
+#: ../../include/features.php:61
+msgid "Post/Comment Tools"
+msgstr "Beitrag-/Kommentar-Tools"
 
-#: ../../include/identity.php:793 ../../include/identity.php:868
-#: ../../mod/ping.php:252
-msgid "[today]"
-msgstr "[Heute]"
+#: ../../include/features.php:63
+msgid "Edit Sent Posts"
+msgstr "Bearbeite gesendete Beiträge"
 
-#: ../../include/identity.php:805
-msgid "Birthday Reminders"
-msgstr "Geburtstags Erinnerungen"
+#: ../../include/features.php:63
+msgid "Edit and correct posts and comments after sending"
+msgstr "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"
 
-#: ../../include/identity.php:806
-msgid "Birthdays this week:"
-msgstr "Geburtstage in dieser Woche:"
+#: ../../include/features.php:64
+msgid "Tagging"
+msgstr "Verschlagworten"
 
-#: ../../include/identity.php:861
-msgid "[No description]"
-msgstr "[Keine Beschreibung]"
+#: ../../include/features.php:64
+msgid "Ability to tag existing posts"
+msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten"
 
-#: ../../include/identity.php:879
-msgid "Event Reminders"
-msgstr "Veranstaltungs- Erinnerungen"
+#: ../../include/features.php:65
+msgid "Post Categories"
+msgstr "Beitrags-Kategorien"
 
-#: ../../include/identity.php:880
-msgid "Events this week:"
-msgstr "Veranstaltungen in dieser Woche:"
+#: ../../include/features.php:65
+msgid "Add categories to your posts"
+msgstr "Kategorien für Beiträge"
 
-#: ../../include/identity.php:893 ../../include/identity.php:977
-#: ../../mod/profperm.php:103
-msgid "Profile"
-msgstr "Profil"
+#: ../../include/features.php:66 ../../include/widgets.php:283
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Gesicherte Ordner"
 
-#: ../../include/identity.php:901 ../../mod/settings.php:911
-msgid "Full Name:"
-msgstr "Voller Name:"
+#: ../../include/features.php:66
+msgid "Ability to file posts under folders"
+msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
 
-#: ../../include/identity.php:908
-msgid "j F, Y"
-msgstr "j F, Y"
+#: ../../include/features.php:67
+msgid "Dislike Posts"
+msgstr "Gefällt-mir-nicht Beiträge"
 
-#: ../../include/identity.php:909
-msgid "j F"
-msgstr "j F"
+#: ../../include/features.php:67
+msgid "Ability to dislike posts/comments"
+msgstr "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"
 
-#: ../../include/identity.php:916
-msgid "Birthday:"
-msgstr "Geburtstag:"
+#: ../../include/features.php:68
+msgid "Star Posts"
+msgstr "Beiträge mit Sternchen versehen"
 
-#: ../../include/identity.php:920
-msgid "Age:"
-msgstr "Alter:"
+#: ../../include/features.php:68
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
 
-#: ../../include/identity.php:929
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "für %1$d %2$s"
+#: ../../include/features.php:69
+msgid "Tag Cloud"
+msgstr "Tag Wolke"
 
-#: ../../include/identity.php:932 ../../mod/profiles.php:538
-msgid "Sexual Preference:"
-msgstr "Sexuelle Orientierung:"
+#: ../../include/features.php:69
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"
 
-#: ../../include/identity.php:936 ../../mod/profiles.php:540
-msgid "Hometown:"
-msgstr "Heimatstadt:"
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."
 
-#: ../../include/identity.php:938
-msgid "Tags:"
-msgstr "Schlagworte:"
+#: ../../include/group.php:223
+msgid "Default privacy group for new contacts"
+msgstr "Standard-Privatsphärengruppe für neue Kontakte"
 
-#: ../../include/identity.php:940 ../../mod/profiles.php:541
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
+#: ../../include/group.php:242 ../../mod/admin.php:750
+msgid "All Channels"
+msgstr "Alle Kanäle"
 
-#: ../../include/identity.php:942
-msgid "Religion:"
-msgstr "Religion:"
+#: ../../include/group.php:264
+msgid "edit"
+msgstr "Bearbeiten"
 
-#: ../../include/identity.php:944 ../../mod/directory.php:164
-msgid "About:"
-msgstr "Über:"
+#: ../../include/group.php:285
+msgid "Collections"
+msgstr "Sammlungen"
 
-#: ../../include/identity.php:946
-msgid "Hobbies/Interests:"
-msgstr "Hobbys/Interessen:"
+#: ../../include/group.php:286
+msgid "Edit collection"
+msgstr "Bearbeite Sammlungen"
 
-#: ../../include/identity.php:948 ../../mod/profiles.php:544
-msgid "Likes:"
-msgstr "Gefällt-mir:"
+#: ../../include/group.php:287
+msgid "Create a new collection"
+msgstr "Neue Sammlung erzeugen"
 
-#: ../../include/identity.php:950 ../../mod/profiles.php:545
-msgid "Dislikes:"
-msgstr "Gefällt-mir-nicht:"
+#: ../../include/group.php:288
+msgid "Channels not in any collection"
+msgstr "Kanäle, die nicht in einer Sammlung sind"
 
-#: ../../include/identity.php:953
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformation und soziale Netzwerke:"
+#: ../../include/group.php:290 ../../include/widgets.php:253
+msgid "add"
+msgstr "hinzufügen"
 
-#: ../../include/identity.php:955
-msgid "My other channels:"
-msgstr "Meine anderen Kanäle:"
+#: ../../include/notify.php:23
+msgid "created a new post"
+msgstr "Neuer Beitrag wurde erzeugt"
 
-#: ../../include/identity.php:957
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
+msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../include/identity.php:959
-msgid "Books, literature:"
-msgstr "Bücher, Literatur:"
+#: ../../include/photos.php:89
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
 
-#: ../../include/identity.php:961
-msgid "Television:"
-msgstr "Fernsehen:"
+#: ../../include/photos.php:96
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
 
-#: ../../include/identity.php:963
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/Tanz/Kultur/Unterhaltung:"
+#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
+msgid "Unable to process image"
+msgstr "Kann Bild nicht verarbeiten"
 
-#: ../../include/identity.php:965
-msgid "Love/Romance:"
-msgstr "Liebe/Romantik:"
+#: ../../include/photos.php:185
+msgid "Photo storage failed."
+msgstr "Foto speichern schlug fehl"
 
-#: ../../include/identity.php:967
-msgid "Work/employment:"
-msgstr "Arbeit/Anstellung:"
+#: ../../include/photos.php:302 ../../include/conversation.php:1478
+msgid "Photo Albums"
+msgstr "Fotoalben"
 
-#: ../../include/identity.php:969
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
+#: ../../include/photos.php:306 ../../mod/photos.php:690
+#: ../../mod/photos.php:1169
+msgid "Upload New Photos"
+msgstr "Lade neue Fotos hoch"
 
-#: ../../include/reddav.php:1018
-msgid "Edit File properties"
-msgstr "Dateieigenschaften ändern"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Männlich"
 
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:509
-#: ../../include/bbcode.php:512
-msgid "Image/photo"
-msgstr "Bild/Foto"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Weiblich"
 
-#: ../../include/bbcode.php:129 ../../include/bbcode.php:517
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Momentan männlich"
 
-#: ../../include/bbcode.php:136
-msgid "QR code"
-msgstr "QR Code"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Momentan weiblich"
 
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Größtenteils männlich"
 
-#: ../../include/bbcode.php:181
-msgid "post"
-msgstr "Beitrag"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Größtenteils weiblich"
 
-#: ../../include/bbcode.php:469 ../../include/bbcode.php:489
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transsexuell"
 
-#: ../../include/oembed.php:157
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Zwischengeschlechtlich"
 
-#: ../../include/oembed.php:166
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transsexuell"
 
-#: ../../include/features.php:21
-msgid "General Features"
-msgstr "Allgemeine Funktionen"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Zwitter"
 
-#: ../../include/features.php:23
-msgid "Content Expiration"
-msgstr "Verfall von Inhalten"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Geschlechtslos"
 
-#: ../../include/features.php:23
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "unklar"
 
-#: ../../include/features.php:24
-msgid "Multiple Profiles"
-msgstr "Mehrfachprofile"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Anders"
 
-#: ../../include/features.php:24
-msgid "Ability to create multiple profiles"
-msgstr "Mehrfachprofile anlegen können"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Unentschieden"
 
-#: ../../include/features.php:25
-msgid "Web Pages"
-msgstr "Webseiten"
+#: ../../include/profile_selectors.php:23
+msgid "Males"
+msgstr "Männer"
 
-#: ../../include/features.php:25
-msgid "Provide managed web pages on your channel"
-msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
+msgstr "Frauen"
 
-#: ../../include/features.php:26
-msgid "Private Notes"
-msgstr "private Notizen"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
+msgstr "Schwul"
 
-#: ../../include/features.php:26
-msgid "Enables a tool to store notes and reminders"
-msgstr "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
+msgstr "Lesbisch"
 
-#: ../../include/features.php:31
-msgid "Extended Identity Sharing"
-msgstr "Erweitertes Teilen von Identitäten"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
+msgstr "Keine Bevorzugung"
 
-#: ../../include/features.php:31
-msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
-msgstr "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt."
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
+msgstr "Bisexuell"
 
-#: ../../include/features.php:32
-msgid "Expert Mode"
-msgstr "Expertenmodus"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
+msgstr "Autosexuell"
 
-#: ../../include/features.php:32
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
+msgstr "Enthaltsam"
 
-#: ../../include/features.php:33
-msgid "Premium Channel"
-msgstr "Premium-Kanal"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
+msgstr "Jungfräulich"
 
-#: ../../include/features.php:33
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
+msgstr "Abweichend"
 
-#: ../../include/features.php:38
-msgid "Post Composition Features"
-msgstr "Nachbearbeitungsfunktionen"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
+msgstr "Fetisch"
 
-#: ../../include/features.php:39
-msgid "Richtext Editor"
-msgstr "Formatierungseditor"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
+msgstr "Unmengen"
 
-#: ../../include/features.php:39
-msgid "Enable richtext editor"
-msgstr "Aktiviere Formatierungseditor"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr "Sexlos"
 
-#: ../../include/features.php:40
-msgid "Post Preview"
-msgstr "Voransicht"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
+msgstr "Single"
 
-#: ../../include/features.php:40
-msgid "Allow previewing posts and comments before publishing them"
-msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
+msgstr "Einsam"
 
-#: ../../include/features.php:41 ../../include/widgets.php:476
-#: ../../mod/sources.php:81
-msgid "Channel Sources"
-msgstr "Kanal Quellen"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
+msgstr "Verfügbar"
 
-#: ../../include/features.php:41
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
 
-#: ../../include/features.php:42
-msgid "Even More Encryption"
-msgstr "Noch mehr Verschlüsselung"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
+msgstr "Verguckt"
 
-#: ../../include/features.php:42
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr "Verknallt"
 
-#: ../../include/features.php:47
-msgid "Network and Stream Filtering"
-msgstr "Netzwerk- und Stream-Filter"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
+msgstr "Lerne gerade jemanden kennen"
 
-#: ../../include/features.php:48
-msgid "Search by Date"
-msgstr "Suche nach Datum"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr "Treulos"
 
-#: ../../include/features.php:48
-msgid "Ability to select posts by date ranges"
-msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr "Sexabhängig"
 
-#: ../../include/features.php:49
-msgid "Collections Filter"
-msgstr "Filter für Sammlung"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr "Freunde/Begünstigte"
 
-#: ../../include/features.php:49
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
+msgstr "Lose"
 
-#: ../../include/features.php:50 ../../include/widgets.php:252
-msgid "Saved Searches"
-msgstr "Gesicherte Suchanfragen"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
+msgstr "Verlobt"
 
-#: ../../include/features.php:50
-msgid "Save search terms for re-use"
-msgstr "Gesicherte Suchbegriffe zur Wiederverwendung"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
+msgstr "Verheiratet"
 
-#: ../../include/features.php:51
-msgid "Network Personal Tab"
-msgstr "Persönlicher Netzwerkreiter"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr "Gewissermaßen verheiratet"
 
-#: ../../include/features.php:51
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
+msgstr "Partner"
 
-#: ../../include/features.php:52
-msgid "Network New Tab"
-msgstr "Netzwerkreiter Neu"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr "Lebensgemeinschaft"
 
-#: ../../include/features.php:52
-msgid "Enable tab to display all new Network activity"
-msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
+msgstr "Informelle Ehe"
 
-#: ../../include/features.php:53
-msgid "Affinity Tool"
-msgstr "Beziehungs-Tool"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
+msgstr "Glücklich"
 
-#: ../../include/features.php:53
-msgid "Filter stream activity by depth of relationships"
-msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
+msgstr "Nicht Ausschau haltend"
 
-#: ../../include/features.php:54
-msgid "Suggest Channels"
-msgstr "Kanäle Vorschlagen"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
+msgstr "Swinger"
 
-#: ../../include/features.php:54
-msgid "Show channel suggestions"
-msgstr "Kanal-Vorschläge anzeigen"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr "Betrogen"
 
-#: ../../include/features.php:59
-msgid "Post/Comment Tools"
-msgstr "Beitrag-/Kommentar-Tools"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
+msgstr "Getrennt"
 
-#: ../../include/features.php:61
-msgid "Edit Sent Posts"
-msgstr "Bearbeite gesendete Beiträge"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
+msgstr "Labil"
 
-#: ../../include/features.php:61
-msgid "Edit and correct posts and comments after sending"
-msgstr "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
+msgstr "Geschieden"
 
-#: ../../include/features.php:62
-msgid "Tagging"
-msgstr "Verschlagworten"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr "Gewissermaßen geschieden"
 
-#: ../../include/features.php:62
-msgid "Ability to tag existing posts"
-msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
+msgstr "Verwitwet"
 
-#: ../../include/features.php:63
-msgid "Post Categories"
-msgstr "Beitrags-Kategorien"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr "Ungewiss"
 
-#: ../../include/features.php:63
-msgid "Add categories to your posts"
-msgstr "Kategorien für Beiträge"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr "Es ist kompliziert"
 
-#: ../../include/features.php:64 ../../include/widgets.php:283
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
-msgstr "Gesicherte Ordner"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
+msgstr "Interessiert mich nicht"
 
-#: ../../include/features.php:64
-msgid "Ability to file posts under folders"
-msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
+msgstr "Frag mich mal"
 
-#: ../../include/features.php:65
-msgid "Dislike Posts"
-msgstr "Gefällt-mir-nicht Beiträge"
+#: ../../include/attach.php:179 ../../include/attach.php:227
+msgid "Item was not found."
+msgstr "Beitrag wurde nicht gefunden."
 
-#: ../../include/features.php:65
-msgid "Ability to dislike posts/comments"
-msgstr "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"
+#: ../../include/attach.php:280
+msgid "No source file."
+msgstr "Keine Quelldatei."
 
-#: ../../include/features.php:66
-msgid "Star Posts"
-msgstr "Beiträge mit Sternchen versehen"
+#: ../../include/attach.php:297
+msgid "Cannot locate file to replace"
+msgstr "Kann Datei zum Ersetzen nicht finden"
 
-#: ../../include/features.php:66
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
+#: ../../include/attach.php:315
+msgid "Cannot locate file to revise/update"
+msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
 
-#: ../../include/features.php:67
-msgid "Tag Cloud"
-msgstr "Tag Wolke"
+#: ../../include/attach.php:326
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Datei überschreitet das Größen-Limit von %d"
 
-#: ../../include/features.php:67
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"
+#: ../../include/attach.php:338
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht."
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."
+#: ../../include/attach.php:422
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
 
-#: ../../include/group.php:223
-msgid "Default privacy group for new contacts"
-msgstr "Standard-Privatsphärengruppe für neue Kontakte"
+#: ../../include/attach.php:434
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
 
-#: ../../include/group.php:242 ../../mod/admin.php:700
-msgid "All Channels"
-msgstr "Alle Kanäle"
+#: ../../include/attach.php:478 ../../include/attach.php:495
+msgid "Path not available."
+msgstr "Pfad nicht verfügbar."
 
-#: ../../include/group.php:264
-msgid "edit"
-msgstr "Bearbeiten"
+#: ../../include/attach.php:545
+msgid "Empty pathname"
+msgstr "leere Pfadangabe"
 
-#: ../../include/group.php:285
-msgid "Collections"
-msgstr "Sammlungen"
+#: ../../include/attach.php:563
+msgid "duplicate filename or path"
+msgstr "doppelter Dateiname oder Pfad"
 
-#: ../../include/group.php:286
-msgid "Edit collection"
-msgstr "Bearbeite Sammlungen"
+#: ../../include/attach.php:588
+msgid "Path not found."
+msgstr "Pfad nicht gefunden."
 
-#: ../../include/group.php:287
-msgid "Create a new collection"
-msgstr "Neue Sammlung erzeugen"
+#: ../../include/attach.php:633
+msgid "mkdir failed."
+msgstr "mkdir fehlgeschlagen."
 
-#: ../../include/group.php:288
-msgid "Channels not in any collection"
-msgstr "Kanäle, die nicht in einer Sammlung sind"
+#: ../../include/attach.php:637
+msgid "database storage failed."
+msgstr "Speichern in der Datenbank fehlgeschlagen."
 
-#: ../../include/group.php:290 ../../include/widgets.php:253
-msgid "add"
-msgstr "hinzufügen"
+#: ../../include/taxonomy.php:210
+msgid "Tags"
+msgstr "Tags"
 
-#: ../../include/notify.php:23
-msgid "created a new post"
-msgstr "Neuer Beitrag wurde erzeugt"
+#: ../../include/taxonomy.php:227
+msgid "Keywords"
+msgstr "Schlüsselbegriffe"
 
-#: ../../include/notify.php:24
-#, php-format
-msgid "commented on %s's post"
-msgstr "hat %s's Beitrag kommentiert"
+#: ../../include/taxonomy.php:252
+msgid "have"
+msgstr "habe"
 
-#: ../../include/photos.php:15 ../../include/attach.php:97
-#: ../../include/attach.php:128 ../../include/attach.php:184
-#: ../../include/attach.php:199 ../../include/attach.php:232
-#: ../../include/attach.php:246 ../../include/attach.php:267
-#: ../../include/attach.php:462 ../../include/attach.php:540
-#: ../../include/items.php:3454 ../../mod/common.php:35
-#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257
-#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../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/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:522 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../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/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76
-#: ../../mod/filestorage.php:99 ../../mod/manage.php:6
-#: ../../mod/settings.php:484 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348
-msgid "Permission denied."
-msgstr "Zugang verweigert"
+#: ../../include/taxonomy.php:252
+msgid "has"
+msgstr "hat"
 
-#: ../../include/photos.php:89
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
+#: ../../include/taxonomy.php:253
+msgid "want"
+msgstr "will"
 
-#: ../../include/photos.php:96
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/taxonomy.php:253
+msgid "wants"
+msgstr "will"
 
-#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
-msgid "Unable to process image"
-msgstr "Kann Bild nicht verarbeiten"
+#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
+msgid "like"
+msgstr "Gefällt-mir"
 
-#: ../../include/photos.php:185
-msgid "Photo storage failed."
-msgstr "Foto speichern schlug fehl"
+#: ../../include/taxonomy.php:254
+msgid "likes"
+msgstr "Gefällt-mir"
 
-#: ../../include/photos.php:302 ../../include/conversation.php:1476
-msgid "Photo Albums"
-msgstr "Fotoalben"
+#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
+msgid "dislike"
+msgstr "Gefällt-mir-nicht"
 
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1165
-msgid "Upload New Photos"
-msgstr "Lade neue Fotos hoch"
+#: ../../include/taxonomy.php:255
+msgid "dislikes"
+msgstr "Gefällt-mir-nicht"
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
-msgstr "Männlich"
+#: ../../include/auth.php:76
+msgid "Logged out."
+msgstr "Ausgeloggt."
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
-msgstr "Weiblich"
+#: ../../include/auth.php:188
+msgid "Failed authentication"
+msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Momentan männlich"
+#: ../../include/auth.php:203
+msgid "Login failed."
+msgstr "Login fehlgeschlagen."
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Momentan weiblich"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr "Ungültige E-Mail-Adresse"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Größtenteils männlich"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Größtenteils weiblich"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transsexuell"
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr "Eine Einladung wird benötigt"
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Zwischengeschlechtlich"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht bestätigt werden"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transsexuell"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
+msgstr "Bitte gib die benötigten Informationen ein."
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Zwitter"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
+msgstr "Speichern der Account-Informationen fehlgeschlagen"
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Geschlechtslos"
+#: ../../include/account.php:273
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registrierungsanfrage auf %s"
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "unklar"
+#: ../../include/account.php:275 ../../include/account.php:302
+#: ../../include/account.php:359
+msgid "Administrator"
+msgstr "Administrator"
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
-msgstr "Anders"
+#: ../../include/account.php:297
+msgid "your registration password"
+msgstr "dein Registrierungspasswort"
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Unentschieden"
+#: ../../include/account.php:300 ../../include/account.php:357
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registrierungsdetails für %s"
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
-msgstr "Männer"
+#: ../../include/account.php:366
+msgid "Account approved."
+msgstr "Account bestätigt."
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
-msgstr "Frauen"
+#: ../../include/account.php:400
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrierung für %s widerrufen"
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
-msgstr "Schwul"
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr "Sortieroptionen"
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr "Lesbisch"
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr "alphabetisch"
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
-msgstr "Keine Bevorzugung"
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr "Entgegengesetzt alphabetisch"
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr "Bisexuell"
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr "Neueste zuerst"
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr "Autosexuell"
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
+msgstr "Sichere Suche einschalten"
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr "Enthaltsam"
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
+msgstr "Sichere Suche ausschalten"
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
-msgstr "Jungfräulich"
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
-msgstr "Abweichend"
+#: ../../include/enotify.php:40
+msgid "Red Matrix Notification"
+msgstr "Red Matrix Benachrichtigung"
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
-msgstr "Fetisch"
+#: ../../include/enotify.php:41
+msgid "redmatrix"
+msgstr "redmatrix"
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
-msgstr "Unmengen"
+#: ../../include/enotify.php:43
+msgid "Thank You,"
+msgstr "Danke."
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr "Sexlos"
+#: ../../include/enotify.php:45
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrator"
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
-msgstr "Single"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s "
+msgstr "%s "
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
-msgstr "Einsam"
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
+msgstr "[Red Notify] Neue Mail auf %s empfangen"
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
-msgstr "Verfügbar"
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s hat dir %2$s geschickt."
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
-msgstr "Verguckt"
+#: ../../include/enotify.php:87
+msgid "a private message"
+msgstr "eine private Nachricht"
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
-msgstr "Verknallt"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
-msgstr "Lerne gerade jemanden kennen"
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]a %4$s[/zrl] kommentiert"
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
-msgstr "Treulos"
+#: ../../include/enotify.php:150
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
-msgstr "Sexabhängig"
+#: ../../include/enotify.php:159
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
-msgstr "Freunde/Begünstigte"
+#: ../../include/enotify.php:170
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
-msgstr "Lose"
+#: ../../include/enotify.php:171
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
-msgstr "Verlobt"
+#: ../../include/enotify.php:174 ../../include/enotify.php:189
+#: ../../include/enotify.php:215 ../../include/enotify.php:234
+#: ../../include/enotify.php:248
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
-msgstr "Verheiratet"
+#: ../../include/enotify.php:180
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
+msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
-msgstr "Gewissermaßen verheiratet"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
-msgstr "Partner"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
-msgstr "Lebensgemeinschaft"
+#: ../../include/enotify.php:208
+#, php-format
+msgid "[Red:Notify] %s tagged you"
+msgstr "[Red Notify] %s hat dich getaggt"
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
-msgstr "Informelle Ehe"
+#: ../../include/enotify.php:209
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
-msgstr "Glücklich"
+#: ../../include/enotify.php:210
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
-msgstr "Nicht Ausschau haltend"
+#: ../../include/enotify.php:223
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
+msgstr "[Red Notify] %1$s hat dich angestupst"
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
-msgstr "Swinger"
+#: ../../include/enotify.php:224
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
-msgstr "Betrogen"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
-msgstr "Getrennt"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
+msgstr "[Red:Hinweis] %s hat Dich getaggt"
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
-msgstr "Labil"
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
 
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
-msgstr "Geschieden"
+#: ../../include/enotify.php:243
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
-msgstr "Gewissermaßen geschieden"
+#: ../../include/enotify.php:255
+msgid "[Red:Notify] Introduction received"
+msgstr "[Red:Notify] Vorstellung erhalten"
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
-msgstr "Verwitwet"
+#: ../../include/enotify.php:256
+#, php-format
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
-msgstr "Ungewiss"
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
-msgstr "Es ist kompliziert"
+#: ../../include/enotify.php:261 ../../include/enotify.php:280
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
-msgstr "Interessiert mich nicht"
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Bitte besuche %s um sie anzunehmen oder abzulehnen."
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
-msgstr "Frag mich mal"
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Friend suggestion received"
+msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
 
-#: ../../include/attach.php:179 ../../include/attach.php:227
-msgid "Item was not found."
-msgstr "Beitrag wurde nicht gefunden."
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
 
-#: ../../include/attach.php:280
-msgid "No source file."
-msgstr "Keine Quelldatei."
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
 
-#: ../../include/attach.php:297
-msgid "Cannot locate file to replace"
-msgstr "Kann Datei zum Ersetzen nicht finden"
+#: ../../include/enotify.php:278
+msgid "Name:"
+msgstr "Name:"
 
-#: ../../include/attach.php:315
-msgid "Cannot locate file to revise/update"
-msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+#: ../../include/enotify.php:279
+msgid "Photo:"
+msgstr "Foto:"
 
-#: ../../include/attach.php:326
+#: ../../include/enotify.php:282
 #, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Datei überschreitet das Größen-Limit von %d"
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/attach.php:338
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht."
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr "Kategorien"
 
-#: ../../include/attach.php:422
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
 
-#: ../../include/attach.php:434
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+#: ../../include/widgets.php:123 ../../mod/connections.php:236
+msgid "Suggestions"
+msgstr "Vorschläge"
 
-#: ../../include/attach.php:478 ../../include/attach.php:495
-msgid "Path not available."
-msgstr "Pfad nicht verfügbar."
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr "Mehr anzeigen..."
+
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."
+
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
+
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr "Adresse des Kanals eingeben"
 
-#: ../../include/attach.php:545
-msgid "Empty pathname"
-msgstr "leere Pfadangabe"
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
 
-#: ../../include/attach.php:563
-msgid "duplicate filename or path"
-msgstr "doppelter Dateiname oder Pfad"
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr "Notizen"
 
-#: ../../include/attach.php:588
-msgid "Path not found."
-msgstr "Pfad nicht gefunden."
+#: ../../include/widgets.php:173 ../../include/text.php:738
+#: ../../include/text.php:752 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Speichern"
 
-#: ../../include/attach.php:633
-msgid "mkdir failed."
-msgstr "mkdir fehlgeschlagen."
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr "Eintrag löschen"
 
-#: ../../include/attach.php:637
-msgid "database storage failed."
-msgstr "Speichern in der Datenbank fehlgeschlagen."
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr "Alles"
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
-msgstr "Tags"
+#: ../../include/widgets.php:318 ../../include/items.php:3575
+msgid "Archives"
+msgstr "Archive"
 
-#: ../../include/taxonomy.php:227
-msgid "Keywords"
-msgstr "Schlüsselbegriffe"
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr "Aktualisieren"
 
-#: ../../include/taxonomy.php:252
-msgid "have"
-msgstr "habe"
+#: ../../include/widgets.php:371 ../../mod/connedit.php:386
+msgid "Me"
+msgstr "Ich"
 
-#: ../../include/taxonomy.php:252
-msgid "has"
-msgstr "hat"
+#: ../../include/widgets.php:372 ../../mod/connedit.php:388
+msgid "Best Friends"
+msgstr "Beste Freunde"
 
-#: ../../include/taxonomy.php:253
-msgid "want"
-msgstr "will"
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr "Kollegen"
 
-#: ../../include/taxonomy.php:253
-msgid "wants"
-msgstr "will"
+#: ../../include/widgets.php:375 ../../mod/connedit.php:390
+msgid "Former Friends"
+msgstr "ehem. Freunde"
 
-#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
-msgid "like"
-msgstr "Gefällt-mir"
+#: ../../include/widgets.php:376 ../../mod/connedit.php:391
+msgid "Acquaintances"
+msgstr "Bekanntschaften"
 
-#: ../../include/taxonomy.php:254
-msgid "likes"
-msgstr "Gefällt-mir"
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr "Jeder"
 
-#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
-msgid "dislike"
-msgstr "Gefällt-mir-nicht"
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../include/taxonomy.php:255
-msgid "dislikes"
-msgstr "Gefällt-mir-nicht"
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../include/auth.php:76
-msgid "Logged out."
-msgstr "Ausgeloggt."
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../include/auth.php:188
-msgid "Failed authentication"
-msgstr "Authentifizierung fehlgeschlagen"
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr "Funktions-Einstellungen"
 
-#: ../../include/auth.php:203
-msgid "Login failed."
-msgstr "Login fehlgeschlagen."
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse"
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr "Verbundene Apps"
 
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr "Kanal exportieren"
 
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr "Automatische Berechtigungen (Erweitert)"
 
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr "Eine Einladung wird benötigt"
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr "Prämium-Kanal Einstellungen"
 
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht bestätigt werden"
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr "E-Mails abrufen"
 
-#: ../../include/account.php:119
-msgid "Please enter the required information."
-msgstr "Bitte gib die benötigten Informationen ein."
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Chaträume"
 
-#: ../../include/account.php:187
-msgid "Failed to store account information."
-msgstr "Speichern der Account-Informationen fehlgeschlagen"
+#: ../../include/api.php:974
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
 
-#: ../../include/account.php:273
+#: ../../include/contact_widgets.php:14
 #, php-format
-msgid "Registration request at %s"
-msgstr "Registrierungsanfrage auf %s"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/account.php:275 ../../include/account.php:302
-#: ../../include/account.php:359
-msgid "Administrator"
-msgstr "Administrator"
+#: ../../include/contact_widgets.php:20
+msgid "Find Channels"
+msgstr "Finde Kanäle"
 
-#: ../../include/account.php:297
-msgid "your registration password"
-msgstr "dein Registrierungspasswort"
+#: ../../include/contact_widgets.php:21
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
 
-#: ../../include/account.php:300 ../../include/account.php:357
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registrierungsdetails für %s"
+#: ../../include/contact_widgets.php:22
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
 
-#: ../../include/account.php:366
-msgid "Account approved."
-msgstr "Account bestätigt."
+#: ../../include/contact_widgets.php:23
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
 
-#: ../../include/account.php:400
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrierung für %s widerrufen"
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
+#: ../../mod/directory.php:211 ../../mod/connections.php:355
+msgid "Find"
+msgstr "Finde"
 
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
-msgstr "Sortieroptionen"
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
+msgid "Channel Suggestions"
+msgstr "Kanal-Vorschläge"
 
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
-msgstr "alphabetisch"
+#: ../../include/contact_widgets.php:27
+msgid "Random Profile"
+msgstr "Zufallsprofil"
 
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
-msgstr "Entgegengesetzt alphabetisch"
+#: ../../include/contact_widgets.php:28
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
 
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
-msgstr "Neueste zuerst"
+#: ../../include/contact_widgets.php:120
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
 
-#: ../../include/dir_fns.php:30
-msgid "Enable Safe Search"
-msgstr "Sichere Suche einschalten"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Neue Seite"
 
-#: ../../include/dir_fns.php:32
-msgid "Disable Safe Search"
-msgstr "Sichere Suche ausschalten"
+#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
+#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
+#: ../../mod/layouts.php:102 ../../mod/filestorage.php:170
+#: ../../mod/settings.php:571 ../../mod/editlayout.php:106
+#: ../../mod/editpost.php:103 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: ../../include/dir_fns.php:34
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
+msgstr "Klicke hier, um das Upgrade durchzuführen."
 
-#: ../../include/enotify.php:40
-msgid "Red Matrix Notification"
-msgstr "Red Matrix Benachrichtigung"
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
 
-#: ../../include/enotify.php:41
-msgid "redmatrix"
-msgstr "redmatrix"
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
+msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
 
-#: ../../include/enotify.php:43
-msgid "Thank You,"
-msgstr "Danke."
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
+msgstr "Der Kanal ist auf dieser Seite blockiert "
+
+#: ../../include/follow.php:26
+msgid "Channel location missing."
+msgstr "Adresse des Kanals fehlt."
 
-#: ../../include/enotify.php:45
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrator"
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
+msgstr "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein."
 
-#: ../../include/enotify.php:80
-#, php-format
-msgid "%s "
-msgstr "%s "
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
+msgstr "Antwort des entfernten Kanals war unverständlich."
 
-#: ../../include/enotify.php:84
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red Notify] Neue Mail auf %s empfangen"
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
+msgstr "Antwort des entfernten Kanals war unvollständig."
 
-#: ../../include/enotify.php:86
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
+#: ../../include/follow.php:129
+msgid "local account not found."
+msgstr "Lokales Konto nicht gefunden."
 
-#: ../../include/enotify.php:87
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s hat dir %2$s geschickt."
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
+msgstr "Du kannst dich nicht mit dir selbst verbinden."
 
-#: ../../include/enotify.php:87
-msgid "a private message"
-msgstr "eine private Nachricht"
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
+msgstr "Kann meinen öffentlichen Stream und Beiträge sehen"
 
-#: ../../include/enotify.php:88
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
+msgstr "Kann meinen öffentliches Kanal-Profil sehen"
 
-#: ../../include/enotify.php:142
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]a %4$s[/zrl] kommentiert"
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
+msgstr "Kann meine öffentlichen Fotoalben sehen"
 
-#: ../../include/enotify.php:150
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
+msgstr "Kann mein öffentliches Adressbuch sehen"
 
-#: ../../include/enotify.php:159
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
+msgstr "Kann meinen öffentlichen Dateiordner sehen"
 
-#: ../../include/enotify.php:170
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
+msgstr "Kann meine öffentlichen Seiten sehen"
 
-#: ../../include/enotify.php:171
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
+msgstr "Können mir den Stream und die Beiträge aus ihrem Kanal schicken"
 
-#: ../../include/enotify.php:174 ../../include/enotify.php:189
-#: ../../include/enotify.php:215 ../../include/enotify.php:234
-#: ../../include/enotify.php:248
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
 
-#: ../../include/enotify.php:180
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
+msgstr "Kann meine Beiträge kommentieren"
 
-#: ../../include/enotify.php:182
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
+msgstr "Kann mir private Nachrichten schicken"
 
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
+msgstr "Kann Fotos in meinen Fotoalben veröffentlichen"
 
-#: ../../include/enotify.php:208
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red Notify] %s hat dich getaggt"
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
 
-#: ../../include/enotify.php:209
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
 
-#: ../../include/enotify.php:210
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
+msgstr "Kann mit mir chatten (wenn verfügbar)"
 
-#: ../../include/enotify.php:223
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red Notify] %1$s hat dich angestupst"
+#: ../../include/permissions.php:27
+msgid "Requires compatible chat plugin"
+msgstr "Benötigt ein kompatibles Chat-Plugin"
 
-#: ../../include/enotify.php:224
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
+msgstr "Kann in meinen öffentlichen Dateiordner schreiben"
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
+msgstr "Kann meine öffentlichen Seiten bearbeiten"
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Hinweis] %s hat Dich getaggt"
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
+msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden"
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften."
 
-#: ../../include/enotify.php:243
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
+#: ../../include/permissions.php:32
+msgid "Can administer my channel resources"
+msgstr "Kann meine Kanäle administrieren"
 
-#: ../../include/enotify.php:255
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Notify] Vorstellung erhalten"
+#: ../../include/permissions.php:32
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
 
-#: ../../include/enotify.php:256
-#, php-format
-msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
-msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
+msgstr "Standard"
 
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
-msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
+#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../index.php:346
+msgid "Permission denied"
+msgstr "Keine Berechtigung"
 
-#: ../../include/enotify.php:261 ../../include/enotify.php:280
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Du kannst Dir das Profil unter %s ansehen"
+#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
+msgid "Item not found."
+msgstr "Element nicht gefunden."
 
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Bitte besuche %s um sie anzunehmen oder abzulehnen."
+#: ../../include/items.php:3748 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
+msgstr "Sammlung nicht gefunden"
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
+#: ../../include/items.php:3763
+msgid "Collection is empty."
+msgstr "Sammlung ist leer."
 
-#: ../../include/enotify.php:271
+#: ../../include/items.php:3770
 #, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
+msgid "Collection: %s"
+msgstr "Sammlung: %s"
 
-#: ../../include/enotify.php:272
+#: ../../include/items.php:3781
 #, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
-
-#: ../../include/enotify.php:278
-msgid "Name:"
-msgstr "Name:"
+msgid "Connection: %s"
+msgstr "Verbindung: %s"
 
-#: ../../include/enotify.php:279
-msgid "Photo:"
-msgstr "Foto:"
+#: ../../include/items.php:3784
+msgid "Connection not found."
+msgstr "Die Verbindung wurde nicht gefunden."
 
-#: ../../include/enotify.php:282
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
+#: ../../include/security.php:280
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
-msgstr "Kategorien"
+#: ../../include/text.php:315
+msgid "prev"
+msgstr "vorherige"
 
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
+#: ../../include/text.php:317
+msgid "first"
+msgstr "erste"
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:236
-msgid "Suggestions"
-msgstr "Vorschläge"
+#: ../../include/text.php:346
+msgid "last"
+msgstr "letzte"
 
-#: ../../include/widgets.php:124
-msgid "See more..."
-msgstr "Mehr anzeigen..."
+#: ../../include/text.php:349
+msgid "next"
+msgstr "nächste"
 
-#: ../../include/widgets.php:146
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."
+#: ../../include/text.php:361
+msgid "older"
+msgstr "älter"
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
+#: ../../include/text.php:363
+msgid "newer"
+msgstr "neuer"
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
-msgstr "Adresse des Kanals eingeben"
+#: ../../include/text.php:654
+msgid "No connections"
+msgstr "Keine Verbindungen"
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+#: ../../include/text.php:665
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d Verbindung"
+msgstr[1] "%d Verbindungen"
 
-#: ../../include/widgets.php:171
-msgid "Notes"
-msgstr "Notizen"
+#: ../../include/text.php:677
+msgid "View Connections"
+msgstr "Zeige Verbindungen"
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
-msgstr "Eintrag löschen"
+#: ../../include/text.php:818
+msgid "poke"
+msgstr "anstupsen"
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
-msgstr "Alles"
+#: ../../include/text.php:818 ../../include/conversation.php:240
+msgid "poked"
+msgstr "stupste"
 
-#: ../../include/widgets.php:318 ../../include/items.php:3575
-msgid "Archives"
-msgstr "Archive"
+#: ../../include/text.php:819
+msgid "ping"
+msgstr "anpingen"
 
-#: ../../include/widgets.php:370
-msgid "Refresh"
-msgstr "Aktualisieren"
+#: ../../include/text.php:819
+msgid "pinged"
+msgstr "pingte"
 
-#: ../../include/widgets.php:371 ../../mod/connedit.php:386
-msgid "Me"
-msgstr "Ich"
+#: ../../include/text.php:820
+msgid "prod"
+msgstr "knuffen"
 
-#: ../../include/widgets.php:372 ../../mod/connedit.php:388
-msgid "Best Friends"
-msgstr "Beste Freunde"
+#: ../../include/text.php:820
+msgid "prodded"
+msgstr "knuffte"
 
-#: ../../include/widgets.php:374
-msgid "Co-workers"
-msgstr "Kollegen"
+#: ../../include/text.php:821
+msgid "slap"
+msgstr "ohrfeigen"
 
-#: ../../include/widgets.php:375 ../../mod/connedit.php:390
-msgid "Former Friends"
-msgstr "ehem. Freunde"
+#: ../../include/text.php:821
+msgid "slapped"
+msgstr "ohrfeigte"
 
-#: ../../include/widgets.php:376 ../../mod/connedit.php:391
-msgid "Acquaintances"
-msgstr "Bekanntschaften"
+#: ../../include/text.php:822
+msgid "finger"
+msgstr "befummeln"
 
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr "Jeder"
+#: ../../include/text.php:822
+msgid "fingered"
+msgstr "befummelte"
 
-#: ../../include/widgets.php:409
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
+#: ../../include/text.php:823
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
 
-#: ../../include/widgets.php:415
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
+#: ../../include/text.php:823
+msgid "rebuffed"
+msgstr "abfuhrerteilte"
 
-#: ../../include/widgets.php:421
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
+#: ../../include/text.php:835
+msgid "happy"
+msgstr "glücklich"
 
-#: ../../include/widgets.php:427
-msgid "Feature settings"
-msgstr "Funktions-Einstellungen"
+#: ../../include/text.php:836
+msgid "sad"
+msgstr "traurig"
 
-#: ../../include/widgets.php:433
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../include/text.php:837
+msgid "mellow"
+msgstr "sanft"
 
-#: ../../include/widgets.php:439
-msgid "Connected apps"
-msgstr "Verbundene Apps"
+#: ../../include/text.php:838
+msgid "tired"
+msgstr "müde"
 
-#: ../../include/widgets.php:445
-msgid "Export channel"
-msgstr "Kanal exportieren"
+#: ../../include/text.php:839
+msgid "perky"
+msgstr "frech"
 
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
-msgstr "Automatische Berechtigungen (Erweitert)"
+#: ../../include/text.php:840
+msgid "angry"
+msgstr "sauer"
 
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
-msgstr "Prämium-Kanal Einstellungen"
+#: ../../include/text.php:841
+msgid "stupified"
+msgstr "verblüfft"
 
-#: ../../include/widgets.php:504
-msgid "Check Mail"
-msgstr "E-Mails abrufen"
+#: ../../include/text.php:842
+msgid "puzzled"
+msgstr "verwirrt"
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d Einladung verfügbar"
-msgstr[1] "%d Einladungen verfügbar"
+#: ../../include/text.php:843
+msgid "interested"
+msgstr "interessiert"
 
-#: ../../include/contact_widgets.php:20
-msgid "Find Channels"
-msgstr "Finde Kanäle"
+#: ../../include/text.php:844
+msgid "bitter"
+msgstr "verbittert"
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
+#: ../../include/text.php:845
+msgid "cheerful"
+msgstr "fröhlich"
 
-#: ../../include/contact_widgets.php:22
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
+#: ../../include/text.php:846
+msgid "alive"
+msgstr "lebendig"
 
-#: ../../include/contact_widgets.php:23
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
+#: ../../include/text.php:847
+msgid "annoyed"
+msgstr "verärgert"
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:355
-msgid "Find"
-msgstr "Finde"
+#: ../../include/text.php:848
+msgid "anxious"
+msgstr "unruhig"
 
-#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
-msgid "Channel Suggestions"
-msgstr "Kanal-Vorschläge"
+#: ../../include/text.php:849
+msgid "cranky"
+msgstr "schrullig"
 
-#: ../../include/contact_widgets.php:27
-msgid "Random Profile"
-msgstr "Zufallsprofil"
+#: ../../include/text.php:850
+msgid "disturbed"
+msgstr "verstört"
 
-#: ../../include/contact_widgets.php:28
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
+#: ../../include/text.php:851
+msgid "frustrated"
+msgstr "frustriert"
 
-#: ../../include/contact_widgets.php:120
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeinsame Verbindung"
-msgstr[1] "%d gemeinsame Verbindungen"
+#: ../../include/text.php:852
+msgid "motivated"
+msgstr "motiviert"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Neue Seite"
+#: ../../include/text.php:853
+msgid "relaxed"
+msgstr "entspannt"
 
-#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
-#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:171
-#: ../../mod/settings.php:569 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:98 ../../mod/blocks.php:93
-#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
-msgid "Edit"
-msgstr "Bearbeiten"
+#: ../../include/text.php:854
+msgid "surprised"
+msgstr "überrascht"
 
-#: ../../include/plugin.php:475 ../../include/plugin.php:477
-msgid "Click here to upgrade."
-msgstr "Klicke hier, um das Upgrade durchzuführen."
+#: ../../include/text.php:1017
+msgid "Monday"
+msgstr "Montag"
 
-#: ../../include/plugin.php:483
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+#: ../../include/text.php:1017
+msgid "Tuesday"
+msgstr "Dienstag"
 
-#: ../../include/plugin.php:488
-msgid "This action is not available under your subscription plan."
-msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+#: ../../include/text.php:1017
+msgid "Wednesday"
+msgstr "Mittwoch"
 
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
-msgstr "Der Kanal ist auf dieser Seite blockiert "
+#: ../../include/text.php:1017
+msgid "Thursday"
+msgstr "Donnerstag"
 
-#: ../../include/follow.php:26
-msgid "Channel location missing."
-msgstr "Adresse des Kanals fehlt."
+#: ../../include/text.php:1017
+msgid "Friday"
+msgstr "Freitag"
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein."
+#: ../../include/text.php:1017
+msgid "Saturday"
+msgstr "Samstag"
 
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
-msgstr "Antwort des entfernten Kanals war unverständlich."
+#: ../../include/text.php:1017
+msgid "Sunday"
+msgstr "Sonntag"
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
-msgstr "Antwort des entfernten Kanals war unvollständig."
+#: ../../include/text.php:1021
+msgid "January"
+msgstr "Januar"
 
-#: ../../include/follow.php:129
-msgid "local account not found."
-msgstr "Lokales Konto nicht gefunden."
+#: ../../include/text.php:1021
+msgid "February"
+msgstr "Februar"
 
-#: ../../include/follow.php:138
-msgid "Cannot connect to yourself."
-msgstr "Du kannst dich nicht mit dir selbst verbinden."
+#: ../../include/text.php:1021
+msgid "March"
+msgstr "März"
 
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
-msgstr "Kann meinen öffentlichen Stream und Beiträge sehen"
+#: ../../include/text.php:1021
+msgid "April"
+msgstr "April"
 
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
-msgstr "Kann meinen öffentliches Kanal-Profil sehen"
+#: ../../include/text.php:1021
+msgid "May"
+msgstr "Mai"
 
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
-msgstr "Kann meine öffentlichen Fotoalben sehen"
+#: ../../include/text.php:1021
+msgid "June"
+msgstr "Juni"
 
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
-msgstr "Kann mein öffentliches Adressbuch sehen"
+#: ../../include/text.php:1021
+msgid "July"
+msgstr "Juli"
 
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
-msgstr "Kann meinen öffentlichen Dateiordner sehen"
+#: ../../include/text.php:1021
+msgid "August"
+msgstr "August"
 
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
-msgstr "Kann meine öffentlichen Seiten sehen"
+#: ../../include/text.php:1021
+msgid "September"
+msgstr "September"
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
-msgstr "Können mir den Stream und die Beiträge aus ihrem Kanal schicken"
+#: ../../include/text.php:1021
+msgid "October"
+msgstr "Oktober"
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+#: ../../include/text.php:1021
+msgid "November"
+msgstr "November"
 
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
-msgstr "Kann meine Beiträge kommentieren"
+#: ../../include/text.php:1021
+msgid "December"
+msgstr "Dezember"
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
-msgstr "Kann mir private Nachrichten schicken"
+#: ../../include/text.php:1099
+msgid "unknown.???"
+msgstr "unbekannt.???"
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
-msgstr "Kann Fotos in meinen Fotoalben veröffentlichen"
+#: ../../include/text.php:1100
+msgid "bytes"
+msgstr "Bytes"
 
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+#: ../../include/text.php:1135
+msgid "remove category"
+msgstr "Kategorie entfernen"
 
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+#: ../../include/text.php:1157
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
 
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
+#: ../../include/text.php:1215 ../../include/text.php:1227
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
-msgstr "Benötigt ein kompatibles Chat-Plugin"
+#: ../../include/text.php:1403 ../../mod/events.php:332
+msgid "link to source"
+msgstr "Link zum Originalbeitrag"
 
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
-msgstr "Kann in meinen öffentlichen Dateiordner schreiben"
+#: ../../include/text.php:1422
+msgid "Select a page layout: "
+msgstr "Ein Seiten-Layout auswählen"
 
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
-msgstr "Kann meine öffentlichen Seiten bearbeiten"
+#: ../../include/text.php:1425 ../../include/text.php:1490
+msgid "default"
+msgstr "Standard"
 
-#: ../../include/permissions.php:31
-msgid "Can source my \"public\" posts in derived channels"
-msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden"
+#: ../../include/text.php:1461
+msgid "Page content type: "
+msgstr "Content-Typ der Seite"
 
-#: ../../include/permissions.php:31
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften."
+#: ../../include/text.php:1502
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
 
-#: ../../include/permissions.php:32
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
+#: ../../include/text.php:1654 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
+msgstr "Foto"
 
-#: ../../include/permissions.php:32
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
+#: ../../include/text.php:1657 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr "Ereignis"
 
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
-#: ../../view/theme/apw/php/config.php:176
-msgid "Default"
-msgstr "Standard"
+#: ../../include/text.php:1660 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr "Status"
 
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:19 ../../index.php:347
-msgid "Permission denied"
-msgstr "Keine Berechtigung"
+#: ../../include/text.php:1662 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr "Kommentar"
 
-#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:150
-#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18
-#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
-msgid "Item not found."
-msgstr "Element nicht gefunden."
+#: ../../include/text.php:1667
+msgid "activity"
+msgstr "Aktivität"
 
-#: ../../include/items.php:3743 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
-msgstr "Sammlung nicht gefunden"
+#: ../../include/text.php:1929
+msgid "Design"
+msgstr "Design"
 
-#: ../../include/items.php:3758
-msgid "Collection is empty."
-msgstr "Sammlung ist leer."
+#: ../../include/text.php:1931
+msgid "Blocks"
+msgstr "Blöcke"
 
-#: ../../include/items.php:3765
-#, php-format
-msgid "Collection: %s"
-msgstr "Sammlung: %s"
+#: ../../include/text.php:1932
+msgid "Menus"
+msgstr "Menüs"
 
-#: ../../include/items.php:3776
-#, php-format
-msgid "Connection: %s"
-msgstr "Verbindung: %s"
+#: ../../include/text.php:1933
+msgid "Layouts"
+msgstr "Layouts"
 
-#: ../../include/items.php:3779
-msgid "Connection not found."
-msgstr "Die Verbindung wurde nicht gefunden."
+#: ../../include/text.php:1934
+msgid "Pages"
+msgstr "Seiten"
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:841
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
 msgid "Private Message"
 msgstr "Private Nachricht"
 
 #: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695
-#: ../../mod/group.php:176 ../../mod/photos.php:1019
-#: ../../mod/filestorage.php:172 ../../mod/settings.php:570
+#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:745
+#: ../../mod/group.php:176 ../../mod/photos.php:1023
+#: ../../mod/filestorage.php:171 ../../mod/settings.php:572
 msgid "Delete"
 msgstr "Löschen"
 
@@ -2580,11 +2616,11 @@ msgstr "Nachricht überprüft"
 msgid "add tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:951
 msgid "I like this (toggle)"
 msgstr "Ich mag das (Umschalter)"
 
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:176 ../../mod/photos.php:952
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (Umschalter)"
 
@@ -2627,15 +2663,15 @@ msgstr "von %s"
 msgid "last edited: %s"
 msgstr "zuletzt bearbeitet: %s"
 
-#: ../../include/ItemObject.php:221
+#: ../../include/ItemObject.php:221 ../../include/conversation.php:690
 #, php-format
 msgid "Expires: %s"
 msgstr "Verfällt: %s"
 
-#: ../../include/ItemObject.php:248 ../../include/conversation.php:706
-#: ../../include/conversation.php:1119 ../../mod/photos.php:950
+#: ../../include/ItemObject.php:248 ../../include/conversation.php:707
+#: ../../include/conversation.php:1120 ../../mod/photos.php:954
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153
+#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:153
 #: ../../mod/editblock.php:129
 msgid "Please wait"
 msgstr "Bitte warten"
@@ -2647,8 +2683,8 @@ msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:966
-#: ../../mod/photos.php:1053
+#: ../../include/ItemObject.php:534 ../../mod/photos.php:970
+#: ../../mod/photos.php:1057
 msgid "This is you"
 msgstr "Das bist du"
 
@@ -2656,16 +2692,17 @@ msgstr "Das bist du"
 #: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
 #: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
 #: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828
-#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1056
-#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132
-#: ../../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/mail.php:223 ../../mod/mail.php:335
-#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142
+#: ../../mod/admin.php:431 ../../mod/admin.php:738 ../../mod/admin.php:878
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1164 ../../mod/group.php:81
+#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:933
+#: ../../mod/photos.php:973 ../../mod/photos.php:1060 ../../mod/chat.php:107
+#: ../../mod/chat.php:133 ../../mod/profiles.php:506
+#: ../../mod/filestorage.php:131 ../../mod/import.php:387
+#: ../../mod/settings.php:509 ../../mod/settings.php:621
+#: ../../mod/settings.php:649 ../../mod/settings.php:673
+#: ../../mod/settings.php:744 ../../mod/settings.php:908
+#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/poke.php:166
+#: ../../mod/fsuggest.php:108 ../../mod/mood.php:142
 #: ../../view/theme/redbasic/php/config.php:85
 #: ../../view/theme/apw/php/config.php:231
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2705,36 +2742,18 @@ msgstr "Link"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:546 ../../include/conversation.php:1082
-#: ../../mod/webpages.php:122 ../../mod/photos.php:970
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127
+#: ../../include/ItemObject.php:546 ../../include/conversation.php:1083
+#: ../../mod/webpages.php:122 ../../mod/photos.php:974
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:132
 #: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../include/ItemObject.php:549 ../../include/conversation.php:1146
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135
+#: ../../include/ItemObject.php:549 ../../include/conversation.php:1147
+#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:140
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
-#: ../../include/security.php:49
-msgid "Welcome "
-msgstr "Willkommen"
-
-#: ../../include/security.php:50
-msgid "Please upload a profile photo."
-msgstr "Bitte lade ein Profilfoto hoch."
-
-#: ../../include/security.php:53
-msgid "Welcome back "
-msgstr "Willkommen zurück"
-
-#: ../../include/security.php:363
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
-
 #: ../../include/conversation.php:123
 msgid "channel"
 msgstr "Kanal"
@@ -2777,344 +2796,344 @@ msgstr "Kategorien:"
 msgid "Filed under:"
 msgstr "Gespeichert unter:"
 
-#: ../../include/conversation.php:704
+#: ../../include/conversation.php:705
 msgid "View in context"
 msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/conversation.php:833
+#: ../../include/conversation.php:834
 msgid "remove"
 msgstr "lösche"
 
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:838
 msgid "Loading..."
 msgstr "Lädt ..."
 
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:839
 msgid "Delete Selected Items"
 msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/conversation.php:929
+#: ../../include/conversation.php:930
 msgid "View Source"
 msgstr "Quelle anzeigen"
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:931
 msgid "Follow Thread"
 msgstr "Unterhaltung folgen"
 
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:932
 msgid "View Status"
 msgstr "Status ansehen"
 
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:934
 msgid "View Photos"
 msgstr "Fotos ansehen"
 
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:935
 msgid "Matrix Activity"
 msgstr "Matrix Aktivität"
 
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:936
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:937
 msgid "Send PM"
 msgstr "Sende PN"
 
-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:938
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
 #, php-format
 msgid "%s likes this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1003
+#: ../../include/conversation.php:1004
 #, php-format
 msgid "%2$d people like this."
 msgid_plural "%2$d people like this."
 msgstr[0] "%2$d Person gefällt das."
 msgstr[1] "%2$d Leuten gefällt das."
 
-#: ../../include/conversation.php:1005
+#: ../../include/conversation.php:1006
 #, php-format
 msgid "%2$d people don't like this."
 msgid_plural "%2$d people don't like this."
 msgstr[0] "%2$d Person gefällt das nicht."
 msgstr[1] "%2$d Leuten gefällt das nicht."
 
-#: ../../include/conversation.php:1011
+#: ../../include/conversation.php:1012
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1014
+#: ../../include/conversation.php:1015
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ", und %d andere"
 
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
 #, php-format
 msgid "%s like this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
 #, php-format
 msgid "%s don't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1065
+#: ../../include/conversation.php:1066
 msgid "Visible to everybody"
 msgstr "Sichtbar für jeden"
 
-#: ../../include/conversation.php:1066 ../../mod/mail.php:171
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
 #: ../../mod/mail.php:269
 msgid "Please enter a link URL:"
 msgstr "Gib eine URL ein:"
 
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1068
 msgid "Please enter a video link/URL:"
 msgstr "Gib einen Video-Link/URL ein:"
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1069
 msgid "Please enter an audio link/URL:"
 msgstr "Gib einen Audio-Link/URL ein:"
 
-#: ../../include/conversation.php:1069
+#: ../../include/conversation.php:1070
 msgid "Tag term:"
 msgstr "Schlagwort:"
 
-#: ../../include/conversation.php:1070 ../../mod/filer.php:35
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
 msgid "Save to Folder:"
 msgstr "Speichern in Ordner:"
 
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1072
 msgid "Where are you right now?"
 msgstr "Wo bist du jetzt grade?"
 
-#: ../../include/conversation.php:1072 ../../mod/mail.php:172
+#: ../../include/conversation.php:1073 ../../mod/mail.php:172
 #: ../../mod/mail.php:270 ../../mod/editpost.php:52
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../include/conversation.php:1096 ../../mod/photos.php:949
+#: ../../include/conversation.php:1097 ../../mod/photos.php:953
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
 msgid "Page link title"
 msgstr "Seitentitel-Link"
 
-#: ../../include/conversation.php:1100 ../../mod/mail.php:219
+#: ../../include/conversation.php:1101 ../../mod/mail.php:219
 #: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145
+#: ../../mod/editpost.php:104 ../../mod/editwebpage.php:145
 #: ../../mod/editblock.php:121
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../include/conversation.php:1101
+#: ../../include/conversation.php:1102
 msgid "upload photo"
 msgstr "Foto hochladen"
 
-#: ../../include/conversation.php:1102 ../../mod/mail.php:220
+#: ../../include/conversation.php:1103 ../../mod/mail.php:220
 #: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146
+#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:146
 #: ../../mod/editblock.php:122
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1104
 msgid "attach file"
 msgstr "Datei anfügen"
 
-#: ../../include/conversation.php:1104 ../../mod/mail.php:221
+#: ../../include/conversation.php:1105 ../../mod/mail.php:221
 #: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147
+#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:147
 #: ../../mod/editblock.php:123
 msgid "Insert web link"
 msgstr "Link einfügen"
 
-#: ../../include/conversation.php:1105
+#: ../../include/conversation.php:1106
 msgid "web link"
 msgstr "Web-Link"
 
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1107
 msgid "Insert video link"
 msgstr "Video-Link einfügen"
 
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1108
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:1108
+#: ../../include/conversation.php:1109
 msgid "Insert audio link"
 msgstr "Audio-Link einfügen"
 
-#: ../../include/conversation.php:1109
+#: ../../include/conversation.php:1110
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:113
+#: ../../mod/editpost.php:110 ../../mod/editwebpage.php:151
 #: ../../mod/editblock.php:127
 msgid "Set your location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1111
+#: ../../include/conversation.php:1112
 msgid "set location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:114
+#: ../../mod/editpost.php:111 ../../mod/editwebpage.php:152
 #: ../../mod/editblock.php:128
 msgid "Clear browser location"
 msgstr "Browser-Standort löschen"
 
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1114
 msgid "clear location"
 msgstr "Standort löschen"
 
-#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169
+#: ../../include/conversation.php:1116 ../../mod/editlayout.php:127
+#: ../../mod/editpost.php:124 ../../mod/editwebpage.php:169
 #: ../../mod/editblock.php:142
 msgid "Set title"
 msgstr "Titel"
 
-#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171
+#: ../../include/conversation.php:1119 ../../mod/editlayout.php:130
+#: ../../mod/editpost.php:126 ../../mod/editwebpage.php:171
 #: ../../mod/editblock.php:145
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154
+#: ../../include/conversation.php:1121 ../../mod/editlayout.php:116
+#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:154
 #: ../../mod/editblock.php:130
 msgid "Permission settings"
 msgstr "Berechtigungs-Einstellungen"
 
-#: ../../include/conversation.php:1121
+#: ../../include/conversation.php:1122
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164
+#: ../../include/conversation.php:1130 ../../mod/editlayout.php:124
+#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:164
 #: ../../mod/editblock.php:139
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172
+#: ../../include/conversation.php:1132 ../../mod/editlayout.php:131
+#: ../../mod/editpost.php:127 ../../mod/editwebpage.php:172
 #: ../../mod/editblock.php:146
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Beispiel: bob@example.com, mary@example.com"
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:226
+#: ../../include/conversation.php:1145 ../../mod/mail.php:226
 #: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182
+#: ../../mod/editpost.php:138 ../../mod/editwebpage.php:182
 #: ../../mod/editblock.php:156
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
-#: ../../include/conversation.php:1148 ../../mod/editpost.php:136
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:508
-#: ../../mod/settings.php:534 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/settings.php:510
+#: ../../mod/settings.php:536 ../../mod/editpost.php:143
 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../include/conversation.php:1379
+#: ../../include/conversation.php:1381
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: ../../include/conversation.php:1382
+#: ../../include/conversation.php:1384
 msgid "Sort by Comment Date"
 msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/conversation.php:1385
+#: ../../include/conversation.php:1387
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: ../../include/conversation.php:1388
+#: ../../include/conversation.php:1390
 msgid "Sort by Post Date"
 msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/conversation.php:1392
+#: ../../include/conversation.php:1394
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../include/conversation.php:1395
+#: ../../include/conversation.php:1397
 msgid "Posts that mention or involve you"
 msgstr "Beiträge mit Beteiligung deinerseits"
 
-#: ../../include/conversation.php:1398 ../../mod/menu.php:57
+#: ../../include/conversation.php:1400 ../../mod/menu.php:57
 #: ../../mod/connections.php:209
 msgid "New"
 msgstr "Neu"
 
-#: ../../include/conversation.php:1401
+#: ../../include/conversation.php:1403
 msgid "Activity Stream - by date"
 msgstr "Activity Stream - nach Datum sortiert"
 
-#: ../../include/conversation.php:1408
+#: ../../include/conversation.php:1410
 msgid "Starred"
 msgstr "Markiert"
 
-#: ../../include/conversation.php:1411
+#: ../../include/conversation.php:1413
 msgid "Favourite Posts"
 msgstr "Beiträge mit Sternchen"
 
-#: ../../include/conversation.php:1418
+#: ../../include/conversation.php:1420
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1421
+#: ../../include/conversation.php:1423
 msgid "Posts flagged as SPAM"
 msgstr "Nachrichten die als SPAM markiert wurden"
 
-#: ../../include/conversation.php:1452
+#: ../../include/conversation.php:1454
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../include/conversation.php:1455
+#: ../../include/conversation.php:1457
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/conversation.php:1464
+#: ../../include/conversation.php:1466
 msgid "About"
 msgstr "Über"
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1469
 msgid "Profile Details"
 msgstr "Profil-Details"
 
-#: ../../include/conversation.php:1482 ../../mod/fbrowser.php:114
+#: ../../include/conversation.php:1484 ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Dateien"
 
-#: ../../include/conversation.php:1485
+#: ../../include/conversation.php:1487
 msgid "Files and Storage"
 msgstr "Dateien und Speicher"
 
-#: ../../include/conversation.php:1494
+#: ../../include/conversation.php:1496
 msgid "Events and Calendar"
 msgstr "Veranstaltungen und Kalender"
 
-#: ../../include/conversation.php:1501
+#: ../../include/conversation.php:1503
 msgid "Webpages"
 msgstr "Webseiten"
 
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1506
 msgid "Manage Webpages"
 msgstr "Webseiten verwalten"
 
@@ -3342,7 +3361,7 @@ msgid ""
 "http://getzot.com"
 msgstr "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an"
 
-#: ../../mod/cloud.php:88
+#: ../../mod/cloud.php:112
 msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
 msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"
 
@@ -3442,12 +3461,12 @@ msgid "View recent posts and comments"
 msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
 #: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:747
 msgid "Unblock"
 msgstr "Freigeben"
 
 #: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:746
 msgid "Block"
 msgstr "Blockieren"
 
@@ -3693,13 +3712,13 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:496 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
 msgid "No"
 msgstr "Nein"
 
@@ -3721,7 +3740,7 @@ msgid "Channel not found."
 msgstr "Kanal nicht gefunden."
 
 #: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100
-#: ../../index.php:227
+#: ../../index.php:226
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -4074,7 +4093,7 @@ msgid ""
 "poller."
 msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
 
-#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr "Bearbeite Beitrag"
 
@@ -4274,521 +4293,531 @@ msgstr "Konnte die Quelle nicht löschen."
 msgid "Theme settings updated."
 msgstr "Theme-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:87 ../../mod/admin.php:419
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:687 ../../mod/admin.php:699
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:785 ../../mod/admin.php:827
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
 msgid "Plugins"
 msgstr "Plug-Ins"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:990 ../../mod/admin.php:1026
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
 msgid "Themes"
 msgstr "Themes"
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:479
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
 msgid "Server"
 msgstr "Server"
 
-#: ../../mod/admin.php:92
+#: ../../mod/admin.php:93
 msgid "DB updates"
 msgstr "DB-Aktualisierungen"
 
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1113
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../mod/admin.php:112
+#: ../../mod/admin.php:113
 msgid "Plugin Features"
 msgstr "Plug-In Funktionen"
 
-#: ../../mod/admin.php:114
+#: ../../mod/admin.php:115
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzer Anmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:188
+#: ../../mod/admin.php:189
 msgid "Message queues"
 msgstr "Nachrichten Warteschlange"
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:478
-#: ../../mod/admin.php:686 ../../mod/admin.php:784 ../../mod/admin.php:826
-#: ../../mod/admin.php:989 ../../mod/admin.php:1025 ../../mod/admin.php:1112
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../mod/admin.php:194
+#: ../../mod/admin.php:195
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:197
 msgid "Registered users"
 msgstr "Registrierte Benutzer"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:482
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
 msgid "Pending registrations"
 msgstr "Ausstehende Registrierungen"
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:200
 msgid "Version"
 msgstr "Version"
 
-#: ../../mod/admin.php:201 ../../mod/admin.php:483
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
 msgid "Active plugins"
 msgstr "Aktive Plug-Ins"
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:350
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:371 ../../mod/settings.php:700
+#: ../../mod/admin.php:379 ../../mod/settings.php:702
 msgid "No special theme for mobile devices"
 msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:381
 msgid "No special theme for accessibility"
 msgstr "Kein spezielles Accessibility Theme vorhanden"
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:409
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:410
 msgid "Requires approval"
 msgstr "Genehmigung erforderlich"
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:411
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:416
 msgid "Private"
 msgstr "Privat"
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:417
 msgid "Paid Access"
 msgstr "Kostenpflichtiger Zugang"
 
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:418
 msgid "Free Access"
 msgstr "Kostenloser Zugang"
 
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:419
 msgid "Tiered Access"
 msgstr "Abgestufter Zugang"
 
-#: ../../mod/admin.php:421 ../../mod/register.php:189
+#: ../../mod/admin.php:432 ../../mod/register.php:189
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:433
 msgid "File upload"
 msgstr "Dateiupload"
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:434
 msgid "Policies"
 msgstr "Richtlinien"
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:435
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:439
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:440
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr "Administrator Informationen"
+
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden."
+
+#: ../../mod/admin.php:442
 msgid "System language"
 msgstr "System-Sprache"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
 msgid "System theme"
 msgstr "System-Theme"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Standard System-Theme - kann durch Nutzerprofile überschieben werden - Theme.Einstellungen ändern"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
 msgid "Mobile system theme"
 msgstr "Mobile System-Theme:"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
 msgid "Theme for mobile devices"
 msgstr "Theme für mobile Geräte"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
 msgid "Accessibility system theme"
 msgstr "Accessibility System-Theme"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
 msgid "Accessibility theme"
 msgstr "Accessibility Theme"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
 msgid "Channel to use for this website's static pages"
 msgstr "Kanal für die statischen Seiten dieser Webseite verwenden"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
 msgid "Site Channel"
 msgstr "Seiten Kanal"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Größe in Bytes von hochgeladenen Bildern. Standard ist 0, was keine Einschränkung bedeutet."
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
 msgid "Access policy"
 msgstr "Zugangsrichtlinien"
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
 msgid "Accounts abandoned after x days"
 msgstr "Accounts gelten nach X Tagen als unbenutzt"
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine Systemressourchen auf das Pollen von externen Seiten wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Force publish"
 msgstr "Veröffentlichung erzwingen"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "No login on Homepage"
 msgstr "Kein Login auf der Homepage"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Check to hide the login form from your sites homepage when visitors arrive "
 "who are not logged in (e.g. when you put the content of the homepage in via "
 "the site channel)."
 msgstr "Wählen um das Login Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört."
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "Proxy user"
 msgstr "Proxy Benutzer"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
 msgid "Network timeout"
 msgstr "Netzwerk-Timeout"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "Delivery interval"
 msgstr "Auslieferung Intervall"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Maximum Load Average"
 msgstr "Maximum Load Average"
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:520
 msgid "No server found"
 msgstr "Kein Server gefunden"
 
-#: ../../mod/admin.php:477 ../../mod/admin.php:700
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
 msgid "for channel"
 msgstr "für Kanal"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
 msgid "on server"
 msgstr "auf Server"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
 msgid "Status"
 msgstr "Status"
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:548
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:558
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs."
 
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:561
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s wurde erfolgreich angewandt."
 
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:565
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s liefert keinen Rückgabewert. Unbekannt ob es erfolgreich war."
 
-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:568
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update Funktion %s konnte nicht gefunden werden."
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:583
 msgid "No failed updates."
 msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:587
 msgid "Failed Updates"
 msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:589
 msgid "Mark success (if update was manually applied)"
 msgstr "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)"
 
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:590
 msgid "Attempt to execute this update step automatically"
 msgstr "Versuche diesen Updateschritt automatisch anzuwenden"
 
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:616
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s Nutzer blockiert/freigegeben"
 msgstr[1] "%s Nutzer blockiert/freigegeben"
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:623
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s Nutzer gelöscht"
 msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:654
 msgid "Account not found"
 msgstr "Konto nicht gefunden"
 
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:665
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Benutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Benutzer '%s' freigegeben"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Benutzer '%s' blockiert"
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:739
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:740
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:741
 msgid "Request date"
 msgstr "Antragsdatum"
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:742
 msgid "No registrations."
 msgstr "Keine Registrierungen."
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:743
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:744
 msgid "Deny"
 msgstr "Verweigern"
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Register date"
 msgstr "Registrierungs-Datum"
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Expires"
 msgstr "Verfällt"
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
 msgid "Service Class"
 msgstr "Service-Klasse"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:752
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:703
+#: ../../mod/admin.php:753
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:744
+#: ../../mod/admin.php:794
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-In %s deaktiviert."
 
-#: ../../mod/admin.php:748
+#: ../../mod/admin.php:798
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-In %s aktiviert."
 
-#: ../../mod/admin.php:758 ../../mod/admin.php:960
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:962
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: ../../mod/admin.php:786 ../../mod/admin.php:991
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:794 ../../mod/admin.php:1001
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:974
 msgid "No themes found."
 msgstr "Keine Theme gefunden."
 
-#: ../../mod/admin.php:983
+#: ../../mod/admin.php:1033
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:1031
+#: ../../mod/admin.php:1081
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1082
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:1059
+#: ../../mod/admin.php:1109
 msgid "Log settings updated."
 msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1165
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1171
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis."
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1173
 msgid "Log level"
 msgstr "Protokollstufe"
 
@@ -4813,7 +4842,7 @@ msgid "Unable to add menu element."
 msgstr "Kann Menü-Bestandteil nicht hinzufügen."
 
 #: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:177
+#: ../../mod/dirprofile.php:181
 msgid "Not found."
 msgstr "Nicht gefunden."
 
@@ -4861,7 +4890,7 @@ msgstr "Neues Menü-Bestandteil"
 msgid "Menu Item Permissions"
 msgstr "Menü-Element Zugriffsrechte"
 
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:930
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:937
 msgid "(click to open/close)"
 msgstr "(zum öffnen/schließen anklicken)"
 
@@ -4973,7 +5002,7 @@ msgstr "Album nicht gefunden."
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:159 ../../mod/photos.php:934
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -5011,13 +5040,13 @@ msgstr "oder bestehenden Album Namen:"
 msgid "Do not show a status post for this upload"
 msgstr "Keine Statusnachricht für diesen Upload senden"
 
-#: ../../mod/photos.php:603 ../../mod/photos.php:925
-#: ../../mod/filestorage.php:125
+#: ../../mod/photos.php:603 ../../mod/photos.php:929
+#: ../../mod/filestorage.php:124
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1101
-#: ../../mod/photos.php:1116
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1105
+#: ../../mod/photos.php:1120
 msgid "Contact Photos"
 msgstr "Kontakt Bilder"
 
@@ -5033,7 +5062,7 @@ msgstr "Zeige neueste zuerst"
 msgid "Show Oldest First"
 msgstr "Zeige älteste zuerst"
 
-#: ../../mod/photos.php:729 ../../mod/photos.php:1148
+#: ../../mod/photos.php:729 ../../mod/photos.php:1152
 msgid "View Photo"
 msgstr "Foto ansehen"
 
@@ -5045,51 +5074,63 @@ msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt w
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:835
+#: ../../mod/photos.php:837
 msgid "Use as profile photo"
 msgstr "Als Profilfoto verwenden"
 
-#: ../../mod/photos.php:859
+#: ../../mod/photos.php:861
 msgid "View Full Size"
 msgstr "In voller Größe anzeigen"
 
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:917
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:915
+#: ../../mod/photos.php:919
 msgid "Rotate CW (right)"
 msgstr "Drehen US (rechts)"
 
-#: ../../mod/photos.php:916
+#: ../../mod/photos.php:920
 msgid "Rotate CCW (left)"
 msgstr "Drehen EUS (links)"
 
-#: ../../mod/photos.php:918
+#: ../../mod/photos.php:922
 msgid "New album name"
 msgstr "Name des neuen Albums:"
 
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:925
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:923
+#: ../../mod/photos.php:927
 msgid "Add a Tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../mod/photos.php:927
+#: ../../mod/photos.php:931
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1154
+#: ../../mod/photos.php:1158
 msgid "View Album"
 msgstr "Album ansehen"
 
-#: ../../mod/photos.php:1163
+#: ../../mod/photos.php:1167
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
+
+#: ../../mod/chat.php:130
+msgid "New Chatroom"
+msgstr "Neuen Chatraum"
+
+#: ../../mod/chat.php:131
+msgid "Chatroom Name"
+msgstr "Chatraum Name"
+
 #: ../../mod/filer.php:35
 msgid "- select -"
 msgstr "-auswählen-"
@@ -5175,12 +5216,12 @@ msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 msgid "Welcome to %s"
 msgstr "Willkommen auf %s"
 
-#: ../../mod/directory.php:143 ../../mod/profiles.php:573
-#: ../../mod/dirprofile.php:95
+#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
 msgid "Age: "
 msgstr "Alter:"
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:98
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
 msgid "Gender: "
 msgstr "Geschlecht:"
 
@@ -5228,7 +5269,7 @@ msgstr "Neue Verbindungen vorschlagen"
 msgid "Show pending (new) connections"
 msgstr "Zeige schwebende (neue) Verbindungen"
 
-#: ../../mod/connections.php:248
+#: ../../mod/connections.php:248 ../../mod/profperm.php:134
 msgid "All Connections"
 msgstr "Alle Verbindungen"
 
@@ -5293,7 +5334,7 @@ msgstr "Layout Name"
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: ../../mod/help.php:68 ../../index.php:224
+#: ../../mod/help.php:68 ../../index.php:223
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
@@ -5352,6 +5393,53 @@ msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 msgid "This site is not a directory server"
 msgstr "Diese Website ist kein Verzeichnis-Server"
 
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
+
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
+
+#: ../../mod/siteinfo.php:94
+msgid "Red"
+msgstr "Red"
+
+#: ../../mod/siteinfo.php:95
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
+
+#: ../../mod/siteinfo.php:98
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
+
+#: ../../mod/siteinfo.php:99
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
+
+#: ../../mod/siteinfo.php:100
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+
+#: ../../mod/siteinfo.php:103
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
+"librelist - dot com"
+msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com"
+
+#: ../../mod/siteinfo.php:104
+msgid "Site Administrators"
+msgstr "Administratoren"
+
 #: ../../mod/lockview.php:34
 msgid "Remote privacy information not available."
 msgstr "Entfernte Privatsphären Einstellungen sind nicht verfügbar."
@@ -5365,7 +5453,7 @@ msgid "Hub not found."
 msgstr "Server nicht gefunden."
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:475
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
@@ -5389,226 +5477,226 @@ msgstr "Profil kann nicht geklont werden."
 msgid "Profile Name is required."
 msgstr "Profil-Name erforderlich."
 
-#: ../../mod/profiles.php:306
+#: ../../mod/profiles.php:294
 msgid "Marital Status"
 msgstr "Familienstand"
 
-#: ../../mod/profiles.php:310
+#: ../../mod/profiles.php:298
 msgid "Romantic Partner"
 msgstr "Romantische Partner"
 
-#: ../../mod/profiles.php:314
+#: ../../mod/profiles.php:302
 msgid "Likes"
 msgstr "Gefällt-mir"
 
-#: ../../mod/profiles.php:318
+#: ../../mod/profiles.php:306
 msgid "Dislikes"
 msgstr "Gefällt-mir-nicht"
 
-#: ../../mod/profiles.php:322
+#: ../../mod/profiles.php:310
 msgid "Work/Employment"
 msgstr "Arbeit/Anstellung"
 
-#: ../../mod/profiles.php:325
+#: ../../mod/profiles.php:313
 msgid "Religion"
 msgstr "Religion"
 
-#: ../../mod/profiles.php:329
+#: ../../mod/profiles.php:317
 msgid "Political Views"
 msgstr "Politische Anscihten"
 
-#: ../../mod/profiles.php:333
+#: ../../mod/profiles.php:321
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../../mod/profiles.php:337
+#: ../../mod/profiles.php:325
 msgid "Sexual Preference"
 msgstr "Sexuelle Orientierung"
 
-#: ../../mod/profiles.php:341
+#: ../../mod/profiles.php:329
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../../mod/profiles.php:345
+#: ../../mod/profiles.php:333
 msgid "Interests"
 msgstr "Hobbys/Interessen"
 
-#: ../../mod/profiles.php:349
+#: ../../mod/profiles.php:337
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
 msgid "Location"
 msgstr "Ort"
 
-#: ../../mod/profiles.php:439
+#: ../../mod/profiles.php:427
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:494
+#: ../../mod/profiles.php:482
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils"
 
-#: ../../mod/profiles.php:517
+#: ../../mod/profiles.php:505
 msgid "Edit Profile Details"
 msgstr "Bearbeite Profil-Details"
 
-#: ../../mod/profiles.php:519
+#: ../../mod/profiles.php:507
 msgid "View this profile"
 msgstr "Dieses Profil ansehen"
 
-#: ../../mod/profiles.php:520
+#: ../../mod/profiles.php:508
 msgid "Change Profile Photo"
 msgstr "Profilfoto ändern"
 
-#: ../../mod/profiles.php:521
+#: ../../mod/profiles.php:509
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../mod/profiles.php:522
+#: ../../mod/profiles.php:510
 msgid "Clone this profile"
 msgstr "Dieses Profil klonen"
 
-#: ../../mod/profiles.php:523
+#: ../../mod/profiles.php:511
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:524
+#: ../../mod/profiles.php:512
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:525
+#: ../../mod/profiles.php:513
 msgid "Your Full Name:"
 msgstr "Dein voller Name:"
 
-#: ../../mod/profiles.php:526
+#: ../../mod/profiles.php:514
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:527
+#: ../../mod/profiles.php:515
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:516
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:529
+#: ../../mod/profiles.php:517
 msgid "Street Address:"
 msgstr "Straße und Hausnummer:"
 
-#: ../../mod/profiles.php:530
+#: ../../mod/profiles.php:518
 msgid "Locality/City:"
 msgstr "Wohnort:"
 
-#: ../../mod/profiles.php:531
+#: ../../mod/profiles.php:519
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:520
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:521
 msgid "Region/State:"
 msgstr "Region/Bundesstaat"
 
-#: ../../mod/profiles.php:534
+#: ../../mod/profiles.php:522
 msgid "♥ Marital Status:"
 msgstr "♥ Beziehungsstatus:"
 
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:523
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:524
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:525
 msgid "Since [date]:"
 msgstr "Seit [Datum]:"
 
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:527
 msgid "Homepage URL:"
 msgstr "Homepage URL:"
 
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:530
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:543
+#: ../../mod/profiles.php:531
 msgid "Keywords:"
 msgstr "Schlüsselwörter:"
 
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:534
 msgid "Example: fishing photography software"
 msgstr "Beispiel: fischen Fotografie Software"
 
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:535
 msgid "Used in directory listings"
 msgstr "Wird in Verzeichnis Auflistungen verwendet"
 
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:536
 msgid "Tell us about yourself..."
 msgstr "Erzähl uns ein wenig von Dir..."
 
-#: ../../mod/profiles.php:549
+#: ../../mod/profiles.php:537
 msgid "Hobbies/Interests"
 msgstr "Hobbys/Interessen"
 
-#: ../../mod/profiles.php:550
+#: ../../mod/profiles.php:538
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../mod/profiles.php:551
+#: ../../mod/profiles.php:539
 msgid "My other channels"
 msgstr "Meine anderen Kanäle"
 
-#: ../../mod/profiles.php:552
+#: ../../mod/profiles.php:540
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:541
 msgid "Books, literature"
 msgstr "Bücher, Literatur"
 
-#: ../../mod/profiles.php:554
+#: ../../mod/profiles.php:542
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:543
 msgid "Film/dance/culture/entertainment"
 msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:556
+#: ../../mod/profiles.php:544
 msgid "Love/romance"
 msgstr "Liebe/Romantik"
 
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:545
 msgid "Work/employment"
 msgstr "Arbeit/Anstellung"
 
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:546
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:551
 msgid ""
 "This is your public profile.
          It may "
 "be visible to anybody using the internet."
 msgstr "Dies ist Dein öffentliches Profil.
          Es könnte für jeden im Internet sichtbar sein."
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:600
 msgid "Edit/Manage Profiles"
 msgstr "Bearbeite/Verwalte Profile"
 
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:601
 msgid "Add profile things"
 msgstr "Profil-Dinge hinzufügen"
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:602
 msgid "Include desirable objects in your profile"
 msgstr "binde begehrenswerte Dinge in dein Profil ein"
 
@@ -5646,43 +5734,43 @@ msgstr "Oder importiere einen bestehenden Kanal von einem
 msgid "Permission Denied."
 msgstr "Zugriff verweigert."
 
-#: ../../mod/filestorage.php:86
+#: ../../mod/filestorage.php:85
 msgid "File not found."
 msgstr "Datei nicht gefunden"
 
-#: ../../mod/filestorage.php:120
+#: ../../mod/filestorage.php:119
 msgid "Edit file permissions"
 msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../mod/filestorage.php:127
+#: ../../mod/filestorage.php:126
 msgid "Include all files and sub folders"
 msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../mod/filestorage.php:128
+#: ../../mod/filestorage.php:127
 msgid "Return to file list"
 msgstr "Zurück zur Dateiliste"
 
-#: ../../mod/filestorage.php:130
+#: ../../mod/filestorage.php:129
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen"
 
-#: ../../mod/filestorage.php:131
+#: ../../mod/filestorage.php:130
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen"
 
-#: ../../mod/filestorage.php:168
+#: ../../mod/filestorage.php:167
 msgid "Download"
 msgstr "Download"
 
-#: ../../mod/filestorage.php:174
+#: ../../mod/filestorage.php:173
 msgid "Used: "
 msgstr "Verwendet:"
 
-#: ../../mod/filestorage.php:175
+#: ../../mod/filestorage.php:174
 msgid "[directory]"
 msgstr "[Verzeichnis]"
 
-#: ../../mod/filestorage.php:177
+#: ../../mod/filestorage.php:176
 msgid "Limit: "
 msgstr "Limit:"
 
@@ -5901,7 +5989,7 @@ msgstr "Name wird benötigt"
 msgid "Key and Secret are required"
 msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:533
+#: ../../mod/settings.php:79 ../../mod/settings.php:535
 msgid "Update"
 msgstr "Update"
 
@@ -5933,334 +6021,342 @@ msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:437
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:506 ../../mod/settings.php:532
-#: ../../mod/settings.php:568
+#: ../../mod/settings.php:508 ../../mod/settings.php:534
+#: ../../mod/settings.php:570
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../../mod/settings.php:509 ../../mod/settings.php:535
+#: ../../mod/settings.php:511 ../../mod/settings.php:537
 msgid "Name"
 msgstr "Name"
 
-#: ../../mod/settings.php:509
+#: ../../mod/settings.php:511
 msgid "Name of application"
 msgstr "Name der Anwendung"
 
-#: ../../mod/settings.php:510 ../../mod/settings.php:536
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:510 ../../mod/settings.php:511
+#: ../../mod/settings.php:512 ../../mod/settings.php:513
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
 
-#: ../../mod/settings.php:511 ../../mod/settings.php:537
+#: ../../mod/settings.php:513 ../../mod/settings.php:539
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:514 ../../mod/settings.php:540
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: ../../mod/settings.php:512
+#: ../../mod/settings.php:514
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit"
 
-#: ../../mod/settings.php:513 ../../mod/settings.php:539
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
 msgid "Icon url"
 msgstr "Symbol-URL"
 
-#: ../../mod/settings.php:513
+#: ../../mod/settings.php:515
 msgid "Optional"
 msgstr "Optional"
 
-#: ../../mod/settings.php:524
+#: ../../mod/settings.php:526
 msgid "You can't edit this application."
 msgstr "Diese Anwendung kann nicht bearbeitet werden."
 
-#: ../../mod/settings.php:567
+#: ../../mod/settings.php:569
 msgid "Connected Apps"
 msgstr "Verbundene Apps"
 
-#: ../../mod/settings.php:571
+#: ../../mod/settings.php:573
 msgid "Client key starts with"
 msgstr "Client key beginnt mit"
 
-#: ../../mod/settings.php:572
+#: ../../mod/settings.php:574
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:573
+#: ../../mod/settings.php:575
 msgid "Remove authorization"
 msgstr "Authorisierung aufheben"
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:586
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:594
 msgid "Feature Settings"
 msgstr "Funktions-Einstellungen"
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:617
 msgid "Account Settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:618
 msgid "Password Settings"
 msgstr "Kennwort-Einstellungen"
 
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:619
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
 msgid "Leave password fields blank unless changing"
 msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
 
-#: ../../mod/settings.php:620 ../../mod/settings.php:912
+#: ../../mod/settings.php:622 ../../mod/settings.php:917
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:623
 msgid "Remove Account"
 msgstr "Konto entfernen"
 
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:624
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden."
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
 msgid "Off"
 msgstr "Aus"
 
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
 msgid "On"
 msgstr "An"
 
-#: ../../mod/settings.php:645
+#: ../../mod/settings.php:647
 msgid "Additional Features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:672
 msgid "Connector Settings"
 msgstr "Connector-Einstellungen"
 
-#: ../../mod/settings.php:740
+#: ../../mod/settings.php:742
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:748
 msgid "Display Theme:"
 msgstr "Anzeige Theme:"
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:749
 msgid "Mobile Theme:"
 msgstr "Mobile Theme:"
 
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum von 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
 
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
 msgid "Maximum of 100 items"
 msgstr "Maximum von 100 Beiträgen"
 
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:752
 msgid "Don't show emoticons"
 msgstr "Emoticons nicht zeigen"
 
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:788
 msgid "Nobody except yourself"
 msgstr "Niemand außer du selbst"
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:789
 msgid "Only those you specifically allow"
 msgstr "Nur die, denen du es explizit erlaubst"
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:790
 msgid "Anybody in your address book"
 msgstr "Jeder aus Ihrem Adressbuch"
 
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:791
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:792
 msgid "Anybody in this network"
 msgstr "Jeder in diesem Netzwerk"
 
-#: ../../mod/settings.php:791
+#: ../../mod/settings.php:793
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:870
 msgid "Publish your default profile in the network directory"
 msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:875
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288
+#: ../../mod/settings.php:879 ../../mod/profile_photo.php:288
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:879
+#: ../../mod/settings.php:884
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:906
 msgid "Channel Settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:915
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:918
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../mod/settings.php:914
+#: ../../mod/settings.php:919
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:920
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
 msgid "Adult Content"
 msgstr "Nicht Jugendfreie-Inhalte"
 
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
 msgid "This channel publishes adult content."
 msgstr "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte"
 
-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:924
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:926
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
+
+#: ../../mod/settings.php:926
+msgid "Prevents showing if you are available for chat"
+msgstr "Verhindert es als für Chats verfügbar angezeigt zu werden"
+
+#: ../../mod/settings.php:928
 msgid "Quick Privacy Settings:"
 msgstr "Schnelle Datenschutz-Einstellungen:"
 
-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:929
 msgid "Very Public - extremely permissive"
 msgstr "Sehr offen - extrem freizügig"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:930
 msgid "Typical - default public, privacy when desired"
 msgstr "Typisch - Standard öffentlich, Privatheit wenn gewünscht"
 
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:931
 msgid "Private - default private, rarely open or public"
 msgstr "Privat - Standard privat, selten offen oder öffentlich"
 
-#: ../../mod/settings.php:925
+#: ../../mod/settings.php:932
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Geschlossen - Standard zu und von jedem geblockt"
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:936
 msgid "Default Post Permissions"
 msgstr "Beitragszugriffrechte Standardeinstellungen"
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
 msgid "Useful to reduce spamming"
 msgstr "Nützlich um Spam zu verringern"
 
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:951
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:952
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten wenn:"
 
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:953
 msgid "accepting a friend request"
 msgstr "einer Kontaktanfrage stattgegeben wurde"
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:954
 msgid "joining a forum/community"
 msgstr "ein Forum beigetreten wurde"
 
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:955
 msgid "making an interesting profile change"
 msgstr "eine interessante Änderung am Profil vorgenommen wurde"
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:956
 msgid "Send a notification email when:"
 msgstr "Eine Email Benachrichtigung senden wenn:"
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:957
 msgid "You receive an introduction"
 msgstr "Du eine Vorstellung erhältst"
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:958
 msgid "Your introductions are confirmed"
 msgstr "Deine Vorstellung bestätigt wurde."
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:959
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:960
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:961
 msgid "You receive a private message"
 msgstr "Du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:962
 msgid "You receive a friend suggestion"
 msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:963
 msgid "You are tagged in a post"
 msgstr "Du wurdest in einem Beitrag getaggt"
 
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:964
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:967
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Account / Seiten Arten Einstellungen"
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:968
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
@@ -6351,17 +6447,17 @@ msgstr "Layout bearbeiten"
 msgid "Delete layout?"
 msgstr "Layout löschen?"
 
-#: ../../mod/editlayout.php:110 ../../mod/editpost.php:102
+#: ../../mod/editlayout.php:110 ../../mod/editpost.php:107
 #: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
 msgid "Insert YouTube video"
 msgstr "YouTube-Video einfügen"
 
-#: ../../mod/editlayout.php:111 ../../mod/editpost.php:103
+#: ../../mod/editlayout.php:111 ../../mod/editpost.php:108
 #: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Vorbis [.ogg]-Video einfügen"
 
-#: ../../mod/editlayout.php:112 ../../mod/editpost.php:104
+#: ../../mod/editlayout.php:112 ../../mod/editpost.php:109
 #: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg]-Audio einfügen"
@@ -6522,10 +6618,6 @@ msgstr "Diesen Beitrag privat machen"
 msgid "Wall Photos"
 msgstr "Wall Fotos"
 
-#: ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
-
 #: ../../mod/channel.php:85
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
@@ -6571,69 +6663,22 @@ msgstr "Block löschen?"
 msgid "Delete Block"
 msgstr "Block löschen"
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
 msgid "Invalid profile identifier."
 msgstr "Ungültiger Profil Identifikator"
 
-#: ../../mod/profperm.php:101
+#: ../../mod/profperm.php:105
 msgid "Profile Visibility Editor"
 msgstr "Profil-Sichtbarkeits Editor"
 
-#: ../../mod/profperm.php:105
+#: ../../mod/profperm.php:109
 msgid "Click on a contact to add or remove."
 msgstr "Wähle einen Kontakt zum Hinzufügen oder Löschen aus."
 
-#: ../../mod/profperm.php:114
+#: ../../mod/profperm.php:118
 msgid "Visible To"
 msgstr "Sichtbar für"
 
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr "Alle Kontakte (mit sicherem Zuging zum Profil)"
-
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr "Version %s"
-
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:92
-msgid "Red"
-msgstr "Red"
-
-#: ../../mod/siteinfo.php:93
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
-
-#: ../../mod/siteinfo.php:96
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
-
-#: ../../mod/siteinfo.php:97
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
-
-#: ../../mod/siteinfo.php:98
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
-
-#: ../../mod/siteinfo.php:101
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
-"librelist - dot com"
-msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-
 #: ../../mod/suggest.php:35
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
@@ -6818,39 +6863,39 @@ msgstr "Laune"
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
 
-#: ../../mod/ping.php:160
+#: ../../mod/ping.php:186
 msgid "sent you a private message"
 msgstr "eine private Nachricht schicken"
 
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:244
 msgid "added your channel"
 msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../mod/ping.php:262
+#: ../../mod/ping.php:288
 msgid "posted an event"
 msgstr "hat eine Veranstaltung veröffentlicht"
 
-#: ../../mod/dirprofile.php:111
+#: ../../mod/dirprofile.php:114
 msgid "Status: "
 msgstr "Status:"
 
-#: ../../mod/dirprofile.php:112
+#: ../../mod/dirprofile.php:115
 msgid "Sexual Preference: "
 msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/dirprofile.php:114
+#: ../../mod/dirprofile.php:117
 msgid "Homepage: "
 msgstr "Webseite:"
 
-#: ../../mod/dirprofile.php:115
+#: ../../mod/dirprofile.php:118
 msgid "Hometown: "
 msgstr "Wohnort:"
 
-#: ../../mod/dirprofile.php:117
+#: ../../mod/dirprofile.php:120
 msgid "About: "
 msgstr "Über:"
 
-#: ../../mod/dirprofile.php:164
+#: ../../mod/dirprofile.php:168
 msgid "Keywords: "
 msgstr "Schlüsselbegriffe:"
 
diff --git a/view/de/strings.php b/view/de/strings.php
index 0beec543e..3637c4bf5 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -12,7 +12,6 @@ $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert";
 $a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Beende diese Sitzung";
 $a->strings["Home"] = "Home";
@@ -71,6 +70,11 @@ $a->strings["Admin"] = "Admin";
 $a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
 $a->strings["Nothing new here"] = "Nichts Neues hier";
 $a->strings["Please wait..."] = "Bitte warten...";
+$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
+$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
+$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
+$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
+$a->strings["Permission denied."] = "Zugang verweigert";
 $a->strings["Connect"] = "Verbinden";
 $a->strings["New window"] = "Neues Fenster";
 $a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
@@ -115,94 +119,17 @@ $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden";
+$a->strings["view full size"] = "In Vollbildansicht anschauen";
 $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i";
 $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
 $a->strings["Location:"] = "Ort:";
-$a->strings["prev"] = "vorherige";
-$a->strings["first"] = "erste";
-$a->strings["last"] = "letzte";
-$a->strings["next"] = "nächste";
-$a->strings["older"] = "älter";
-$a->strings["newer"] = "neuer";
-$a->strings["No connections"] = "Keine Verbindungen";
-$a->strings["%d Connection"] = array(
-	0 => "%d Verbindung",
-	1 => "%d Verbindungen",
-);
-$a->strings["View Connections"] = "Zeige Verbindungen";
-$a->strings["Save"] = "Speichern";
-$a->strings["poke"] = "anstupsen";
-$a->strings["poked"] = "stupste";
-$a->strings["ping"] = "anpingen";
-$a->strings["pinged"] = "pingte";
-$a->strings["prod"] = "knuffen";
-$a->strings["prodded"] = "knuffte";
-$a->strings["slap"] = "ohrfeigen";
-$a->strings["slapped"] = "ohrfeigte";
-$a->strings["finger"] = "befummeln";
-$a->strings["fingered"] = "befummelte";
-$a->strings["rebuff"] = "eine Abfuhr erteilen";
-$a->strings["rebuffed"] = "abfuhrerteilte";
-$a->strings["happy"] = "glücklich";
-$a->strings["sad"] = "traurig";
-$a->strings["mellow"] = "sanft";
-$a->strings["tired"] = "müde";
-$a->strings["perky"] = "frech";
-$a->strings["angry"] = "sauer";
-$a->strings["stupified"] = "verblüfft";
-$a->strings["puzzled"] = "verwirrt";
-$a->strings["interested"] = "interessiert";
-$a->strings["bitter"] = "verbittert";
-$a->strings["cheerful"] = "fröhlich";
-$a->strings["alive"] = "lebendig";
-$a->strings["annoyed"] = "verärgert";
-$a->strings["anxious"] = "unruhig";
-$a->strings["cranky"] = "schrullig";
-$a->strings["disturbed"] = "verstört";
-$a->strings["frustrated"] = "frustriert";
-$a->strings["motivated"] = "motiviert";
-$a->strings["relaxed"] = "entspannt";
-$a->strings["surprised"] = "überrascht";
-$a->strings["Monday"] = "Montag";
-$a->strings["Tuesday"] = "Dienstag";
-$a->strings["Wednesday"] = "Mittwoch";
-$a->strings["Thursday"] = "Donnerstag";
-$a->strings["Friday"] = "Freitag";
-$a->strings["Saturday"] = "Samstag";
-$a->strings["Sunday"] = "Sonntag";
-$a->strings["January"] = "Januar";
-$a->strings["February"] = "Februar";
-$a->strings["March"] = "März";
-$a->strings["April"] = "April";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juni";
-$a->strings["July"] = "Juli";
-$a->strings["August"] = "August";
-$a->strings["September"] = "September";
-$a->strings["October"] = "Oktober";
-$a->strings["November"] = "November";
-$a->strings["December"] = "Dezember";
-$a->strings["unknown.???"] = "unbekannt.???";
-$a->strings["bytes"] = "Bytes";
-$a->strings["remove category"] = "Kategorie entfernen";
-$a->strings["remove from file"] = "aus der Datei entfernen";
-$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
-$a->strings["link to source"] = "Link zum Originalbeitrag";
-$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
-$a->strings["default"] = "Standard";
-$a->strings["Page content type: "] = "Content-Typ der Seite";
-$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
-$a->strings["photo"] = "Foto";
-$a->strings["event"] = "Ereignis";
-$a->strings["status"] = "Status";
-$a->strings["comment"] = "Kommentar";
-$a->strings["activity"] = "Aktivität";
-$a->strings["Design"] = "Design";
-$a->strings["Blocks"] = "Blöcke";
-$a->strings["Menus"] = "Menüs";
-$a->strings["Layouts"] = "Layouts";
-$a->strings["Pages"] = "Seiten";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["QR code"] = "QR Code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+$a->strings["post"] = "Beitrag";
+$a->strings["$1 wrote:"] = "$1 schrieb:";
 $a->strings["Delete this item?"] = "Dieses Element löschen?";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["show more"] = "mehr zeigen";
@@ -234,7 +161,6 @@ $a->strings["[no subject]"] = "[no subject]";
 $a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
 $a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
 $a->strings["Profile Photos"] = "Profilfotos";
-$a->strings["view full size"] = "In Vollbildansicht anschauen";
 $a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
 $a->strings["Empty name"] = "Namensfeld leer";
 $a->strings["Name too long"] = "Name ist zu lang";
@@ -258,6 +184,7 @@ $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
 $a->strings["Gender:"] = "Geschlecht:";
 $a->strings["Status:"] = "Status:";
 $a->strings["Homepage:"] = "Homepage:";
+$a->strings["Online Now"] = "gerade online";
 $a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r";
 $a->strings["F d"] = "d. F";
 $a->strings["[today]"] = "[Heute]";
@@ -292,12 +219,6 @@ $a->strings["Love/Romance:"] = "Liebe/Romantik:";
 $a->strings["Work/employment:"] = "Arbeit/Anstellung:";
 $a->strings["School/education:"] = "Schule/Ausbildung:";
 $a->strings["Edit File properties"] = "Dateieigenschaften ändern";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["QR code"] = "QR Code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-$a->strings["post"] = "Beitrag";
-$a->strings["$1 wrote:"] = "$1 schrieb:";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
 $a->strings["General Features"] = "Allgemeine Funktionen";
@@ -365,7 +286,6 @@ $a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sam
 $a->strings["add"] = "hinzufügen";
 $a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
 $a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-$a->strings["Permission denied."] = "Zugang verweigert";
 $a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
 $a->strings["Image file is empty."] = "Bilddatei ist leer.";
 $a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
@@ -524,6 +444,7 @@ $a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
 $a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
 $a->strings["Notes"] = "Notizen";
+$a->strings["Save"] = "Speichern";
 $a->strings["Remove term"] = "Eintrag löschen";
 $a->strings["Everything"] = "Alles";
 $a->strings["Archives"] = "Archive";
@@ -544,6 +465,8 @@ $a->strings["Export channel"] = "Kanal exportieren";
 $a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
 $a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen";
 $a->strings["Check Mail"] = "E-Mails abrufen";
+$a->strings["Chat Rooms"] = "Chaträume";
+$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
 $a->strings["%d invitation available"] = array(
 	0 => "%d Einladung verfügbar",
 	1 => "%d Einladungen verfügbar",
@@ -601,6 +524,90 @@ $a->strings["Collection is empty."] = "Sammlung ist leer.";
 $a->strings["Collection: %s"] = "Sammlung: %s";
 $a->strings["Connection: %s"] = "Verbindung: %s";
 $a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+$a->strings["prev"] = "vorherige";
+$a->strings["first"] = "erste";
+$a->strings["last"] = "letzte";
+$a->strings["next"] = "nächste";
+$a->strings["older"] = "älter";
+$a->strings["newer"] = "neuer";
+$a->strings["No connections"] = "Keine Verbindungen";
+$a->strings["%d Connection"] = array(
+	0 => "%d Verbindung",
+	1 => "%d Verbindungen",
+);
+$a->strings["View Connections"] = "Zeige Verbindungen";
+$a->strings["poke"] = "anstupsen";
+$a->strings["poked"] = "stupste";
+$a->strings["ping"] = "anpingen";
+$a->strings["pinged"] = "pingte";
+$a->strings["prod"] = "knuffen";
+$a->strings["prodded"] = "knuffte";
+$a->strings["slap"] = "ohrfeigen";
+$a->strings["slapped"] = "ohrfeigte";
+$a->strings["finger"] = "befummeln";
+$a->strings["fingered"] = "befummelte";
+$a->strings["rebuff"] = "eine Abfuhr erteilen";
+$a->strings["rebuffed"] = "abfuhrerteilte";
+$a->strings["happy"] = "glücklich";
+$a->strings["sad"] = "traurig";
+$a->strings["mellow"] = "sanft";
+$a->strings["tired"] = "müde";
+$a->strings["perky"] = "frech";
+$a->strings["angry"] = "sauer";
+$a->strings["stupified"] = "verblüfft";
+$a->strings["puzzled"] = "verwirrt";
+$a->strings["interested"] = "interessiert";
+$a->strings["bitter"] = "verbittert";
+$a->strings["cheerful"] = "fröhlich";
+$a->strings["alive"] = "lebendig";
+$a->strings["annoyed"] = "verärgert";
+$a->strings["anxious"] = "unruhig";
+$a->strings["cranky"] = "schrullig";
+$a->strings["disturbed"] = "verstört";
+$a->strings["frustrated"] = "frustriert";
+$a->strings["motivated"] = "motiviert";
+$a->strings["relaxed"] = "entspannt";
+$a->strings["surprised"] = "überrascht";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["January"] = "Januar";
+$a->strings["February"] = "Februar";
+$a->strings["March"] = "März";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "Dezember";
+$a->strings["unknown.???"] = "unbekannt.???";
+$a->strings["bytes"] = "Bytes";
+$a->strings["remove category"] = "Kategorie entfernen";
+$a->strings["remove from file"] = "aus der Datei entfernen";
+$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
+$a->strings["link to source"] = "Link zum Originalbeitrag";
+$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
+$a->strings["default"] = "Standard";
+$a->strings["Page content type: "] = "Content-Typ der Seite";
+$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
+$a->strings["photo"] = "Foto";
+$a->strings["event"] = "Ereignis";
+$a->strings["status"] = "Status";
+$a->strings["comment"] = "Kommentar";
+$a->strings["activity"] = "Aktivität";
+$a->strings["Design"] = "Design";
+$a->strings["Blocks"] = "Blöcke";
+$a->strings["Menus"] = "Menüs";
+$a->strings["Layouts"] = "Layouts";
+$a->strings["Pages"] = "Seiten";
 $a->strings["Private Message"] = "Private Nachricht";
 $a->strings["Delete"] = "Löschen";
 $a->strings["Select"] = "Auswählen";
@@ -640,10 +647,6 @@ $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["Preview"] = "Vorschau";
 $a->strings["Encrypt text"] = "Text verschlüsseln";
-$a->strings["Welcome "] = "Willkommen";
-$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilfoto hoch.";
-$a->strings["Welcome back "] = "Willkommen zurück";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
 $a->strings["channel"] = "Kanal";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
@@ -1031,6 +1034,8 @@ $a->strings["Policies"] = "Richtlinien";
 $a->strings["Advanced"] = "Fortgeschritten";
 $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
+$a->strings["Administrator Information"] = "Administrator Informationen";
+$a->strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden.";
 $a->strings["System language"] = "System-Sprache";
 $a->strings["System theme"] = "System-Theme";
 $a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard System-Theme - kann durch Nutzerprofile überschieben werden - Theme.Einstellungen ändern";
@@ -1196,6 +1201,9 @@ $a->strings["Add a Tag"] = "Schlagwort hinzufügen";
 $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
 $a->strings["View Album"] = "Album ansehen";
 $a->strings["Recent Photos"] = "Neueste Fotos";
+$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
+$a->strings["New Chatroom"] = "Neuen Chatraum";
+$a->strings["Chatroom Name"] = "Chatraum Name";
 $a->strings["- select -"] = "-auswählen-";
 $a->strings["Menu updated."] = "Menü aktualisiert.";
 $a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
@@ -1260,6 +1268,16 @@ $a->strings["Channel added."] = "Kanal hinzugefügt.";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
 $a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
+$a->strings["Version %s"] = "Version %s";
+$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
+$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
+$a->strings["Red"] = "Red";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
+$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
+$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com um mehr über die Red Matrix zu erfahren.";
+$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
+$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
+$a->strings["Site Administrators"] = "Administratoren";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
 $a->strings["Hub not found."] = "Server nicht gefunden.";
@@ -1454,6 +1472,8 @@ $a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
 $a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
 $a->strings["This channel publishes adult content."] = "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte";
 $a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+$a->strings["Prevents showing if you are available for chat"] = "Verhindert es als für Chats verfügbar angezeigt zu werden";
 $a->strings["Quick Privacy Settings:"] = "Schnelle Datenschutz-Einstellungen:";
 $a->strings["Very Public - extremely permissive"] = "Sehr offen - extrem freizügig";
 $a->strings["Typical - default public, privacy when desired"] = "Typisch - Standard öffentlich, Privatheit wenn gewünscht";
@@ -1542,7 +1562,6 @@ $a->strings["Recipient"] = "Empfänger";
 $a->strings["Choose what you wish to do to recipient"] = "Wähle was du mit dem/r Empfänger/in tun willst";
 $a->strings["Make this post private"] = "Diesen Beitrag privat machen";
 $a->strings["Wall Photos"] = "Wall Fotos";
-$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
 $a->strings["Not available."] = "Nicht verfügbar.";
 $a->strings["Community"] = "Gemeinschaft";
@@ -1558,16 +1577,6 @@ $a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator";
 $a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor";
 $a->strings["Click on a contact to add or remove."] = "Wähle einen Kontakt zum Hinzufügen oder Löschen aus.";
 $a->strings["Visible To"] = "Sichtbar für";
-$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit sicherem Zuging zum Profil)";
-$a->strings["Version %s"] = "Version %s";
-$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
-$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
-$a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
-$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com um mehr über die Red Matrix zu erfahren.";
-$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
 $a->strings["No messages."] = "Keine Nachrichten.";
-- 
cgit v1.2.3


From d8f16442a1ca7d0be18dedd52c0f4eb339ba19b6 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 4 Feb 2014 00:52:34 -0800
Subject: bookmark permissions

---
 boot.php                |  3 ++-
 include/permissions.php |  1 +
 install/database.sql    |  2 ++
 install/update.php      | 10 +++++++++-
 mod/settings.php        |  6 +++++-
 version.inc             |  2 +-
 view/js/mod_connedit.js |  1 +
 view/js/mod_settings.js |  4 ++++
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 18a4ff888..faae00273 100755
--- a/boot.php
+++ b/boot.php
@@ -46,7 +46,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
 
-define ( 'DB_UPDATE_VERSION',       1095  );
+define ( 'DB_UPDATE_VERSION',       1096  );
 
 define ( 'EOL',                    '
          ' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -270,6 +270,7 @@ define ( 'PERMS_W_STORAGE',        0x02000);
 define ( 'PERMS_R_PAGES',          0x04000);
 define ( 'PERMS_W_PAGES',          0x08000);
 define ( 'PERMS_A_REPUBLISH',      0x10000);
+define ( 'PERMS_A_BOOMARK',        0x20000);
 
 // General channel permissions
 
diff --git a/include/permissions.php b/include/permissions.php
index 1b11dfb87..060ed841c 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -29,6 +29,7 @@ function get_perms() {
 		'write_pages' => array('channel_w_pages',   intval(PERMS_W_PAGES),   false, t('Can edit my "public" pages'), ''),
 
 		'republish' => array('channel_a_republish', intval(PERMS_A_REPUBLISH), false, t('Can source my "public" posts in derived channels'), t('Somewhat advanced - very useful in open communities')),
+		'bookmark' => array('channel_a_bookmark', intval(PERMS_A_BOOKMARK), false, t('Can send me bookmarks'), ''),
 		'delegate'      => array('channel_a_delegate', intval(PERMS_A_DELEGATE),    false, t('Can administer my channel resources'), t('Extremely advanced. Leave this alone unless you know what you are doing')),
 	);
 	$ret = array('global_permissions' => $global_perms);
diff --git a/install/database.sql b/install/database.sql
index c89e4cef2..86531a415 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -177,6 +177,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128',
   `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '128',
   `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_a_bookmark` int(10) unsigned NOT NULL DEFAULT '128',
   PRIMARY KEY (`channel_id`),
   UNIQUE KEY `channel_address_unique` (`channel_address`),
   KEY `channel_account_id` (`channel_account_id`),
@@ -211,6 +212,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
   KEY `channel_w_pages` (`channel_w_pages`),
   KEY `channel_deleted` (`channel_deleted`),
   KEY `channel_a_republish` (`channel_a_republish`),
+  KEY `channel_a_bookmark` (`channel_a_bookmark`),
   KEY `channel_dirdate` (`channel_dirdate`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
diff --git a/install/update.php b/install/update.php
index e8b6d37f6..93442a81f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 
Date: Tue, 4 Feb 2014 01:42:43 -0800
Subject: fix the search for system bookmarks

---
 include/menu.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/menu.php b/include/menu.php
index be9831951..7522f69a3 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -75,7 +75,6 @@ function menu_create($arr) {
 	$r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
 		dbesc($menu_name),
 		intval($menu_channel_id),
-		intval($menu_flags)
 	);
 
 	if($r)
@@ -101,9 +100,15 @@ function menu_create($arr) {
 
 }
 
+/**
+ * If $flags is present, check that all the bits in $flags are set
+ * so that MENU_SYSTEM|MENU_BOOKMARK will return entries with both
+ * bits set. We will use this to find system generated bookmarks.
+ */
+
 function menu_list($channel_id, $flags = 0) {
 
-	$sel_options = (($flags) ? " and ( menu_flags & " . intval($flags) . " ) " : '');
+	$sel_options = (($flags) ? " and ( menu_flags & " . intval($flags) . " ) = " . intval($flags) . " " : '');
 
 	$r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_name",
 		intval($channel_id)
@@ -204,7 +209,8 @@ function menu_add_item($menu_id, $uid, $arr) {
 		$channel = get_app()->get_channel();	
 	}
 
-	if ((! $arr['contact_allow'])
+	if (($channel) 
+		&& (! $arr['contact_allow'])
 		&& (! $arr['group_allow'])
 		&& (! $arr['contact_deny'])
 		&& (! $arr['group_deny'])) {
-- 
cgit v1.2.3


From 3665bc38ef15137c7d36a12aa13a44c4d0304547 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 4 Feb 2014 16:06:56 -0800
Subject: bookmarking

---
 boot.php                |  2 +-
 include/bookmarks.php   | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/items.php       | 15 ++++++++++++++
 include/menu.php        | 27 ++++++++++++++-----------
 include/permissions.php |  2 +-
 mod/bookmarks.php       | 40 +++++++++++++++++++++++++++++++++++++
 mod/parse_url.php       |  2 +-
 7 files changed, 126 insertions(+), 15 deletions(-)
 create mode 100644 include/bookmarks.php
 create mode 100644 mod/bookmarks.php

diff --git a/boot.php b/boot.php
index faae00273..1d462eff8 100755
--- a/boot.php
+++ b/boot.php
@@ -270,7 +270,7 @@ define ( 'PERMS_W_STORAGE',        0x02000);
 define ( 'PERMS_R_PAGES',          0x04000);
 define ( 'PERMS_W_PAGES',          0x08000);
 define ( 'PERMS_A_REPUBLISH',      0x10000);
-define ( 'PERMS_A_BOOMARK',        0x20000);
+define ( 'PERMS_A_BOOKMARK',       0x20000);
 
 // General channel permissions
 
diff --git a/include/bookmarks.php b/include/bookmarks.php
new file mode 100644
index 000000000..62ec9fcab
--- /dev/null
+++ b/include/bookmarks.php
@@ -0,0 +1,53 @@
+ $menu['menu'],
@@ -74,7 +75,7 @@ function menu_create($arr) {
 
 	$r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
 		dbesc($menu_name),
-		intval($menu_channel_id),
+		intval($menu_channel_id)
 	);
 
 	if($r)
@@ -106,9 +107,11 @@ function menu_create($arr) {
  * bits set. We will use this to find system generated bookmarks.
  */
 
-function menu_list($channel_id, $flags = 0) {
+function menu_list($channel_id, $name = '', $flags = 0) {
 
-	$sel_options = (($flags) ? " and ( menu_flags & " . intval($flags) . " ) = " . intval($flags) . " " : '');
+	$sel_options = '';
+	$sel_options .= (($name) ? " and name = '" . protect_sprintf(dbesc($name)) . "' " : '');
+	$sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : '');
 
 	$r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_name",
 		intval($channel_id)
@@ -229,11 +232,11 @@ function menu_add_item($menu_id, $uid, $arr) {
 		$str_contact_deny  = perms2str($arr['contact_deny']);
 	}
 
-
-	$allow_cid = perms2str($arr['allow_cid']);
-	$allow_gid = perms2str($arr['allow_gid']);
-	$deny_cid = perms2str($arr['deny_cid']);
-	$deny_gid = perms2str($arr['deny_gid']);
+//  unused
+//	$allow_cid = perms2str($arr['allow_cid']);
+//	$allow_gid = perms2str($arr['allow_gid']);
+//	$deny_cid = perms2str($arr['deny_cid']);
+//	$deny_gid = perms2str($arr['deny_gid']);
 
 	$r = q("insert into menu_item ( mitem_link, mitem_desc, mitem_flags, allow_cid, allow_gid, deny_cid, deny_gid, mitem_channel_id, mitem_menu_id, mitem_order ) values ( '%s', '%s', %d, '%s', '%s', '%s', '%s', %d, %d, %d ) ",
 		dbesc($mitem_link),
diff --git a/include/permissions.php b/include/permissions.php
index 060ed841c..420591c54 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -29,7 +29,7 @@ function get_perms() {
 		'write_pages' => array('channel_w_pages',   intval(PERMS_W_PAGES),   false, t('Can edit my "public" pages'), ''),
 
 		'republish' => array('channel_a_republish', intval(PERMS_A_REPUBLISH), false, t('Can source my "public" posts in derived channels'), t('Somewhat advanced - very useful in open communities')),
-		'bookmark' => array('channel_a_bookmark', intval(PERMS_A_BOOKMARK), false, t('Can send me bookmarks'), ''),
+		'bookmark' => array('channel_a_bookmark', intval(PERMS_A_BOOKMARK), false, t('Can send me bookmarks'), 'Bookmarks from this person will automatically be saved'),
 		'delegate'      => array('channel_a_delegate', intval(PERMS_A_DELEGATE),    false, t('Can administer my channel resources'), t('Extremely advanced. Leave this alone unless you know what you are doing')),
 	);
 	$ret = array('global_permissions' => $global_perms);
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
new file mode 100644
index 000000000..25bf39a7a
--- /dev/null
+++ b/mod/bookmarks.php
@@ -0,0 +1,40 @@
+' . t('My Bookmarks') . '';
+
+	$x = menu_list(local_user(),'',MENU_BOOKMARK);
+
+	if($x) {
+		foreach($x as $xx) {
+			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+			$o .= menu_render($y);
+		}
+	}
+
+	$o .= '
          ' . t('My Connections Bookmarks') . '
          ';
+
+
+	$x = menu_list(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);
+
+	if($x) {
+		foreach($x as $xx) {
+			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+			$o .= menu_render($y);
+		}
+	}
+
+
+
+	return $o;
+
+}
+
diff --git a/mod/parse_url.php b/mod/parse_url.php
index c206c24ec..340e1a67e 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -252,7 +252,7 @@ function parse_url_content(&$a) {
 
 	logger('parse_url: ' . $url);
 
-	$template = $br . '[url=%s]%s[/url]%s' . $br;
+	$template = $br . '#^[url=%s]%s[/url]%s' . $br;
 
 	$arr = array('url' => $url, 'text' => '');
 
-- 
cgit v1.2.3


From aede006970fb9124161b4732b9f44002a35d17ef Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 4 Feb 2014 17:12:13 -0800
Subject: bookmarks - mop up and go home

---
 include/ItemObject.php   | 10 ++++++++++
 include/bookmarks.php    |  2 +-
 include/conversation.php |  8 ++++++++
 include/menu.php         |  2 +-
 mod/bookmarks.php        | 34 ++++++++++++++++++++++++++++++++++
 view/js/mod_connedit.js  |  2 +-
 view/js/mod_settings.js  |  2 +-
 view/tpl/conv_item.tpl   |  3 +++
 view/tpl/jot-header.tpl  |  8 +++++++-
 9 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/include/ItemObject.php b/include/ItemObject.php
index e9a0b65c0..9b1a6fbcd 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -171,6 +171,15 @@ class Item extends BaseObject {
 			);
 		}
 
+		$has_bookmarks = false;
+		if(is_array($item['term'])) {
+			foreach($item['term'] as $t) {
+				if($t['type'] == TERM_BOOKMARK)
+					$has_bookmarks = true;
+			}
+		}
+
+
 		if($this->is_commentable()) {
 			$like = array( t("I like this \x28toggle\x29"), t("like"));
 			$dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
@@ -237,6 +246,7 @@ class Item extends BaseObject {
 			'star'      => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
 			'tagger'    => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
 			'filer'     => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
+			'bookmark'  => (($conv->get_profile_owner() == local_user() && $has_bookmarks) ? t('Bookmark Links') : ''),
 			'drop'      => $drop,
 			'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
 // end toolbar buttons
diff --git a/include/bookmarks.php b/include/bookmarks.php
index 62ec9fcab..3ca8ee1c1 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -29,7 +29,7 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 	$arr = array();
 	$arr['menu_name'] = substr($sender['xchan_hash'],0,16) . ' ' . $sender['xchan_name'];
 	$arr['menu_desc'] = sprintf( t('%1$s\'s bookmarks'), $sender['xchan_name']);
-	$arr['menu_flags'] = MENU_SYSTEM|MENU_BOOKMARK;
+	$arr['menu_flags'] = (($sender['xchan_hash'] === $channel['channel_hash']) ? MENU_BOOKMARK : MENU_SYSTEM|MENU_BOOKMARK);
 	$arr['menu_channel_id'] = $channel_id;
 
 	$x = menu_list($arr['menu_channel_id'],$arr['menu_name'],$arr['menu_flags']);
diff --git a/include/conversation.php b/include/conversation.php
index 316bc1612..633435871 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1496,6 +1496,14 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 			'title' => t('Events and Calendar'),
 			'id'    => 'events-tab',
 		);
+
+		$tabs[] = array(
+			'label' => t('Bookmarks'),
+			'url'	=> $a->get_baseurl() . '/bookmarks',
+			'sel' 	=> ((argv(0) == 'bookmarks') ? 'active' : ''),
+			'title' => t('Saved Bookmarks'),
+			'id'    => 'bookmarks-tab',
+		);
 	}
 
 	if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) {
diff --git a/include/menu.php b/include/menu.php
index e5bd4a680..105e4216b 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -110,7 +110,7 @@ function menu_create($arr) {
 function menu_list($channel_id, $name = '', $flags = 0) {
 
 	$sel_options = '';
-	$sel_options .= (($name) ? " and name = '" . protect_sprintf(dbesc($name)) . "' " : '');
+	$sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : '');
 	$sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : '');
 
 	$r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_name",
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 25bf39a7a..fe5ec1e19 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -1,5 +1,39 @@
 get_channel();
+		
+	$i = q("select * from item where id = %d and uid = %d limit 1",
+		intval($item_id),
+		intval(local_user())
+	);
+	if(! $i)
+		return;
+
+	$i = fetch_post_tags($i);
+
+	$item = $i[0];
+
+	$terms = get_terms_oftype($item['term'],TERM_BOOKMARK);
+
+	if($terms && (! $i[0]['item_restrict'])) {
+		require_once('include/bookmarks.php');
+		require_once('include/Contact.php');
+		$s = channelx_by_hash($i[0]['author_xchan']);
+		foreach($terms as $t) {
+			bookmark_add($u,$s[0],$t,$i[0]['item_private']);
+			notice( t('Bookmark(s) added') . EOL);
+		}
+	}
+	killme();
+}
+
 function bookmarks_content(&$a) {
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 6bb39fb7a..7a33952dc 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -17,7 +17,7 @@ function connectFullShare() {
 	$('#me_id_perms_chat').attr('checked','checked');
 	$('#me_id_perms_view_storage').attr('checked','checked');
 	$('#me_id_perms_republish').attr('checked','checked');
-	$('#me_id_perms_bookmark').attr('checked','checked');
+
 }
 
 function connectCautiousShare() {
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 7ede7fb73..16101db57 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -66,7 +66,7 @@ function channel_privacy_macro(n) {
         $('#id_write_pages option').eq(1).attr('selected','selected');
         $('#id_delegate option').eq(0).attr('selected','selected');
 		$('#id_republish option').eq(0).attr('selected','selected');
-		$('#id_bookmark option').eq(0).attr('selected','selected');
+		$('#id_bookmark option').eq(1).attr('selected','selected');
 		$('#id_profile_in_directory_onoff .off').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .on').addClass('hidden');
 		$('#id_profile_in_directory').val(0);
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 50a243ff4..869692bfa 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -85,6 +85,9 @@
 			{{/if}}
 			{{if $item.filer}}
 			
+			{{/if}}
+			{{if $item.bookmark}}
+			
 			{{/if}}			
 			
 
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 878e1e7da..80421d552 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -185,7 +185,6 @@ function enableOnUser(){
 		}
 	}
 
-
 	function jotGetLocation() {
 		reply = prompt("{{$whereareu}}", $('#jot-location').val());
 		if(reply && reply.length) {
@@ -295,6 +294,13 @@ function enableOnUser(){
 		
 	}
 
+	function itemBookmark(id) {
+		$.get('{{$baseurl}}/bookmarks?f=&item=' + id);
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	}
+
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
-- 
cgit v1.2.3


From 9f439c3248c0464298e0b486a85ad74ec2df8270 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 4 Feb 2014 17:14:22 -0800
Subject: add icon translation for new icon

---
 view/js/icon_translate.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index 838ff899f..737164cb8 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -51,4 +51,5 @@ $(document).ready(function() {
 		$('.icon-globe').addClass('');
 		$('.icon-circle-blank').addClass('');
 		$('.icon-circle').addClass('');
+		$('.icon-bookmark').addClass('');
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 8a11c2941395bdd325ac076bd22ad011fe41f3c7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 4 Feb 2014 19:39:56 -0800
Subject: make links in comments bookmark-able

---
 include/bookmarks.php | 4 ++++
 include/text.php      | 2 +-
 mod/item.php          | 4 ++--
 view/js/main.js       | 6 ++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/bookmarks.php b/include/bookmarks.php
index 3ca8ee1c1..3a4c5c5d6 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -7,6 +7,10 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 	$iarr = array();
 	$channel_id = $channel['channel_id'];
 
+
+	
+
+
 	if($private)
 		$iarr['contact_allow'] = array($channel['channel_hash']); 
 	$iarr['mitem_link'] = $taxonomy['url'];
diff --git a/include/text.php b/include/text.php
index dc7d94b6d..266d8952b 100755
--- a/include/text.php
+++ b/include/text.php
@@ -604,7 +604,7 @@ function get_tags($s) {
 
 	// bookmarks
 
-	if(preg_match_all('/#\^\[(url|zrl)=(.*?)\](.*?)\[\/(url|zrl)\]/',$s,$match,PREG_SET_ORDER)) {
+	if(preg_match_all('/#\^\[(url|zrl)(.*?)\](.*?)\[\/(url|zrl)\]/',$s,$match,PREG_SET_ORDER)) {
 		foreach($match as $mtch) {
 			$ret[] = $mtch[0];
 		}
diff --git a/mod/item.php b/mod/item.php
index 68bb75897..c8c0e3762 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -896,9 +896,9 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
 	//is it a hash tag? 
 	if(strpos($tag,'#') === 0) {
 		if(strpos($tag,'#^[') === 0) {
-			if(preg_match('/#\^\[(url|zrl)=(.*?)\](.*?)\[\/(url|zrl)\]/',$tag,$match)) {
+			if(preg_match('/#\^\[(url|zrl)(.*?)\](.*?)\[\/(url|zrl)\]/',$tag,$match)) {
 				$basetag = $match[3];
-				$url = $match[2];
+				$url = ((substr($match[2],0,1) === '=') ? substr($match[2],1) : $match[3]);
 				$replaced = true;
 
 			}
diff --git a/view/js/main.js b/view/js/main.js
index c8e9fc9a2..44cb79949 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -55,6 +55,8 @@
 		if(typeof(insertFormatting) != 'undefined')
 		   return(insertFormatting(comment,BBcode,id));
 
+		var urlprefix = ((BBcode == 'url') ? '#^' : '');
+
 		var tmpStr = $("#comment-edit-text-" + id).val();
 		if(tmpStr == comment) {
 			tmpStr = "";
@@ -68,11 +70,11 @@
 		if (document.selection) {
 			textarea.focus();
 			selected = document.selection.createRange();
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+			selected.text = urlprefix+"["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 		} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 			var start = textarea.selectionStart;
 			var end = textarea.selectionEnd;
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			textarea.value = textarea.value.substring(0, start) + urlprefix+"["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 		}
 		return true;
 	}
-- 
cgit v1.2.3


From f30a39f9df5dc0cc70a9cb9befe87a8723c75721 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 03:15:10 -0800
Subject: bookmark debug logging

---
 include/bookmarks.php | 8 +++-----
 mod/bookmarks.php     | 6 +++++-
 version.inc           | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/bookmarks.php b/include/bookmarks.php
index 3a4c5c5d6..7a9f40697 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -7,10 +7,6 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 	$iarr = array();
 	$channel_id = $channel['channel_id'];
 
-
-	
-
-
 	if($private)
 		$iarr['contact_allow'] = array($channel['channel_hash']); 
 	$iarr['mitem_link'] = $taxonomy['url'];
@@ -45,12 +41,14 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 		logger('bookmark_add: unable to create menu ' . $arr['menu_name']);
 		return; 
 	}
-
+	logger('add_bookmark: menu_id ' . $menu_id);
 	$r = q("select * from menu_item where mitem_link = '%s' and mitem_menu_id = %d and mitem_channel_id = %d limit 1",
 		dbesc($iarr['mitem_link']),
 		intval($menu_id),
 		intval($channel_id) 
 	);
+	if($r)
+		logger('duplicate menu entry');
 	if(! $r)
 		$r = menu_add_item($menu_id,$channel_id,$iarr);
 	return $r;
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index fe5ec1e19..73958ff2f 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -26,9 +26,13 @@ function bookmarks_init(&$a) {
 		require_once('include/bookmarks.php');
 		require_once('include/Contact.php');
 		$s = channelx_by_hash($i[0]['author_xchan']);
+		if(! $s) {
+			notice( t('Author lookup failed') . EOL);
+			killme();
+		}
 		foreach($terms as $t) {
 			bookmark_add($u,$s[0],$t,$i[0]['item_private']);
-			notice( t('Bookmark(s) added') . EOL);
+			notice( t('Bookmark added') . EOL);
 		}
 	}
 	killme();
diff --git a/version.inc b/version.inc
index 6140d2174..c26fe7d69 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-04.578
+2014-02-05.579
-- 
cgit v1.2.3


From 24f32e55c88311867218c1d93c808cd842453078 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 03:29:02 -0800
Subject: bookmarking bugfix

---
 include/bookmarks.php |  2 +-
 mod/bookmarks.php     | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/include/bookmarks.php b/include/bookmarks.php
index 7a9f40697..99cb60e64 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -48,7 +48,7 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 		intval($channel_id) 
 	);
 	if($r)
-		logger('duplicate menu entry');
+		logger('add_bookmark: duplicate menu entry', LOGGER_DEBUG);
 	if(! $r)
 		$r = menu_add_item($menu_id,$channel_id,$iarr);
 	return $r;
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 73958ff2f..de30d9bb6 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -8,11 +8,12 @@ function bookmarks_init(&$a) {
 		return;
 
 	$u = $a->get_channel();
-		
+
 	$i = q("select * from item where id = %d and uid = %d limit 1",
 		intval($item_id),
 		intval(local_user())
 	);
+
 	if(! $i)
 		return;
 
@@ -22,16 +23,18 @@ function bookmarks_init(&$a) {
 
 	$terms = get_terms_oftype($item['term'],TERM_BOOKMARK);
 
-	if($terms && (! $i[0]['item_restrict'])) {
+	if($terms && (! $item['item_restrict'])) {
 		require_once('include/bookmarks.php');
-		require_once('include/Contact.php');
-		$s = channelx_by_hash($i[0]['author_xchan']);
+
+		$s = q("select * from xchan where xchan_hash = '%s' limit 1",
+			dbesc($item['author_xchan'])
+		);
 		if(! $s) {
-			notice( t('Author lookup failed') . EOL);
+			logger('mod_bookmarks: author lookup failed.');
 			killme();
 		}
 		foreach($terms as $t) {
-			bookmark_add($u,$s[0],$t,$i[0]['item_private']);
+			bookmark_add($u,$s[0],$t,$item['item_private']);
 			notice( t('Bookmark added') . EOL);
 		}
 	}
-- 
cgit v1.2.3


From 0844110f7b154a0fb5102362fe732c2b091222d7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 03:44:46 -0800
Subject: preserve system bit when editing menus

---
 mod/menu.php          | 5 ++++-
 view/tpl/menuedit.tpl | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mod/menu.php b/mod/menu.php
index dd8fe8300..a2d0c2385 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -9,7 +9,9 @@ function menu_post(&$a) {
 
 	$_REQUEST['menu_channel_id'] = local_user();
 	if($_REQUEST['menu_bookmark'])
-		$_REQUEST['menu_flags'] = MENU_BOOKMARK;
+		$_REQUEST['menu_flags'] |= MENU_BOOKMARK;
+	if($_REQUEST['menu_system'])
+		$_REQUEST['menu_flags'] |= MENU_SYSTEM;
 
 	$menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
 	if($menu_id) {
@@ -108,6 +110,7 @@ function menu_content(&$a) {
 					'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
 					'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
 					'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), ''),
+					'$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0),
 					'$submit' => t('Modify')
 				));
 				return $o;
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 324dbe426..1ccfb3d68 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -10,6 +10,10 @@
 {{if $menu_id}}
 
 {{/if}}
+{{if $menu_system}}
+
+{{/if}}
+
 
 {{include file="field_input.tpl" field=$menu_name}} 
 {{include file="field_input.tpl" field=$menu_desc}}
-- 
cgit v1.2.3


From a606fc0ba39fc5f672fec389b5130b07fe1a1a5d Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 5 Feb 2014 14:34:25 +0100
Subject: add a sanitized style tag to bbcode

---
 include/bbcode.php | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/text.php   |  4 ++++
 2 files changed, 59 insertions(+)

diff --git a/include/bbcode.php b/include/bbcode.php
index 2e2faddd6..bd2c7d11a 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -262,6 +262,56 @@ function rpost_callback($match) {
 	}
 }
 
+function bb_sanitize_style($input) {
+	//whitelist	property			limits (0 = no limitation)
+	$w = array(	// color properties
+			"color"			=>	0,
+			"background-color"	=>	0,
+			// box properties
+			"padding"		=>	array("px"=>100, "%"=>0, "em"=>2, "ex"=>2, "mm"=>0, "cm"=>0, "in"=>0, "pt"=>0, "pc"=>0),
+			"margin"		=>	array("px"=>100, "%"=>0, "em"=>2, "ex"=>2, "mm"=>0, "cm"=>0, "in"=>0, "pt"=>0, "pc"=>0),
+			"border"		=>	array("px"=>100, "%"=>0, "em"=>2, "ex"=>2, "mm"=>0, "cm"=>0, "in"=>0, "pt"=>0, "pc"=>0),
+			"float"			=>	0,
+			"clear"			=>	0,
+			// text properties
+			"text-decoration"	=>	0,
+
+	);
+
+	$css_string = $input[1];
+	$a = explode(';',$css_string);
+	foreach($a as $parts){
+		list($k, $v) = explode(':', $parts);
+	$css[ trim($k) ] = trim($v);
+	}
+
+	// sanitize properties
+	$b = array_merge(array_diff_key($css, $w), array_diff_key($w, $css));
+	$css = array_diff_key($css, $b);
+
+	foreach($css as $key => $value) {
+		if($w[$key] != null) {
+			foreach($w[$key] as $limit_key => $limit_value) {
+				//sanitize values
+				if(strpos($value, $limit_key)) {
+					$value = preg_replace_callback(
+						"/(\S.*?)$limit_key/ism",
+						function($match) use($limit_value, $limit_key) {
+							if($match[1] > $limit_value) {
+								return $limit_value . $limit_key;
+							} else {
+								 return $match[1] . $limit_key;
+							}
+						},
+						$value
+					);
+				}
+			}
+		}
+		$css_string_san .= $key . ":" . $value ."; ";
+	}
+	return "" . $input[2] . "";
+}
 
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendica/Red - Mike Macgirvin
@@ -576,6 +626,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		$Text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*) float=right\](.*?)\[\/zmg\]/ism", '' . t('Image/photo') . '', $Text);
 	}
 
+	// style (sanitized)
+	if (strpos($Text,'[/style]') !== false) {
+		$Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism", "bb_sanitize_style", $Text);
+	}
+
 	// crypt
 	if (strpos($Text,'[/crypt]') !== false) {	
 		$x = random_string();
diff --git a/include/text.php b/include/text.php
index 266d8952b..2b334068f 100755
--- a/include/text.php
+++ b/include/text.php
@@ -565,6 +565,10 @@ function get_tags($s) {
 
 	$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
 
+	// ignore anything in [style= ]
+
+	$s = preg_replace('/\[style=(.*?)\]/sm','',$s);
+
 	// Match full names against @tags including the space between first and last
 	// We will look these up afterward to see if they are full names or not recognisable.
 
-- 
cgit v1.2.3


From efa30f1b03540981a7718daa7c598157a727f30d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 15:01:53 -0800
Subject: This would be about the 75th attempt to try and prevent duplicated
 email notifications for comments. Eventually we'll find something that works.

---
 include/items.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 860d714d1..35865086e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2107,6 +2107,15 @@ function send_status_notifications($post_id,$item) {
 		}
 	}
 
+	$link =  get_app()->get_baseurl() . '/display/' . $item['mid'];
+
+	$r = q("select id from notify where link = '%s' and uid = %d limit 1",
+		dbesc($link),
+		intval($item['uid'])
+	);
+	if($r)
+		$notify = false;
+
 	if(! $notify)
 		return;
 	require_once('include/enotify.php');
@@ -2115,7 +2124,7 @@ function send_status_notifications($post_id,$item) {
 		'from_xchan'   => $item['author_xchan'],
 		'to_xchan'     => $r[0]['channel_hash'],
 		'item'         => $item,
-		'link'		   => get_app()->get_baseurl() . '/display/' . $item['mid'],
+		'link'		   => $link,
 		'verb'         => ACTIVITY_POST,
 		'otype'        => 'item',
 		'parent'       => $parent,
-- 
cgit v1.2.3


From fdc0a7e95e1c0bd174bf09a4c3833ea29fd7211b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 15:56:18 -0800
Subject: fix auto-add of bookmarks to find sender correctly and optionally
 auto add bookmarks for self

---
 include/items.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/items.php b/include/items.php
index 35865086e..2f2bcb2e4 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2183,12 +2183,18 @@ function tag_deliver($uid,$item_id) {
 
 	if($terms && (! $i[0]['item_restrict'])) {
 		logger('tag_deliver: found bookmark');
-		if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && ($i[0]['author_xchan'] != $u[0]['channel_hash'])) {
+		$bookmark_self = intval(get_pconfig($uid,'system','bookmark_self'));
+		if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && (($i[0]['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) {
 			require_once('include/bookmarks.php');
 			require_once('include/Contact.php');
-			$s = channelx_by_hash($i[0]['author_xchan']);
-			foreach($terms as $t) {
-				bookmark_add($u[0],$s[0],$t,$i[0]['item_private']);
+
+			$s = q("select * from xchan where xchan_hash = '%s' limit 1",
+				dbesc($item['author_xchan'])
+			);
+			if($s) {
+				foreach($terms as $t) {
+					bookmark_add($u[0],$s[0],$t,$i[0]['item_private']);
+				}
 			}
 		}
 	}
-- 
cgit v1.2.3


From da8a79ebfa948bc5f2f300404f661e71fdde788d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 16:01:02 -0800
Subject: cleanup - nothing more

---
 include/items.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index 2f2bcb2e4..8b9cc8d04 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2181,10 +2181,10 @@ function tag_deliver($uid,$item_id) {
 
 	$terms = get_terms_oftype($item['term'],TERM_BOOKMARK);
 
-	if($terms && (! $i[0]['item_restrict'])) {
+	if($terms && (! $item['item_restrict'])) {
 		logger('tag_deliver: found bookmark');
 		$bookmark_self = intval(get_pconfig($uid,'system','bookmark_self'));
-		if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && (($i[0]['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) {
+		if(perm_is_allowed($u[0]['channel_id'],$item['author_xchan'],'bookmark') && (($item['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) {
 			require_once('include/bookmarks.php');
 			require_once('include/Contact.php');
 
@@ -2193,7 +2193,7 @@ function tag_deliver($uid,$item_id) {
 			);
 			if($s) {
 				foreach($terms as $t) {
-					bookmark_add($u[0],$s[0],$t,$i[0]['item_private']);
+					bookmark_add($u[0],$s[0],$t,$item['item_private']);
 				}
 			}
 		}
-- 
cgit v1.2.3


From 1b406be544a2e434b56eed26bab14ede63fe2104 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 16:28:51 -0800
Subject: allow bookmarks to use richtext

---
 include/menu.php                                                     | 5 ++++-
 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js    | 2 +-
 .../tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/menu.php b/include/menu.php
index 105e4216b..813d7bcdb 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -1,6 +1,7 @@
  $menu['menu'],
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
index 81b69e736..80e10d833 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/
            (.*?)<\/ul>/gi,"[list]$1[/list]");t(/
              (.*?)<\/ul>/gi,"[list=]$1[/list]");t(/
                (.*?)<\/ul>/gi,"[list=1]$1[/list]");t(/
                  (.*?)<\/ul>/gi,"[list=i]$1[/list]");t(/
                    (.*?)<\/ul>/gi,"[list=I]$1[/list]");t(/
                      (.*?)<\/ul>/gi,"[list=a]$1[/list]");t(/
                        (.*?)<\/ul>/gi,"[list=A]$1[/list]");t(/
                      • (.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/
                        /gi,"[hr]");t(/
                        /gi,"\n");t(//gi,"\n");t(/
                        /gi,"\n");t(/
                        /gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi,"
                        ");t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');t(/\[url\](.*?)\[\/url\]/gi,'$1');t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[list=\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[list=1\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[list=i\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[list=I\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[list=a\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[list=A\](.*?)\[\/list\]/gi,'
                          $1
                        ');t(/\[li\](.*?)\[\/li\]/gi,"
                      • $1
                        • ");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                        $1
                        ");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/
                          (.*?)<\/ul>/gi,"[list]$1[/list]");t(/
                            (.*?)<\/ul>/gi,"[list=]$1[/list]");t(/
                              (.*?)<\/ul>/gi,"[list=1]$1[/list]");t(/
                                (.*?)<\/ul>/gi,"[list=i]$1[/list]");t(/
                                  (.*?)<\/ul>/gi,"[list=I]$1[/list]");t(/
                                    (.*?)<\/ul>/gi,"[list=a]$1[/list]");t(/
                                      (.*?)<\/ul>/gi,"[list=A]$1[/list]");t(/
                                    • (.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/
                                      /gi,"[hr]");t(/
                                      /gi,"\n");t(//gi,"\n");t(/
                                      /gi,"\n");t(/
                                      /gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi,"
                                      ");t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');t(/\[url\](.*?)\[\/url\]/gi,'$1');t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[list=\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[list=1\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[list=i\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[list=I\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[list=a\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[list=A\](.*?)\[\/list\]/gi,'
                                        $1
                                      ');t(/\[li\](.*?)\[\/li\]/gi,"
                                    • $1
                                      • ");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                                      $1
                                      ");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 387ccdd59..4606845b4 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -75,7 +75,7 @@
 			
 			// example:  to [b]
 
-			rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			rep(/(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");
 			rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");
 			rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");
 			rep(/(.*?)<\/font>/gi,"$1");
-- 
cgit v1.2.3


From cb6716a644dad4c7c196330cf945de36a000e5a3 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 18:51:50 -0800
Subject: fix the xchan lookup tool

---
 mod/xchan.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod/xchan.php b/mod/xchan.php
index 984a62f95..9d4cdcc22 100644
--- a/mod/xchan.php
+++ b/mod/xchan.php
@@ -14,9 +14,11 @@ function xchan_content(&$a) {
 
 	if(x($_GET,'addr')) {
 		$addr = trim($_GET['addr']);
+
 		$r = q("select xchan_name from xchan where xchan_hash like '%s%%'",
-			dbesc(addr)
+			dbesc($addr)
 		);
+
 		if($r) {
 			foreach($r as $rr)
 				$o .= $rr['xchan_name'] . EOL;
-- 
cgit v1.2.3


From 05a70a8760d705e80c548d96a9d083ab032dbd8b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 19:16:12 -0800
Subject: add chatroom links

---
 include/conversation.php | 14 ++++++++++++++
 mod/chat.php             | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/include/conversation.php b/include/conversation.php
index 633435871..77c7bac70 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1488,6 +1488,19 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 			'id'    => 'files-tab',
 		);
 	}
+
+	require_once('include/chat.php');
+	$chats = chatroom_list($a->profile['profile_uid']);
+
+	$tabs[] = array(
+		'label' => t('Chatrooms') . '(' . count($chats) . ')',
+		'url'	=> $a->get_baseurl() . '/chat/' . $nickname,
+		'sel' 	=> ((argv(0) == 'chat') ? 'active' : ''),
+		'title' => t('Chatrooms'),
+		'id'    => 'chat-tab',
+	);
+
+
 	if($is_owner) {
 		$tabs[] = array(
 			'label' => t('Events'),
@@ -1506,6 +1519,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		);
 	}
 
+
 	if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) {
 		$tabs[] = array(
 			'label' => t('Webpages'),
diff --git a/mod/chat.php b/mod/chat.php
index e79973aef..e3725830c 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -155,6 +155,15 @@ function chat_content(&$a) {
 
 	require_once('include/widgets.php');
 
-	return widget_chatroom_list(array());
+	$o = replace_macros(get_markup_template('chatrooms.tpl'), array(
+		'$header' => sprintf( t('%1$s\'s Chatrooms'), $a->profile['name']),
+		'$baseurl' => z_root(),
+		'$nickname' => $channel['channel_address'],
+		'$rooms' => widget_chatroom_list(array()),
+		'$newroom' => t('New Chatroom'),
+		'$is_owner' => ((local_user() && local_user() == $a->profile['profile_uid']) ? 1 : 0)
+	));
+ 
+	return $o;
 
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 61f3ffc635acbc53a825152f9bb1bb2ab262dde5 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 19:16:41 -0800
Subject: add chatrooms template

---
 view/tpl/chatrooms.tpl | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 view/tpl/chatrooms.tpl

diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
new file mode 100644
index 000000000..c3dae6627
--- /dev/null
+++ b/view/tpl/chatrooms.tpl
@@ -0,0 +1,10 @@
+
                                      {{$header}}
                                      
+
+{{if $is_owner}}
+
                                      
+{{$newroom}}
+
                                      
+{{/if}}
+
+{{$rooms}}
+
-- 
cgit v1.2.3


From 5c5a14c4df217ce18264fdc78568c72cbe514eb8 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 20:43:43 -0800
Subject: this is basic but perhaps that's what we really need.

---
 assets/home.html | 77 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/assets/home.html b/assets/home.html
index c7f9c852c..30cde3cb4 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -1,25 +1,72 @@
-
-
-
+.tab {
+  float: left;
+  width: 25px;
+}
+.td {
+  float: left;
+  width: 200px;
+  font-size: 1.8em;
+  margin-bottom: 5px;
+  margin-right: 25px;
+	color: #808080;
+
+}
+
 
-
+
 
 
                                      
 
 
                                      
-
                                      
-Dream it. Do it.
+
                                      Dream it. Do it.
                                      
+
 
                                      
+
                                      
+
                                      Communications
                                      
+
                                      Message Expiration
                                      
+
                                      Photo Albums
                                      
+
                                      Decentralised
                                      
+
                                      Cloud Storage
                                      
+
                                      Blogging
                                      
+
                                      Decent Encryption
                                      
+
                                      Chatrooms
                                      
+
                                      Webpage Creation
                                      
+
                                      Content Management
                                      
+
                                      Games
                                      
+
                                      Unincorporated
                                      
+
                                      Forums
                                      
+
                                      Share Anything Digital
                                      
+
                                      Pseudonyms
                                      
+
                                      Multiple Identities
                                      
+
                                      Event Calendar
                                      
+
                                      Bookmarking
                                      
+
                                      Community Tagging
                                      
+
                                      Internet-scale Privacy
                                      
+
                                      Single Sign-On
                                      
+
                                      Directory Services
                                      
+
                                      Nomadic Identity
                                      
+
                                      Social Networking
                                      
+
                                      Derivative Channels
                                      
+
                                      Multiple Profiles
                                      
+
                                      Privacy Groups
                                      
+
                                      Autonomy
                                      
+
                                      Affinity Filtering
                                      
+
                                      Friend Suggestions
                                      
+
                                      Cross-Site Auth
                                      
+
                                      Themes
                                      
+
                                      Plugins
                                      
+
                                      External API
                                      
+
                                      3rd Party Apps
                                      
+
                                      Open Source
                                      
 
+
                                      
 
+
                                      Welcome to the Matrix
                                      “The most fun you ever had without taking your clothes off.”
                                      Public Sites | Project Home | Git | Developers
                                      
-- 
cgit v1.2.3


From 2c451d5c288d976b886338df4692249125dc8172 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 20:53:01 -0800
Subject: a couple more

---
 .htaccess        | 1 +
 assets/home.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index 52eb5d6c0..7f752018c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,7 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
+#SSLCipherSuite ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH
 
 # don't allow any web access to logfiles, even after rotation/compression
 
diff --git a/assets/home.html b/assets/home.html
index 30cde3cb4..975896c0c 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -35,6 +35,7 @@ header { z-index: 10000; }
 
                                      Photo Albums
                                      
 
                                      Decentralised
                                      
 
                                      Cloud Storage
                                      
+
                                      Own Your Content
                                      
 
                                      Blogging
                                      
 
                                      Decent Encryption
                                      
 
                                      Chatrooms
                                      
@@ -46,6 +47,7 @@ header { z-index: 10000; }
 
                                      Share Anything Digital
                                      
 
                                      Pseudonyms
                                      
 
                                      Multiple Identities
                                      
+
                                      No Advertising
                                      
 
                                      Event Calendar
                                      
 
                                      Bookmarking
                                      
 
                                      Community Tagging
                                      
-- 
cgit v1.2.3


From c739c4389389466ef012825ea8fe27b56af5c15a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 00:50:13 -0800
Subject: more important things to mention. And this is still only the
 important stuff.

---
 assets/home.html | 1 +
 version.inc      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/home.html b/assets/home.html
index 975896c0c..24baf1f10 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -39,6 +39,7 @@ header { z-index: 10000; }
 
                                      Blogging
                                      
 
                                      Decent Encryption
                                      
 
                                      Chatrooms
                                      
+
                                      "Unsend" Private Mail
                                      
 
                                      Webpage Creation
                                      
 
                                      Content Management
                                      
 
                                      Games
                                      
diff --git a/version.inc b/version.inc
index c26fe7d69..424737526 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-05.579
+2014-02-06.580
-- 
cgit v1.2.3


From 7a522be20bd66a0a904dcddf33d53e59aa04a92d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 01:05:22 -0800
Subject: leave out the quotes

---
 assets/home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/home.html b/assets/home.html
index 24baf1f10..1a0a13481 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -39,7 +39,7 @@ header { z-index: 10000; }
 
                                      Blogging
                                      
 
                                      Decent Encryption
                                      
 
                                      Chatrooms
                                      
-
                                      "Unsend" Private Mail
                                      
+
                                      Unsend Private Mail
                                      
 
                                      Webpage Creation
                                      
 
                                      Content Management
                                      
 
                                      Games
                                      
-- 
cgit v1.2.3


From f9381ed746009348462f4f96ed397fabab4e172e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 13:32:29 -0800
Subject: notification bug - don't use $r, we already set it to something else
 that we need further on.

---
 include/items.php    | 6 ++++--
 view/en/htconfig.tpl | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index 8b9cc8d04..b7919ade6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2109,11 +2109,13 @@ function send_status_notifications($post_id,$item) {
 
 	$link =  get_app()->get_baseurl() . '/display/' . $item['mid'];
 
-	$r = q("select id from notify where link = '%s' and uid = %d limit 1",
+
+	$y = q("select id from notify where link = '%s' and uid = %d limit 1",
 		dbesc($link),
 		intval($item['uid'])
 	);
-	if($r)
+
+	if($y)
 		$notify = false;
 
 	if(! $notify)
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 28fdd04f0..840e7a124 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -65,12 +65,13 @@ $a->config['system']['access_policy'] = ACCESS_PRIVATE;
 $a->config['system']['sellpage'] = '';
 
 // Maximum size of an imported message, 0 is unlimited
+// FIXME - NOT currently implemented. 
 
 $a->config['system']['max_import_size'] = 200000;
 
 // maximum size of uploaded photos
 
-$a->config['system']['maximagesize'] = 3000000;
+$a->config['system']['maximagesize'] = 12000000;
 
 // Location of PHP command line processor
 
-- 
cgit v1.2.3


From 3e677ec53de7517c249114dd30539141fbde85e3 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 13:54:39 -0800
Subject: add bookmark tag to naked links if they're red sites. We can do this
 because red links are linkified when the post is submitted. Can't do this for
 other naked links because they only get linkified during display and won't
 have a taxonomy object attached to the message.

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index b7919ade6..1a26198da 100755
--- a/include/items.php
+++ b/include/items.php
@@ -160,7 +160,7 @@ function red_zrl_callback($matches) {
 			$zrl = true;
 	}
 	if($zrl)
-		return $matches[1] . '[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]';
+		return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]';
 	return $matches[0];
 }
 
-- 
cgit v1.2.3


From a46fa1fbaecb5623fb6287ff9fb4479ad2f4f1d1 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 15:23:20 -0800
Subject: apply service class restriction to the number of channels allowed in
 a chatroom at a time ('chatters_inroom'). If you've got a public site you
 probably want to restrict this.

---
 include/chat.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/chat.php b/include/chat.php
index 5af3a3a9a..fb1d4fe65 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -114,6 +114,17 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 		return false;
 	}
 
+	$limit = service_class_fetch($r[0]['cr_uid'],'chatters_inroom');
+	if($limit !== false) {
+		$x = q("select count(*) as total from chatpresence where cp_room = %d",
+				intval($room_id)
+		);
+		if($x && $x[0]['total'] > $limit) {
+			notice( t('Room is full') . EOL);
+			return false;
+		}
+	}
+
 	if(intval($x[0]['cr_expire']))
 		$r = q("delete from chat where created < UTC_TIMESTAMP() - INTERVAL " . intval($x[0]['cr_expire']) . " MINUTE and chat_room = " . intval($x[0]['cr_id']));
 
-- 
cgit v1.2.3


From 9b2dc9b87c01f02463997ea4674c364151918f8b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 16:22:40 -0800
Subject: make all naked links bookmark-able

---
 include/items.php | 2 +-
 mod/item.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/items.php b/include/items.php
index 1a26198da..88b258604 100755
--- a/include/items.php
+++ b/include/items.php
@@ -161,7 +161,7 @@ function red_zrl_callback($matches) {
 	}
 	if($zrl)
 		return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]';
-	return $matches[0];
+	return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]';
 }
 
 
diff --git a/mod/item.php b/mod/item.php
index c8c0e3762..47a3f1961 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -425,7 +425,7 @@ function item_post(&$a) {
 		 * (already known to us) which will get a zrl, otherwise link with url
 		 */
 
-		$body = preg_replace_callback("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
+		$body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
 		/**
 		 *
-- 
cgit v1.2.3


From be475bb0cc066b4dbc75118ee29e369ca658d471 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Fri, 7 Feb 2014 00:24:39 +0000
Subject: Minor doco - markdown doesn't like angle brackets.  Also give
 instructions for mounting one's own directory rather than the cloud root.

---
 doc/dav_davfs2.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/dav_davfs2.md b/doc/dav_davfs2.md
index 546638810..e4313e810 100644
--- a/doc/dav_davfs2.md
+++ b/doc/dav_davfs2.md
@@ -12,7 +12,7 @@ and select "yes" at the prompt.
 
 Now you need to add any user you want to be able to mount dav to the davfs2 group
 
-`usermod -aG davfs2 `
+`usermod -aG davfs2 {{DesktopUser}}`
 
 Edit /etc/fstab
 
@@ -20,9 +20,9 @@ Edit /etc/fstab
 
 to include your cloud directory by adding
 
-`example.com/cloud/ /mount/point davfs user,noauto,uid=,file_mode=600,dir_mode=700 0 1`
+`example.com/cloud/{{Username}} /mount/point davfs user,noauto,uid={{DesktopUser}},file_mode=600,dir_mode=700 0 1`
 
-Where example.com is the URL of your hub, /mount/point is the location you want to mount the cloud, and  is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.
+Where {{Username}} is your username at your Red hub, example.com is the URL of your hub, /mount/point is the location you want to mount the cloud, and {{DesktopUser}} is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.
 
 For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be
 
@@ -42,10 +42,10 @@ Create a file called 'secrets'
 
 and add your cloud login credentials
 
-`example.com/cloud  `
+`example.com/cloud {{username}} {{password}}`
 
 
-Where  and  are the username and password for your hub.
+Where {{username}} and {{password}} are the username and password for your hub.
 
 Don't let this file be writeable by anyone who doesn't need it with
 
@@ -53,6 +53,6 @@ Don't let this file be writeable by anyone who doesn't need it with
 
 Finally, mount the drive.
 
-`mount example.com/cloud`
+`mount example.com/cloud/{{username}}`
 
 You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves.
-- 
cgit v1.2.3


From e8d98fbc851daa19881a4aa1e0d21bc44b307932 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 16:43:04 -0800
Subject: extend the usermenu so we don't have to keep going back to channel
 homepage to get to the other channel links

---
 include/nav.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index 008899c47..8fef4a1f9 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -75,10 +75,14 @@ EOT;
 		$nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'));
 		$nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'));
 		if(feature_enabled(local_user(),'multi_profiles'))
-			$nav['usermenu'][]   = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit Profiles'));
+			$nav['usermenu'][]   = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'));
 		$nav['usermenu'][] = Array('photos/' . $channel['channel_address'], t('Photos'), "", t('Your photos'));
-//		$nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events'));
-		
+		$nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files'));
+		$nav['usermenu'][] = Array('chat/' . $channel['channel_address'],t('Chat'),"",t('Your chatrooms'));
+		$nav['usermenu'][] = Array('events', t('Events'), "", t('Your events'));
+		$nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks'));
+		if(feature_enabled($channel['channel_id'],'webpages'))
+			$nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'));	
 	}
 	else {
 		if(! get_account_id()) 
-- 
cgit v1.2.3


From b779400218c2360a4354cfbecda620c8e24bfb87 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 21:31:42 -0800
Subject: mod/ping - don't perform any database calls if installing

---
 mod/ping.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mod/ping.php b/mod/ping.php
index 4b07fee7a..b9d9a9c77 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -43,6 +43,12 @@ function ping_init(&$a) {
 		unset($_SESSION['sysmsg_info']);
 	}
 
+	if($a->install) {
+		echo json_encode($result);
+		killme();
+	}
+
+
 	if(get_observer_hash() && (! $result['invalid'])) {
 		$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1",
 			dbesc(get_observer_hash()),
-- 
cgit v1.2.3


From cda1224066f0bbf63dbd0b0e69a78c8e27c18afd Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 6 Feb 2014 23:10:14 -0800
Subject: missing element in new chatroom link

---
 mod/chat.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mod/chat.php b/mod/chat.php
index e3725830c..872571f8c 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -79,6 +79,9 @@ function chat_post(&$a) {
 
 function chat_content(&$a) {
 
+	if(local_user())
+		$channel = $a->get_channel();
+
 	$observer = get_observer_hash();
 	if(! $observer) {
 		notice( t('Permission denied.') . EOL);
@@ -129,7 +132,7 @@ function chat_content(&$a) {
 	if(local_user() && argc() > 2 && argv(2) === 'new') {
 
 
-		$channel = $a->get_channel();  
+
 		$channel_acl = array(
 			'allow_cid' => $channel['channel_allow_cid'], 
 			'allow_gid' => $channel['channel_allow_gid'], 
-- 
cgit v1.2.3


From fb49647993fec8f52e69801ce92a9882a4c95b1a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 7 Feb 2014 00:49:45 -0800
Subject: doc updates

---
 doc/html/Contact_8php.html                         |   6 +-
 doc/html/apw_2php_2style_8php.html                 |   2 +-
 doc/html/auth_8php.html                            |   4 +-
 doc/html/bbcode_8php.html                          |  26 +-
 doc/html/bbcode_8php.js                            |   1 +
 doc/html/boot_8php.html                            |  81 +++-
 doc/html/boot_8php.js                              |   3 +
 doc/html/classApp-members.html                     | 131 +++----
 doc/html/classApp.html                             |  14 +
 doc/html/classApp.js                               |   1 +
 doc/html/cloud_8php.html                           |   6 +-
 doc/html/dba__driver_8php.html                     |   6 +-
 doc/html/dir_d41ce877eb409a4791b288730010abe2.html |   2 +
 doc/html/dir_d41ce877eb409a4791b288730010abe2.js   |   1 +
 doc/html/dir_d44c64559bbebec7f509842c48db8b23.html |   4 +
 doc/html/dir_d44c64559bbebec7f509842c48db8b23.js   |   2 +
 doc/html/docblox__errorchecker_8php.html           |   4 +-
 doc/html/extract_8php.html                         |   4 +-
 doc/html/files.html                                | 369 +++++++++---------
 doc/html/fpostit_8php.html                         |   8 +-
 doc/html/functions.html                            |   7 +-
 doc/html/functions_vars.html                       |   7 +-
 doc/html/globals.html                              |  63 +--
 doc/html/globals_0x62.html                         |  14 +-
 doc/html/globals_0x67.html                         |   6 +-
 doc/html/globals_0x69.html                         |   4 +-
 doc/html/globals_0x6d.html                         |   2 +-
 doc/html/globals_0x6e.html                         |   3 -
 doc/html/globals_0x70.html                         |   3 +
 doc/html/globals_0x73.html                         |  10 +-
 doc/html/globals_0x74.html                         |   9 +-
 doc/html/globals_func_0x62.html                    |  14 +-
 doc/html/globals_func_0x67.html                    |   6 +-
 doc/html/globals_func_0x69.html                    |   3 +
 doc/html/globals_func_0x6d.html                    |   2 +-
 doc/html/globals_func_0x6e.html                    |   3 -
 doc/html/globals_func_0x73.html                    |  10 +-
 doc/html/globals_vars.html                         |  63 +--
 doc/html/globals_vars_0x70.html                    |   3 +
 doc/html/globals_vars_0x74.html                    |   3 +
 doc/html/help_8php.html                            |   4 +-
 doc/html/include_2bookmarks_8php.html              | 161 ++++++++
 doc/html/include_2bookmarks_8php.js                |   4 +
 doc/html/include_2config_8php.html                 |   2 +-
 doc/html/include_2menu_8php.html                   |  23 +-
 doc/html/include_2menu_8php.js                     |   2 +-
 doc/html/items_8php.html                           |   2 +-
 doc/html/language_8php.html                        |   2 +-
 doc/html/mod_2bookmarks_8php.html                  | 155 ++++++++
 doc/html/mod_2bookmarks_8php.js                    |   5 +
 doc/html/namespacefriendica-to-smarty-tpl.html     |   2 +
 doc/html/navtree.js                                |  16 +-
 doc/html/navtreeindex0.js                          | 318 +++++++--------
 doc/html/navtreeindex1.js                          | 332 ++++++++--------
 doc/html/navtreeindex2.js                          |  12 +-
 doc/html/navtreeindex3.js                          | 322 +++++++--------
 doc/html/navtreeindex4.js                          | 158 ++++----
 doc/html/navtreeindex5.js                          | 430 ++++++++++-----------
 doc/html/navtreeindex6.js                          | 388 +++++++++----------
 doc/html/navtreeindex7.js                          | 400 +++++++++----------
 doc/html/navtreeindex8.js                          | 139 ++++---
 doc/html/parse__url_8php.html                      |   4 +-
 doc/html/php2po_8php.html                          |   6 +-
 doc/html/php_2theme__init_8php.html                |   2 +-
 doc/html/plugin_8php.html                          |   2 +-
 doc/html/redbasic_2php_2style_8php.html            | 312 +--------------
 doc/html/redbasic_2php_2style_8php.js              |  23 +-
 doc/html/search/all_24.js                          |  22 +-
 doc/html/search/all_62.js                          |   6 +
 doc/html/search/all_67.js                          |   2 +-
 doc/html/search/all_69.js                          |   3 +-
 doc/html/search/all_6d.js                          |   2 +-
 doc/html/search/all_6e.js                          |   1 -
 doc/html/search/all_70.js                          |   1 +
 doc/html/search/all_73.js                          |   5 +-
 doc/html/search/all_74.js                          |   1 +
 doc/html/search/files_62.js                        |   2 +
 doc/html/search/files_73.js                        |   1 +
 doc/html/search/functions_62.js                    |   4 +
 doc/html/search/functions_67.js                    |   2 +-
 doc/html/search/functions_69.js                    |   1 +
 doc/html/search/functions_6d.js                    |   2 +-
 doc/html/search/functions_6e.js                    |   1 -
 doc/html/search/functions_73.js                    |   4 +-
 doc/html/search/variables_24.js                    |  22 +-
 doc/html/search/variables_69.js                    |   2 +-
 doc/html/search/variables_70.js                    |   1 +
 doc/html/search/variables_74.js                    |   1 +
 doc/html/security_8php.html                        |   4 +-
 doc/html/spam_8php.html                            | 165 ++++++++
 doc/html/spam_8php.js                              |   5 +
 doc/html/taxonomy_8php.html                        |   2 +-
 doc/html/text_8php.html                            |  75 ++--
 doc/html/text_8php.js                              |   5 +-
 doc/html/theme_2blogga_2php_2default_8php.html     |   4 +-
 ...e_2blogga_2view_2theme_2blog_2default_8php.html |   6 +-
 doc/html/tpldebug_8php.html                        |   4 +-
 doc/html/typo_8php.html                            |   2 +-
 doc/html/typohelper_8php.html                      |   2 +-
 99 files changed, 2337 insertions(+), 2159 deletions(-)
 create mode 100644 doc/html/include_2bookmarks_8php.html
 create mode 100644 doc/html/include_2bookmarks_8php.js
 create mode 100644 doc/html/mod_2bookmarks_8php.html
 create mode 100644 doc/html/mod_2bookmarks_8php.js
 create mode 100644 doc/html/spam_8php.html
 create mode 100644 doc/html/spam_8php.js

diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html
index e6e4270df..682ad9137 100644
--- a/doc/html/Contact_8php.html
+++ b/doc/html/Contact_8php.html
@@ -140,8 +140,8 @@ Functions
  
  terminate_friendship ($user, $self, $contact)
  
-if(!function_exists('mark_for_death')) 
                                      
-if(!function_exists('unmark_for_death')) random_profile ()
+if(!function_exists('mark_for_death')) 
                                      
+if(!function_exists('unmark_for_death')) random_profile ()
  
 
 
                                      Function Documentation
                                      
@@ -358,7 +358,7 @@ Functions
 
                                      
       
-          
+          
diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html
index 1c91ca1ea..1d605f028 100644
--- a/doc/html/apw_2php_2style_8php.html
+++ b/doc/html/apw_2php_2style_8php.html
@@ -128,7 +128,7 @@ Variables
                                      
         
                                      if (!function_exists('mark_for_death')) if (!function_exists('unmark_for_death')) random_profile if (!function_exists('mark_for_death')) if (!function_exists('unmark_for_death')) random_profile 
           (
           )
           
                                      
       
                                      
 
                                      
 
-
                                      Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
                                      
+
                                      Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
                                      
 
 
                                      
 
                                      
diff --git a/doc/html/auth_8php.html b/doc/html/auth_8php.html
index 79e1ce375..ab3e3e2a9 100644
--- a/doc/html/auth_8php.html
+++ b/doc/html/auth_8php.html
@@ -120,7 +120,7 @@ Functions
 
-
                                      
 
                                      
 Variables
                                      if((isset($_SESSION))&&(x($_SESSION,'authenticated'))&&((!(x($_POST,'auth-params')))||($_POST['auth-params']!== 
                                      
+
                                      if((isset($_SESSION))&&(x($_SESSION,'authenticated'))&&((!(x($_POST,'auth-params')))||($_POST['auth-params']!== 
                                      
 'login')))                                       		else
                                      
 
                                       
                                      
 
                                      
@@ -179,7 +179,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if ((isset($_SESSION))&&(x($_SESSION,'authenticated'))&&((!(x($_POST,'auth-params')))||($_POST['auth-params']!== 'login'))) elseif ((isset($_SESSION))&&(x($_SESSION,'authenticated'))&&((!(x($_POST,'auth-params')))||($_POST['auth-params']!== 'login'))) else
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html
index c0823aa23..35da04d33 100644
--- a/doc/html/bbcode_8php.html
+++ b/doc/html/bbcode_8php.html
@@ -122,8 +122,8 @@ Functions
  
  bb_unspacefy_and_trim ($st)
  
-if(!function_exists('bb_extract_images')) 
                                      
-if(!function_exists('bb_replace_images')) bb_parse_crypt ($match)
+if(!function_exists('bb_extract_images')) 
                                      
+if(!function_exists('bb_replace_images')) bb_parse_crypt ($match)
  
  bb_qr ($match)
  
@@ -135,6 +135,8 @@ Functions
  
  rpost_callback ($match)
  
+ bb_sanitize_style ($input)
+ 
  bbcode ($Text, $preserve_nl=false, $tryoembed=true)
  
 
@@ -160,7 +162,7 @@ Functions
 
                                      
       
-          
+          
@@ -185,6 +187,22 @@ Functions
                                      
         
                                      if (!function_exists('bb_extract_images')) if (!function_exists('bb_replace_images')) bb_parse_crypt if (!function_exists('bb_extract_images')) if (!function_exists('bb_replace_images')) bb_parse_crypt 
           (
            
           $match)
                                      
       
                                      
 
                                      
 
+
                                      
+
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      bb_sanitize_style ( $input)
                                      
+
                                      
+
 
                                      
 
                                      
 
@@ -281,7 +299,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by bb2diaspora(), chatsvc_content(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), siteinfo_content(), and tagrm_content().
                                      
+
                                      Referenced by bb2diaspora(), chatsvc_content(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), menu_render(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), siteinfo_content(), and tagrm_content().
                                      
 
 
                                      
 
diff --git a/doc/html/bbcode_8php.js b/doc/html/bbcode_8php.js
index 1f7680fb8..77e2758b6 100644
--- a/doc/html/bbcode_8php.js
+++ b/doc/html/bbcode_8php.js
@@ -3,6 +3,7 @@ var bbcode_8php =
     [ "bb_location", "bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd", null ],
     [ "bb_parse_crypt", "bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f", null ],
     [ "bb_qr", "bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c", null ],
+    [ "bb_sanitize_style", "bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e", null ],
     [ "bb_ShareAttributes", "bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a", null ],
     [ "bb_ShareAttributesSimple", "bbcode_8php.html#a2be26414a367118143cc89e2d58e7377", null ],
     [ "bb_spacefy", "bbcode_8php.html#a8911e027907820df3db03b4f76724b50", null ],
diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html
index 0f5ad9a59..f0e6b6c99 100644
--- a/doc/html/boot_8php.html
+++ b/doc/html/boot_8php.html
@@ -161,6 +161,8 @@ Functions
  
  proc_run ($cmd)
  
+ is_windows ()
+ 
  current_theme ()
  
  current_theme_url ($installing=false)
@@ -200,7 +202,7 @@ Variables
  
 const ZOT_REVISION 1
  
-const DB_UPDATE_VERSION 1095
+const DB_UPDATE_VERSION 1096
  
 const EOL '<br />' . "\r\n"
  
@@ -368,6 +370,8 @@ Variables
  
 const PERMS_A_REPUBLISH 0x10000
  
+const PERMS_A_BOOKMARK 0x20000
+ 
 const PERMS_PUBLIC 0x0001
  
 const PERMS_NETWORK 0x0002
@@ -494,6 +498,8 @@ Variables
  
 const TERM_THING 7
  
+const TERM_BOOKMARK 8
+ 
 const TERM_OBJ_POST 1
  
 const TERM_OBJ_PHOTO 2
@@ -1014,7 +1020,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by advanced_profile(), api_statuses_user_timeline(), attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), chat_content(), chatsvc_content(), chatsvc_init(), chatsvc_post(), cloud_init(), 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(), ping_init(), prepare_body(), profile_content(), profile_sidebar(), search_content(), RedBrowser\set_writeable(), 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().
                                      
+
                                      Referenced by advanced_profile(), api_statuses_user_timeline(), attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), bookmarks_content(), chat_content(), chatsvc_content(), chatsvc_init(), chatsvc_post(), cloud_init(), 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(), ping_init(), prepare_body(), profile_content(), profile_sidebar(), search_content(), RedBrowser\set_writeable(), 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().
                                      
 
 
                                      
 
@@ -1032,7 +1038,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), chat_content(), chat_post(), 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(), filestorage_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().
                                      
+
                                      Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), chat_content(), chat_post(), chatsvc_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(), filestorage_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), 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(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), xref_init(), and zid_init().
                                      
 
 
                                      
 
@@ -1119,6 +1125,23 @@ Variables
 
 
                                      Referenced by admin_content(), admin_post(), check_account_admin(), findpeople_widget(), invite_content(), invite_post(), nav(), ping_init(), register_post(), regmod_content(), and thing_init().
                                      
 
+
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+        
+      
                                      is_windows ()
                                      
+
                                      
+
+
                                      Referenced by check_php(), and proc_run().
                                      
+
 
                                      
 
                                      
 
@@ -1134,7 +1157,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(), dirprofile_init(), 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(), sslify_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(), bookmarks_init(), check_form_security_token_ForbiddenOnErr(), cloud_init(), contactgroup_content(), dirprofile_init(), 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(), sslify_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().
                                      
 
 
                                      
 
@@ -1169,7 +1192,7 @@ Variables
       
 
                                      
 
-
                                      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(), chat_content(), chat_init(), chat_post(), cloud_init(), 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_content(), dirprofile_init(), 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(), filestorage_post(), 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(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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().
                                      
+
                                      Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), 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_content(), dirprofile_init(), 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(), filestorage_post(), 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(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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().
                                      
 
 
                                      
 
@@ -1221,7 +1244,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by achievements_content(), 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(), chat_content(), chat_init(), chatroom_enter(), 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(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
                                      
+
                                      Referenced by achievements_content(), 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(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), 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(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
                                      
 
 
                                      
 
@@ -1321,7 +1344,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(), cloud_init(), 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(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), 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(), group_side(), 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_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), 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(), 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(), chatsvc_content(), check_form_security_token(), cloud_init(), 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(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), 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(), group_side(), 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_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), 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(), 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().
                                      
 
 
                                      
 
@@ -1355,7 +1378,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by allowed_public_recips(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), 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_albums_list(), photos_create_item(), photos_list_photos(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), 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_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().
                                      
+
                                      Referenced by allowed_public_recips(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), dirprofile_init(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), 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_albums_list(), photos_create_item(), photos_list_photos(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), 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_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().
                                      
 
 
                                      
 
@@ -2104,7 +2127,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      const DB_UPDATE_VERSION 1095const DB_UPDATE_VERSION 1096
         
                                      
       
                                      
 
                                      
@@ -2218,7 +2241,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by achievements_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), apps_content(), attach_init(), blocks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_keys(), check_php(), check_store(), common_content(), common_init(), community_content(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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(), thing_content(), thing_init(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
                                      
+
                                      Referenced by achievements_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), apps_content(), attach_init(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_keys(), check_php(), check_store(), common_content(), common_init(), community_content(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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(), thing_content(), thing_init(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
                                      
 
 
                                      
 
@@ -2803,7 +2826,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by RedDirectory\__construct(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), delete_imported_item(), deliver_run(), directory_content(), directory_run(), dirprofile_init(), expire_run(), fix_private_photos(), RedFile\get(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), 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(), RedFile\put(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().
                                      
+
                                      Referenced by RedDirectory\__construct(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), delete_imported_item(), deliver_run(), directory_content(), directory_run(), dirprofile_init(), expire_run(), fix_private_photos(), RedFile\get(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), 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(), RedFile\put(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().
                                      
 
 
                                      
 
@@ -2957,6 +2980,8 @@ Variables
       
 
                                      
 
+
                                      Referenced by bookmark_add(), bookmarks_content(), menu_content(), and menu_post().
                                      
+
 
                                      
 
 
@@ -2983,7 +3008,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by menu_render(), mitem_content(), and mitem_post().
                                      
+
                                      Referenced by bookmark_add(), menu_render(), mitem_content(), and mitem_post().
                                      
 
 
                                      
 
@@ -2998,6 +3023,8 @@ Variables
 
                                      
 
                                      Menu types 
                                      
 
+
                                      Referenced by bookmark_add(), bookmarks_content(), menu_content(), and menu_post().
                                      
+
 
                                      
 
 
@@ -3648,6 +3675,20 @@ Variables
 
 
                                      Referenced by create_sys_channel(), get_sys_channel(), and zfinger_init().
                                      
 
+
+
+
+
                                      
+
                                      
+      
+        
+          
+        
+      
                                      const PERMS_A_BOOKMARK 0x20000
                                      
+
                                      
+
+
                                      Referenced by get_perms().
                                      
+
 
                                      
 
                                      
 
@@ -4209,6 +4250,20 @@ Variables
 
 
                                      Referenced by attach_mkdir(), change_channel(), check_store(), and cloud_init().
                                      
 
+
+
+
+
                                      
+
                                      
+      
+        
+          
+        
+      
                                      const TERM_BOOKMARK 8
                                      
+
                                      
+
+
                                      Referenced by bookmarks_init(), decode_tags(), encode_item_terms(), Item\get_template_data(), handle_tag(), and tag_deliver().
                                      
+
 
                                      
 
                                      
 
@@ -4381,7 +4436,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by thing_init().
                                      
+
                                      Referenced by decode_tags(), and thing_init().
                                      
 
 
                                      
 
diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js
index 5d4638739..280cf3cbc 100644
--- a/doc/html/boot_8php.js
+++ b/doc/html/boot_8php.js
@@ -25,6 +25,7 @@ var boot_8php =
     [ "info", "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498", null ],
     [ "is_ajax", "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c", null ],
     [ "is_site_admin", "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e", null ],
+    [ "is_windows", "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08", null ],
     [ "killme", "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c", null ],
     [ "load_contact_links", "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6", null ],
     [ "local_user", "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44", null ],
@@ -205,6 +206,7 @@ var boot_8php =
     [ "PAGE_PREMIUM", "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8", null ],
     [ "PAGE_REMOVED", "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6", null ],
     [ "PAGE_SYSTEM", "boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932", null ],
+    [ "PERMS_A_BOOKMARK", "boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b", null ],
     [ "PERMS_A_DELEGATE", "boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b", null ],
     [ "PERMS_A_REPUBLISH", "boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead", null ],
     [ "PERMS_CONTACTS", "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6", null ],
@@ -245,6 +247,7 @@ var boot_8php =
     [ "SSL_POLICY_NONE", "boot_8php.html#af86c651547aa8f9e549ee40a09455549", null ],
     [ "SSL_POLICY_SELFSIGN", "boot_8php.html#adca48aee78465ae3064ca4432c0d87b5", null ],
     [ "STORAGE_DEFAULT_PERMISSIONS", "boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6", null ],
+    [ "TERM_BOOKMARK", "boot_8php.html#a115faf8797718c3165498abbd6895843", null ],
     [ "TERM_CATEGORY", "boot_8php.html#af33d1b2e98a1e21af672005525d46dfe", null ],
     [ "TERM_FILE", "boot_8php.html#afb97615e985a013799839b68b99018d7", null ],
     [ "TERM_HASHTAG", "boot_8php.html#a2750985ec445617d7e82ae3098c91e3f", null ],
diff --git a/doc/html/classApp-members.html b/doc/html/classApp-members.html
index 4661adc60..6e2218d84 100644
--- a/doc/html/classApp-members.html
+++ b/doc/html/classApp-members.html
@@ -138,71 +138,72 @@ $(document).ready(function(){initNavTree('classApp.html','');});
   $hooksApp
   $hostnameAppprivate
   $identitiesApp
-  $interactiveApp
-  $js_sourcesApp
-  $languageApp
-  $layoutApp
-  $ldelimAppprivate
-  $moduleApp
-  $module_loadedApp
-  $nav_selApp
-  $observerApp
-  $pageApp
-  $pagerApp
-  $pathAppprivate
-  $permsAppprivate
-  $pluginsApp
-  $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
+  $installApp
+  $interactiveApp
+  $js_sourcesApp
+  $languageApp
+  $layoutApp
+  $ldelimAppprivate
+  $moduleApp
+  $module_loadedApp
+  $nav_selApp
+  $observerApp
+  $pageApp
+  $pagerApp
+  $pathAppprivate
+  $permsAppprivate
+  $pluginsApp
+  $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 3c6d0655e..bd8e6bbf0 100644
--- a/doc/html/classApp.html
+++ b/doc/html/classApp.html
@@ -184,6 +184,8 @@ Public Member Functions
 
+
+
@@ -1254,6 +1256,18 @@ Private Attributes
                                      
 
                                      
 Public Attributes
                                       $install = false
                                       
                                      
 
                                       $account = null
                                      
 
                                       
                                      
 
                                       $channel = null
                                      
       
                                      
 
                                      
 
+
                                      
+
+
+
                                      
+
                                      
+      
+        
+          
+        
+      
                                      App::$install = false
                                      
+
                                      
+
 
                                      
 
                                      
 
diff --git a/doc/html/classApp.js b/doc/html/classApp.js
index 52808c33c..c7c8e3b05 100644
--- a/doc/html/classApp.js
+++ b/doc/html/classApp.js
@@ -58,6 +58,7 @@ var classApp =
     [ "$hooks", "classApp.html#a3694aa1907aa103a2adbc71f926f0fa0", null ],
     [ "$hostname", "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3", null ],
     [ "$identities", "classApp.html#a7954862f44f606b0ff83d4c74d15e792", null ],
+    [ "$install", "classApp.html#a576ecb1c5b4a283221e6f2f0ec248251", null ],
     [ "$interactive", "classApp.html#a4c7cfc62d39508086cf300dc2e39c4df", null ],
     [ "$js_sources", "classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d", null ],
     [ "$language", "classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f", null ],
diff --git a/doc/html/cloud_8php.html b/doc/html/cloud_8php.html
index 8fd8cf18f..a5ea81c0a 100644
--- a/doc/html/cloud_8php.html
+++ b/doc/html/cloud_8php.html
@@ -112,8 +112,8 @@ $(document).ready(function(){initNavTree('cloud_8php.html','');});
 
-
+
                                      
 
                                      
 Functions
                                      if(x($_SERVER,'REDIRECT_REMOTE_USER')) 
                                      
-if(x($_SERVER,'HTTP_AUTHORIZATION'))                                       		cloud_init (&$a)
                                      if(x($_SERVER,'REDIRECT_REMOTE_USER')) 
                                      
+if(x($_SERVER,'HTTP_AUTHORIZATION'))                                       		cloud_init (&$a)
                                      
 
                                       
                                      
 
                                      
 
                                      Function Documentation
                                      
@@ -122,7 +122,7 @@ Functions
 
                                      
       
-          
+          
diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html
index 8b32c3ca1..ea87c5b78 100644
--- a/doc/html/dba__driver_8php.html
+++ b/doc/html/dba__driver_8php.html
@@ -202,7 +202,7 @@ Functions
                                      
         
                                      if (x($_SERVER,'REDIRECT_REMOTE_USER')) if (x($_SERVER,'HTTP_AUTHORIZATION')) cloud_init if (x($_SERVER,'REDIRECT_REMOTE_USER')) if (x($_SERVER,'HTTP_AUTHORIZATION')) cloud_init 
           (
           & 
           $a)
                                      
       
                                      
 
                                      
 
-
                                      Referenced by account_verify_password(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), 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(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), menu_list(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().
                                      
 
 
                                      
 
@@ -264,8 +264,6 @@ Functions
       
 
                                      
 
-
                                      Referenced by page_content().
                                      
-
 
                                      
 
 
@@ -320,7 +318,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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), 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(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().
                                      
+
                                      Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), 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(), chat_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
index 721315a1e..6d9fb9f31 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
@@ -120,6 +120,8 @@ Files
  
 file  blocks.php
  
+file  bookmarks.php
+ 
 file  chanman.php
  
 file  channel.php
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index 264f8fda7..cc5010eed 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -8,6 +8,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "apps.php", "apps_8php.html", "apps_8php" ],
     [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ],
     [ "blocks.php", "blocks_8php.html", "blocks_8php" ],
+    [ "bookmarks.php", "mod_2bookmarks_8php.html", "mod_2bookmarks_8php" ],
     [ "chanman.php", "mod_2chanman_8php.html", null ],
     [ "channel.php", "channel_8php.html", "channel_8php" ],
     [ "chanview.php", "chanview_8php.html", "chanview_8php" ],
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
index 60c458b85..04b0ad01b 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -129,6 +129,8 @@ Files
  
 file  bbcode.php
  
+file  bookmarks.php
+ 
 file  cache.php
  
 file  chanman.php
@@ -241,6 +243,8 @@ Files
  
 file  socgraph.php
  
+file  spam.php
+ 
 file  system_unavailable.php
  
 file  taxonomy.php
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
index c047455f1..02d7747fe 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
@@ -13,6 +13,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 =
     ] ],
     [ "bb2diaspora.php", "bb2diaspora_8php.html", "bb2diaspora_8php" ],
     [ "bbcode.php", "bbcode_8php.html", "bbcode_8php" ],
+    [ "bookmarks.php", "include_2bookmarks_8php.html", "include_2bookmarks_8php" ],
     [ "cache.php", "cache_8php.html", [
       [ "Cache", "classCache.html", null ]
     ] ],
@@ -83,6 +84,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 =
     [ "security.php", "security_8php.html", "security_8php" ],
     [ "session.php", "session_8php.html", "session_8php" ],
     [ "socgraph.php", "socgraph_8php.html", "socgraph_8php" ],
+    [ "spam.php", "spam_8php.html", "spam_8php" ],
     [ "system_unavailable.php", "system__unavailable_8php.html", "system__unavailable_8php" ],
     [ "taxonomy.php", "taxonomy_8php.html", "taxonomy_8php" ],
     [ "template_processor.php", "template__processor_8php.html", "template__processor_8php" ],
diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html
index b17226b25..28091a557 100644
--- a/doc/html/docblox__errorchecker_8php.html
+++ b/doc/html/docblox__errorchecker_8php.html
@@ -134,7 +134,7 @@ Variables
  
  $filelist =array()
  
-while($dh=opendir($dir)) if(runs($filelist)) $res =$filelist
+while($dh=opendir($dir)) if(runs($filelist)) $res =$filelist
  
  $i =0
  
@@ -253,7 +253,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by aes_encapsulate(), aes_unencapsulate(), alt_pager(), check_config(), drop_item(), fix_private_photos(), get_bb_tag_pos(), is_a_date_arg(), item_post(), item_redir_and_replace_images(), jindent(), load_database_rem(), node2bbcodesub(), notification(), paginate(), photos_post(), profile_activity(), reload_plugins(), remove_community_tag(), scale_external_images(), tag_deliver(), and zot_import().
                                      
+
                                      Referenced by aes_encapsulate(), aes_unencapsulate(), alt_pager(), bookmarks_init(), check_config(), drop_item(), fix_private_photos(), get_bb_tag_pos(), is_a_date_arg(), item_post(), item_redir_and_replace_images(), jindent(), load_database_rem(), node2bbcodesub(), notification(), paginate(), photos_post(), profile_activity(), reload_plugins(), remove_community_tag(), scale_external_images(), tag_deliver(), and zot_import().
                                      
 
 
                                      
 
diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html
index fe980d447..7a998ee4f 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(), api_statuses_user_timeline(), array_sanitise(), attach_mkdir(), attach_store(), chat_post(), chatroom_create(), chatroom_destroy(), 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_cloudpath(), 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(), 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(), api_statuses_user_timeline(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_post(), chatroom_create(), chatroom_destroy(), 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_cloudpath(), 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(), 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(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_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(), sslify(), 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(), bookmarks_init(), 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(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), 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(), sslify(), string_splitter(), stripdcode_br_cb(), t(), tag_deliver(), 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/files.html b/doc/html/files.html
index 5957a0122..0aa37853e 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -127,68 +127,70 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*BaseObject.php
 |o*bb2diaspora.php
 |o*bbcode.php
-|o*cache.php
-|o*chanman.php
-|o*chat.php
-|o*cli_startup.php
-|o*cli_suggest.php
-|o*comanche.php
-|o*config.php
-|o*Contact.php
-|o*contact_selectors.php
-|o*contact_widgets.php
-|o*conversation.php
-|o*ConversationObject.php
-|o*cronhooks.php
-|o*crypto.php
-|o*datetime.php
-|o*deliver.php
-|o*dir_fns.php
-|o*directory.php
-|o*enotify.php
-|o*event.php
-|o*expire.php
-|o*features.php
-|o*follow.php
-|o*friendica_smarty.php
-|o*gprobe.php
-|o*group.php
-|o*html2bbcode.php
-|o*html2plain.php
-|o*identity.php
-|o*ItemObject.php
-|o*ITemplateEngine.php
-|o*items.php
-|o*language.php
-|o*menu.php
-|o*message.php
-|o*nav.php
-|o*network.php
-|o*notifier.php
-|o*notify.php
-|o*oauth.php
-|o*oembed.php
-|o*onedirsync.php
-|o*onepoll.php
-|o*page_widgets.php
-|o*permissions.php
-|o*photos.php
-|o*plugin.php
-|o*poller.php
-|o*profile_selectors.php
-|o*ProtoDriver.php
-|o*queue.php
-|o*queue_fn.php
-|o*reddav.php
-|o*security.php
-|o*session.php
-|o*socgraph.php
-|o*system_unavailable.php
-|o*taxonomy.php
-|o*template_processor.php
-|o*text.php
-|o*widgets.php
-|\*zot.php
+|o*bookmarks.php
+|o*cache.php
+|o*chanman.php
+|o*chat.php
+|o*cli_startup.php
+|o*cli_suggest.php
+|o*comanche.php
+|o*config.php
+|o*Contact.php
+|o*contact_selectors.php
+|o*contact_widgets.php
+|o*conversation.php
+|o*ConversationObject.php
+|o*cronhooks.php
+|o*crypto.php
+|o*datetime.php
+|o*deliver.php
+|o*dir_fns.php
+|o*directory.php
+|o*enotify.php
+|o*event.php
+|o*expire.php
+|o*features.php
+|o*follow.php
+|o*friendica_smarty.php
+|o*gprobe.php
+|o*group.php
+|o*html2bbcode.php
+|o*html2plain.php
+|o*identity.php
+|o*ItemObject.php
+|o*ITemplateEngine.php
+|o*items.php
+|o*language.php
+|o*menu.php
+|o*message.php
+|o*nav.php
+|o*network.php
+|o*notifier.php
+|o*notify.php
+|o*oauth.php
+|o*oembed.php
+|o*onedirsync.php
+|o*onepoll.php
+|o*page_widgets.php
+|o*permissions.php
+|o*photos.php
+|o*plugin.php
+|o*poller.php
+|o*profile_selectors.php
+|o*ProtoDriver.php
+|o*queue.php
+|o*queue_fn.php
+|o*reddav.php
+|o*security.php
+|o*session.php
+|o*socgraph.php
+|o*spam.php
+|o*system_unavailable.php
+|o*taxonomy.php
+|o*template_processor.php
+|o*text.php
+|o*widgets.php
+|\*zot.php
 o+mod
 |o*_well_known.php
 |o*achievements.php
@@ -198,127 +200,128 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*apps.php
 |o*attach.php
 |o*blocks.php
-|o*chanman.php
-|o*channel.php
-|o*chanview.php
-|o*chat.php
-|o*chatsvc.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
-|o*dirprofile.php
-|o*dirsearch.php
-|o*display.php
-|o*editblock.php
-|o*editlayout.php
-|o*editpost.php
-|o*editwebpage.php
-|o*events.php
-|o*fbrowser.php
-|o*feed.php
-|o*filer.php
-|o*filerm.php
-|o*filestorage.php
-|o*follow.php
-|o*fsuggest.php
-|o*group.php
-|o*help.php
-|o*home.php
-|o*hostxrd.php
-|o*import.php
-|o*invite.php
-|o*item.php
-|o*layouts.php
-|o*like.php
-|o*lockview.php
-|o*login.php
-|o*lostpass.php
-|o*magic.php
-|o*mail.php
-|o*manage.php
-|o*match.php
-|o*menu.php
-|o*message.php
-|o*mitem.php
-|o*mood.php
-|o*msearch.php
-|o*network.php
-|o*new_channel.php
-|o*notes.php
-|o*notifications.php
-|o*notify.php
-|o*oembed.php
-|o*oexchange.php
-|o*online.php
-|o*opensearch.php
-|o*page.php
-|o*parse_url.php
-|o*photo.php
-|o*photos.php
-|o*php.php
-|o*ping.php
-|o*poco.php
-|o*poke.php
-|o*post.php
-|o*pretheme.php
-|o*probe.php
-|o*profile.php
-|o*profile_photo.php
-|o*profiles.php
-|o*profperm.php
-|o*pubsites.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*sslify.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*xref.php
-|o*zfinger.php
-|o*zotfeed.php
-|\*zping.php
+|o*bookmarks.php
+|o*chanman.php
+|o*channel.php
+|o*chanview.php
+|o*chat.php
+|o*chatsvc.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
+|o*dirprofile.php
+|o*dirsearch.php
+|o*display.php
+|o*editblock.php
+|o*editlayout.php
+|o*editpost.php
+|o*editwebpage.php
+|o*events.php
+|o*fbrowser.php
+|o*feed.php
+|o*filer.php
+|o*filerm.php
+|o*filestorage.php
+|o*follow.php
+|o*fsuggest.php
+|o*group.php
+|o*help.php
+|o*home.php
+|o*hostxrd.php
+|o*import.php
+|o*invite.php
+|o*item.php
+|o*layouts.php
+|o*like.php
+|o*lockview.php
+|o*login.php
+|o*lostpass.php
+|o*magic.php
+|o*mail.php
+|o*manage.php
+|o*match.php
+|o*menu.php
+|o*message.php
+|o*mitem.php
+|o*mood.php
+|o*msearch.php
+|o*network.php
+|o*new_channel.php
+|o*notes.php
+|o*notifications.php
+|o*notify.php
+|o*oembed.php
+|o*oexchange.php
+|o*online.php
+|o*opensearch.php
+|o*page.php
+|o*parse_url.php
+|o*photo.php
+|o*photos.php
+|o*php.php
+|o*ping.php
+|o*poco.php
+|o*poke.php
+|o*post.php
+|o*pretheme.php
+|o*probe.php
+|o*profile.php
+|o*profile_photo.php
+|o*profiles.php
+|o*profperm.php
+|o*pubsites.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*sslify.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*xref.php
+|o*zfinger.php
+|o*zotfeed.php
+|\*zping.php
 o+util
 |o+fpostit
 ||\*fpostit.php
diff --git a/doc/html/fpostit_8php.html b/doc/html/fpostit_8php.html
index c0007a22e..b17a11384 100644
--- a/doc/html/fpostit_8php.html
+++ b/doc/html/fpostit_8php.html
@@ -118,11 +118,11 @@ Functions
 
-
+if(isset($_GET['text'])) if(isset($_GET['url'])) 
                                      
+if((isset($title))&&(isset($text))&&(isset($url))) 
                                      
 
                                      
 Variables
                                      if(($_POST["friendika_acct_name"]!= 
                                      
+
                                      if(($_POST["friendika_acct_name"]!= 
                                      
 '')&&($_POST["friendika_password"]!= 
                                      
 '')) if(isset($_GET['title'])) 
                                      
-if(isset($_GET['text'])) if(isset($_GET['url'])) 
                                      
-if((isset($title))&&(isset($text))&&(isset($url)))                                       		else
                                      else
                                      
 
                                       
                                      
 
                                      
 
                                      Function Documentation
                                      
@@ -158,7 +158,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if (isset($_POST['submit'])) elseif (isset($_POST['submit'])) else
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/functions.html b/doc/html/functions.html
index dc4831efd..0af65c864 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -286,6 +286,9 @@ $(document).ready(function(){initNavTree('functions.html','');});
 
                                    • $image
 : photo_driver
 
                                      • 
+
                                    • $install
+: App
+
                                      • 
 
                                    • $interactive
 : App
 
                                      • 
@@ -325,9 +328,9 @@ $(document).ready(function(){initNavTree('functions.html','');});
 : Template
 
 
                                    • $observer
-: App
+: Conversation
 , RedBasicAuth
-, Conversation
+, App
 
                                      • 
 
                                    • $os_path
 : RedDirectory
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html
index 711b28d89..bb05f0d18 100644
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -267,6 +267,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 
                                    • $image
 : photo_driver
 
                                      • 
+
                                    • $install
+: App
+
                                      • 
 
                                    • $interactive
 : App
 
                                      • 
@@ -306,9 +309,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
 : Template
 
 
                                    • $observer
-: App
+: Conversation
 , RedBasicAuth
-, Conversation
+, App
 
                                      • 
 
                                    • $os_path
 : RedDirectory
diff --git a/doc/html/globals.html b/doc/html/globals.html
index 85e38e7d5..5df6b05c9 100644
--- a/doc/html/globals.html
+++ b/doc/html/globals.html
@@ -156,18 +156,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
 
                                    • $aside
 : minimalisticdarkness.php
 
                                      • 
-
                                    • $background_image
-: style.php
-
                                      • 
-
                                    • $banner_colour
-: style.php
-
                                      • 
-
                                    • $bgcolour
-: style.php
-
                                      • 
-
                                    • $body_font_size
-: style.php
-
                                      • 
 
                                    • $bodyclass
 : default.php
 
                                      • 
@@ -180,9 +168,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
 
                                    • $comment_indent
 : style.php
 
                                      • 
-
                                    • $converse_width
-: style.php
-
                                      • 
 
                                    • $dir
 : docblox_errorchecker.php
 
                                      • 
@@ -196,15 +181,9 @@ $(document).ready(function(){initNavTree('globals.html','');});
 : docblox_errorchecker.php
 
 
                                    • $files
-: extract.php
+: typo.php
+, extract.php
 , tpldebug.php
-, typo.php
-
                                      • 
-
                                    • $font_colour
-: style.php
-
                                      • 
-
                                    • $font_size
-: style.php
 
                                      • 
 
                                    • $gc_probability
 : session.php
@@ -227,12 +206,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
 
                                    • $install_wizard_pass
 : setup.php
 
                                      • 
-
                                    • $item_colour
-: style.php
-
                                      • 
-
                                    • $item_opacity
-: style.php
-
                                      • 
 
                                    • $itemfloat
 : minimalisticdarkness.php
 
                                      • 
@@ -242,12 +215,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
 
                                    • $minwidth
 : minimalisticdarkness.php
 
                                      • 
-
                                    • $nav_colour
-: style.php
-
                                      • 
-
                                    • $nav_min_opacity
-: style.php
-
                                      • 
 
                                    • $nav_percent_min_opacity
 : style.php
 
                                      • 
@@ -278,21 +245,12 @@ $(document).ready(function(){initNavTree('globals.html','');});
 
                                    • $pofile
 : php2po.php
 
                                      • 
-
                                    • $radius
-: style.php
-
                                      • 
-
                                    • $reply_photo
-: style.php
-
                                      • 
 
                                    • $res
 : docblox_errorchecker.php
 
                                      • 
 
                                    • $s
 : extract.php
 
                                      • 
-
                                    • $schema
-: style.php
-
                                      • 
 
                                    • $sectionleft
 : minimalisticdarkness.php
 
                                      • 
@@ -305,26 +263,11 @@ $(document).ready(function(){initNavTree('globals.html','');});
 
                                    • $session_expire
 : session.php
 
                                      • 
-
                                    • $shadow
-: style.php
-
                                      • 
-
                                    • $sloppy_photos
-: style.php
-
                                      • 
 
                                    • $str
 : typohelper.php
 
                                      • 
-
                                    • $toolicon_activecolour
-: style.php
-
                                      • 
-
                                    • $toolicon_colour
-: style.php
-
                                      • 
-
                                    • $top_photo
-: style.php
-
                                      • 
 
                                    • $uid
-: style.php
+: style.php
 
                                      • 
 
                                    • $width
 : minimalisticdarkness.php
diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html
index 829720890..22f3da55b 100644
--- a/doc/html/globals_0x62.html
+++ b/doc/html/globals_0x62.html
@@ -162,6 +162,9 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
 
                                    • bb_qr()
 : bbcode.php
 
                                      • 
+
                                    • bb_sanitize_style()
+: bbcode.php
+
                                      • 
 
                                    • bb_ShareAttributes()
 : bbcode.php
 
                                      • 
@@ -208,11 +211,20 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
 : theme.php
 
 
                                    • blogtheme_form()
-: config.php
+: config.php
 
                                      • 
 
                                    • blogtheme_imgurl()
 : theme.php
 
                                      • 
+
                                    • bookmark_add()
+: bookmarks.php
+
                                      • 
+
                                    • bookmarks_content()
+: bookmarks.php
+
                                      • 
+
                                    • bookmarks_init()
+: bookmarks.php
+
                                      • 
 
                                    • breaklines()
 : html2plain.php
 
                                      • 
diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html
index 74e4658a5..5f85794f4 100644
--- a/doc/html/globals_0x67.html
+++ b/doc/html/globals_0x67.html
@@ -147,9 +147,6 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 
                                    • gender_selector()
 : profile_selectors.php
 
                                      • 
-
                                    • generate_user_guid()
-: text.php
-
                                      • 
 
                                    • get_account_id()
 : boot.php
 
                                      • 
@@ -303,6 +300,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 
                                    • get_things()
 : taxonomy.php
 
                                      • 
+
                                    • get_words()
+: spam.php
+
                                      • 
 
                                    • get_xconfig()
 : config.php
 
                                      • 
diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html
index 14705638b..caad74618 100644
--- a/doc/html/globals_0x69.html
+++ b/doc/html/globals_0x69.html
@@ -155,7 +155,6 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
 
 
                                    • if
 : php2po.php
-, style.php
 , default.php
 , full.php
 , style.php
@@ -223,6 +222,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
 
                                    • is_site_admin()
 : boot.php
 
                                      • 
+
                                    • is_windows()
+: boot.php
+
                                      • 
 
                                    • ITEM_BLOCKED
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html
index d3434fc10..61e3aa333 100644
--- a/doc/html/globals_0x6d.html
+++ b/doc/html/globals_0x6d.html
@@ -244,7 +244,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
 : boot.php
 
 
                                    • menu_list()
-: menu.php
+: menu.php
 
                                      • 
 
                                    • menu_post()
 : menu.php
diff --git a/doc/html/globals_0x6e.html b/doc/html/globals_0x6e.html
index 8444dcae5..65ab55e66 100644
--- a/doc/html/globals_0x6e.html
+++ b/doc/html/globals_0x6e.html
@@ -282,9 +282,6 @@ $(document).ready(function(){initNavTree('globals_0x6e.html','');});
 
                                    • normalise_link()
 : text.php
 
                                      • 
-
                                    • normalise_openid()
-: text.php
-
                                      • 
 
                                    • notags()
 : text.php
 
                                      • 
diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html
index ff17f32c6..6695df3c8 100644
--- a/doc/html/globals_0x70.html
+++ b/doc/html/globals_0x70.html
@@ -207,6 +207,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 
                                    • perms2str()
 : text.php
 
                                      • 
+
                                    • PERMS_A_BOOKMARK
+: boot.php
+
                                      • 
 
                                    • PERMS_A_DELEGATE
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index b62a96af4..1235e571b 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -237,8 +237,11 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 
                                    • sitelist_init()
 : sitelist.php
 
                                      • 
-
                                    • smile_encode()
-: text.php
+
                                    • smile_shield()
+: text.php
+
                                      • 
+
                                    • smile_unshield()
+: text.php
 
                                      • 
 
                                    • smilies()
 : text.php
@@ -306,6 +309,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 
                                    • string_plural_select_default()
 : language.php
 
                                      • 
+
                                    • string_splitter()
+: spam.php
+
                                      • 
 
                                    • stringify_array_elms()
 : text.php
 
                                      • 
diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html
index 0617b994a..74333601e 100644
--- a/doc/html/globals_0x74.html
+++ b/doc/html/globals_0x74.html
@@ -174,6 +174,9 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
 
                                    • template_unescape()
 : template_processor.php
 
                                      • 
+
                                    • TERM_BOOKMARK
+: boot.php
+
                                      • 
 
                                    • TERM_CATEGORY
 : boot.php
 
                                      • 
@@ -229,10 +232,10 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
 : items.php
 
 
                                    • theme_admin()
-: config.php
+: config.php
 
                                      • 
 
                                    • theme_admin_post()
-: config.php
+: config.php
 
                                      • 
 
                                    • theme_attachments()
 : text.php
@@ -244,7 +247,7 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
 : plugin.php
 
                                      • 
 
                                    • theme_post()
-: config.php
+: config.php
 
                                      • 
 
                                    • theme_status()
 : admin.php
diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html
index 3bf6aae6d..7902b5776 100644
--- a/doc/html/globals_func_0x62.html
+++ b/doc/html/globals_func_0x62.html
@@ -161,6 +161,9 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
 
                                    • bb_qr()
 : bbcode.php
 
                                      • 
+
                                    • bb_sanitize_style()
+: bbcode.php
+
                                      • 
 
                                    • bb_ShareAttributes()
 : bbcode.php
 
                                      • 
@@ -207,11 +210,20 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
 : theme.php
 
 
                                    • blogtheme_form()
-: config.php
+: config.php
 
                                      • 
 
                                    • blogtheme_imgurl()
 : theme.php
 
                                      • 
+
                                    • bookmark_add()
+: bookmarks.php
+
                                      • 
+
                                    • bookmarks_content()
+: bookmarks.php
+
                                      • 
+
                                    • bookmarks_init()
+: bookmarks.php
+
                                      • 
 
                                    • breaklines()
 : html2plain.php
 
                                      • 
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html
index 643036d3c..e92d8eabe 100644
--- a/doc/html/globals_func_0x67.html
+++ b/doc/html/globals_func_0x67.html
@@ -146,9 +146,6 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
 
                                    • gender_selector()
 : profile_selectors.php
 
                                      • 
-
                                    • generate_user_guid()
-: text.php
-
                                      • 
 
                                    • get_account_id()
 : boot.php
 
                                      • 
@@ -302,6 +299,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
 
                                    • get_things()
 : taxonomy.php
 
                                      • 
+
                                    • get_words()
+: spam.php
+
                                      • 
 
                                    • get_xconfig()
 : config.php
 
                                      • 
diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html
index dc155ac19..3c5c33102 100644
--- a/doc/html/globals_func_0x69.html
+++ b/doc/html/globals_func_0x69.html
@@ -215,6 +215,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
 
                                    • is_site_admin()
 : boot.php
 
                                      • 
+
                                    • is_windows()
+: boot.php
+
                                      • 
 
                                    • item_check_service_class()
 : item.php
 
                                      • 
diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html
index c90133798..c3826c5b3 100644
--- a/doc/html/globals_func_0x6d.html
+++ b/doc/html/globals_func_0x6d.html
@@ -210,7 +210,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
 : menu.php
 
 
                                    • menu_list()
-: menu.php
+: menu.php
 
                                      • 
 
                                    • menu_post()
 : menu.php
diff --git a/doc/html/globals_func_0x6e.html b/doc/html/globals_func_0x6e.html
index 8af69c3b4..e2d970840 100644
--- a/doc/html/globals_func_0x6e.html
+++ b/doc/html/globals_func_0x6e.html
@@ -194,9 +194,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');});
 
                                    • normalise_link()
 : text.php
 
                                      • 
-
                                    • normalise_openid()
-: text.php
-
                                      • 
 
                                    • notags()
 : text.php
 
                                      • 
diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html
index 608695ca5..6e0a9015c 100644
--- a/doc/html/globals_func_0x73.html
+++ b/doc/html/globals_func_0x73.html
@@ -236,8 +236,11 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
 
                                    • sitelist_init()
 : sitelist.php
 
                                      • 
-
                                    • smile_encode()
-: text.php
+
                                    • smile_shield()
+: text.php
+
                                      • 
+
                                    • smile_unshield()
+: text.php
 
                                      • 
 
                                    • smilies()
 : text.php
@@ -293,6 +296,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
 
                                    • string_plural_select_default()
 : language.php
 
                                      • 
+
                                    • string_splitter()
+: spam.php
+
                                      • 
 
                                    • stringify_array_elms()
 : text.php
 
                                      • 
diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html
index 152e8159d..e2ba25cd8 100644
--- a/doc/html/globals_vars.html
+++ b/doc/html/globals_vars.html
@@ -151,18 +151,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
                                    • $aside
 : minimalisticdarkness.php
 
                                      • 
-
                                    • $background_image
-: style.php
-
                                      • 
-
                                    • $banner_colour
-: style.php
-
                                      • 
-
                                    • $bgcolour
-: style.php
-
                                      • 
-
                                    • $body_font_size
-: style.php
-
                                      • 
 
                                    • $bodyclass
 : default.php
 
                                      • 
@@ -175,9 +163,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
                                    • $comment_indent
 : style.php
 
                                      • 
-
                                    • $converse_width
-: style.php
-
                                      • 
 
                                    • $dir
 : docblox_errorchecker.php
 
                                      • 
@@ -191,15 +176,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 : docblox_errorchecker.php
 
 
                                    • $files
-: extract.php
+: typo.php
+, extract.php
 , tpldebug.php
-, typo.php
-
                                      • 
-
                                    • $font_colour
-: style.php
-
                                      • 
-
                                    • $font_size
-: style.php
 
                                      • 
 
                                    • $gc_probability
 : session.php
@@ -222,12 +201,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
                                    • $install_wizard_pass
 : setup.php
 
                                      • 
-
                                    • $item_colour
-: style.php
-
                                      • 
-
                                    • $item_opacity
-: style.php
-
                                      • 
 
                                    • $itemfloat
 : minimalisticdarkness.php
 
                                      • 
@@ -237,12 +210,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
                                    • $minwidth
 : minimalisticdarkness.php
 
                                      • 
-
                                    • $nav_colour
-: style.php
-
                                      • 
-
                                    • $nav_min_opacity
-: style.php
-
                                      • 
 
                                    • $nav_percent_min_opacity
 : style.php
 
                                      • 
@@ -273,21 +240,12 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
                                    • $pofile
 : php2po.php
 
                                      • 
-
                                    • $radius
-: style.php
-
                                      • 
-
                                    • $reply_photo
-: style.php
-
                                      • 
 
                                    • $res
 : docblox_errorchecker.php
 
                                      • 
 
                                    • $s
 : extract.php
 
                                      • 
-
                                    • $schema
-: style.php
-
                                      • 
 
                                    • $sectionleft
 : minimalisticdarkness.php
 
                                      • 
@@ -300,26 +258,11 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
                                    • $session_expire
 : session.php
 
                                      • 
-
                                    • $shadow
-: style.php
-
                                      • 
-
                                    • $sloppy_photos
-: style.php
-
                                      • 
 
                                    • $str
 : typohelper.php
 
                                      • 
-
                                    • $toolicon_activecolour
-: style.php
-
                                      • 
-
                                    • $toolicon_colour
-: style.php
-
                                      • 
-
                                    • $top_photo
-: style.php
-
                                      • 
 
                                    • $uid
-: style.php
+: style.php
 
                                      • 
 
                                    • $width
 : minimalisticdarkness.php
diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html
index 02c290708..d70778e4e 100644
--- a/doc/html/globals_vars_0x70.html
+++ b/doc/html/globals_vars_0x70.html
@@ -169,6 +169,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
 
                                    • PAGE_SYSTEM
 : boot.php
 
                                      • 
+
                                    • PERMS_A_BOOKMARK
+: boot.php
+
                                      • 
 
                                    • PERMS_A_DELEGATE
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_vars_0x74.html b/doc/html/globals_vars_0x74.html
index ea2637f84..5700fcc09 100644
--- a/doc/html/globals_vars_0x74.html
+++ b/doc/html/globals_vars_0x74.html
@@ -139,6 +139,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x74.html','');});
  
 
 
                                      - t -
                                        
+
                                      • TERM_BOOKMARK
+: boot.php
+
                                        • 
 
                                      • TERM_CATEGORY
 : boot.php
 
                                        • 
diff --git a/doc/html/help_8php.html b/doc/html/help_8php.html
index 4eb654d30..3a7df70f8 100644
--- a/doc/html/help_8php.html
+++ b/doc/html/help_8php.html
@@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('help_8php.html','');});
 
-
+
@@ -123,7 +123,7 @@ Functions
                                        
       
                                        
 
                                        
 Functions
                                        if(!function_exists('load_doc_file')) help_content (&$a)
                                        if(!function_exists('load_doc_file')) help_content (&$a)
                                        
 
                                         
                                        
 
                                         preg_callback_help_include ($matches)
                                        
 
                                         
                                        
 
                                        
-          
+          
diff --git a/doc/html/include_2bookmarks_8php.html b/doc/html/include_2bookmarks_8php.html
new file mode 100644
index 000000000..28218b211
--- /dev/null
+++ b/doc/html/include_2bookmarks_8php.html
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+The Red Matrix: include/bookmarks.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                        
+
                                        
+
                                        
         
                                        if (!function_exists('load_doc_file')) help_content if (!function_exists('load_doc_file')) help_content 
           (
           & 
           $a)
                                        
+ 
+ 
+  
+  
+ 
+ 
+
                                        
+   
                                        The Red Matrix
+   
                                        
+  
                                        
+
                                      
+
+
+
+  
+  
+
+
                                      
+  
+  
                                      
+  
                                      
+
                                      
+
+
                                      
+
+
+
+
+
                                      
+
+
                                      
+
+
                                      
+  
                                      
+Functions  
                                      
+  
                                      
+
                                      bookmarks.php File Reference
                                        
                                      
+
                                      
+
                                      
+
+
+
+
+
                                      
+Functions
                                       bookmark_add ($channel, $sender, $taxonomy, $private)
                                       
                                      
+
                                      Function Documentation
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
                                      bookmark_add ( $channel, 
                                       $sender, 
                                       $taxonomy, 
                                       $private 
                                      )
                                      
+
                                      
+
+
                                      Referenced by bookmarks_init(), and tag_deliver().
                                      
+
+
                                      
+
                                      
+
                                      
+
                                      
+
diff --git a/doc/html/include_2bookmarks_8php.js b/doc/html/include_2bookmarks_8php.js
new file mode 100644
index 000000000..c63d2d4dd
--- /dev/null
+++ b/doc/html/include_2bookmarks_8php.js
@@ -0,0 +1,4 @@
+var include_2bookmarks_8php =
+[
+    [ "bookmark_add", "include_2bookmarks_8php.html#a88ce7dee6a3dc7465aa9b8eaa45b0087", null ]
+];
\ No newline at end of file
diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html
index 5a1f4cc8c..0ba29be14 100644
--- a/doc/html/include_2config_8php.html
+++ b/doc/html/include_2config_8php.html
@@ -256,7 +256,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), RedFile\put(), 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 account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), 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().
                                      
 
 
                                      
 
diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html
index 4308e6884..b3096e224 100644
--- a/doc/html/include_2menu_8php.html
+++ b/doc/html/include_2menu_8php.html
@@ -120,8 +120,8 @@ Functions
  
  menu_create ($arr)
  
- menu_list ($channel_id, $flags=0)
- 
+ menu_list ($channel_id, $name= '', $flags=0)
+ 
  menu_edit ($arr)
  
  menu_delete ($menu_name, $uid)
@@ -166,7 +166,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by mitem_post().
                                      
+
                                      Referenced by bookmark_add(), and mitem_post().
                                      
 
 
                                      
 
@@ -184,7 +184,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by menu_post().
                                      
+
                                      Referenced by bookmark_add(), and menu_post().
                                      
 
 
                                      
 
@@ -358,7 +358,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by comanche_menu(), mitem_content(), and profile_sidebar().
                                      
+
                                      Referenced by bookmarks_content(), comanche_menu(), mitem_content(), and profile_sidebar().
                                      
 
 
                                      
 
@@ -390,7 +390,7 @@ Functions
 
 
 
-
+
 
                                      
 
                                      
       
@@ -400,6 +400,12 @@ Functions
+        
+          
+          
+          
+          
+        
@@ -413,8 +419,9 @@ Functions
                                      
           
                                       
           $channel_id, 
         
                                       $name = '', 
                                      
         
                                      
           
           
                                      
         
       
                                      
 
                                      
+
                                      If $flags is present, check that all the bits in $flags are set so that MENU_SYSTEM|MENU_BOOKMARK will return entries with both bits set. We will use this to find system generated bookmarks. 
                                      
 
-
                                      Referenced by menu_content().
                                      
+
                                      Referenced by bookmark_add(), bookmarks_content(), and menu_content().
                                      
 
 
                                      
 
                                      
@@ -432,7 +439,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by comanche_menu(), profile_sidebar(), and widget_menu_preview().
                                      
+
                                      Referenced by bookmarks_content(), comanche_menu(), profile_sidebar(), and widget_menu_preview().
                                      
 
 
                                      
 
diff --git a/doc/html/include_2menu_8php.js b/doc/html/include_2menu_8php.js
index 11134c4b7..4ddf8be33 100644
--- a/doc/html/include_2menu_8php.js
+++ b/doc/html/include_2menu_8php.js
@@ -9,6 +9,6 @@ var include_2menu_8php =
     [ "menu_edit_item", "include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa", null ],
     [ "menu_fetch", "include_2menu_8php.html#a68ebbf492470c930f652013656f9071d", null ],
     [ "menu_fetch_id", "include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7", null ],
-    [ "menu_list", "include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10", null ],
+    [ "menu_list", "include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d", null ],
     [ "menu_render", "include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html
index a17e9cc15..13aecfbec 100644
--- a/doc/html/items_8php.html
+++ b/doc/html/items_8php.html
@@ -832,7 +832,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by channel_content(), display_content(), editpost_content(), events_content(), home_content(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().
                                      
+
                                      Referenced by bookmarks_init(), channel_content(), display_content(), editpost_content(), events_content(), home_content(), item_expire(), items_fetch(), network_content(), notifier_run(), page_content(), search_content(), tag_deliver(), and zot_feed().
                                      
 
 
                                      
 
diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html
index 5c8c1eb46..e3e6e1355 100644
--- a/doc/html/language_8php.html
+++ b/doc/html/language_8php.html
@@ -280,7 +280,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by achievements_content(), 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(), bbcode(), blocks_content(), blogtheme_form(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), 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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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().
                                      
+
                                      Referenced by achievements_content(), 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(), bbcode(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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_2bookmarks_8php.html b/doc/html/mod_2bookmarks_8php.html
new file mode 100644
index 000000000..2a1782120
--- /dev/null
+++ b/doc/html/mod_2bookmarks_8php.html
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+The Red Matrix: mod/bookmarks.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                      
+
                                      
+
+ 
+ 
+  
+  
+ 
+ 
+
                                      
+   
                                      The Red Matrix
+   
                                      
+  
                                      
+
                                      
+
+
+
+  
+  
+
                                      
+
                                      
+  
+  
                                      
+  
                                      
+
                                      
+
+
                                      
+
+
+
+
+
                                      
+
+
                                      
+
+
                                      
+  
                                      
+Functions  
                                      
+  
                                      
+
                                      bookmarks.php File Reference
                                        
                                      
+
                                      
+
                                      
+
+
+
+
+
+
+
                                      
+Functions
                                       bookmarks_init (&$a)
                                       
                                       bookmarks_content (&$a)
                                       
                                      
+
                                      Function Documentation
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      bookmarks_content (& $a)
                                      
+
                                      
+
+
                                      
+
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      bookmarks_init (& $a)
                                      
+
                                      
+
+
                                      
+
                                      
+
                                      
+
                                      
+
diff --git a/doc/html/mod_2bookmarks_8php.js b/doc/html/mod_2bookmarks_8php.js
new file mode 100644
index 000000000..d0b12a7f8
--- /dev/null
+++ b/doc/html/mod_2bookmarks_8php.js
@@ -0,0 +1,5 @@
+var mod_2bookmarks_8php =
+[
+    [ "bookmarks_content", "mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a", null ],
+    [ "bookmarks_init", "mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3", null ]
+];
\ No newline at end of file
diff --git a/doc/html/namespacefriendica-to-smarty-tpl.html b/doc/html/namespacefriendica-to-smarty-tpl.html
index dc2d9796a..5f42c69ba 100644
--- a/doc/html/namespacefriendica-to-smarty-tpl.html
+++ b/doc/html/namespacefriendica-to-smarty-tpl.html
@@ -228,6 +228,8 @@ Variables
       
 
                                      
 
+
                                      Referenced by siteinfo_content().
                                      
+
 
                                      
 
 
                                      Variable Documentation
                                      
diff --git a/doc/html/navtree.js b/doc/html/navtree.js
index 9d558eb94..179b7f3c9 100644
--- a/doc/html/navtree.js
+++ b/doc/html/navtree.js
@@ -36,14 +36,14 @@ var NAVTREE =
 var NAVTREEINDEX =
 [
 "BaseObject_8php.html",
-"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688",
-"classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3",
-"comanche_8php.html",
-"functions_0x72.html",
-"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5",
-"notes_8php.html#a4dbd7b1f906440746af48b484d66535a",
-"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586",
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f"
+"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8",
+"classConversation.html#a66f121ca4026246f86a732e5faa0682c",
+"cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b",
+"functions_0x6c.html",
+"include_2follow_8php.html",
+"namespaceutil.html",
+"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76",
+"widgets_8php.html#a08035db02ff6a23260146b4c64153422"
 ];
 
 var SYNCONMSG = 'click to disable panel synchronisation';
diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js
index c67149936..9afe72c2e 100644
--- a/doc/html/navtreeindex0.js
+++ b/doc/html/navtreeindex0.js
@@ -1,26 +1,26 @@
 var NAVTREEINDEX0 =
 {
 "BaseObject_8php.html":[5,0,0,8],
-"Contact_8php.html":[5,0,0,18],
-"Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[5,0,0,18,2],
-"Contact_8php.html#a186162051a5127069cc851d78740f205":[5,0,0,18,4],
-"Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,18,8],
-"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,18,10],
-"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,18,13],
-"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,18,12],
-"Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc":[5,0,0,18,6],
-"Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258":[5,0,0,18,5],
-"Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960":[5,0,0,18,14],
-"Contact_8php.html#a6e64de7db60b7243dce45fb6347636ff":[5,0,0,18,3],
-"Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71":[5,0,0,18,9],
-"Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e":[5,0,0,18,7],
-"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,18,11],
-"Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[5,0,0,18,1],
-"Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[5,0,0,18,0],
-"ConversationObject_8php.html":[5,0,0,22],
-"ITemplateEngine_8php.html":[5,0,0,41],
-"ItemObject_8php.html":[5,0,0,40],
-"ProtoDriver_8php.html":[5,0,0,60],
+"Contact_8php.html":[5,0,0,19],
+"Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[5,0,0,19,2],
+"Contact_8php.html#a186162051a5127069cc851d78740f205":[5,0,0,19,4],
+"Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,19,8],
+"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,19,10],
+"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,19,13],
+"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,19,12],
+"Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc":[5,0,0,19,6],
+"Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258":[5,0,0,19,5],
+"Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960":[5,0,0,19,14],
+"Contact_8php.html#a6e64de7db60b7243dce45fb6347636ff":[5,0,0,19,3],
+"Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71":[5,0,0,19,9],
+"Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e":[5,0,0,19,7],
+"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,19,11],
+"Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[5,0,0,19,1],
+"Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[5,0,0,19,0],
+"ConversationObject_8php.html":[5,0,0,23],
+"ITemplateEngine_8php.html":[5,0,0,42],
+"ItemObject_8php.html":[5,0,0,41],
+"ProtoDriver_8php.html":[5,0,0,61],
 "__well__known_8php.html":[5,0,1,0],
 "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[5,0,1,0,0],
 "account_8php.html":[5,0,0,2],
@@ -87,18 +87,19 @@ var NAVTREEINDEX0 =
 "bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba":[5,0,0,9,1],
 "bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc":[5,0,0,9,4],
 "bbcode_8php.html":[5,0,0,10],
-"bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,7],
-"bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,6],
-"bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a":[5,0,0,10,3],
-"bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,4],
+"bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[5,0,0,10,8],
+"bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[5,0,0,10,7],
+"bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a":[5,0,0,10,4],
+"bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,5],
 "bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd":[5,0,0,10,0],
-"bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322":[5,0,0,10,10],
-"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,8],
-"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,9],
+"bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322":[5,0,0,10,11],
+"bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e":[5,0,0,10,3],
+"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,9],
+"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,10],
 "bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f":[5,0,0,10,1],
-"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,5],
+"bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,6],
 "bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c":[5,0,0,10,2],
-"bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8":[5,0,0,10,11],
+"bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8":[5,0,0,10,12],
 "blocks_8php.html":[5,0,1,7],
 "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0],
 "blogga_2php_2theme_8php.html":[5,0,3,2,1,0,2],
@@ -110,144 +111,143 @@ var NAVTREEINDEX0 =
 "blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae":[5,0,3,2,1,1,0,0,2,1],
 "blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec":[5,0,3,2,1,1,0,0,2,4],
 "boot_8php.html":[5,0,4],
-"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,130],
-"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,34],
-"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,144],
-"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,241],
-"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,50],
-"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,162],
-"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,42],
-"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,99],
+"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,131],
+"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,35],
+"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,145],
+"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,243],
+"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,51],
+"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,163],
+"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,43],
+"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,100],
 "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1],
-"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,201],
-"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,64],
-"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,166],
-"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,258],
-"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,254],
-"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,257],
+"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,202],
+"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,65],
+"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,167],
+"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,261],
+"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,257],
+"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,260],
 "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,21],
-"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,56],
+"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,57],
 "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15],
-"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,192],
-"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,59],
-"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,143],
-"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,139],
-"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,165],
-"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,133],
-"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,265],
-"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,235],
-"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,267],
-"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,169],
-"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,73],
-"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,214],
-"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,101],
-"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,150],
-"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,185],
-"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,237],
-"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,37],
+"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,75],
+"boot_8php.html#a115faf8797718c3165498abbd6895843":[5,0,4,247],
+"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,79],
+"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,76],
+"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,193],
+"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,60],
+"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,144],
+"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,140],
+"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,166],
+"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,134],
+"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,268],
+"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,237],
+"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,270],
+"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,170],
+"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,74],
+"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,216],
+"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,102],
+"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,151],
+"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,186],
+"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,239],
+"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,38],
 "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,20],
-"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,97],
-"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,89],
-"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,247],
-"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,188],
-"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,80],
-"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,125],
-"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,212],
-"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,102],
-"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,233],
-"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,184],
-"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,122],
-"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,65],
-"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,70],
-"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,219],
-"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,137],
-"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,39],
-"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,115],
-"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,152],
-"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,271],
-"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,173],
-"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,104],
-"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,109],
-"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,270],
-"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,210],
+"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,98],
+"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,90],
+"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,250],
+"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,189],
+"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,81],
+"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,126],
+"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,214],
+"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,103],
+"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,235],
+"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,185],
+"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,123],
+"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,66],
+"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,71],
+"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,221],
+"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,138],
+"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,40],
+"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,116],
+"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,153],
+"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,274],
+"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,174],
+"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,105],
+"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,110],
+"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,273],
+"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,212],
 "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12],
-"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,126],
-"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,205],
-"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,183],
-"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,86],
-"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,159],
-"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,147],
-"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,68],
-"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[5,0,4,153],
-"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,255],
-"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,171],
-"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,100],
-"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,227],
-"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,170],
+"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,58],
+"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,88],
+"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,49],
+"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,127],
+"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,207],
+"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,184],
+"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,87],
+"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,160],
+"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,148],
+"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,69],
+"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[5,0,4,154],
+"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,258],
+"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,172],
+"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,101],
+"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,229],
+"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,171],
 "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6],
-"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,203],
-"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,223],
-"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,195],
-"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,151],
-"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,38],
-"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,79],
-"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,31],
-"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,187],
-"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,222],
-"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,268],
+"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,204],
+"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,225],
+"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,196],
+"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,152],
+"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,39],
+"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,80],
+"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,32],
+"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,188],
+"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,224],
+"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,271],
 "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,19],
-"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,58],
-"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,177],
-"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,199],
-"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,76],
-"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,157],
-"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,200],
+"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,59],
+"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,178],
+"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,200],
+"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,77],
+"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,158],
+"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,201],
 "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,18],
-"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,72],
-"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,251],
-"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,163],
-"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,135],
-"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,138],
-"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,41],
-"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,141],
-"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,239],
-"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,226],
-"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,220],
-"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,98],
-"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,90],
-"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,208],
-"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,124],
-"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[5,0,4,204],
-"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,238],
-"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[5,0,4,156],
-"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,26],
-"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,178],
-"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,128],
-"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,69],
+"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,73],
+"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,254],
+"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,164],
+"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,136],
+"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,139],
+"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,42],
+"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,142],
+"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,241],
+"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,228],
+"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,222],
+"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,99],
+"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,91],
+"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,210],
+"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,125],
+"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[5,0,4,205],
+"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,240],
+"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[5,0,4,157],
+"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,27],
+"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,179],
+"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,129],
+"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,70],
 "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2],
-"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,259],
+"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,262],
 "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4],
-"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,71],
-"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,84],
-"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,229],
-"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,110],
-"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,62],
-"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,127],
-"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,158],
-"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,160],
-"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,45],
-"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,81],
-"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,113],
-"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,197],
-"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,49],
-"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,107]
+"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,72],
+"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,85],
+"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,231],
+"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,111],
+"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,63],
+"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,128],
+"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,159],
+"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,67],
+"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[5,0,4,104],
+"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[5,0,4,55],
+"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,161],
+"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,46],
+"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,82],
+"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,114],
+"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,198]
 };
diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js
index 589b3e524..941a9d3ae 100644
--- a/doc/html/navtreeindex1.js
+++ b/doc/html/navtreeindex1.js
@@ -1,215 +1,220 @@
 var NAVTREEINDEX1 =
 {
-"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,53],
-"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,120],
-"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,112],
-"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,250],
-"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,249],
-"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,176],
+"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,50],
+"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,108],
+"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,54],
+"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,121],
+"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,113],
+"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,253],
+"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,252],
+"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,177],
 "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,16],
-"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,95],
-"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,224],
-"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,123],
-"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,117],
-"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,231],
-"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,266],
-"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,29],
+"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,96],
+"boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b":[5,0,4,206],
+"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,226],
+"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,124],
+"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,118],
+"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,233],
+"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,269],
+"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,30],
 "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11],
-"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,142],
-"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,121],
-"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,119],
-"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,261],
-"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,236],
+"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,143],
+"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,122],
+"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,120],
+"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,264],
+"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,238],
 "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,17],
-"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,190],
-"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,225],
-"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,44],
+"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,191],
+"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,227],
+"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,45],
 "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5],
-"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,217],
-"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,191],
-"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,264],
-"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,252],
-"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,216],
-"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,179],
+"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,219],
+"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,192],
+"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,267],
+"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,255],
+"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,218],
+"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,180],
 "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,24],
-"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,198],
-"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,40],
-"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,149],
+"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,199],
+"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,41],
+"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,150],
 "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9],
-"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,146],
-"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,221],
-"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,132],
-"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,206],
-"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,63],
-"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,182],
-"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,111],
-"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,207],
-"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,30],
-"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,202],
-"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,228],
-"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,175],
-"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,211],
-"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,105],
-"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,134],
-"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,51],
-"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,193],
+"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,147],
+"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,107],
+"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,84],
+"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,93],
+"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,223],
+"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,133],
+"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,208],
+"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,64],
+"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,183],
+"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,112],
+"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,209],
+"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31],
+"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,203],
+"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,230],
+"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,176],
+"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,213],
+"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,106],
+"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,135],
+"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,52],
+"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,194],
 "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7],
-"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,94],
-"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,35],
-"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,232],
+"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,95],
+"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,36],
+"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,234],
 "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3],
-"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,256],
-"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,118],
+"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,259],
+"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,62],
+"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,109],
+"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,94],
+"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,119],
 "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,23],
-"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,161],
-"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,230],
-"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,262],
-"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,114],
-"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,116],
-"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,189],
-"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,32],
+"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,162],
+"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,232],
+"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,92],
+"boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[5,0,4,25],
+"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,34],
+"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,53],
+"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,265],
+"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,115],
+"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,117],
+"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,190],
+"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,33],
 "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13],
 "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8],
-"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,164],
-"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,263],
-"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,218],
-"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,196],
-"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,60],
-"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,145],
-"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,154],
+"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,165],
+"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,266],
+"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,220],
+"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,197],
+"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,61],
+"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,146],
+"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,155],
 "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10],
-"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,213],
-"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,240],
-"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,234],
-"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,88],
-"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,129],
-"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,243],
-"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,36],
+"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,68],
+"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,83],
+"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,28],
+"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,215],
+"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,242],
+"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,236],
+"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,89],
+"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,130],
+"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,245],
+"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,37],
 "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,22],
-"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,248],
-"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,172],
-"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,148],
-"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,180],
-"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,260],
-"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,25],
-"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,253],
-"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,46],
-"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,215],
-"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,244],
-"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,155],
-"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,96],
-"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,167],
-"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,181],
-"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,131],
-"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,28],
-"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,245],
-"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,174],
-"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,55],
-"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,47],
-"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,136],
-"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,194],
-"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,85],
-"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,242],
-"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,186],
-"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,168],
-"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,246],
-"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,43],
-"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,77],
-"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,140],
+"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,251],
+"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,173],
+"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,149],
+"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,181],
+"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,263],
+"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,26],
+"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,256],
+"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,47],
+"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,217],
+"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,246],
+"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,156],
+"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,97],
+"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,168],
+"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,182],
+"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,132],
+"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,29],
+"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,248],
+"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,175],
+"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,56],
+"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,48],
+"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,137],
+"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,195],
+"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,86],
+"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,244],
+"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,187],
+"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,169],
+"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,249],
+"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,44],
+"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,78],
+"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,141],
 "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14],
-"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,269],
-"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,209],
-"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],
-"chatsvc_8php.html":[5,0,1,12],
-"chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116":[5,0,1,12,1],
-"chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9":[5,0,1,12,0],
-"chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03":[5,0,1,12,2],
+"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,272],
+"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,211],
+"cache_8php.html":[5,0,0,12],
+"channel_8php.html":[5,0,1,10],
+"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,10,0],
+"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,10,1],
+"chanview_8php.html":[5,0,1,11],
+"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,11,0],
+"chatsvc_8php.html":[5,0,1,13],
+"chatsvc_8php.html#a28d248b056fa47452e28ed01130e9116":[5,0,1,13,1],
+"chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9":[5,0,1,13,0],
+"chatsvc_8php.html#a7c9a9b9c24a2b02eed8efd6b09632d03":[5,0,1,13,2],
 "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,74],
+"classApp.html#a08c24d6a6fc52fcc784b0f765f13b820":[4,0,5,75],
 "classApp.html#a08f0537964d98958d218066364cff785":[4,0,5,1],
 "classApp.html#a0ce85be198e46570366cb3344f3c55b8":[4,0,5,50],
-"classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d":[4,0,5,59],
+"classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d":[4,0,5,60],
 "classApp.html#a123b903dfe5d3488cc68db3471d36fd2":[4,0,5,30],
-"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,78],
+"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,79],
 "classApp.html#a14bd4b1c29f3aff371fe5d4cb11aeea3":[4,0,5,32],
-"classApp.html#a1936f2afce0dc0d1bbed15ae1f2ee81a":[4,0,5,72],
-"classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f":[4,0,5,60],
+"classApp.html#a1936f2afce0dc0d1bbed15ae1f2ee81a":[4,0,5,73],
+"classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f":[4,0,5,61],
 "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,76],
+"classApp.html#a244b2d53b21be269aad2269d23192f95":[4,0,5,77],
 "classApp.html#a256360c9184fed6d7556e0bc0a835d7f":[4,0,5,48],
-"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,75],
+"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,76],
 "classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a":[4,0,5,12],
 "classApp.html#a330410a288f3393d53772f5e98f857ea":[4,0,5,51],
-"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,65],
+"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,66],
 "classApp.html#a344d2b7dc2f276648d521aee4da1731c":[4,0,5,23],
 "classApp.html#a3694aa1907aa103a2adbc71f926f0fa0":[4,0,5,55],
 "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,89],
-"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,84],
+"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[4,0,5,90],
+"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,85],
 "classApp.html#a495ec082c2719314e536070ca1ce073d":[4,0,5,42],
-"classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,67],
+"classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,68],
 "classApp.html#a4bdd7bfed62f50515fce652127bf481b":[4,0,5,25],
-"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[4,0,5,58],
-"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[4,0,5,66],
+"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[4,0,5,59],
+"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[4,0,5,67],
 "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,87],
-"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,73],
-"classApp.html#a58ac598544892ff7c32890291b72635e":[4,0,5,61],
-"classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[4,0,5,62],
+"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[4,0,5,88],
+"classApp.html#a576ecb1c5b4a283221e6f2f0ec248251":[4,0,5,58],
+"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,74],
+"classApp.html#a58ac598544892ff7c32890291b72635e":[4,0,5,62],
+"classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[4,0,5,63],
 "classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad":[4,0,5,3],
 "classApp.html#a5cfc098c061b7d765add58fd2ca97445":[4,0,5,39],
-"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,79],
+"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,80],
 "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,80],
-"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,81],
-"classApp.html#a6bcb19cdc4907077da72864686d5a780":[4,0,5,68],
-"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[4,0,5,64],
+"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[4,0,5,81],
+"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,82],
+"classApp.html#a6bcb19cdc4907077da72864686d5a780":[4,0,5,69],
+"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[4,0,5,65],
 "classApp.html#a6f55d087e1ff4710132c1b0863faa2ee":[4,0,5,47],
-"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,82],
+"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,83],
 "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,86],
+"classApp.html#a91fd3c8b89016113b05f3be24805ccff":[4,0,5,87],
 "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,90],
+"classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d":[4,0,5,64],
+"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,91],
 "classApp.html#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,13],
 "classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,38],
-"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,85],
+"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,86],
 "classApp.html#ab3da757abe5cb45bf88f07cc51a73b58":[4,0,5,35],
-"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,70],
+"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,71],
 "classApp.html#abe0e4fa91097f7a6588e1213a834121c":[4,0,5,37],
 "classApp.html#abea5a4f77dcd53c928dc4eed86616637":[4,0,5,19],
 "classApp.html#abf46a653d8499e7c253cc1be894a6d83":[4,0,5,17],
@@ -217,18 +222,18 @@ var NAVTREEINDEX1 =
 "classApp.html#ac1d80a14492acc932715d54567d8a589":[4,0,5,46],
 "classApp.html#ac6e6b1c7d6df408580ff79977fcfa656":[4,0,5,54],
 "classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88":[4,0,5,43],
-"classApp.html#acad5896b7a79ae31433ad8f89606c728":[4,0,5,69],
+"classApp.html#acad5896b7a79ae31433ad8f89606c728":[4,0,5,70],
 "classApp.html#acb27e607fe4c82603444676e25c36b70":[4,0,5,11],
-"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,77],
+"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,78],
 "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,88],
+"classApp.html#adf2aaf95b062736a6fd5fc70fadf80e8":[4,0,5,89],
 "classApp.html#ae3f47830543d0d902f66913def8db66b":[4,0,5,53],
-"classApp.html#ae9f96338f32187d308b67b980eea0008":[4,0,5,71],
+"classApp.html#ae9f96338f32187d308b67b980eea0008":[4,0,5,72],
 "classApp.html#aeb1fe1c8ad9aa639909bd183ce578536":[4,0,5,18],
-"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,83],
+"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,84],
 "classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166":[4,0,5,15],
 "classApp.html#af5007c42a693afd9c4899c243b2e1363":[4,0,5,49],
 "classApp.html#af58db526040829b1c8bd95561b329262":[4,0,5,34],
@@ -244,10 +249,5 @@ var NAVTREEINDEX1 =
 "classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8":[4,0,8,7],
 "classConversation.html#a5879199008b96bee7550b576d614e1c1":[4,0,8,10],
 "classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2":[4,0,8,17],
-"classConversation.html#a5effe8ad3007e01333df44b81432b813":[4,0,8,5],
-"classConversation.html#a66f121ca4026246f86a732e5faa0682c":[4,0,8,11],
-"classConversation.html#a8335cdd43f1836e3c255638e61a09e16":[4,0,8,1],
-"classConversation.html#a8748445aa26047ebed5141f3c3cbc244":[4,0,8,16],
-"classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd":[4,0,8,3],
-"classConversation.html#a8898bddc1e8990e81dab9a13a532cc93":[4,0,8,12]
+"classConversation.html#a5effe8ad3007e01333df44b81432b813":[4,0,8,5]
 };
diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index 9735aefbf..5b151823a 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -1,5 +1,10 @@
 var NAVTREEINDEX2 =
 {
+"classConversation.html#a66f121ca4026246f86a732e5faa0682c":[4,0,8,11],
+"classConversation.html#a8335cdd43f1836e3c255638e61a09e16":[4,0,8,1],
+"classConversation.html#a8748445aa26047ebed5141f3c3cbc244":[4,0,8,16],
+"classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd":[4,0,8,3],
+"classConversation.html#a8898bddc1e8990e81dab9a13a532cc93":[4,0,8,12],
 "classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3":[4,0,8,8],
 "classConversation.html#aa95c1a62af38bdfba7add9549bec083b":[4,0,8,13],
 "classConversation.html#adf25ce023b69a166c63c6e84e02c136a":[4,0,8,9],
@@ -244,10 +249,5 @@ var NAVTREEINDEX2 =
 "classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb":[4,0,21,9],
 "classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207":[4,0,21,1],
 "classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393":[4,0,21,3],
-"cli__startup_8php.html":[5,0,0,14],
-"cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,14,0],
-"cli__suggest_8php.html":[5,0,0,15],
-"cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,15,0],
-"cloud_8php.html":[5,0,1,13],
-"cloud_8php.html#a1b79a6fe0454bc76673ad9aef55bf02d":[5,0,1,13,0]
+"cli__startup_8php.html":[5,0,0,15]
 };
diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index 157cb4625..8f82938d8 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,104 +1,109 @@
 var NAVTREEINDEX3 =
 {
-"comanche_8php.html":[5,0,0,16],
-"comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,16,4],
-"comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,16,2],
-"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,16,1],
-"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,16,3],
-"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,16,0],
-"comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f":[5,0,0,16,6],
-"comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,16,5],
-"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,16,7],
-"common_8php.html":[5,0,1,14],
-"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,14,0],
-"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,14,1],
-"community_8php.html":[5,0,1,15],
-"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,15,0],
-"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,15,1],
-"connect_8php.html":[5,0,1,16],
-"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,16,2],
-"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,16,0],
-"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,16,1],
-"connections_8php.html":[5,0,1,17],
-"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,17,3],
-"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,17,0],
-"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,17,2],
-"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,17,1],
-"connedit_8php.html":[5,0,1,18],
-"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[5,0,1,18,3],
-"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[5,0,1,18,2],
-"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[5,0,1,18,0],
-"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[5,0,1,18,1],
-"contact__selectors_8php.html":[5,0,0,19],
-"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,19,1],
-"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,19,0],
-"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,19,3],
-"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,19,2],
-"contact__widgets_8php.html":[5,0,0,20],
-"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,20,0],
-"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,20,2],
-"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,20,1],
-"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,20,3],
-"contactgroup_8php.html":[5,0,1,19],
-"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,19,0],
-"conversation_8php.html":[5,0,0,21],
-"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,21,7],
-"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,21,9],
-"conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,0,21,16],
-"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,21,22],
-"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,21,6],
-"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,21,17],
-"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,21,15],
-"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,21,23],
-"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,21,8],
-"conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4":[5,0,0,21,14],
-"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,21,13],
-"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,21,21],
-"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,21,19],
-"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,21,10],
-"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,21,4],
-"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,21,2],
-"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,21,20],
-"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,21,0],
-"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,21,1],
-"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,21,11],
-"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,21,5],
-"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,21,18],
-"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,21,12],
-"conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81":[5,0,0,21,3],
-"cronhooks_8php.html":[5,0,0,23],
-"cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,23,0],
-"crypto_8php.html":[5,0,0,24],
-"crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5":[5,0,0,24,5],
-"crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[5,0,0,24,2],
-"crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c":[5,0,0,24,4],
-"crypto_8php.html#a5c61821d205f95f127114159cbffa764":[5,0,0,24,1],
-"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[5,0,0,24,9],
-"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,24,6],
-"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,24,10],
-"crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[5,0,0,24,0],
-"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,24,8],
-"crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,24,3],
-"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,24,7],
+"cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,15,0],
+"cli__suggest_8php.html":[5,0,0,16],
+"cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,16,0],
+"cloud_8php.html":[5,0,1,14],
+"cloud_8php.html#a1b79a6fe0454bc76673ad9aef55bf02d":[5,0,1,14,0],
+"comanche_8php.html":[5,0,0,17],
+"comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,17,4],
+"comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,17,2],
+"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,17,1],
+"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,17,3],
+"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,17,0],
+"comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f":[5,0,0,17,6],
+"comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,17,5],
+"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,17,7],
+"common_8php.html":[5,0,1,15],
+"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,15,0],
+"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,15,1],
+"community_8php.html":[5,0,1,16],
+"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,16,0],
+"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,16,1],
+"connect_8php.html":[5,0,1,17],
+"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,17,2],
+"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,17,0],
+"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,17,1],
+"connections_8php.html":[5,0,1,18],
+"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,18,3],
+"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,18,0],
+"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,18,2],
+"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,18,1],
+"connedit_8php.html":[5,0,1,19],
+"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[5,0,1,19,3],
+"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[5,0,1,19,2],
+"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[5,0,1,19,0],
+"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[5,0,1,19,1],
+"contact__selectors_8php.html":[5,0,0,20],
+"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,20,1],
+"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,20,0],
+"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,20,3],
+"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,20,2],
+"contact__widgets_8php.html":[5,0,0,21],
+"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,21,0],
+"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,21,2],
+"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,21,1],
+"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,21,3],
+"contactgroup_8php.html":[5,0,1,20],
+"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,20,0],
+"conversation_8php.html":[5,0,0,22],
+"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,22,7],
+"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,22,9],
+"conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,0,22,16],
+"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,22,22],
+"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,22,6],
+"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,22,17],
+"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,22,15],
+"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,22,23],
+"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,22,8],
+"conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4":[5,0,0,22,14],
+"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,22,13],
+"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,22,21],
+"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,22,19],
+"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,22,10],
+"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,22,4],
+"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,22,2],
+"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,22,20],
+"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,22,0],
+"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,22,1],
+"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,22,11],
+"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,22,5],
+"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,22,18],
+"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,22,12],
+"conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81":[5,0,0,22,3],
+"cronhooks_8php.html":[5,0,0,24],
+"cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,24,0],
+"crypto_8php.html":[5,0,0,25],
+"crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5":[5,0,0,25,5],
+"crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[5,0,0,25,2],
+"crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c":[5,0,0,25,4],
+"crypto_8php.html#a5c61821d205f95f127114159cbffa764":[5,0,0,25,1],
+"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[5,0,0,25,9],
+"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,25,6],
+"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,25,10],
+"crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[5,0,0,25,0],
+"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,25,8],
+"crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,25,3],
+"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,25,7],
 "dark_8php.html":[5,0,3,2,2,1,0],
 "darkness_8php.html":[5,0,3,2,0,1,0],
 "darknessleftaside_8php.html":[5,0,3,2,0,1,1],
 "darknessrightaside_8php.html":[5,0,3,2,0,1,2],
-"datetime_8php.html":[5,0,0,25],
-"datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,25,6],
-"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,25,11],
-"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,25,5],
-"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,25,3],
-"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,25,10],
-"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,25,7],
-"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,25,9],
-"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,25,12],
-"datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,0,25,13],
-"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,25,8],
-"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,25,0],
-"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,25,2],
-"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,25,4],
-"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,25,1],
+"datetime_8php.html":[5,0,0,26],
+"datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,26,6],
+"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,26,11],
+"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,26,5],
+"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,26,3],
+"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,26,10],
+"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,26,7],
+"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,26,9],
+"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,26,12],
+"datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,0,26,13],
+"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,26,8],
+"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,26,0],
+"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,26,2],
+"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,26,4],
+"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,26,1],
 "db__update_8php.html":[5,0,2,2],
 "dba__driver_8php.html":[5,0,0,0,0],
 "dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f":[5,0,0,0,0,8],
@@ -111,10 +116,10 @@ var NAVTREEINDEX3 =
 "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4],
 "dba__mysql_8php.html":[5,0,0,0,1],
 "dba__mysqli_8php.html":[5,0,0,0,2],
-"delegate_8php.html":[5,0,1,20],
-"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,20,0],
-"deliver_8php.html":[5,0,0,26],
-"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,26,0],
+"delegate_8php.html":[5,0,1,21],
+"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,21,0],
+"deliver_8php.html":[5,0,0,27],
+"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,27,0],
 "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,2,2,0],
 "dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[5,0,3,2,0,1],
 "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0],
@@ -130,13 +135,13 @@ var NAVTREEINDEX3 =
 "dir_8543001e5d25368a6edede3e63efb554.html":[5,0,3,2],
 "dir_922c77e958c99a98db92d38a3a349bf2.html":[5,0,3,2,1],
 "dir_92d6b429199666aa3765c8a934db5e14.html":[5,0,3,2,1,1],
-"dir__fns_8php.html":[5,0,0,27],
-"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,27,5],
-"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,27,4],
-"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,27,2],
-"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,27,3],
-"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[5,0,0,27,0],
-"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[5,0,0,27,1],
+"dir__fns_8php.html":[5,0,0,28],
+"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,28,5],
+"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,28,4],
+"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,28,2],
+"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,28,3],
+"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[5,0,0,28,0],
+"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[5,0,0,28,1],
 "dir_a8a0005c2b8590c535262d232c22afab.html":[5,0,3,2,1,1,0,0],
 "dir_aae29906d7bfc07d076125f669c8352e.html":[5,0,0,1],
 "dir_b2f003339c516cc00c8cadcafbe82f13.html":[5,0,3],
@@ -145,14 +150,14 @@ var NAVTREEINDEX3 =
 "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1],
 "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0],
 "dir_d520c5cf583201d9437764f209363c22.html":[5,0,3,2,0],
-"dirprofile_8php.html":[5,0,1,22],
-"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[5,0,1,22,0],
-"dirsearch_8php.html":[5,0,1,23],
-"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,23,1],
-"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,23,2],
-"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,23,0],
-"display_8php.html":[5,0,1,24],
-"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,24,0],
+"dirprofile_8php.html":[5,0,1,23],
+"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[5,0,1,23,0],
+"dirsearch_8php.html":[5,0,1,24],
+"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,24,1],
+"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,24,2],
+"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,24,0],
+"display_8php.html":[5,0,1,25],
+"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,25,0],
 "docblox__errorchecker_8php.html":[5,0,2,3],
 "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,3,3],
 "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,3,2],
@@ -165,49 +170,49 @@ var NAVTREEINDEX3 =
 "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,3,4],
 "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,3,1],
 "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,3,10],
-"editblock_8php.html":[5,0,1,25],
-"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,25,0],
-"editlayout_8php.html":[5,0,1,26],
-"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,26,0],
-"editpost_8php.html":[5,0,1,27],
-"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,27,0],
-"editwebpage_8php.html":[5,0,1,28],
-"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,28,0],
-"enotify_8php.html":[5,0,0,29],
-"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,29,1],
-"event_8php.html":[5,0,0,30],
-"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[5,0,0,30,6],
-"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[5,0,0,30,0],
-"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[5,0,0,30,1],
-"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[5,0,0,30,5],
-"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,30,2],
-"event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,30,3],
-"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,30,4],
-"events_8php.html":[5,0,1,29],
-"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,29,0],
-"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,29,1],
-"expire_8php.html":[5,0,0,31],
-"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,31,0],
+"editblock_8php.html":[5,0,1,26],
+"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,26,0],
+"editlayout_8php.html":[5,0,1,27],
+"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,27,0],
+"editpost_8php.html":[5,0,1,28],
+"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,28,0],
+"editwebpage_8php.html":[5,0,1,29],
+"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,29,0],
+"enotify_8php.html":[5,0,0,30],
+"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,30,1],
+"event_8php.html":[5,0,0,31],
+"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[5,0,0,31,6],
+"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[5,0,0,31,0],
+"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[5,0,0,31,1],
+"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[5,0,0,31,5],
+"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,31,2],
+"event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,31,3],
+"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,31,4],
+"events_8php.html":[5,0,1,30],
+"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,30,0],
+"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,30,1],
+"expire_8php.html":[5,0,0,32],
+"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,32,0],
 "extract_8php.html":[5,0,2,4],
 "extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44":[5,0,2,4,3],
 "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,4,2],
 "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,4,0],
 "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,4,1],
-"fbrowser_8php.html":[5,0,1,30],
-"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,30,0],
-"features_8php.html":[5,0,0,32],
-"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,32,0],
-"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,32,1],
-"feed_8php.html":[5,0,1,31],
-"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,31,0],
-"filer_8php.html":[5,0,1,32],
-"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,32,0],
-"filerm_8php.html":[5,0,1,33],
-"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,33,0],
+"fbrowser_8php.html":[5,0,1,31],
+"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,31,0],
+"features_8php.html":[5,0,0,33],
+"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,33,0],
+"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,33,1],
+"feed_8php.html":[5,0,1,32],
+"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,32,0],
+"filer_8php.html":[5,0,1,33],
+"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,33,0],
+"filerm_8php.html":[5,0,1,34],
+"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,34,0],
 "files.html":[5,0],
-"filestorage_8php.html":[5,0,1,34],
-"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,34,0],
-"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[5,0,1,34,1],
+"filestorage_8php.html":[5,0,1,35],
+"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,35,0],
+"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[5,0,1,35,1],
 "fpostit_8php.html":[5,0,2,0,0],
 "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0],
 "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[5,0,2,0,0,1],
@@ -227,10 +232,10 @@ var NAVTREEINDEX3 =
 "friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[5,0,2,5,7],
 "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,5,4],
 "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,5,3],
-"friendica__smarty_8php.html":[5,0,0,34],
-"fsuggest_8php.html":[5,0,1,36],
-"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,36,1],
-"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,36,0],
+"friendica__smarty_8php.html":[5,0,0,35],
+"fsuggest_8php.html":[5,0,1,37],
+"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,37,1],
+"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,37,0],
 "full_8php.html":[5,0,3,1,1],
 "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,1,1,0],
 "functions.html":[4,3,0],
@@ -244,10 +249,5 @@ var NAVTREEINDEX3 =
 "functions_0x66.html":[4,3,0,7],
 "functions_0x67.html":[4,3,0,8],
 "functions_0x68.html":[4,3,0,9],
-"functions_0x69.html":[4,3,0,10],
-"functions_0x6c.html":[4,3,0,11],
-"functions_0x6e.html":[4,3,0,12],
-"functions_0x6f.html":[4,3,0,13],
-"functions_0x70.html":[4,3,0,14],
-"functions_0x71.html":[4,3,0,15]
+"functions_0x69.html":[4,3,0,10]
 };
diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index ffadab93e..cc26043ab 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,10 @@
 var NAVTREEINDEX4 =
 {
+"functions_0x6c.html":[4,3,0,11],
+"functions_0x6e.html":[4,3,0,12],
+"functions_0x6f.html":[4,3,0,13],
+"functions_0x70.html":[4,3,0,14],
+"functions_0x71.html":[4,3,0,15],
 "functions_0x72.html":[4,3,0,16],
 "functions_0x73.html":[4,3,0,17],
 "functions_0x74.html":[4,3,0,18],
@@ -103,56 +108,56 @@ var NAVTREEINDEX4 =
 "globals_vars_0x77.html":[5,1,2,19],
 "globals_vars_0x78.html":[5,1,2,20],
 "globals_vars_0x7a.html":[5,1,2,21],
-"gprobe_8php.html":[5,0,0,35],
-"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,35,0],
+"gprobe_8php.html":[5,0,0,36],
+"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,36,0],
 "greenthumbnails_8php.html":[5,0,3,2,0,1,3],
-"help_8php.html":[5,0,1,38],
-"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,38,1],
-"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,38,0],
+"help_8php.html":[5,0,1,39],
+"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,39,1],
+"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,39,0],
 "hierarchy.html":[4,2],
-"home_8php.html":[5,0,1,39],
-"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,39,0],
-"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,39,1],
-"hostxrd_8php.html":[5,0,1,40],
-"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,40,0],
-"html2bbcode_8php.html":[5,0,0,37],
-"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,37,3],
-"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,37,1],
-"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,37,0],
-"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,37,2],
-"html2plain_8php.html":[5,0,0,38],
-"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,38,0],
-"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,38,3],
-"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,38,2],
-"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,38,1],
-"identity_8php.html":[5,0,0,39],
-"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,39,3],
-"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,39,9],
-"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,39,2],
-"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,39,12],
-"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,39,18],
-"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,39,17],
-"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,39,19],
-"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,39,7],
-"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,39,22],
-"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,39,23],
-"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,39,1],
-"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,39,20],
-"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,39,15],
-"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,39,8],
-"identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,39,0],
-"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,39,11],
-"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,39,10],
-"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,39,5],
-"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,39,13],
-"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,39,4],
-"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,39,16],
-"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,39,14],
-"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,39,6],
-"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,39,21],
-"import_8php.html":[5,0,1,41],
-"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,41,1],
-"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,41,0],
+"home_8php.html":[5,0,1,40],
+"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,40,0],
+"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,40,1],
+"hostxrd_8php.html":[5,0,1,41],
+"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,41,0],
+"html2bbcode_8php.html":[5,0,0,38],
+"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,38,3],
+"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,38,1],
+"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,38,0],
+"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,38,2],
+"html2plain_8php.html":[5,0,0,39],
+"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,39,0],
+"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,39,3],
+"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,39,2],
+"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,39,1],
+"identity_8php.html":[5,0,0,40],
+"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,40,3],
+"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,40,9],
+"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,40,2],
+"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,40,12],
+"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,40,18],
+"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,40,17],
+"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,40,19],
+"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,40,7],
+"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,40,22],
+"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,40,23],
+"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,40,1],
+"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,40,20],
+"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,40,15],
+"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,40,8],
+"identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,40,0],
+"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,40,11],
+"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,40,10],
+"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,40,5],
+"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,40,13],
+"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,40,4],
+"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,40,16],
+"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,40,14],
+"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,40,6],
+"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,40,21],
+"import_8php.html":[5,0,1,42],
+"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,42,1],
+"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,42,0],
 "include_2api_8php.html":[5,0,0,5],
 "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12],
 "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5],
@@ -219,35 +224,30 @@ var NAVTREEINDEX4 =
 "include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc":[5,0,0,6,6],
 "include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[5,0,0,6,1],
 "include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,11],
-"include_2chanman_8php.html":[5,0,0,12],
-"include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[5,0,0,12,0],
-"include_2chat_8php.html":[5,0,0,13],
-"include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[5,0,0,13,3],
-"include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639":[5,0,0,13,1],
-"include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91":[5,0,0,13,2],
-"include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422":[5,0,0,13,0],
-"include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a":[5,0,0,13,4],
-"include_2config_8php.html":[5,0,0,17],
-"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,17,7],
-"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,17,0],
-"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,17,9],
-"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,17,11],
-"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,17,1],
-"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,17,2],
-"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,17,6],
-"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,17,8],
-"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,17,5],
-"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,17,10],
-"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,17,3],
-"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,17,4],
-"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,17,12],
-"include_2directory_8php.html":[5,0,0,28],
-"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,28,0],
-"include_2follow_8php.html":[5,0,0,33],
-"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,33,0],
-"include_2group_8php.html":[5,0,0,36],
-"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,36,2],
-"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,36,10],
-"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,36,1],
-"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,36,0]
+"include_2bookmarks_8php.html":[5,0,0,11],
+"include_2bookmarks_8php.html#a88ce7dee6a3dc7465aa9b8eaa45b0087":[5,0,0,11,0],
+"include_2chanman_8php.html":[5,0,0,13],
+"include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[5,0,0,13,0],
+"include_2chat_8php.html":[5,0,0,14],
+"include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[5,0,0,14,3],
+"include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639":[5,0,0,14,1],
+"include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91":[5,0,0,14,2],
+"include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422":[5,0,0,14,0],
+"include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a":[5,0,0,14,4],
+"include_2config_8php.html":[5,0,0,18],
+"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,18,7],
+"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,18,0],
+"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,18,9],
+"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,18,11],
+"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,18,1],
+"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,18,2],
+"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,18,6],
+"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,18,8],
+"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,18,5],
+"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,18,10],
+"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,18,3],
+"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,18,4],
+"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,18,12],
+"include_2directory_8php.html":[5,0,0,29],
+"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,29,0]
 };
diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js
index 78f28bd09..2ac89bcc6 100644
--- a/doc/html/navtreeindex5.js
+++ b/doc/html/navtreeindex5.js
@@ -1,172 +1,179 @@
 var NAVTREEINDEX5 =
 {
-"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,36,6],
-"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,36,7],
-"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,36,4],
-"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[5,0,0,36,8],
-"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,36,5],
-"include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[5,0,0,36,11],
-"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,36,3],
-"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,36,9],
-"include_2menu_8php.html":[5,0,0,44],
-"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,44,1],
-"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,44,3],
-"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,44,8],
-"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,44,7],
-"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,44,5],
-"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,44,10],
-"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,44,2],
-"include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10":[5,0,0,44,9],
-"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,44,6],
-"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,44,4],
-"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,44,0],
-"include_2message_8php.html":[5,0,0,45],
-"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,45,2],
-"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,45,1],
-"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,45,3],
-"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[5,0,0,45,4],
-"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,45,0],
-"include_2network_8php.html":[5,0,0,47],
-"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,47,5],
-"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,47,10],
-"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,47,4],
-"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,47,9],
-"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,47,8],
-"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,47,13],
-"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,47,7],
-"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,47,14],
-"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,47,12],
-"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,47,6],
-"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,47,19],
-"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,47,16],
-"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,47,17],
-"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,47,18],
-"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,47,2],
-"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,47,0],
-"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,47,3],
-"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,47,15],
-"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,47,11],
-"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,47,1],
-"include_2notify_8php.html":[5,0,0,49],
-"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,49,0],
-"include_2oembed_8php.html":[5,0,0,51],
-"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,51,5],
-"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,51,7],
-"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,51,1],
-"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,51,4],
-"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,51,3],
-"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,51,6],
-"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,51,0],
-"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,51,2],
-"include_2photos_8php.html":[5,0,0,56],
-"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,56,0],
-"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,56,2],
-"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,56,1],
-"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,56,7],
-"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,56,3],
-"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,56,6],
-"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,56,5],
-"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,56,4],
+"include_2follow_8php.html":[5,0,0,34],
+"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,34,0],
+"include_2group_8php.html":[5,0,0,37],
+"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,37,2],
+"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,37,10],
+"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,37,1],
+"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,37,0],
+"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,37,6],
+"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,37,7],
+"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,37,4],
+"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[5,0,0,37,8],
+"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,37,5],
+"include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[5,0,0,37,11],
+"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,37,3],
+"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,37,9],
+"include_2menu_8php.html":[5,0,0,45],
+"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,45,1],
+"include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d":[5,0,0,45,9],
+"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,45,3],
+"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,45,8],
+"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,45,7],
+"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,45,5],
+"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,45,10],
+"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,45,2],
+"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,45,6],
+"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,45,4],
+"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,45,0],
+"include_2message_8php.html":[5,0,0,46],
+"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,46,2],
+"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,46,1],
+"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,46,3],
+"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[5,0,0,46,4],
+"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,46,0],
+"include_2network_8php.html":[5,0,0,48],
+"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,48,5],
+"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,48,10],
+"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,48,4],
+"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,48,9],
+"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,48,8],
+"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,48,13],
+"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,48,7],
+"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,48,14],
+"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,48,12],
+"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,48,6],
+"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,48,19],
+"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,48,16],
+"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,48,17],
+"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,48,18],
+"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,48,2],
+"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,48,0],
+"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,48,3],
+"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,48,15],
+"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,48,11],
+"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,48,1],
+"include_2notify_8php.html":[5,0,0,50],
+"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,50,0],
+"include_2oembed_8php.html":[5,0,0,52],
+"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,52,5],
+"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,52,7],
+"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,52,1],
+"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,52,4],
+"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,52,3],
+"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,52,6],
+"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,52,0],
+"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,52,2],
+"include_2photos_8php.html":[5,0,0,57],
+"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,57,0],
+"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,57,2],
+"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,57,1],
+"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,57,7],
+"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,57,3],
+"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,57,6],
+"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,57,5],
+"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,57,4],
 "index.html":[],
 "interfaceITemplateEngine.html":[4,0,18],
 "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1],
 "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0],
-"invite_8php.html":[5,0,1,42],
-"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,42,0],
-"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,42,1],
-"item_8php.html":[5,0,1,43],
-"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,43,0],
-"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,43,3],
-"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,43,5],
-"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,43,4],
-"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,43,1],
-"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[5,0,1,43,2],
-"items_8php.html":[5,0,0,42],
-"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,42,54],
-"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,42,2],
-"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,42,6],
-"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,42,27],
-"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,42,7],
-"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,42,32],
-"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,42,36],
-"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,42,24],
-"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,42,4],
-"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,42,31],
-"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,42,38],
-"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,42,3],
-"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,42,13],
-"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,42,53],
-"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,42,20],
-"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,42,0],
-"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,42,44],
-"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,42,47],
-"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,42,29],
-"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,42,19],
-"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,42,12],
-"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,42,17],
-"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,42,37],
-"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,42,15],
-"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,42,35],
-"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,42,40],
-"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,42,33],
-"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,42,42],
-"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,42,16],
-"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,42,11],
-"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,42,5],
-"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,42,51],
-"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,42,26],
-"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,42,10],
-"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,42,30],
-"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,42,52],
-"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,42,9],
-"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,42,21],
-"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,42,8],
-"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,42,28],
-"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,42,48],
-"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,42,49],
-"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,42,25],
-"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,42,45],
-"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,42,1],
-"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,42,43],
-"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,42,18],
-"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,42,39],
-"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,42,46],
-"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,42,50],
-"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,42,23],
-"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,42,34],
-"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,42,41],
-"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,42,14],
-"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,42,22],
-"language_8php.html":[5,0,0,43],
-"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,43,6],
-"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,43,0],
-"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,43,4],
-"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,43,3],
-"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,43,1],
-"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,43,7],
-"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,43,5],
-"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,43,2],
-"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,43,8],
-"layouts_8php.html":[5,0,1,44],
-"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,44,0],
-"like_8php.html":[5,0,1,45],
-"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,45,0],
-"lockview_8php.html":[5,0,1,46],
-"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,46,0],
-"login_8php.html":[5,0,1,47],
-"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,47,0],
-"lostpass_8php.html":[5,0,1,48],
-"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,48,0],
-"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,48,1],
-"magic_8php.html":[5,0,1,49],
-"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,49,0],
-"mail_8php.html":[5,0,1,50],
-"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[5,0,1,50,0],
-"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[5,0,1,50,1],
-"manage_8php.html":[5,0,1,51],
-"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,51,0],
-"match_8php.html":[5,0,1,52],
-"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,52,0],
+"invite_8php.html":[5,0,1,43],
+"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,43,0],
+"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,43,1],
+"item_8php.html":[5,0,1,44],
+"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,44,0],
+"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,44,3],
+"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,44,5],
+"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,44,4],
+"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,44,1],
+"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[5,0,1,44,2],
+"items_8php.html":[5,0,0,43],
+"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,43,54],
+"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,43,2],
+"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,43,6],
+"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,43,27],
+"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,43,7],
+"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,43,32],
+"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,43,36],
+"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,43,24],
+"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,43,4],
+"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,43,31],
+"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,43,38],
+"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,43,3],
+"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,43,13],
+"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,43,53],
+"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,43,20],
+"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,43,0],
+"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,43,44],
+"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,43,47],
+"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,43,29],
+"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,43,19],
+"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,43,12],
+"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,43,17],
+"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,43,37],
+"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,43,15],
+"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,43,35],
+"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,43,40],
+"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,43,33],
+"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,43,42],
+"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,43,16],
+"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,43,11],
+"items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,43,5],
+"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,43,51],
+"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,43,26],
+"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,43,10],
+"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,43,30],
+"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,43,52],
+"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,43,9],
+"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,43,21],
+"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,43,8],
+"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,43,28],
+"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,43,48],
+"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,43,49],
+"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,43,25],
+"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,43,45],
+"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,43,1],
+"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,43,43],
+"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,43,18],
+"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,43,39],
+"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,43,46],
+"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,43,50],
+"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,43,23],
+"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,43,34],
+"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,43,41],
+"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,43,14],
+"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,43,22],
+"language_8php.html":[5,0,0,44],
+"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,44,6],
+"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,44,0],
+"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,44,4],
+"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,44,3],
+"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,44,1],
+"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,44,7],
+"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,44,5],
+"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,44,2],
+"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,44,8],
+"layouts_8php.html":[5,0,1,45],
+"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,45,0],
+"like_8php.html":[5,0,1,46],
+"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,46,0],
+"lockview_8php.html":[5,0,1,47],
+"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,47,0],
+"login_8php.html":[5,0,1,48],
+"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,48,0],
+"lostpass_8php.html":[5,0,1,49],
+"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,49,0],
+"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,49,1],
+"magic_8php.html":[5,0,1,50],
+"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,50,0],
+"mail_8php.html":[5,0,1,51],
+"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[5,0,1,51,0],
+"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[5,0,1,51,1],
+"manage_8php.html":[5,0,1,52],
+"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,52,0],
+"match_8php.html":[5,0,1,53],
+"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,53,0],
 "md_README.html":[2],
 "md_config.html":[0],
 "md_fresh.html":[1],
@@ -178,76 +185,69 @@ var NAVTREEINDEX5 =
 "minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[5,0,3,2,0,1,4,0],
 "minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[5,0,3,2,0,1,4,2],
 "minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[5,0,3,2,0,1,4,1],
-"mitem_8php.html":[5,0,1,55],
-"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,55,2],
-"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,55,0],
-"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,55,1],
+"mitem_8php.html":[5,0,1,56],
+"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,56,2],
+"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,56,0],
+"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,56,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_2chat_8php.html":[5,0,1,11],
-"mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f":[5,0,1,11,0],
-"mod_2chat_8php.html#a999d594745597c656c9760253ae297ad":[5,0,1,11,2],
-"mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e":[5,0,1,11,1],
-"mod_2directory_8php.html":[5,0,1,21],
-"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,21,1],
-"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,21,0],
-"mod_2follow_8php.html":[5,0,1,35],
-"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,35,1],
-"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,35,0],
-"mod_2group_8php.html":[5,0,1,37],
-"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,37,0],
-"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,37,1],
-"mod_2menu_8php.html":[5,0,1,53],
-"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,53,0],
-"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,53,1],
-"mod_2message_8php.html":[5,0,1,54],
-"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[5,0,1,54,0],
-"mod_2network_8php.html":[5,0,1,58],
-"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,58,1],
-"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,58,0],
-"mod_2notify_8php.html":[5,0,1,62],
-"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,62,1],
-"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,62,0],
-"mod_2oembed_8php.html":[5,0,1,63],
-"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,63,0],
-"mod_2photos_8php.html":[5,0,1,70],
-"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,70,2],
-"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,70,0],
-"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,70,1],
+"mod_2bookmarks_8php.html":[5,0,1,8],
+"mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3":[5,0,1,8,1],
+"mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a":[5,0,1,8,0],
+"mod_2chanman_8php.html":[5,0,1,9],
+"mod_2chat_8php.html":[5,0,1,12],
+"mod_2chat_8php.html#a8b0b8bee6fef6477e8c64c5e951b1b4f":[5,0,1,12,0],
+"mod_2chat_8php.html#a999d594745597c656c9760253ae297ad":[5,0,1,12,2],
+"mod_2chat_8php.html#aa9ae4782e9baef0b7314ab9527c2707e":[5,0,1,12,1],
+"mod_2directory_8php.html":[5,0,1,22],
+"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,22,1],
+"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,22,0],
+"mod_2follow_8php.html":[5,0,1,36],
+"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,36,1],
+"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,36,0],
+"mod_2group_8php.html":[5,0,1,38],
+"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,38,0],
+"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,38,1],
+"mod_2menu_8php.html":[5,0,1,54],
+"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,54,0],
+"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,54,1],
+"mod_2message_8php.html":[5,0,1,55],
+"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[5,0,1,55,0],
+"mod_2network_8php.html":[5,0,1,59],
+"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,59,1],
+"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,59,0],
+"mod_2notify_8php.html":[5,0,1,63],
+"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,63,1],
+"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,63,0],
+"mod_2oembed_8php.html":[5,0,1,64],
+"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,64,0],
+"mod_2photos_8php.html":[5,0,1,71],
+"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,71,2],
+"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,71,0],
+"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,71,1],
 "mod__filestorage_8php.html":[5,0,3,0,0],
 "mod__import_8php.html":[5,0,3,1,3],
 "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,1,3,0],
-"mood_8php.html":[5,0,1,56],
-"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,56,0],
-"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,56,1],
-"msearch_8php.html":[5,0,1,57],
-"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,57,0],
+"mood_8php.html":[5,0,1,57],
+"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,57,0],
+"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,57,1],
+"msearch_8php.html":[5,0,1,58],
+"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,58,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],
 "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],
 "namespaces.html":[3,0],
 "namespaceupdatetpl.html":[4,0,3],
 "namespaceupdatetpl.html":[3,0,3],
-"namespaceutil.html":[4,0,4],
-"namespaceutil.html":[3,0,4],
-"nav_8php.html":[5,0,0,46],
-"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,46,0],
-"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,46,1],
-"new__channel_8php.html":[5,0,1,59],
-"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,59,2],
-"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,59,1],
-"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,59,0],
-"none_8php.html":[5,0,3,1,4],
-"notes_8php.html":[5,0,1,60]
+"namespaceutil.html":[4,0,4]
 };
diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index d7b3c75f1..cba20f8a2 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -1,48 +1,58 @@
 var NAVTREEINDEX6 =
 {
-"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,60,0],
-"notifications_8php.html":[5,0,1,61],
-"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,61,1],
-"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,61,0],
-"notifier_8php.html":[5,0,0,48],
-"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,48,0],
-"oauth_8php.html":[5,0,0,50],
-"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,50,3],
-"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,50,2],
-"oexchange_8php.html":[5,0,1,64],
-"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,64,0],
-"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,64,1],
+"namespaceutil.html":[3,0,4],
+"nav_8php.html":[5,0,0,47],
+"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,47,0],
+"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,47,1],
+"new__channel_8php.html":[5,0,1,60],
+"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,60,2],
+"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,60,1],
+"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,60,0],
+"none_8php.html":[5,0,3,1,4],
+"notes_8php.html":[5,0,1,61],
+"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,61,0],
+"notifications_8php.html":[5,0,1,62],
+"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,62,1],
+"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,62,0],
+"notifier_8php.html":[5,0,0,49],
+"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,49,0],
+"oauth_8php.html":[5,0,0,51],
+"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,51,3],
+"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,51,2],
+"oexchange_8php.html":[5,0,1,65],
+"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,65,0],
+"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,65,1],
 "olddefault_8php.html":[5,0,3,2,0,1,5],
-"onedirsync_8php.html":[5,0,0,52],
-"onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,52,0],
-"onepoll_8php.html":[5,0,0,53],
-"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,53,0],
-"online_8php.html":[5,0,1,65],
-"online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[5,0,1,65,0],
-"opensearch_8php.html":[5,0,1,66],
-"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,66,0],
-"page_8php.html":[5,0,1,67],
-"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,67,1],
-"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,67,0],
-"page__widgets_8php.html":[5,0,0,54],
-"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,54,1],
-"page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,54,0],
+"onedirsync_8php.html":[5,0,0,53],
+"onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[5,0,0,53,0],
+"onepoll_8php.html":[5,0,0,54],
+"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,54,0],
+"online_8php.html":[5,0,1,66],
+"online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[5,0,1,66,0],
+"opensearch_8php.html":[5,0,1,67],
+"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,67,0],
+"page_8php.html":[5,0,1,68],
+"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,68,1],
+"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,68,0],
+"page__widgets_8php.html":[5,0,0,55],
+"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,55,1],
+"page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,55,0],
 "pages.html":[],
-"parse__url_8php.html":[5,0,1,68],
-"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,68,2],
-"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,68,3],
-"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,68,1],
-"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,68,0],
+"parse__url_8php.html":[5,0,1,69],
+"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,69,2],
+"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,69,3],
+"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,69,1],
+"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,69,0],
 "passion_8php.html":[5,0,3,2,0,1,6],
 "passionwide_8php.html":[5,0,3,2,0,1,7],
-"permissions_8php.html":[5,0,0,55],
-"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,55,2],
-"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,55,0],
-"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,55,3],
-"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,55,4],
-"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,55,1],
-"photo_8php.html":[5,0,1,69],
-"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,69,0],
+"permissions_8php.html":[5,0,0,56],
+"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,56,2],
+"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,56,0],
+"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,56,3],
+"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,56,4],
+"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,56,1],
+"photo_8php.html":[5,0,1,70],
+"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,70,0],
 "photo__driver_8php.html":[5,0,0,1,0],
 "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2],
 "photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[5,0,0,1,0,1],
@@ -63,54 +73,54 @@ var NAVTREEINDEX6 =
 "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,0,0],
 "php_2theme__init_8php.html":[5,0,3,1,5],
 "php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,1,5,0],
-"php_8php.html":[5,0,1,71],
-"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,71,0],
+"php_8php.html":[5,0,1,72],
+"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,72,0],
 "pine_8php.html":[5,0,3,2,0,1,8],
-"ping_8php.html":[5,0,1,72],
-"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,72,0],
-"plugin_8php.html":[5,0,0,57],
-"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,57,21],
-"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,57,24],
-"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,57,20],
-"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,57,8],
-"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,57,16],
-"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,57,18],
-"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,57,7],
-"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,57,15],
-"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,57,13],
-"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,57,28],
-"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,57,9],
-"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,57,26],
-"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,57,11],
-"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,57,23],
-"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,57,27],
-"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,57,4],
-"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,57,0],
-"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,57,29],
-"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,57,1],
-"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,57,25],
-"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,57,22],
-"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,57,12],
-"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,57,17],
-"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,57,3],
-"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,57,6],
-"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,57,2],
-"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,57,14],
-"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,57,10],
-"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,57,19],
-"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,57,5],
+"ping_8php.html":[5,0,1,73],
+"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,73,0],
+"plugin_8php.html":[5,0,0,58],
+"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,58,21],
+"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,58,24],
+"plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[5,0,0,58,20],
+"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,58,8],
+"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,58,16],
+"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,58,18],
+"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,58,7],
+"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,58,15],
+"plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[5,0,0,58,13],
+"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,58,28],
+"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,58,9],
+"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,58,26],
+"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,58,11],
+"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,58,23],
+"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,58,27],
+"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,58,4],
+"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,58,0],
+"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,58,29],
+"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,58,1],
+"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,58,25],
+"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,58,22],
+"plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[5,0,0,58,12],
+"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,58,17],
+"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,58,3],
+"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,58,6],
+"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,58,2],
+"plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b":[5,0,0,58,14],
+"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,58,10],
+"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,58,19],
+"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,58,5],
 "po2php_8php.html":[5,0,2,7],
 "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0],
-"poco_8php.html":[5,0,1,73],
-"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,73,0],
-"poke_8php.html":[5,0,1,74],
-"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,74,1],
-"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,74,0],
-"poller_8php.html":[5,0,0,58],
-"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,58,0],
-"post_8php.html":[5,0,1,75],
-"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,75,0],
-"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,75,1],
+"poco_8php.html":[5,0,1,74],
+"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,74,0],
+"poke_8php.html":[5,0,1,75],
+"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,75,1],
+"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,75,0],
+"poller_8php.html":[5,0,0,59],
+"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,59,0],
+"post_8php.html":[5,0,1,76],
+"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,76,0],
+"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,76,1],
 "post__to__red_8php.html":[5,0,2,1,0,0],
 "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823":[5,0,2,1,0,0,16],
 "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,0,12],
@@ -136,118 +146,108 @@ var NAVTREEINDEX6 =
 "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,0,18],
 "post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,0,23],
 "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,0,11],
-"pretheme_8php.html":[5,0,1,76],
-"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,76,0],
-"probe_8php.html":[5,0,1,77],
-"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,77,0],
-"profile_8php.html":[5,0,1,78],
-"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,78,0],
-"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,78,1],
-"profile__photo_8php.html":[5,0,1,79],
-"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,79,0],
-"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,79,1],
-"profile__selectors_8php.html":[5,0,0,59],
-"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,59,2],
-"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,59,1],
-"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,59,0],
-"profiles_8php.html":[5,0,1,80],
-"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,80,1],
-"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,80,0],
-"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,80,2],
-"profperm_8php.html":[5,0,1,81],
-"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,81,1],
-"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,81,0],
-"pubsites_8php.html":[5,0,1,82],
-"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,82,0],
-"queue_8php.html":[5,0,0,61],
-"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,61,0],
-"queue__fn_8php.html":[5,0,0,62],
-"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,62,1],
-"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,62,0],
-"randprof_8php.html":[5,0,1,83],
-"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,83,0],
+"pretheme_8php.html":[5,0,1,77],
+"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,77,0],
+"probe_8php.html":[5,0,1,78],
+"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,78,0],
+"profile_8php.html":[5,0,1,79],
+"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,79,0],
+"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,79,1],
+"profile__photo_8php.html":[5,0,1,80],
+"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,80,0],
+"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,80,1],
+"profile__selectors_8php.html":[5,0,0,60],
+"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,60,2],
+"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,60,1],
+"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,60,0],
+"profiles_8php.html":[5,0,1,81],
+"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,81,1],
+"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,81,0],
+"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,81,2],
+"profperm_8php.html":[5,0,1,82],
+"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,82,1],
+"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,82,0],
+"pubsites_8php.html":[5,0,1,83],
+"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,83,0],
+"queue_8php.html":[5,0,0,62],
+"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,62,0],
+"queue__fn_8php.html":[5,0,0,63],
+"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,63,1],
+"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,63,0],
+"randprof_8php.html":[5,0,1,84],
+"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,84,0],
 "redbasic_2php_2style_8php.html":[5,0,3,2,2,0,1],
-"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,2,2,0,1,12],
-"redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4":[5,0,3,2,2,0,1,16],
-"redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,2,2,0,1,2],
-"redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473":[5,0,3,2,2,0,1,5],
-"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,2,2,0,1,23],
-"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,2,2,0,1,9],
-"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,2,2,0,1,8],
-"redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,2,2,0,1,0],
-"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,2,2,0,1,21],
-"redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,2,2,0,1,4],
-"redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d":[5,0,3,2,2,0,1,24],
-"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,2,2,0,1,15],
-"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,2,2,0,1,6],
-"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,2,2,0,1,19],
-"redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb":[5,0,3,2,2,0,1,22],
-"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,2,2,0,1,17],
-"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,2,2,0,1,26],
-"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,2,2,0,1,10],
-"redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c":[5,0,3,2,2,0,1,13],
-"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,2,2,0,1,18],
-"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,2,2,0,1,25],
-"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,2,2,0,1,11],
-"redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158":[5,0,3,2,2,0,1,14],
-"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,2,2,0,1,20],
-"redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8":[5,0,3,2,2,0,1,3],
-"redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0":[5,0,3,2,2,0,1,1],
-"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,2,2,0,1,7],
+"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,2,2,0,1,1],
+"redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,2,2,0,1,0],
+"redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d":[5,0,3,2,2,0,1,4],
+"redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c":[5,0,3,2,2,0,1,2],
+"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,2,2,0,1,5],
+"redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158":[5,0,3,2,2,0,1,3],
 "redbasic_2php_2theme_8php.html":[5,0,3,2,2,0,2],
 "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,2,2,0,2,0],
 "redbasic_8php.html":[5,0,3,2,0,1,9],
-"reddav_8php.html":[5,0,0,63],
-"reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[5,0,0,63,5],
-"reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[5,0,0,63,6],
-"reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[5,0,0,63,4],
-"register_8php.html":[5,0,1,84],
-"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,84,0],
-"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,84,2],
-"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,84,1],
-"regmod_8php.html":[5,0,1,85],
-"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,85,0],
-"removeme_8php.html":[5,0,1,86],
-"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,86,0],
-"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,86,1],
-"rmagic_8php.html":[5,0,1,87],
-"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,87,0],
-"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,87,2],
-"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,87,1],
-"rpost_8php.html":[5,0,1,88],
-"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,88,0],
-"rsd__xml_8php.html":[5,0,1,89],
-"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,89,0],
-"search_8php.html":[5,0,1,90],
-"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,90,0],
-"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,90,1],
-"search__ac_8php.html":[5,0,1,91],
-"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,91,0],
-"security_8php.html":[5,0,0,64],
-"security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,64,11],
-"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,64,2],
-"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,64,4],
-"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,64,5],
-"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,64,1],
-"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,64,7],
-"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,64,3],
-"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,64,9],
-"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,64,6],
-"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,64,0],
-"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,64,10],
-"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,64,8],
-"session_8php.html":[5,0,0,65],
-"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,65,4],
-"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,65,0],
-"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,65,1],
-"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,65,8],
-"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,65,5],
-"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,65,7],
-"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,65,6],
-"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,65,3],
-"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,65,9],
-"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,65,2],
-"settings_8php.html":[5,0,1,92],
-"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,92,0],
-"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,92,1]
+"reddav_8php.html":[5,0,0,64],
+"reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[5,0,0,64,5],
+"reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[5,0,0,64,6],
+"reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[5,0,0,64,4],
+"register_8php.html":[5,0,1,85],
+"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,85,0],
+"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,85,2],
+"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,85,1],
+"regmod_8php.html":[5,0,1,86],
+"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,86,0],
+"removeme_8php.html":[5,0,1,87],
+"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,87,0],
+"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,87,1],
+"rmagic_8php.html":[5,0,1,88],
+"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,88,0],
+"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,88,2],
+"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,88,1],
+"rpost_8php.html":[5,0,1,89],
+"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,89,0],
+"rsd__xml_8php.html":[5,0,1,90],
+"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,90,0],
+"search_8php.html":[5,0,1,91],
+"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,91,0],
+"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,91,1],
+"search__ac_8php.html":[5,0,1,92],
+"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,92,0],
+"security_8php.html":[5,0,0,65],
+"security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,65,11],
+"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,65,2],
+"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,65,4],
+"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,65,5],
+"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,65,1],
+"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,65,7],
+"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,65,3],
+"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,65,9],
+"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,65,6],
+"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,65,0],
+"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,65,10],
+"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,65,8],
+"session_8php.html":[5,0,0,66],
+"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,66,4],
+"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,66,0],
+"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,66,1],
+"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,66,8],
+"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,66,5],
+"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,66,7],
+"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,66,6],
+"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,66,3],
+"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,66,9],
+"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,66,2],
+"settings_8php.html":[5,0,1,93],
+"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,93,0],
+"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,93,1],
+"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,93,2],
+"setup_8php.html":[5,0,1,94],
+"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,94,2],
+"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,94,14],
+"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,94,5],
+"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,94,13],
+"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,94,10],
+"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,94,3],
+"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,94,1],
+"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,94,8],
+"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,94,12]
 };
diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js
index 1c985bd0e..c543f6f9f 100644
--- a/doc/html/navtreeindex7.js
+++ b/doc/html/navtreeindex7.js
@@ -1,172 +1,163 @@
 var NAVTREEINDEX7 =
 {
-"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,92,2],
-"setup_8php.html":[5,0,1,93],
-"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,93,2],
-"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,93,14],
-"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,93,5],
-"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,93,13],
-"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,93,10],
-"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,93,3],
-"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,93,1],
-"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,93,8],
-"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,93,12],
-"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,93,4],
-"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,93,7],
-"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,93,11],
-"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,93,9],
-"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,93,16],
-"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,93,0],
-"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,93,15],
-"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,93,6],
-"share_8php.html":[5,0,1,94],
-"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,94,0],
-"siteinfo_8php.html":[5,0,1,95],
-"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,95,1],
-"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,95,0],
-"sitelist_8php.html":[5,0,1,96],
-"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,96,0],
-"smilies_8php.html":[5,0,1,97],
-"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,97,0],
-"socgraph_8php.html":[5,0,0,66],
-"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,66,0],
-"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,66,6],
-"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,66,7],
-"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,66,8],
-"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,66,1],
-"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,66,4],
-"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,66,2],
-"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,66,5],
-"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,66,3],
-"sources_8php.html":[5,0,1,98],
-"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,98,0],
-"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,98,1],
-"sslify_8php.html":[5,0,1,99],
-"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,99,0],
-"starred_8php.html":[5,0,1,100],
-"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,100,0],
-"subthread_8php.html":[5,0,1,101],
-"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,101,0],
-"suggest_8php.html":[5,0,1,102],
-"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,102,0],
-"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,102,1],
-"system__unavailable_8php.html":[5,0,0,67],
-"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0],
-"tagger_8php.html":[5,0,1,103],
-"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,103,0],
-"tagrm_8php.html":[5,0,1,104],
-"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,104,1],
-"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,104,0],
-"taxonomy_8php.html":[5,0,0,68],
-"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,68,9],
-"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,68,0],
-"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,68,2],
-"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,68,6],
-"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,68,4],
-"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,68,3],
-"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,68,10],
-"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,68,1],
-"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[5,0,0,68,7],
-"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,68,14],
-"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,68,13],
-"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,68,11],
-"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,68,12],
-"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,68,5],
-"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[5,0,0,68,8],
-"template__processor_8php.html":[5,0,0,69],
-"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,69,3],
-"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,69,1],
-"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,69,2],
-"text_8php.html":[5,0,0,70],
-"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,70,39],
-"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,70,45],
-"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,70,6],
-"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,70,16],
-"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,70,11],
-"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,70,44],
-"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,70,5],
-"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,70,78],
-"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,70,32],
-"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,70,35],
-"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,70,49],
-"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,70,52],
-"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,70,46],
-"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,70,47],
-"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,70,42],
-"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,70,4],
-"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,70,86],
-"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,70,75],
-"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,70,48],
-"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,70,10],
-"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,70,88],
-"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,70,23],
-"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,70,83],
-"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,70,72],
-"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,70,81],
-"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,70,30],
-"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,70,41],
-"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,70,71],
-"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,70,7],
-"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,70,84],
-"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,70,33],
-"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,70,70],
-"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,70,31],
-"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,70,43],
-"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,70,61],
-"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,70,50],
-"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,70,24],
-"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,70,60],
-"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,70,80],
-"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,70,9],
-"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,70,14],
-"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,70,79],
-"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,70,40],
-"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,70,27],
-"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,70,76],
-"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,70,1],
-"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,70,34],
-"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,70,26],
-"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,70,77],
-"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,70,8],
-"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,70,68],
-"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,70,73],
-"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,70,15],
-"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,70,20],
-"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,70,59],
-"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,70,19],
-"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,70,3],
-"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,70,54],
-"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,70,65],
-"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,70,63],
-"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,70,67],
-"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,70,29],
-"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,70,17],
-"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,70,55],
-"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,70,36],
-"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,70,28],
-"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,70,87],
-"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,70,69],
-"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,70,82],
-"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,70,85],
-"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,70,56],
-"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,70,37],
-"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,70,21],
-"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,70,2],
-"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,70,13],
-"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,70,64],
-"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,70,51],
-"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,70,38],
-"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,70,66],
-"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,70,18],
-"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,70,57],
-"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,70,25],
-"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,70,0],
-"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,70,74],
-"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,70,62],
-"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,70,22],
-"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,70,12],
-"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,70,58],
-"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,70,53],
+"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,94,4],
+"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,94,7],
+"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,94,11],
+"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,94,9],
+"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,94,16],
+"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,94,0],
+"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,94,15],
+"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,94,6],
+"share_8php.html":[5,0,1,95],
+"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,95,0],
+"siteinfo_8php.html":[5,0,1,96],
+"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,96,1],
+"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,96,0],
+"sitelist_8php.html":[5,0,1,97],
+"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,97,0],
+"smilies_8php.html":[5,0,1,98],
+"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,98,0],
+"socgraph_8php.html":[5,0,0,67],
+"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,67,0],
+"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,67,6],
+"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,67,7],
+"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,67,8],
+"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,67,1],
+"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,67,4],
+"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,67,2],
+"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,67,5],
+"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,67,3],
+"sources_8php.html":[5,0,1,99],
+"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,99,0],
+"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,99,1],
+"spam_8php.html":[5,0,0,68],
+"spam_8php.html#a05861201147b9a538d006f0269255cf9":[5,0,0,68,1],
+"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[5,0,0,68,0],
+"sslify_8php.html":[5,0,1,100],
+"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,100,0],
+"starred_8php.html":[5,0,1,101],
+"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,101,0],
+"subthread_8php.html":[5,0,1,102],
+"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,102,0],
+"suggest_8php.html":[5,0,1,103],
+"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,103,0],
+"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,103,1],
+"system__unavailable_8php.html":[5,0,0,69],
+"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,69,0],
+"tagger_8php.html":[5,0,1,104],
+"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,104,0],
+"tagrm_8php.html":[5,0,1,105],
+"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,105,1],
+"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,105,0],
+"taxonomy_8php.html":[5,0,0,70],
+"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,70,9],
+"taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,70,0],
+"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,70,2],
+"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,70,6],
+"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,70,4],
+"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,70,3],
+"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,70,10],
+"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,70,1],
+"taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de":[5,0,0,70,7],
+"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,70,14],
+"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,70,13],
+"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,70,11],
+"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,70,12],
+"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,70,5],
+"taxonomy_8php.html#af387463d42ffdf7d2ab3d5b22e40a0c7":[5,0,0,70,8],
+"template__processor_8php.html":[5,0,0,71],
+"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,71,3],
+"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,71,1],
+"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,71,2],
+"text_8php.html":[5,0,0,72],
+"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,72,38],
+"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,72,44],
+"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,72,6],
+"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,72,16],
+"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,72,11],
+"text_8php.html#a10dde167249ed5abf190a7a0986878ea":[5,0,0,72,68],
+"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,72,43],
+"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,72,5],
+"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,72,77],
+"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,72,31],
+"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,72,34],
+"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,72,48],
+"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,72,50],
+"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,72,45],
+"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,72,46],
+"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,72,41],
+"text_8php.html#a273156a6f5cddc6652ad656821cd5805":[5,0,0,72,69],
+"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,72,4],
+"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,72,85],
+"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,72,74],
+"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,72,47],
+"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,72,10],
+"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,72,87],
+"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,72,23],
+"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,72,82],
+"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,72,71],
+"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,72,80],
+"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,72,29],
+"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,72,40],
+"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,72,70],
+"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,72,7],
+"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,72,83],
+"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,72,32],
+"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,72,30],
+"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,72,42],
+"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,72,59],
+"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,72,49],
+"text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,72,24],
+"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,72,58],
+"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,72,79],
+"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,72,9],
+"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,72,14],
+"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,72,78],
+"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,72,39],
+"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,72,26],
+"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,72,75],
+"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,72,1],
+"text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,72,33],
+"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,72,25],
+"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,72,76],
+"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,72,8],
+"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,72,66],
+"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,72,72],
+"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,72,15],
+"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,72,20],
+"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,72,57],
+"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,72,19],
+"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,72,3],
+"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,72,52],
+"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,72,63],
+"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,72,61],
+"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,72,65],
+"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,72,28],
+"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,72,17],
+"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,72,53],
+"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,72,35],
+"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,72,27],
+"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,72,86],
+"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,72,67],
+"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,72,81],
+"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,72,84],
+"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,72,54],
+"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,72,36],
+"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,72,21],
+"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,72,2],
+"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,72,13],
+"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,72,62],
+"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,72,37],
+"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,72,64],
+"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,72,18],
+"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,72,55],
+"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,72,0],
+"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,72,73],
+"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,72,60],
+"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,72,22],
+"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,72,12],
+"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,72,56],
+"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,72,51],
 "theme_2blogga_2php_2default_8php.html":[5,0,3,2,1,0,1],
 "theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[5,0,3,2,1,0,1,2],
 "theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,2,1,0,1,0],
@@ -177,13 +168,13 @@ var NAVTREEINDEX7 =
 "theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539":[5,0,3,2,1,1,0,0,1,1],
 "theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,2,1,1,0,0,1,0],
 "theme_2redbasic_2php_2theme__init_8php.html":[5,0,3,2,2,0,3],
-"thing_8php.html":[5,0,1,105],
-"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,105,0],
-"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,105,1],
-"toggle__mobile_8php.html":[5,0,1,106],
-"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,106,0],
-"toggle__safesearch_8php.html":[5,0,1,107],
-"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,107,0],
+"thing_8php.html":[5,0,1,106],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,106,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,106,1],
+"toggle__mobile_8php.html":[5,0,1,107],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,107,0],
+"toggle__safesearch_8php.html":[5,0,1,108],
+"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,108,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],
@@ -197,18 +188,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,108],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,108,0],
-"update__channel_8php.html":[5,0,1,109],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,109,0],
-"update__community_8php.html":[5,0,1,110],
-"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,110,0],
-"update__display_8php.html":[5,0,1,111],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,111,0],
-"update__network_8php.html":[5,0,1,112],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,112,0],
-"update__search_8php.html":[5,0,1,113],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,113,0],
+"uexport_8php.html":[5,0,1,109],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,109,0],
+"update__channel_8php.html":[5,0,1,110],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,110,0],
+"update__community_8php.html":[5,0,1,111],
+"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,111,0],
+"update__display_8php.html":[5,0,1,112],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,112,0],
+"update__network_8php.html":[5,0,1,113],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,113,0],
+"update__search_8php.html":[5,0,1,114],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,114,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],
@@ -236,18 +227,27 @@ var NAVTREEINDEX7 =
 "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[5,0,3,2,2,0,0,0],
 "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,2,2,0,0,1],
 "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,2,2,0,0,2],
-"view_8php.html":[5,0,1,114],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,114,0],
-"viewconnections_8php.html":[5,0,1,115],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,115,1],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,115,0],
-"viewsrc_8php.html":[5,0,1,116],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,116,0],
-"vote_8php.html":[5,0,1,117],
-"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,117,2],
-"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,117,0],
-"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,117,1],
-"wall__attach_8php.html":[5,0,1,118],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,118,0],
-"wall__upload_8php.html":[5,0,1,119]
+"view_8php.html":[5,0,1,115],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,115,0],
+"viewconnections_8php.html":[5,0,1,116],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,116,1],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,116,0],
+"viewsrc_8php.html":[5,0,1,117],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,117,0],
+"vote_8php.html":[5,0,1,118],
+"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,118,2],
+"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,118,0],
+"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,118,1],
+"wall__attach_8php.html":[5,0,1,119],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,119,0],
+"wall__upload_8php.html":[5,0,1,120],
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,120,0],
+"webfinger_8php.html":[5,0,1,121],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,121,0],
+"webpages_8php.html":[5,0,1,122],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,122,0],
+"wfinger_8php.html":[5,0,1,123],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,123,0],
+"widedarkness_8php.html":[5,0,3,2,0,1,10],
+"widgets_8php.html":[5,0,0,73]
 };
diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js
index bd7393825..3716dd834 100644
--- a/doc/html/navtreeindex8.js
+++ b/doc/html/navtreeindex8.js
@@ -1,77 +1,68 @@
 var NAVTREEINDEX8 =
 {
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,119,0],
-"webfinger_8php.html":[5,0,1,120],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,120,0],
-"webpages_8php.html":[5,0,1,121],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,121,0],
-"wfinger_8php.html":[5,0,1,122],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,122,0],
-"widedarkness_8php.html":[5,0,3,2,0,1,10],
-"widgets_8php.html":[5,0,0,71],
-"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,71,8],
-"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,71,20],
-"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[5,0,0,71,5],
-"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[5,0,0,71,6],
-"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[5,0,0,71,14],
-"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,71,15],
-"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[5,0,0,71,3],
-"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,71,9],
-"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,71,21],
-"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,71,16],
-"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,71,12],
-"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,71,1],
-"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,71,18],
-"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,71,7],
-"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,71,4],
-"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,71,19],
-"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,71,17],
-"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,71,23],
-"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,71,11],
-"widgets_8php.html#add9b24d3304e529a7975e96122315554":[5,0,0,71,0],
-"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[5,0,0,71,10],
-"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,71,22],
-"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,71,2],
-"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,71,13],
-"xchan_8php.html":[5,0,1,123],
-"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,123,0],
-"xrd_8php.html":[5,0,1,124],
-"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,124,0],
-"xref_8php.html":[5,0,1,125],
-"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,125,0],
-"zfinger_8php.html":[5,0,1,126],
-"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,126,0],
-"zot_8php.html":[5,0,0,72],
-"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,72,13],
-"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,72,7],
-"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,72,15],
-"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,72,10],
-"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,72,17],
-"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,72,5],
-"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,72,21],
-"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,72,8],
-"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,72,26],
-"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,72,18],
-"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,72,0],
-"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,72,25],
-"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3],
-"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,24],
-"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,19],
-"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,12],
-"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,11],
-"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,72,14],
-"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,72,23],
-"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,72,16],
-"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,72,27],
-"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,72,9],
-"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,72,1],
-"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[5,0,0,72,4],
-"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,72,2],
-"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,72,20],
-"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,72,22],
-"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,72,6],
-"zotfeed_8php.html":[5,0,1,127],
-"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,127,0],
-"zping_8php.html":[5,0,1,128],
-"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,128,0]
+"widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,73,8],
+"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,73,20],
+"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[5,0,0,73,5],
+"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[5,0,0,73,6],
+"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[5,0,0,73,14],
+"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,73,15],
+"widgets_8php.html#a47c72aac42058ea086c9ef8651c259da":[5,0,0,73,3],
+"widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,73,9],
+"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,73,21],
+"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,73,16],
+"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,73,12],
+"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,73,1],
+"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,73,18],
+"widgets_8php.html#a95c06bc9be133e89768746302d2ac395":[5,0,0,73,7],
+"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,73,4],
+"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,73,19],
+"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,73,17],
+"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,73,23],
+"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,73,11],
+"widgets_8php.html#add9b24d3304e529a7975e96122315554":[5,0,0,73,0],
+"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[5,0,0,73,10],
+"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,73,22],
+"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,73,2],
+"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,73,13],
+"xchan_8php.html":[5,0,1,124],
+"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,124,0],
+"xrd_8php.html":[5,0,1,125],
+"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,125,0],
+"xref_8php.html":[5,0,1,126],
+"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,126,0],
+"zfinger_8php.html":[5,0,1,127],
+"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,127,0],
+"zot_8php.html":[5,0,0,74],
+"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,74,13],
+"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,74,7],
+"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,74,15],
+"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,74,10],
+"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,74,17],
+"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,74,5],
+"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,74,21],
+"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,74,8],
+"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,74,26],
+"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,74,18],
+"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,74,0],
+"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,74,25],
+"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,74,3],
+"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,74,24],
+"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,74,19],
+"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,74,12],
+"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,74,11],
+"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,74,14],
+"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,74,23],
+"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,74,16],
+"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,74,27],
+"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,74,9],
+"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,74,1],
+"zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d":[5,0,0,74,4],
+"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,74,2],
+"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,74,20],
+"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,74,22],
+"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,74,6],
+"zotfeed_8php.html":[5,0,1,128],
+"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,128,0],
+"zping_8php.html":[5,0,1,129],
+"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,129,0]
 };
diff --git a/doc/html/parse__url_8php.html b/doc/html/parse__url_8php.html
index 7dc41c44c..6cf112ea3 100644
--- a/doc/html/parse__url_8php.html
+++ b/doc/html/parse__url_8php.html
@@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('parse__url_8php.html','');});
 
-
+
@@ -153,7 +153,7 @@ Functions
                                      
       
                                      
 
                                      
 Functions
                                      if(!function_exists('deletenode')) completeurl ($url, $scheme)
                                      if(!function_exists('deletenode')) completeurl ($url, $scheme)
                                      
 
                                       
                                      
 
                                       parseurl_getsiteinfo ($url)
                                      
 
                                       
                                      
 
                                      
-          
+          
diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html
index cc75df8b1..345b5c4fa 100644
--- a/doc/html/php2po_8php.html
+++ b/doc/html/php2po_8php.html
@@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('php2po_8php.html','');});
 
                                      
         
                                      if (!function_exists('deletenode')) completeurl if (!function_exists('deletenode')) completeurl 
           (
            
           $url, 
                                      
-
+
@@ -168,7 +168,7 @@ Variables
                                      
 
                                      
 Variables
                                      if(!class_exists('App')) if($argc!=2) $phpfile = $argv[1]
                                      if(!class_exists('App')) if($argc!=2) $phpfile = $argv[1]
                                      
 
                                       
                                      
 
                                       $pofile = dirname($phpfile)."/messages.po"
                                      
 
                                       
                                      
       
                                      
 
                                      
 
-
                                      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), mail_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(), sslify_init(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().
                                      
+
                                      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), mail_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(), sslify_init(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().
                                      
 
 
                                      
 
@@ -191,7 +191,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if (!class_exists('App')) if ($argc!=2) $phpfile = $argv[1]if (!class_exists('App')) if ($argc!=2) $phpfile = $argv[1]
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html
index 876ea1a88..4df6f635b 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(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_chatroom_list(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().
                                      
+
                                      Referenced by api_call(), api_user(), attach_mkdir(), attach_store(), blocks_content(), bookmark_add(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_chatroom_list(), 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 dda7d0fea..1f7f705ee 100644
--- a/doc/html/plugin_8php.html
+++ b/doc/html/plugin_8php.html
@@ -691,7 +691,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by attach_store(), chatroom_create(), RedDirectory\createFile(), filestorage_content(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().
                                      
+
                                      Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedDirectory\createFile(), filestorage_content(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().
                                      
 
 
                                      
 
diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html
index e816fa304..7233c03f7 100644
--- a/doc/html/redbasic_2php_2style_8php.html
+++ b/doc/html/redbasic_2php_2style_8php.html
@@ -112,48 +112,6 @@ $(document).ready(function(){initNavTree('redbasic_2php_2style_8php.html','');})
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -162,62 +120,12 @@ Variables
-
+
                                      
 
                                      
 Variables
                                       $uid = get_theme_uid()
                                       
                                       if ($uid) load_pconfig($uid
                                       
                                       $nav_colour = get_pconfig($uid, "redbasic", "nav_colour")
                                       
                                       $banner_colour = get_pconfig($uid,'redbasic','banner_colour')
                                       
                                       $schema = get_pconfig($uid,'redbasic','schema')
                                       
                                       $bgcolour = get_pconfig($uid, "redbasic", "background_colour")
                                       
                                       $background_image = get_pconfig($uid, "redbasic", "background_image")
                                       
                                       $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour')
                                       
                                       $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour')
                                       
                                       $item_colour = get_pconfig($uid, "redbasic", "item_colour")
                                       
                                       $item_opacity = get_pconfig($uid, "redbasic", "item_opacity")
                                       
                                       $body_font_size = get_pconfig($uid, "redbasic", "body_font_size")
                                       
                                       $font_size = get_pconfig($uid, "redbasic", "font_size")
                                       
                                       $font_colour = get_pconfig($uid, "redbasic", "font_colour")
                                       
                                       $radius = get_pconfig($uid, "redbasic", "radius")
                                       
                                       $shadow = get_pconfig($uid,"redbasic","photo_shadow")
                                       
                                       $converse_width =get_pconfig($uid,"redbasic","converse_width")
                                       
                                       $nav_min_opacity =get_pconfig($uid,'redbasic','nav_min_opacity')
                                       
                                       $sloppy_photos =get_pconfig($uid,'redbasic','sloppy_photos')
                                       
                                       $top_photo =get_pconfig($uid,'redbasic','top_photo')
                                       
                                       $reply_photo =get_pconfig($uid,'redbasic','reply_photo')
                                       
                                      
 
                                       $pmenu_top = intval($top_photo) - 16 . 'px'
                                      
 
                                       
                                      
 
                                       $wwtop = intval($top_photo) - 15 . 'px'
                                      
 
                                       
                                      
 
                                       $pmenu_reply = intval($reply_photo) - 16 . 'px'
                                      
 
                                       
                                      if($nav_min_opacity===false||$nav_min_opacity=== '') else
                                      if($nav_min_opacity===false||$nav_min_opacity=== '') else
                                      
 
                                       
                                      
 
                                       $nav_percent_min_opacity = (int) 100 * $nav_min_opacity
                                      
 
                                       
                                      
 
                                      
 
                                      Variable Documentation
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $background_image = get_pconfig($uid, "redbasic", "background_image")
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $banner_colour = get_pconfig($uid,'redbasic','banner_colour')
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $bgcolour = get_pconfig($uid, "redbasic", "background_colour")
                                      
-
                                      
-
-
                                      Referenced by apw_form(), and theme_content().
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $body_font_size = get_pconfig($uid, "redbasic", "body_font_size")
                                      
-
                                      
-
-
                                      
-
                                      
 
 
                                      
 
                                      
@@ -228,96 +136,6 @@ Variables
       
 
                                      
 
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $converse_width =get_pconfig($uid,"redbasic","converse_width")
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $font_colour = get_pconfig($uid, "redbasic", "font_colour")
                                      
-
                                      
-
-
                                      Referenced by apw_form(), and theme_content().
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $font_size = get_pconfig($uid, "redbasic", "font_size")
                                      
-
                                      
-
-
                                      Referenced by apw_form(), and theme_content().
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $item_colour = get_pconfig($uid, "redbasic", "item_colour")
                                      
-
                                      
-
-
                                      Referenced by apw_form(), and theme_content().
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $item_opacity = get_pconfig($uid, "redbasic", "item_opacity")
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $nav_colour = get_pconfig($uid, "redbasic", "nav_colour")
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $nav_min_opacity =get_pconfig($uid,'redbasic','nav_min_opacity')
                                      
-
                                      
-
 
                                      
 
                                      
 
@@ -354,118 +172,6 @@ Variables
       
 
                                      
 
-
                                      
-
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $radius = get_pconfig($uid, "redbasic", "radius")
                                      
-
                                      
-
-
                                      Referenced by apw_form(), and theme_content().
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $reply_photo =get_pconfig($uid,'redbasic','reply_photo')
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $schema = get_pconfig($uid,'redbasic','schema')
                                      
-
                                      
-
-
                                      Referenced by apw_form(), and theme_content().
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $shadow = get_pconfig($uid,"redbasic","photo_shadow")
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $sloppy_photos =get_pconfig($uid,'redbasic','sloppy_photos')
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour')
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour')
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $top_photo =get_pconfig($uid,'redbasic','top_photo')
                                      
-
                                      
-
-
                                      
-
                                      
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      $uid = get_theme_uid()
                                      
-
                                      
-
 
                                      
 
                                      
 
@@ -485,25 +191,13 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if ($nav_min_opacity===false||$nav_min_opacity=== '') elseif ($nav_min_opacity===false||$nav_min_opacity=== '') else
         
                                      
       
                                      
 
                                      
 Initial value:
                                      {
                                      
-
                                              $nav_float_min_opacity = (float) $nav_min_opacity
                                      
+
                                              $nav_float_min_opacity = (float) $nav_min_opacity
                                      
 
                                      
-
                                      
-
-
-
                                      
-
                                      
-      
-        
-          
-        
-      
                                      if($uid) load_pconfig($uid
                                      
-
                                      
-
 
                                      
 
                                      
 
diff --git a/doc/html/redbasic_2php_2style_8php.js b/doc/html/redbasic_2php_2style_8php.js
index c5e370461..4e9032b97 100644
--- a/doc/html/redbasic_2php_2style_8php.js
+++ b/doc/html/redbasic_2php_2style_8php.js
@@ -1,30 +1,9 @@
 var redbasic_2php_2style_8php =
 [
-    [ "$background_image", "redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c", null ],
-    [ "$banner_colour", "redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0", null ],
-    [ "$bgcolour", "redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574", null ],
-    [ "$body_font_size", "redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8", null ],
     [ "$comment_indent", "redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27", null ],
-    [ "$converse_width", "redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473", null ],
-    [ "$font_colour", "redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b", null ],
-    [ "$font_size", "redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc", null ],
-    [ "$item_colour", "redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16", null ],
-    [ "$item_opacity", "redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8", null ],
-    [ "$nav_colour", "redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649", null ],
-    [ "$nav_min_opacity", "redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1", null ],
     [ "$nav_percent_min_opacity", "redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c", null ],
     [ "$pmenu_reply", "redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c", null ],
     [ "$pmenu_top", "redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158", null ],
-    [ "$radius", "redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351", null ],
-    [ "$reply_photo", "redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4", null ],
-    [ "$schema", "redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee", null ],
-    [ "$shadow", "redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a", null ],
-    [ "$sloppy_photos", "redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad", null ],
-    [ "$toolicon_activecolour", "redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3", null ],
-    [ "$toolicon_colour", "redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb", null ],
-    [ "$top_photo", "redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb", null ],
-    [ "$uid", "redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a", null ],
     [ "$wwtop", "redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d", null ],
-    [ "else", "redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459", null ],
-    [ "if", "redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a", null ]
+    [ "else", "redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js
index f52fc6283..d2a44072d 100644
--- a/doc/html/search/all_24.js
+++ b/doc/html/search/all_24.js
@@ -10,11 +10,7 @@ var searchData=
   ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]],
   ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]],
   ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory\$auth()'],['../classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2',1,'RedFile\$auth()'],['../classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35',1,'RedBrowser\$auth()']]],
-  ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]],
-  ['_24banner_5fcolour',['$banner_colour',['../redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0',1,'style.php']]],
   ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]],
-  ['_24bgcolour',['$bgcolour',['../redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574',1,'style.php']]],
-  ['_24body_5ffont_5fsize',['$body_font_size',['../redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8',1,'style.php']]],
   ['_24bodyclass',['$bodyclass',['../theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php']]],
   ['_24browser',['$browser',['../classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e',1,'RedBasicAuth']]],
   ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]],
@@ -38,7 +34,6 @@ var searchData=
   ['_24contacts',['$contacts',['../classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2',1,'App']]],
   ['_24content',['$content',['../classApp.html#ac1d80a14492acc932715d54567d8a589',1,'App']]],
   ['_24conversation',['$conversation',['../classItem.html#a007424e3e3171dcfb4312a02161da6cd',1,'Item']]],
-  ['_24converse_5fwidth',['$converse_width',['../redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473',1,'style.php']]],
   ['_24css_5fsources',['$css_sources',['../classApp.html#a6f55d087e1ff4710132c1b0863faa2ee',1,'App']]],
   ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]],
   ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]],
@@ -56,8 +51,6 @@ var searchData=
   ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]],
   ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]],
   ['_24folder_5fhash',['$folder_hash',['../classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b',1,'RedDirectory']]],
-  ['_24font_5fcolour',['$font_colour',['../redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b',1,'style.php']]],
-  ['_24font_5fsize',['$font_size',['../redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc',1,'style.php']]],
   ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]],
   ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]],
   ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]],
@@ -71,10 +64,9 @@ var searchData=
   ['_24image',['$image',['../classphoto__driver.html#a7c78b5a01afe61ba3895ac07f4869b55',1,'photo_driver']]],
   ['_24infile',['$infile',['../php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214',1,'php2po.php']]],
   ['_24ink',['$ink',['../php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0',1,'php2po.php']]],
+  ['_24install',['$install',['../classApp.html#a576ecb1c5b4a283221e6f2f0ec248251',1,'App']]],
   ['_24install_5fwizard_5fpass',['$install_wizard_pass',['../setup_8php.html#addb24714bc2542aa4f4215e98fe48432',1,'setup.php']]],
   ['_24interactive',['$interactive',['../classApp.html#a4c7cfc62d39508086cf300dc2e39c4df',1,'App']]],
-  ['_24item_5fcolour',['$item_colour',['../redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16',1,'style.php']]],
-  ['_24item_5fopacity',['$item_opacity',['../redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8',1,'style.php']]],
   ['_24itemfloat',['$itemfloat',['../minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b',1,'minimalisticdarkness.php']]],
   ['_24js_5fsources',['$js_sources',['../classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d',1,'App']]],
   ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]],
@@ -87,8 +79,6 @@ var searchData=
   ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]],
   ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]],
   ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba',1,'RedFile\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]],
-  ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]],
-  ['_24nav_5fmin_5fopacity',['$nav_min_opacity',['../redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1',1,'style.php']]],
   ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]],
   ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]],
   ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]],
@@ -122,24 +112,19 @@ var searchData=
   ['_24profile_5fuid',['$profile_uid',['../classApp.html#a08c24d6a6fc52fcc784b0f765f13b820',1,'App']]],
   ['_24query_5fstring',['$query_string',['../classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f',1,'App']]],
   ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]],
-  ['_24radius',['$radius',['../redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351',1,'style.php']]],
   ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]],
   ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]],
   ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]],
   ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]],
-  ['_24reply_5fphoto',['$reply_photo',['../redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4',1,'style.php']]],
   ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]],
   ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]],
   ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]],
-  ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]],
   ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]],
   ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]],
   ['_24sectionleft',['$sectionleft',['../minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead',1,'minimalisticdarkness.php']]],
   ['_24sectionwidth',['$sectionwidth',['../minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f',1,'minimalisticdarkness.php']]],
   ['_24session_5fexists',['$session_exists',['../session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb',1,'session.php']]],
   ['_24session_5fexpire',['$session_expire',['../session_8php.html#af0100a2642a5268594bbd5742a03d885',1,'session.php']]],
-  ['_24shadow',['$shadow',['../redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a',1,'style.php']]],
-  ['_24sloppy_5fphotos',['$sloppy_photos',['../redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad',1,'style.php']]],
   ['_24sourcename',['$sourcename',['../classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11',1,'App']]],
   ['_24stack',['$stack',['../classTemplate.html#a6f0efc256688c36110180b501067ff11',1,'Template']]],
   ['_24str',['$str',['../typohelper_8php.html#a7542d95618011800c61773127fa625cf',1,'typohelper.php']]],
@@ -153,13 +138,10 @@ var searchData=
   ['_24threaded',['$threaded',['../classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2',1,'Item']]],
   ['_24threads',['$threads',['../classConversation.html#a41f4a549e6a99f98935c4742addd22c8',1,'Conversation']]],
   ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App\$timezone()'],['../classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47',1,'RedBasicAuth\$timezone()']]],
-  ['_24toolicon_5factivecolour',['$toolicon_activecolour',['../redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3',1,'style.php']]],
-  ['_24toolicon_5fcolour',['$toolicon_colour',['../redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb',1,'style.php']]],
-  ['_24top_5fphoto',['$top_photo',['../redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb',1,'style.php']]],
   ['_24toplevel',['$toplevel',['../classItem.html#a5cfa6cf964f433a917a81cab079ff9d8',1,'Item']]],
   ['_24type',['$type',['../classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03',1,'photo_driver']]],
   ['_24types',['$types',['../classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03',1,'photo_driver']]],
-  ['_24uid',['$uid',['../apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a',1,'$uid(): style.php'],['../redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a',1,'$uid(): style.php']]],
+  ['_24uid',['$uid',['../apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a',1,'style.php']]],
   ['_24user',['$user',['../classApp.html#a91fd3c8b89016113b05f3be24805ccff',1,'App']]],
   ['_24valid',['$valid',['../classphoto__driver.html#a01d28d43b404d6f6de219dc9c5069dc9',1,'photo_driver']]],
   ['_24videoheight',['$videoheight',['../classApp.html#a56b1a432c96aef8b1971f779c9d93c8c',1,'App']]],
diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index 31549e04d..c7bfb5bb9 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -9,6 +9,7 @@ var searchData=
   ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]],
   ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]],
   ['bb_5fqr',['bb_qr',['../bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c',1,'bbcode.php']]],
+  ['bb_5fsanitize_5fstyle',['bb_sanitize_style',['../bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e',1,'bbcode.php']]],
   ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a',1,'bbcode.php']]],
   ['bb_5fshareattributessimple',['bb_ShareAttributesSimple',['../bbcode_8php.html#a2be26414a367118143cc89e2d58e7377',1,'bbcode.php']]],
   ['bb_5fspacefy',['bb_spacefy',['../bbcode_8php.html#a8911e027907820df3db03b4f76724b50',1,'bbcode.php']]],
@@ -28,6 +29,11 @@ var searchData=
   ['blogtheme_5fdisplay_5fitem',['blogtheme_display_item',['../blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5',1,'theme.php']]],
   ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]],
   ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]],
+  ['bookmark_5fadd',['bookmark_add',['../include_2bookmarks_8php.html#a88ce7dee6a3dc7465aa9b8eaa45b0087',1,'bookmarks.php']]],
+  ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]],
+  ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]],
+  ['bookmarks_5fcontent',['bookmarks_content',['../mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a',1,'bookmarks.php']]],
+  ['bookmarks_5finit',['bookmarks_init',['../mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3',1,'bookmarks.php']]],
   ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]],
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index fdbda8062..92ca30551 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -2,7 +2,6 @@ var searchData=
 [
   ['gen_5ftoken',['gen_token',['../classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819',1,'FKOAuthDataStore']]],
   ['gender_5fselector',['gender_selector',['../profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355',1,'profile_selectors.php']]],
-  ['generate_5fuser_5fguid',['generate_user_guid',['../text_8php.html#ae4f6881d7e13623f8eded6277595112a',1,'text.php']]],
   ['generatedirectoryindex',['generateDirectoryIndex',['../classRedBrowser.html#a1f7daf50bb9bfcde7345b3b1908dbd7e',1,'RedBrowser']]],
   ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535',1,'RedFile\get()']]],
   ['get_5faccount',['get_account',['../classApp.html#a08bc87aff64f39fbc084e9d6545cee4d',1,'App']]],
@@ -88,6 +87,7 @@ var searchData=
   ['get_5fthings',['get_things',['../taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de',1,'taxonomy.php']]],
   ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]],
   ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
+  ['get_5fwords',['get_words',['../spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6',1,'spam.php']]],
   ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
   ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]],
   ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]],
diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js
index c00bab0c3..0a93cba40 100644
--- a/doc/html/search/all_69.js
+++ b/doc/html/search/all_69.js
@@ -4,7 +4,7 @@ var searchData=
   ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#a3570a4eb77332b292d394c4132cb8f03',1,'identity.php']]],
   ['identity_5fcheck_5fservice_5fclass',['identity_check_service_class',['../identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633',1,'identity.php']]],
   ['ids_5fto_5fquerystr',['ids_to_querystr',['../text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a',1,'text.php']]],
-  ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]],
+  ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]],
   ['imagestring',['imageString',['../classphoto__driver.html#abc9f73ad90923772d52b9fcc4eb117dd',1,'photo_driver\imageString()'],['../classphoto__gd.html#a0795fc029be382557ae3f6e285f40e00',1,'photo_gd\imageString()'],['../classphoto__imagick.html#a70adbef31128c0ac8cbc5dcf34cdb019',1,'photo_imagick\imageString()']]],
   ['import_2ephp',['import.php',['../import_8php.html',1,'']]],
   ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]],
@@ -37,6 +37,7 @@ var searchData=
   ['is_5fvalid',['is_valid',['../classphoto__driver.html#a97289aef3be43d9435ca3717ef10b8ab',1,'photo_driver']]],
   ['is_5fvisiting',['is_visiting',['../classItem.html#a97c7feeea7f26a73176cb19faa455e12',1,'Item']]],
   ['is_5fwall_5fto_5fwall',['is_wall_to_wall',['../classItem.html#aabf87ded59c25b5fe2b2296678e70509',1,'Item']]],
+  ['is_5fwindows',['is_windows',['../boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08',1,'boot.php']]],
   ['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation']]],
   ['item',['Item',['../classItem.html',1,'']]],
   ['item_2ephp',['item.php',['../item_8php.html',1,'']]],
diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js
index 00f9338c1..653217ff9 100644
--- a/doc/html/search/all_6d.js
+++ b/doc/html/search/all_6d.js
@@ -39,7 +39,7 @@ var searchData=
   ['menu_5ffetch_5fid',['menu_fetch_id',['../include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7',1,'menu.php']]],
   ['menu_5fitem_5fnewwin',['MENU_ITEM_NEWWIN',['../boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5',1,'boot.php']]],
   ['menu_5fitem_5fzid',['MENU_ITEM_ZID',['../boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53',1,'boot.php']]],
-  ['menu_5flist',['menu_list',['../include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10',1,'menu.php']]],
+  ['menu_5flist',['menu_list',['../include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d',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']]],
   ['menu_5fsystem',['MENU_SYSTEM',['../boot_8php.html#a718a801b0be6cbaef5e519516da12721',1,'boot.php']]],
diff --git a/doc/html/search/all_6e.js b/doc/html/search/all_6e.js
index 6dfd8d4fc..70b96f018 100644
--- a/doc/html/search/all_6e.js
+++ b/doc/html/search/all_6e.js
@@ -55,7 +55,6 @@ var searchData=
   ['node2bbcodesub',['node2bbcodesub',['../html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7',1,'html2bbcode.php']]],
   ['none_2ephp',['none.php',['../none_8php.html',1,'']]],
   ['normalise_5flink',['normalise_link',['../text_8php.html#a4bbb7d00c05cd20b4e043424f322388f',1,'text.php']]],
-  ['normalise_5fopenid',['normalise_openid',['../text_8php.html#adba17ec946f4285285dc100f7860bf51',1,'text.php']]],
   ['notags',['notags',['../text_8php.html#a1af49756c8c71902a66c7e329c462beb',1,'text.php']]],
   ['notes_2ephp',['notes.php',['../notes_8php.html',1,'']]],
   ['notes_5finit',['notes_init',['../notes_8php.html#a4dbd7b1f906440746af48b484d66535a',1,'notes.php']]],
diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index bc60353db..fd3a679b1 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -29,6 +29,7 @@ var searchData=
   ['permissions_2ephp',['permissions.php',['../permissions_8php.html',1,'']]],
   ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]],
   ['perms2str',['perms2str',['../text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee',1,'text.php']]],
+  ['perms_5fa_5fbookmark',['PERMS_A_BOOKMARK',['../boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b',1,'boot.php']]],
   ['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']]],
   ['perms_5fcontacts',['PERMS_CONTACTS',['../boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6',1,'boot.php']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 9aa06121e..667adaca0 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -72,7 +72,8 @@ var searchData=
   ['siteinfo_5finit',['siteinfo_init',['../siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0',1,'siteinfo.php']]],
   ['sitelist_2ephp',['sitelist.php',['../sitelist_8php.html',1,'']]],
   ['sitelist_5finit',['sitelist_init',['../sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1',1,'sitelist.php']]],
-  ['smile_5fencode',['smile_encode',['../text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6',1,'text.php']]],
+  ['smile_5fshield',['smile_shield',['../text_8php.html#a10dde167249ed5abf190a7a0986878ea',1,'text.php']]],
+  ['smile_5funshield',['smile_unshield',['../text_8php.html#a273156a6f5cddc6652ad656821cd5805',1,'text.php']]],
   ['smilies',['smilies',['../text_8php.html#a3d225b253bb9e0f2498c11647d927b0b',1,'text.php']]],
   ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
   ['smilies_5fcontent',['smilies_content',['../smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f',1,'smilies.php']]],
@@ -85,6 +86,7 @@ var searchData=
   ['sources_2ephp',['sources.php',['../sources_8php.html',1,'']]],
   ['sources_5fcontent',['sources_content',['../sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7',1,'sources.php']]],
   ['sources_5fpost',['sources_post',['../sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e',1,'sources.php']]],
+  ['spam_2ephp',['spam.php',['../spam_8php.html',1,'']]],
   ['ssl_5fpolicy_5ffull',['SSL_POLICY_FULL',['../boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc',1,'boot.php']]],
   ['ssl_5fpolicy_5fnone',['SSL_POLICY_NONE',['../boot_8php.html#af86c651547aa8f9e549ee40a09455549',1,'boot.php']]],
   ['ssl_5fpolicy_5fselfsign',['SSL_POLICY_SELFSIGN',['../boot_8php.html#adca48aee78465ae3064ca4432c0d87b5',1,'boot.php']]],
@@ -101,6 +103,7 @@ var searchData=
   ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
   ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a15e0f8f511cc06192db63387f97238b3',1,'security.php']]],
   ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
+  ['string_5fsplitter',['string_splitter',['../spam_8php.html#a05861201147b9a538d006f0269255cf9',1,'spam.php']]],
   ['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']]],
   ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]],
diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js
index 2d4d9c169..c61b08f93 100644
--- a/doc/html/search/all_74.js
+++ b/doc/html/search/all_74.js
@@ -16,6 +16,7 @@ var searchData=
   ['template_5fescape',['template_escape',['../template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5',1,'template_processor.php']]],
   ['template_5fprocessor_2ephp',['template_processor.php',['../template__processor_8php.html',1,'']]],
   ['template_5funescape',['template_unescape',['../template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e',1,'template_processor.php']]],
+  ['term_5fbookmark',['TERM_BOOKMARK',['../boot_8php.html#a115faf8797718c3165498abbd6895843',1,'boot.php']]],
   ['term_5fcategory',['TERM_CATEGORY',['../boot_8php.html#af33d1b2e98a1e21af672005525d46dfe',1,'boot.php']]],
   ['term_5ffile',['TERM_FILE',['../boot_8php.html#afb97615e985a013799839b68b99018d7',1,'boot.php']]],
   ['term_5fhashtag',['TERM_HASHTAG',['../boot_8php.html#a2750985ec445617d7e82ae3098c91e3f',1,'boot.php']]],
diff --git a/doc/html/search/files_62.js b/doc/html/search/files_62.js
index 693ae9abd..69f28de1d 100644
--- a/doc/html/search/files_62.js
+++ b/doc/html/search/files_62.js
@@ -4,5 +4,7 @@ var searchData=
   ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]],
   ['bbcode_2ephp',['bbcode.php',['../bbcode_8php.html',1,'']]],
   ['blocks_2ephp',['blocks.php',['../blocks_8php.html',1,'']]],
+  ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]],
+  ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]],
   ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]]
 ];
diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js
index f43a68f92..8bf6bc0d3 100644
--- a/doc/html/search/files_73.js
+++ b/doc/html/search/files_73.js
@@ -12,6 +12,7 @@ var searchData=
   ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
   ['socgraph_2ephp',['socgraph.php',['../socgraph_8php.html',1,'']]],
   ['sources_2ephp',['sources.php',['../sources_8php.html',1,'']]],
+  ['spam_2ephp',['spam.php',['../spam_8php.html',1,'']]],
   ['sslify_2ephp',['sslify.php',['../sslify_8php.html',1,'']]],
   ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
   ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]],
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index d28b1f6c4..3675c92a6 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -6,6 +6,7 @@ var searchData=
   ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]],
   ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]],
   ['bb_5fqr',['bb_qr',['../bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c',1,'bbcode.php']]],
+  ['bb_5fsanitize_5fstyle',['bb_sanitize_style',['../bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e',1,'bbcode.php']]],
   ['bb_5fshareattributes',['bb_ShareAttributes',['../bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a',1,'bbcode.php']]],
   ['bb_5fshareattributessimple',['bb_ShareAttributesSimple',['../bbcode_8php.html#a2be26414a367118143cc89e2d58e7377',1,'bbcode.php']]],
   ['bb_5fspacefy',['bb_spacefy',['../bbcode_8php.html#a8911e027907820df3db03b4f76724b50',1,'bbcode.php']]],
@@ -23,6 +24,9 @@ var searchData=
   ['blogtheme_5fdisplay_5fitem',['blogtheme_display_item',['../blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5',1,'theme.php']]],
   ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]],
   ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]],
+  ['bookmark_5fadd',['bookmark_add',['../include_2bookmarks_8php.html#a88ce7dee6a3dc7465aa9b8eaa45b0087',1,'bookmarks.php']]],
+  ['bookmarks_5fcontent',['bookmarks_content',['../mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a',1,'bookmarks.php']]],
+  ['bookmarks_5finit',['bookmarks_init',['../mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3',1,'bookmarks.php']]],
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
   ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 7f2e95beb..14b22673f 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -2,7 +2,6 @@ var searchData=
 [
   ['gen_5ftoken',['gen_token',['../classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819',1,'FKOAuthDataStore']]],
   ['gender_5fselector',['gender_selector',['../profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355',1,'profile_selectors.php']]],
-  ['generate_5fuser_5fguid',['generate_user_guid',['../text_8php.html#ae4f6881d7e13623f8eded6277595112a',1,'text.php']]],
   ['generatedirectoryindex',['generateDirectoryIndex',['../classRedBrowser.html#a1f7daf50bb9bfcde7345b3b1908dbd7e',1,'RedBrowser']]],
   ['get',['get',['../classCache.html#a70392b109331897bf9fdd7f1960e21de',1,'Cache\get()'],['../classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535',1,'RedFile\get()']]],
   ['get_5faccount',['get_account',['../classApp.html#a08bc87aff64f39fbc084e9d6545cee4d',1,'App']]],
@@ -88,6 +87,7 @@ var searchData=
   ['get_5fthings',['get_things',['../taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de',1,'taxonomy.php']]],
   ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]],
   ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
+  ['get_5fwords',['get_words',['../spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6',1,'spam.php']]],
   ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
   ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]],
   ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]],
diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js
index e50061ae5..2c38ca37c 100644
--- a/doc/html/search/functions_69.js
+++ b/doc/html/search/functions_69.js
@@ -33,6 +33,7 @@ var searchData=
   ['is_5fvalid',['is_valid',['../classphoto__driver.html#a97289aef3be43d9435ca3717ef10b8ab',1,'photo_driver']]],
   ['is_5fvisiting',['is_visiting',['../classItem.html#a97c7feeea7f26a73176cb19faa455e12',1,'Item']]],
   ['is_5fwall_5fto_5fwall',['is_wall_to_wall',['../classItem.html#aabf87ded59c25b5fe2b2296678e70509',1,'Item']]],
+  ['is_5fwindows',['is_windows',['../boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08',1,'boot.php']]],
   ['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation']]],
   ['item_5fcheck_5fservice_5fclass',['item_check_service_class',['../item_8php.html#a5b1b36cb301a94b38150074f0d424e74',1,'item.php']]],
   ['item_5fcontent',['item_content',['../item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221',1,'item.php']]],
diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js
index ca6ed3181..afef9b387 100644
--- a/doc/html/search/functions_6d.js
+++ b/doc/html/search/functions_6d.js
@@ -22,7 +22,7 @@ var searchData=
   ['menu_5fedit_5fitem',['menu_edit_item',['../include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa',1,'menu.php']]],
   ['menu_5ffetch',['menu_fetch',['../include_2menu_8php.html#a68ebbf492470c930f652013656f9071d',1,'menu.php']]],
   ['menu_5ffetch_5fid',['menu_fetch_id',['../include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7',1,'menu.php']]],
-  ['menu_5flist',['menu_list',['../include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10',1,'menu.php']]],
+  ['menu_5flist',['menu_list',['../include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d',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_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]],
diff --git a/doc/html/search/functions_6e.js b/doc/html/search/functions_6e.js
index c51d3673c..81768a60f 100644
--- a/doc/html/search/functions_6e.js
+++ b/doc/html/search/functions_6e.js
@@ -19,7 +19,6 @@ var searchData=
   ['node2bbcode',['node2bbcode',['../html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8',1,'html2bbcode.php']]],
   ['node2bbcodesub',['node2bbcodesub',['../html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7',1,'html2bbcode.php']]],
   ['normalise_5flink',['normalise_link',['../text_8php.html#a4bbb7d00c05cd20b4e043424f322388f',1,'text.php']]],
-  ['normalise_5fopenid',['normalise_openid',['../text_8php.html#adba17ec946f4285285dc100f7860bf51',1,'text.php']]],
   ['notags',['notags',['../text_8php.html#a1af49756c8c71902a66c7e329c462beb',1,'text.php']]],
   ['notes_5finit',['notes_init',['../notes_8php.html#a4dbd7b1f906440746af48b484d66535a',1,'notes.php']]],
   ['notice',['notice',['../boot_8php.html#a9255af5ae9c887520091ea04763c1a88',1,'boot.php']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index d1b480134..145812409 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -63,7 +63,8 @@ var searchData=
   ['siteinfo_5fcontent',['siteinfo_content',['../siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656',1,'siteinfo.php']]],
   ['siteinfo_5finit',['siteinfo_init',['../siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0',1,'siteinfo.php']]],
   ['sitelist_5finit',['sitelist_init',['../sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1',1,'sitelist.php']]],
-  ['smile_5fencode',['smile_encode',['../text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6',1,'text.php']]],
+  ['smile_5fshield',['smile_shield',['../text_8php.html#a10dde167249ed5abf190a7a0986878ea',1,'text.php']]],
+  ['smile_5funshield',['smile_unshield',['../text_8php.html#a273156a6f5cddc6652ad656821cd5805',1,'text.php']]],
   ['smilies',['smilies',['../text_8php.html#a3d225b253bb9e0f2498c11647d927b0b',1,'text.php']]],
   ['smilies_5fcontent',['smilies_content',['../smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f',1,'smilies.php']]],
   ['sort_5fby_5fdate',['sort_by_date',['../event_8php.html#a018ea4484910a873a7c1eaa126de9b1a',1,'event.php']]],
@@ -83,6 +84,7 @@ var searchData=
   ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
   ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a15e0f8f511cc06192db63387f97238b3',1,'security.php']]],
   ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
+  ['string_5fsplitter',['string_splitter',['../spam_8php.html#a05861201147b9a538d006f0269255cf9',1,'spam.php']]],
   ['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']]],
diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js
index f52fc6283..d2a44072d 100644
--- a/doc/html/search/variables_24.js
+++ b/doc/html/search/variables_24.js
@@ -10,11 +10,7 @@ var searchData=
   ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]],
   ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]],
   ['_24auth',['$auth',['../classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44',1,'RedDirectory\$auth()'],['../classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2',1,'RedFile\$auth()'],['../classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35',1,'RedBrowser\$auth()']]],
-  ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]],
-  ['_24banner_5fcolour',['$banner_colour',['../redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0',1,'style.php']]],
   ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]],
-  ['_24bgcolour',['$bgcolour',['../redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574',1,'style.php']]],
-  ['_24body_5ffont_5fsize',['$body_font_size',['../redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8',1,'style.php']]],
   ['_24bodyclass',['$bodyclass',['../theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php']]],
   ['_24browser',['$browser',['../classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e',1,'RedBasicAuth']]],
   ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]],
@@ -38,7 +34,6 @@ var searchData=
   ['_24contacts',['$contacts',['../classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2',1,'App']]],
   ['_24content',['$content',['../classApp.html#ac1d80a14492acc932715d54567d8a589',1,'App']]],
   ['_24conversation',['$conversation',['../classItem.html#a007424e3e3171dcfb4312a02161da6cd',1,'Item']]],
-  ['_24converse_5fwidth',['$converse_width',['../redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473',1,'style.php']]],
   ['_24css_5fsources',['$css_sources',['../classApp.html#a6f55d087e1ff4710132c1b0863faa2ee',1,'App']]],
   ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]],
   ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]],
@@ -56,8 +51,6 @@ var searchData=
   ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]],
   ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]],
   ['_24folder_5fhash',['$folder_hash',['../classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b',1,'RedDirectory']]],
-  ['_24font_5fcolour',['$font_colour',['../redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b',1,'style.php']]],
-  ['_24font_5fsize',['$font_size',['../redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc',1,'style.php']]],
   ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]],
   ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]],
   ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]],
@@ -71,10 +64,9 @@ var searchData=
   ['_24image',['$image',['../classphoto__driver.html#a7c78b5a01afe61ba3895ac07f4869b55',1,'photo_driver']]],
   ['_24infile',['$infile',['../php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214',1,'php2po.php']]],
   ['_24ink',['$ink',['../php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0',1,'php2po.php']]],
+  ['_24install',['$install',['../classApp.html#a576ecb1c5b4a283221e6f2f0ec248251',1,'App']]],
   ['_24install_5fwizard_5fpass',['$install_wizard_pass',['../setup_8php.html#addb24714bc2542aa4f4215e98fe48432',1,'setup.php']]],
   ['_24interactive',['$interactive',['../classApp.html#a4c7cfc62d39508086cf300dc2e39c4df',1,'App']]],
-  ['_24item_5fcolour',['$item_colour',['../redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16',1,'style.php']]],
-  ['_24item_5fopacity',['$item_opacity',['../redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8',1,'style.php']]],
   ['_24itemfloat',['$itemfloat',['../minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b',1,'minimalisticdarkness.php']]],
   ['_24js_5fsources',['$js_sources',['../classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d',1,'App']]],
   ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]],
@@ -87,8 +79,6 @@ var searchData=
   ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]],
   ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]],
   ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba',1,'RedFile\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]],
-  ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]],
-  ['_24nav_5fmin_5fopacity',['$nav_min_opacity',['../redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1',1,'style.php']]],
   ['_24nav_5fpercent_5fmin_5fopacity',['$nav_percent_min_opacity',['../redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c',1,'style.php']]],
   ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]],
   ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]],
@@ -122,24 +112,19 @@ var searchData=
   ['_24profile_5fuid',['$profile_uid',['../classApp.html#a08c24d6a6fc52fcc784b0f765f13b820',1,'App']]],
   ['_24query_5fstring',['$query_string',['../classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f',1,'App']]],
   ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]],
-  ['_24radius',['$radius',['../redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351',1,'style.php']]],
   ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]],
   ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]],
   ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]],
   ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]],
-  ['_24reply_5fphoto',['$reply_photo',['../redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4',1,'style.php']]],
   ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]],
   ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]],
   ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]],
-  ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]],
   ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]],
   ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]],
   ['_24sectionleft',['$sectionleft',['../minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead',1,'minimalisticdarkness.php']]],
   ['_24sectionwidth',['$sectionwidth',['../minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f',1,'minimalisticdarkness.php']]],
   ['_24session_5fexists',['$session_exists',['../session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb',1,'session.php']]],
   ['_24session_5fexpire',['$session_expire',['../session_8php.html#af0100a2642a5268594bbd5742a03d885',1,'session.php']]],
-  ['_24shadow',['$shadow',['../redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a',1,'style.php']]],
-  ['_24sloppy_5fphotos',['$sloppy_photos',['../redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad',1,'style.php']]],
   ['_24sourcename',['$sourcename',['../classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11',1,'App']]],
   ['_24stack',['$stack',['../classTemplate.html#a6f0efc256688c36110180b501067ff11',1,'Template']]],
   ['_24str',['$str',['../typohelper_8php.html#a7542d95618011800c61773127fa625cf',1,'typohelper.php']]],
@@ -153,13 +138,10 @@ var searchData=
   ['_24threaded',['$threaded',['../classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2',1,'Item']]],
   ['_24threads',['$threads',['../classConversation.html#a41f4a549e6a99f98935c4742addd22c8',1,'Conversation']]],
   ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App\$timezone()'],['../classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47',1,'RedBasicAuth\$timezone()']]],
-  ['_24toolicon_5factivecolour',['$toolicon_activecolour',['../redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3',1,'style.php']]],
-  ['_24toolicon_5fcolour',['$toolicon_colour',['../redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb',1,'style.php']]],
-  ['_24top_5fphoto',['$top_photo',['../redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb',1,'style.php']]],
   ['_24toplevel',['$toplevel',['../classItem.html#a5cfa6cf964f433a917a81cab079ff9d8',1,'Item']]],
   ['_24type',['$type',['../classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03',1,'photo_driver']]],
   ['_24types',['$types',['../classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03',1,'photo_driver']]],
-  ['_24uid',['$uid',['../apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a',1,'$uid(): style.php'],['../redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a',1,'$uid(): style.php']]],
+  ['_24uid',['$uid',['../apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a',1,'style.php']]],
   ['_24user',['$user',['../classApp.html#a91fd3c8b89016113b05f3be24805ccff',1,'App']]],
   ['_24valid',['$valid',['../classphoto__driver.html#a01d28d43b404d6f6de219dc9c5069dc9',1,'photo_driver']]],
   ['_24videoheight',['$videoheight',['../classApp.html#a56b1a432c96aef8b1971f779c9d93c8c',1,'App']]],
diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js
index dc5368a10..5aa9e0fe6 100644
--- a/doc/html/search/variables_69.js
+++ b/doc/html/search/variables_69.js
@@ -1,6 +1,6 @@
 var searchData=
 [
-  ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]],
+  ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]],
   ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]],
   ['item_5fbug',['ITEM_BUG',['../boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34',1,'boot.php']]],
   ['item_5fbuildblock',['ITEM_BUILDBLOCK',['../boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf',1,'boot.php']]],
diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js
index 6fe926c34..763c94e39 100644
--- a/doc/html/search/variables_70.js
+++ b/doc/html/search/variables_70.js
@@ -11,6 +11,7 @@ var searchData=
   ['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_5fbookmark',['PERMS_A_BOOKMARK',['../boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b',1,'boot.php']]],
   ['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']]],
   ['perms_5fcontacts',['PERMS_CONTACTS',['../boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6',1,'boot.php']]],
diff --git a/doc/html/search/variables_74.js b/doc/html/search/variables_74.js
index e36593332..61edce925 100644
--- a/doc/html/search/variables_74.js
+++ b/doc/html/search/variables_74.js
@@ -1,5 +1,6 @@
 var searchData=
 [
+  ['term_5fbookmark',['TERM_BOOKMARK',['../boot_8php.html#a115faf8797718c3165498abbd6895843',1,'boot.php']]],
   ['term_5fcategory',['TERM_CATEGORY',['../boot_8php.html#af33d1b2e98a1e21af672005525d46dfe',1,'boot.php']]],
   ['term_5ffile',['TERM_FILE',['../boot_8php.html#afb97615e985a013799839b68b99018d7',1,'boot.php']]],
   ['term_5fhashtag',['TERM_HASHTAG',['../boot_8php.html#a2750985ec445617d7e82ae3098c91e3f',1,'boot.php']]],
diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html
index 654e4e2b2..a1df31b11 100644
--- a/doc/html/security_8php.html
+++ b/doc/html/security_8php.html
@@ -132,7 +132,7 @@ Functions
  
  check_form_security_token_ForbiddenOnErr ($typename= '', $formname= 'form_security_token')
  
-if(!function_exists('init_groups_visitor')) stream_perms_api_uids ($perms_min=PERMS_SITE)
+if(!function_exists('init_groups_visitor')) stream_perms_api_uids ($perms_min=PERMS_SITE)
  
  stream_perms_xchans ($perms_min=PERMS_SITE)
  
@@ -426,7 +426,7 @@ Functions
 
                                      
       
-          
+          
diff --git a/doc/html/spam_8php.html b/doc/html/spam_8php.html
new file mode 100644
index 000000000..448abfb17
--- /dev/null
+++ b/doc/html/spam_8php.html
@@ -0,0 +1,165 @@
+
+
+
+
+
+
+The Red Matrix: include/spam.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                      
+
                                      
+
                                      
         
                                      if (!function_exists('init_groups_visitor')) stream_perms_api_uids if (!function_exists('init_groups_visitor')) stream_perms_api_uids 
           (
            
           $perms_min = PERMS_SITE)
                                      
+ 
+ 
+  
+  
+ 
+ 
+
                                      
+   
                                      The Red Matrix
+   
                                      
+  
                                      
+
                                      
+
+
+
+  
+  
+
+
                                      
+  
+  
                                      
+  
                                      
+
                                      
+
+
                                      
+
+
+
+
+
                                      
+
+
                                      
+
+
                                      
+  
                                      
+Functions  
                                      
+  
                                      
+
                                      spam.php File Reference
                                        
                                      
+
                                      
+
                                      
+
+
+
+
+
+
+
                                      
+Functions
                                       string_splitter ($s)
                                       
                                       get_words ($uid, $list)
                                       
                                      
+
                                      Function Documentation
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
                                      get_words ( $uid, 
                                       $list 
                                      )
                                      
+
                                      
+
+
                                      
+
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      string_splitter ( $s)
                                      
+
                                      
+
+
                                      
+
                                      
+
                                      
+
                                      
+
diff --git a/doc/html/spam_8php.js b/doc/html/spam_8php.js
new file mode 100644
index 000000000..3867b1aec
--- /dev/null
+++ b/doc/html/spam_8php.js
@@ -0,0 +1,5 @@
+var spam_8php =
+[
+    [ "get_words", "spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6", null ],
+    [ "string_splitter", "spam_8php.html#a05861201147b9a538d006f0269255cf9", null ]
+];
\ No newline at end of file
diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html
index f5a0c9243..fc33f4d61 100644
--- a/doc/html/taxonomy_8php.html
+++ b/doc/html/taxonomy_8php.html
@@ -296,7 +296,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by conversation(), editpost_content(), format_categories(), format_filer(), item_expire(), item_getfeedtags(), tag_deliver(), and tgroup_check().
                                      
+
                                      Referenced by bookmarks_init(), conversation(), editpost_content(), format_categories(), format_filer(), item_expire(), item_getfeedtags(), tag_deliver(), and tgroup_check().
                                      
 
 
                                      
 
diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html
index a45d9d25b..09aed0ecb 100644
--- a/doc/html/text_8php.html
+++ b/doc/html/text_8php.html
@@ -131,7 +131,7 @@ Functions
  
  unxmlify ($s)
  
-if(!function_exists('hex2bin')) paginate (&$a)
+if(!function_exists('hex2bin')) paginate (&$a)
  
  alt_pager (&$a, $i, $more= '', $less= '')
  
@@ -189,8 +189,10 @@ Functions
  
  smilies ($s, $sample=false)
  
- smile_encode ($m)
- 
+ smile_shield ($m)
+ 
+ smile_unshield ($m)
+ 
  preg_heart ($x)
  
  day_translate ($s)
@@ -233,8 +235,6 @@ Functions
  
  return_bytes ($size_str)
  
- generate_user_guid ()
- 
  base64url_encode ($s, $strip_padding=true)
  
  base64url_decode ($s)
@@ -251,8 +251,6 @@ Functions
  
  item_post_type ($item)
  
- normalise_openid ($s)
- 
  undo_post_tagging ($s)
  
  fix_mce_lf ($s)
@@ -449,7 +447,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by aes_unencapsulate(), get_atom_elements(), get_item_elements(), import_post(), import_site(), import_xchan(), oembed_init(), post_init(), post_post(), smilies(), zfinger_init(), and zot_register_hub().
                                      
+
                                      Referenced by aes_unencapsulate(), get_atom_elements(), get_item_elements(), import_post(), import_site(), import_xchan(), oembed_init(), post_init(), post_post(), smile_unshield(), zfinger_init(), and zot_register_hub().
                                      
 
 
                                      
 
@@ -477,7 +475,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by aes_encapsulate(), allowed_public_recips(), create_identity(), fix_system_urls(), get_item_elements(), identity_basic_export(), import_author_zot(), import_post(), import_xchan(), item_post(), item_store(), item_store_update(), magic_init(), oembed_iframe(), post_activity_item(), post_post(), random_string(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().
                                      
+
                                      Referenced by aes_encapsulate(), allowed_public_recips(), create_identity(), fix_system_urls(), get_item_elements(), identity_basic_export(), import_author_zot(), import_post(), import_xchan(), item_post(), item_store(), item_store_update(), magic_init(), oembed_iframe(), post_activity_item(), post_post(), random_string(), smile_shield(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().
                                      
 
 
                                      
 
@@ -830,21 +828,6 @@ Variables
 
 
                                      Referenced by prepare_body().
                                      
 
-
-
-
-
                                      
-
                                      
-      
-        
-          
-          
-          
-          
-        
-      
                                      generate_user_guid ()
                                      
-
                                      
-
 
                                      
 
                                      
 
@@ -1287,7 +1270,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), 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(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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 RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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().
                                      
 
 
                                      
 
@@ -1425,22 +1408,6 @@ Variables
 
 
                                      Referenced by best_link_url(), conversation(), delegate_content(), item_photo_menu(), link_compare(), tag_deliver(), and tgroup_check().
                                      
 
-
-
-
-
                                      
-
                                      
-      
-        
-          
-          
-          
-          
-          
-        
-      
                                      normalise_openid ( $s)
                                      
-
                                      
-
 
                                      
 
                                      
 
@@ -1477,7 +1444,7 @@ Variables
 
                                      
       
-          
+          
@@ -1645,7 +1612,7 @@ Variables
                                      
         
                                      if (!function_exists('hex2bin')) paginate if (!function_exists('hex2bin')) paginate 
           (
           & 
           $a)
                                      
       
                                      
 
                                      
 
-
                                      Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), chatroom_destroy(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().
                                      
+
                                      Referenced by acl_init(), api_statuses_mentions(), attach_count_files(), attach_list_files(), channel_content(), chatroom_destroy(), connections_content(), dirsearch_content(), file_tag_file_query(), item_permissions_sql(), items_fetch(), menu_list(), network_content(), permissions_sql(), photos_list_photos(), public_permissions_sql(), search_ac_init(), search_content(), and term_query().
                                      
 
 
                                      
 
@@ -1707,7 +1674,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedDirectory\createFile(), directory_run(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().
                                      
+
                                      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedDirectory\createFile(), directory_run(), event_store(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().
                                      
 
 
                                      
 
@@ -1888,12 +1855,28 @@ Variables
 
 
 
-
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      smile_shield ( $m)
                                      
+
                                      
+
+
                                      
+
                                      
+
 
                                      
 
                                      
       
-          
+          
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js
index c3be5dc91..be6fbeab3 100644
--- a/doc/html/text_8php.js
+++ b/doc/html/text_8php.js
@@ -25,7 +25,6 @@ var text_8php =
     [ "fix_mce_lf", "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28", null ],
     [ "format_categories", "text_8php.html#a3054189cff173977f4216c9a3dd29e1b", null ],
     [ "format_filer", "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91", null ],
-    [ "generate_user_guid", "text_8php.html#ae4f6881d7e13623f8eded6277595112a", null ],
     [ "get_mentions", "text_8php.html#a76d1b3435c067978d7b484c45f56472b", null ],
     [ "get_mood_verbs", "text_8php.html#a736db13a966b8abaf8c9198faa35911a", null ],
     [ "get_plink", "text_8php.html#aac0969ae09853205992ba06ab9f9f61a", null ],
@@ -51,7 +50,6 @@ var text_8php =
     [ "micropro", "text_8php.html#a2a902f5fdba8646333e997898ac45ea3", null ],
     [ "mimetype_select", "text_8php.html#a1633412120f52bdce5f43e0a127d9293", null ],
     [ "normalise_link", "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f", null ],
-    [ "normalise_openid", "text_8php.html#adba17ec946f4285285dc100f7860bf51", null ],
     [ "notags", "text_8php.html#a1af49756c8c71902a66c7e329c462beb", null ],
     [ "paginate", "text_8php.html#afe9f178d264d44a94dc1292aaf0fd585", null ],
     [ "perms2str", "text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee", null ],
@@ -70,7 +68,8 @@ var text_8php =
     [ "sanitise_acl", "text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c", null ],
     [ "search", "text_8php.html#a876e94892867019935b348b573299352", null ],
     [ "searchbox", "text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447", null ],
-    [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ],
+    [ "smile_shield", "text_8php.html#a10dde167249ed5abf190a7a0986878ea", null ],
+    [ "smile_unshield", "text_8php.html#a273156a6f5cddc6652ad656821cd5805", null ],
     [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ],
     [ "sslify", "text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9", null ],
     [ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ],
diff --git a/doc/html/theme_2blogga_2php_2default_8php.html b/doc/html/theme_2blogga_2php_2default_8php.html
index 7e1aeec61..20528d9fe 100644
--- a/doc/html/theme_2blogga_2php_2default_8php.html
+++ b/doc/html/theme_2blogga_2php_2default_8php.html
@@ -116,7 +116,7 @@ Variables
-
+
                                      
         
                                      smile_encode smile_unshield 
           (
            
           $m)
                                      
 
                                       
                                      
 
                                       $headimghome = get_config('blogtheme', 'headimghome')
                                      
 
                                       
                                      if($a->module=='display') $bodyclass =""
                                      if($a->module=='display') $bodyclass =""
                                      
 
                                       
                                      
 
                                      
 
                                      Variable Documentation
                                      
@@ -125,7 +125,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if ($a->module=='display') $bodyclass =""if ($a->module=='display') $bodyclass =""
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html b/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html
index eafbefc24..6efad8c6e 100644
--- a/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html
+++ b/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html
@@ -116,7 +116,7 @@ Variables
  
  $headimghome = get_config('blogtheme', 'headimghome')
  
-if($a->module=='display') $bodyclass =""
+if($a->module=='display') $bodyclass =""
  
 
 
                                      Variable Documentation
                                      
@@ -125,7 +125,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if ($a->module=='display') $bodyclass =""if ($a->module=='display') $bodyclass =""
         
                                      
       
                                      
 
                                      
@@ -137,7 +137,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      if (local_user()) $headimg = get_config('blogtheme', 'headimg')if (local_user()) $headimg = get_config('blogtheme', 'headimg')
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/tpldebug_8php.html b/doc/html/tpldebug_8php.html
index fc1d1a91f..b9aeb5405 100644
--- a/doc/html/tpldebug_8php.html
+++ b/doc/html/tpldebug_8php.html
@@ -118,7 +118,7 @@ Functions
 
-
+
@@ -158,7 +158,7 @@ Variables
                                      
       
                                      
 
                                      
 Variables
                                      if($argc > 1) else
                                      if($argc > 1) else
                                      
 
                                       
                                      
 
                                       $files = glob('include/*.php')
                                      
 
                                       
                                      
 
                                      
-          
+          
                                      
         
                                      if ($argc > 1) elseif ($argc > 1) else
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html
index e574d7de3..6bd46403f 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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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().
                                      
+
                                      Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), bb_sanitize_style(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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/typohelper_8php.html b/doc/html/typohelper_8php.html
index a84627eb5..c6abcb4eb 100644
--- a/doc/html/typohelper_8php.html
+++ b/doc/html/typohelper_8php.html
@@ -144,7 +144,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by nav(), subthread_content(), and system_down().
                                      
+
                                      Referenced by nav(), siteinfo_content(), subthread_content(), and system_down().
                                      
 
 
                                      
 
                                      
-- 
cgit v1.2.3


From 14fd940e08e02f1f2b244dfa6751f9778284235b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 7 Feb 2014 00:50:04 -0800
Subject: To be listed as a public site, you need to be an https site with a
 valid cert. If you don't make the cut, you will either not be listed as a
 public site or you will be de-listed. Period. This is non-negotiable.

---
 include/zot.php  |   11 +
 util/messages.po | 5942 +++++++++++++++++++++++++++---------------------------
 version.inc      |    2 +-
 3 files changed, 3035 insertions(+), 2920 deletions(-)

diff --git a/include/zot.php b/include/zot.php
index 7c2cfe019..b7a22a099 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1873,6 +1873,17 @@ function import_site($arr,$pubkey) {
 			$access_policy = ACCESS_TIERED;
 	}
 
+	// don't let insecure sites register as public hubs
+
+	if(strpos($arr['url'],'https://') === false)
+		$access_policy = ACCESS_PRIVATE;
+
+	if($access_policy != ACCESS_PRIVATE) {
+		$x = z_fetch_url($arr['url'] . '/siteinfo/json');
+		if(! $x['success'])
+			$access_policy = ACCESS_PRIVATE;
+	}
+	
 	$directory_url = htmlspecialchars($arr['directory_url'],ENT_COMPAT,'UTF-8',false);
 	$url = htmlspecialchars($arr['url'],ENT_COMPAT,'UTF-8',false);
 	$sellpage = htmlspecialchars($arr['sellpage'],ENT_COMPAT,'UTF-8',false);
diff --git a/util/messages.po b/util/messages.po
index 67adad228..aef3c3dc4 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-01-31.574\n"
+"Project-Id-Version: 2014-02-07.581\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-31 00:02-0800\n"
+"POT-Creation-Date: 2014-02-07 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -52,15 +52,15 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420
+#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1423
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:72 ../../include/nav.php:87
+#: ../../include/nav.php:72 ../../include/nav.php:91
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:75 ../../include/nav.php:121
+#: ../../include/nav.php:75 ../../include/nav.php:125
 msgid "Home"
 msgstr ""
 
@@ -69,7 +69,7 @@ msgid "Your posts and conversations"
 msgstr ""
 
 #: ../../include/nav.php:76 ../../include/conversation.php:933
-#: ../../mod/connedit.php:309 ../../mod/connedit.php:423
+#: ../../mod/connedit.php:312 ../../mod/connedit.php:426
 msgid "View Profile"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgid "Edit Profiles"
 msgstr ""
 
 #: ../../include/nav.php:78
-msgid "Manage/Edit Profiles"
+msgid "Manage/Edit profiles"
 msgstr ""
 
 #: ../../include/nav.php:79 ../../include/conversation.php:1475
@@ -94,890 +94,745 @@ msgstr ""
 msgid "Your photos"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../boot.php:1421
-msgid "Login"
+#: ../../include/nav.php:80 ../../include/conversation.php:1484
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr ""
+
+#: ../../include/nav.php:80
+msgid "Your files"
+msgstr ""
+
+#: ../../include/nav.php:81
+msgid "Chat"
+msgstr ""
+
+#: ../../include/nav.php:81
+msgid "Your chatrooms"
+msgstr ""
+
+#: ../../include/nav.php:82 ../../include/nav.php:175
+#: ../../include/conversation.php:1506 ../../mod/events.php:354
+msgid "Events"
+msgstr ""
+
+#: ../../include/nav.php:82
+msgid "Your events"
+msgstr ""
+
+#: ../../include/nav.php:83 ../../include/conversation.php:1514
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:83
+msgid "Your bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:85 ../../include/conversation.php:1525
+msgid "Webpages"
 msgstr ""
 
 #: ../../include/nav.php:85
+msgid "Your webpages"
+msgstr ""
+
+#: ../../include/nav.php:89 ../../boot.php:1424
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:89
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:102
+#: ../../include/nav.php:106
 #, php-format
 msgid "%s - click to logout"
 msgstr ""
 
-#: ../../include/nav.php:107
+#: ../../include/nav.php:111
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/nav.php:121
+#: ../../include/nav.php:125
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:125 ../../mod/register.php:206 ../../boot.php:1397
+#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1400
 msgid "Register"
 msgstr ""
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:129
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:130 ../../mod/help.php:60 ../../mod/help.php:64
+#: ../../include/nav.php:134 ../../mod/help.php:60 ../../mod/help.php:64
 msgid "Help"
 msgstr ""
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:134
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:137
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:137
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/nav.php:135 ../../include/text.php:736
-#: ../../include/text.php:750 ../../mod/search.php:29
+#: ../../include/nav.php:139 ../../include/text.php:752
+#: ../../include/text.php:766 ../../mod/search.php:29
 msgid "Search"
 msgstr ""
 
-#: ../../include/nav.php:135
+#: ../../include/nav.php:139
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../mod/directory.php:210
+#: ../../include/nav.php:142 ../../mod/directory.php:210
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:142
 msgid "Channel Locator"
 msgstr ""
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:153
 msgid "Matrix"
 msgstr ""
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:153
 msgid "Your matrix"
 msgstr ""
 
-#: ../../include/nav.php:150
+#: ../../include/nav.php:154
 msgid "Mark all matrix notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:152
+#: ../../include/nav.php:156
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/nav.php:152
+#: ../../include/nav.php:156
 msgid "Channel home"
 msgstr ""
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:157
 msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:156
+#: ../../include/nav.php:160
 msgid "Intros"
 msgstr ""
 
-#: ../../include/nav.php:156 ../../mod/connections.php:242
+#: ../../include/nav.php:160 ../../mod/connections.php:244
 msgid "New Connections"
 msgstr ""
 
-#: ../../include/nav.php:159
+#: ../../include/nav.php:163
 msgid "Notices"
 msgstr ""
 
-#: ../../include/nav.php:159
+#: ../../include/nav.php:163
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:160
+#: ../../include/nav.php:164
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:165
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:167
 msgid "Mail"
 msgstr ""
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:167
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:168
 msgid "See all private messages"
 msgstr ""
 
-#: ../../include/nav.php:165
+#: ../../include/nav.php:169
 msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/nav.php:166
+#: ../../include/nav.php:170
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:167
+#: ../../include/nav.php:171
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:168 ../../include/widgets.php:509
+#: ../../include/nav.php:172 ../../include/widgets.php:509
 msgid "New Message"
 msgstr ""
 
-#: ../../include/nav.php:171 ../../include/conversation.php:1493
-#: ../../mod/events.php:354
-msgid "Events"
-msgstr ""
-
-#: ../../include/nav.php:171
+#: ../../include/nav.php:175
 msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/nav.php:172
+#: ../../include/nav.php:176
 msgid "See all events"
 msgstr ""
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:177
 msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:179
 msgid "Channel Select"
 msgstr ""
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:179
 msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/nav.php:177 ../../include/widgets.php:487
+#: ../../include/nav.php:181 ../../include/widgets.php:487
 #: ../../mod/admin.php:837 ../../mod/admin.php:1042
 msgid "Settings"
 msgstr ""
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:181
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:179 ../../mod/connections.php:349
+#: ../../include/nav.php:183 ../../mod/connections.php:351
 msgid "Connections"
 msgstr ""
 
-#: ../../include/nav.php:179
+#: ../../include/nav.php:183
 msgid "Manage/Edit Friends and Connections"
 msgstr ""
 
-#: ../../include/nav.php:186 ../../mod/admin.php:112
+#: ../../include/nav.php:190 ../../mod/admin.php:112
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:186
+#: ../../include/nav.php:190
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/nav.php:212
+#: ../../include/nav.php:216
 msgid "Nothing new here"
 msgstr ""
 
-#: ../../include/nav.php:217
+#: ../../include/nav.php:221
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/chat.php:10
-msgid "Missing room name"
+#: ../../include/text.php:315
+msgid "prev"
 msgstr ""
 
-#: ../../include/chat.php:19
-msgid "Duplicate room name"
+#: ../../include/text.php:317
+msgid "first"
 msgstr ""
 
-#: ../../include/chat.php:68 ../../include/chat.php:76
-msgid "Invalid room specifier."
+#: ../../include/text.php:346
+msgid "last"
 msgstr ""
 
-#: ../../include/chat.php:102
-msgid "Room not found."
+#: ../../include/text.php:349
+msgid "next"
 msgstr ""
 
-#: ../../include/chat.php:113 ../../include/photos.php:15
-#: ../../include/attach.php:97 ../../include/attach.php:128
-#: ../../include/attach.php:184 ../../include/attach.php:199
-#: ../../include/attach.php:232 ../../include/attach.php:246
-#: ../../include/attach.php:267 ../../include/attach.php:462
-#: ../../include/attach.php:540 ../../include/items.php:3454
-#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
-#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../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/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:522
-#: ../../mod/chat.php:84 ../../mod/chat.php:89 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../mod/connections.php:167
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
-#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
-#: ../../mod/filestorage.php:98 ../../mod/manage.php:6
-#: ../../mod/settings.php:486 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:347
-msgid "Permission denied."
+#: ../../include/text.php:361
+msgid "older"
 msgstr ""
 
-#: ../../include/Contact.php:104 ../../include/identity.php:628
-#: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:170
-msgid "Connect"
+#: ../../include/text.php:363
+msgid "newer"
 msgstr ""
 
-#: ../../include/Contact.php:120
-msgid "New window"
+#: ../../include/text.php:670
+msgid "No connections"
 msgstr ""
 
-#: ../../include/Contact.php:121
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/text.php:681
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:693
+msgid "View Connections"
 msgstr ""
 
-#: ../../include/contact_selectors.php:30
-msgid "Unknown | Not categorised"
+#: ../../include/text.php:754 ../../include/text.php:768
+#: ../../include/widgets.php:173 ../../mod/filer.php:36
+msgid "Save"
 msgstr ""
 
-#: ../../include/contact_selectors.php:31
-msgid "Block immediately"
+#: ../../include/text.php:834
+msgid "poke"
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Shady, spammer, self-marketer"
+#: ../../include/text.php:834 ../../include/conversation.php:240
+msgid "poked"
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Known to me, but no opinion"
+#: ../../include/text.php:835
+msgid "ping"
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "OK, probably harmless"
+#: ../../include/text.php:835
+msgid "pinged"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Reputable, has my trust"
+#: ../../include/text.php:836
+msgid "prod"
 msgstr ""
 
-#: ../../include/contact_selectors.php:54
-msgid "Frequently"
+#: ../../include/text.php:836
+msgid "prodded"
 msgstr ""
 
-#: ../../include/contact_selectors.php:55
-msgid "Hourly"
+#: ../../include/text.php:837
+msgid "slap"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Twice daily"
+#: ../../include/text.php:837
+msgid "slapped"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Daily"
+#: ../../include/text.php:838
+msgid "finger"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Weekly"
+#: ../../include/text.php:838
+msgid "fingered"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Monthly"
+#: ../../include/text.php:839
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/contact_selectors.php:74
-msgid "Friendica"
+#: ../../include/text.php:839
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/contact_selectors.php:75
-msgid "OStatus"
+#: ../../include/text.php:851
+msgid "happy"
 msgstr ""
 
-#: ../../include/contact_selectors.php:76
-msgid "RSS/Atom"
+#: ../../include/text.php:852
+msgid "sad"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
-#: ../../mod/admin.php:750 ../../boot.php:1423
-msgid "Email"
+#: ../../include/text.php:853
+msgid "mellow"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "Diaspora"
+#: ../../include/text.php:854
+msgid "tired"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79
-msgid "Facebook"
+#: ../../include/text.php:855
+msgid "perky"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80
-msgid "Zot!"
+#: ../../include/text.php:856
+msgid "angry"
 msgstr ""
 
-#: ../../include/contact_selectors.php:81
-msgid "LinkedIn"
+#: ../../include/text.php:857
+msgid "stupified"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "XMPP/IM"
+#: ../../include/text.php:858
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "MySpace"
+#: ../../include/text.php:859
+msgid "interested"
 msgstr ""
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
+#: ../../include/text.php:860
+msgid "bitter"
 msgstr ""
 
-#: ../../include/datetime.php:152 ../../include/datetime.php:284
-msgid "year"
+#: ../../include/text.php:861
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/datetime.php:157 ../../include/datetime.php:285
-msgid "month"
+#: ../../include/text.php:862
+msgid "alive"
 msgstr ""
 
-#: ../../include/datetime.php:162 ../../include/datetime.php:287
-msgid "day"
+#: ../../include/text.php:863
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/datetime.php:275
-msgid "never"
+#: ../../include/text.php:864
+msgid "anxious"
 msgstr ""
 
-#: ../../include/datetime.php:281
-msgid "less than a second ago"
+#: ../../include/text.php:865
+msgid "cranky"
 msgstr ""
 
-#: ../../include/datetime.php:284
-msgid "years"
+#: ../../include/text.php:866
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/datetime.php:285
-msgid "months"
+#: ../../include/text.php:867
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/datetime.php:286
-msgid "week"
+#: ../../include/text.php:868
+msgid "motivated"
 msgstr ""
 
-#: ../../include/datetime.php:286
-msgid "weeks"
+#: ../../include/text.php:869
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/datetime.php:287
-msgid "days"
+#: ../../include/text.php:870
+msgid "surprised"
 msgstr ""
 
-#: ../../include/datetime.php:288
-msgid "hour"
+#: ../../include/text.php:1031
+msgid "Monday"
 msgstr ""
 
-#: ../../include/datetime.php:288
-msgid "hours"
+#: ../../include/text.php:1031
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/datetime.php:289
-msgid "minute"
+#: ../../include/text.php:1031
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/datetime.php:289
-msgid "minutes"
+#: ../../include/text.php:1031
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/datetime.php:290
-msgid "second"
+#: ../../include/text.php:1031
+msgid "Friday"
 msgstr ""
 
-#: ../../include/datetime.php:290
-msgid "seconds"
+#: ../../include/text.php:1031
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/datetime.php:299
-#, php-format
-msgid "%1$d %2$s ago"
+#: ../../include/text.php:1031
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:50
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../include/text.php:1035
+msgid "January"
 msgstr ""
 
-#: ../../include/network.php:640
-msgid "view full size"
+#: ../../include/text.php:1035
+msgid "February"
 msgstr ""
 
-#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/text.php:1035
+msgid "March"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
-msgid "Starts:"
+#: ../../include/text.php:1035
+msgid "April"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
-msgid "Finishes:"
+#: ../../include/text.php:1035
+msgid "May"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/identity.php:679
-#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
-msgid "Location:"
+#: ../../include/text.php:1035
+msgid "June"
 msgstr ""
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:537
-#: ../../include/bbcode.php:540 ../../include/bbcode.php:545
-#: ../../include/bbcode.php:548 ../../include/bbcode.php:551
-#: ../../include/bbcode.php:554 ../../include/bbcode.php:559
-#: ../../include/bbcode.php:562 ../../include/bbcode.php:567
-#: ../../include/bbcode.php:570 ../../include/bbcode.php:573
-#: ../../include/bbcode.php:576
-msgid "Image/photo"
+#: ../../include/text.php:1035
+msgid "July"
 msgstr ""
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:582
-msgid "Encrypted content"
+#: ../../include/text.php:1035
+msgid "August"
 msgstr ""
 
-#: ../../include/bbcode.php:170
-msgid "QR code"
+#: ../../include/text.php:1035
+msgid "September"
 msgstr ""
 
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/text.php:1035
+msgid "October"
 msgstr ""
 
-#: ../../include/bbcode.php:215
-msgid "post"
+#: ../../include/text.php:1035
+msgid "November"
 msgstr ""
 
-#: ../../include/bbcode.php:505 ../../include/bbcode.php:525
-msgid "$1 wrote:"
+#: ../../include/text.php:1035
+msgid "December"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
+#: ../../include/text.php:1113
+msgid "unknown.???"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
-#: ../../mod/photos.php:972 ../../mod/photos.php:1059
-msgid "Comment"
+#: ../../include/text.php:1114
+msgid "bytes"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125
-#: ../../include/ItemObject.php:270
-msgid "show more"
+#: ../../include/text.php:1149
+msgid "remove category"
 msgstr ""
 
-#: ../../include/js_strings.php:8
-msgid "show fewer"
+#: ../../include/text.php:1171
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/js_strings.php:9
-msgid "Password too short"
+#: ../../include/text.php:1229 ../../include/text.php:1241
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/js_strings.php:10
-msgid "Passwords do not match"
+#: ../../include/text.php:1417 ../../mod/events.php:332
+msgid "link to source"
 msgstr ""
 
-#: ../../include/js_strings.php:11 ../../mod/photos.php:39
-msgid "everybody"
+#: ../../include/text.php:1436
+msgid "Select a page layout: "
 msgstr ""
 
-#: ../../include/js_strings.php:12
-msgid "Secret Passphrase"
+#: ../../include/text.php:1439 ../../include/text.php:1504
+msgid "default"
 msgstr ""
 
-#: ../../include/js_strings.php:13
-msgid "Passphrase hint"
+#: ../../include/text.php:1475
+msgid "Page content type: "
 msgstr ""
 
-#: ../../include/js_strings.php:15
-msgid "timeago.prefixAgo"
+#: ../../include/text.php:1516
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/js_strings.php:16
-msgid "timeago.suffixAgo"
+#: ../../include/text.php:1637 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
 msgstr ""
 
-#: ../../include/js_strings.php:17
-msgid "ago"
+#: ../../include/text.php:1640 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
 msgstr ""
 
-#: ../../include/js_strings.php:18
-msgid "from now"
+#: ../../include/text.php:1643 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
 msgstr ""
 
-#: ../../include/js_strings.php:19
-msgid "less than a minute"
+#: ../../include/text.php:1645 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
 msgstr ""
 
-#: ../../include/js_strings.php:20
-msgid "about a minute"
+#: ../../include/text.php:1650
+msgid "activity"
 msgstr ""
 
-#: ../../include/js_strings.php:21
-#, php-format
-msgid "%d minutes"
+#: ../../include/text.php:1907
+msgid "Design"
 msgstr ""
 
-#: ../../include/js_strings.php:22
-msgid "about an hour"
+#: ../../include/text.php:1909
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/js_strings.php:23
-#, php-format
-msgid "about %d hours"
+#: ../../include/text.php:1910
+msgid "Menus"
 msgstr ""
 
-#: ../../include/js_strings.php:24
-msgid "a day"
+#: ../../include/text.php:1911
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/js_strings.php:25
-#, php-format
-msgid "%d days"
+#: ../../include/text.php:1912
+msgid "Pages"
 msgstr ""
 
-#: ../../include/js_strings.php:26
-msgid "about a month"
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
 msgstr ""
 
-#: ../../include/js_strings.php:27
-#, php-format
-msgid "%d months"
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:183 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
 msgstr ""
 
-#: ../../include/js_strings.php:28
-msgid "about a year"
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/js_strings.php:29
-#, php-format
-msgid "%d years"
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/js_strings.php:30
-msgid " "
+#: ../../include/widgets.php:124
+msgid "See more..."
 msgstr ""
 
-#: ../../include/js_strings.php:31
-msgid "timeago.numbers"
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
 msgstr ""
 
-#: ../../include/message.php:42
-msgid "Unable to determine sender."
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/message.php:143
-msgid "Stored post could not be verified."
+#: ../../include/widgets.php:171
+msgid "Notes"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
-#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674
-#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
-#: ../../mod/profile_photo.php:336
-msgid "Profile Photos"
+#: ../../include/widgets.php:243
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/identity.php:29 ../../mod/item.php:1150
-msgid "Unable to obtain identity information from database"
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/identity.php:62
-msgid "Empty name"
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
 msgstr ""
 
-#: ../../include/identity.php:64
-msgid "Name too long"
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/identity.php:143
-msgid "No account identifier"
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
 msgstr ""
 
-#: ../../include/identity.php:153
-msgid "Nickname is required."
+#: ../../include/widgets.php:318 ../../include/items.php:3613
+msgid "Archives"
 msgstr ""
 
-#: ../../include/identity.php:167
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/widgets.php:370
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/identity.php:226
-msgid "Unable to retrieve created identity"
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
 msgstr ""
 
-#: ../../include/identity.php:285
-msgid "Default Profile"
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
 msgstr ""
 
-#: ../../include/identity.php:310 ../../include/profile_selectors.php:42
-#: ../../include/widgets.php:373 ../../mod/connedit.php:389
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
 msgid "Friends"
 msgstr ""
 
-#: ../../include/identity.php:477
-msgid "Requested channel is not available."
+#: ../../include/widgets.php:374
+msgid "Co-workers"
 msgstr ""
 
-#: ../../include/identity.php:489
-msgid " Sorry, you don't have the permission to view this profile. "
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
 msgstr ""
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
-#: ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40
-#: ../../mod/blocks.php:10 ../../mod/profile.php:16
-msgid "Requested profile is not available."
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/identity.php:642 ../../mod/profiles.php:603
-msgid "Change profile photo"
+#: ../../include/widgets.php:377
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/identity.php:648
-msgid "Profiles"
+#: ../../include/widgets.php:409
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/identity.php:648
-msgid "Manage/edit profiles"
+#: ../../include/widgets.php:415
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/identity.php:649 ../../mod/profiles.php:604
-msgid "Create New Profile"
+#: ../../include/widgets.php:421
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/identity.php:652
-msgid "Edit Profile"
+#: ../../include/widgets.php:427
+msgid "Feature settings"
 msgstr ""
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:615
-msgid "Profile Image"
+#: ../../include/widgets.php:433
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/identity.php:666 ../../mod/profiles.php:618
-msgid "visible to everybody"
+#: ../../include/widgets.php:439
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/identity.php:667 ../../mod/profiles.php:619
-msgid "Edit visibility"
+#: ../../include/widgets.php:445
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/identity.php:681 ../../include/identity.php:908
-#: ../../mod/directory.php:158
-msgid "Gender:"
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
 msgstr ""
 
-#: ../../include/identity.php:682 ../../include/identity.php:928
-#: ../../mod/directory.php:160
-msgid "Status:"
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/identity.php:683 ../../include/identity.php:939
-#: ../../mod/directory.php:162
-msgid "Homepage:"
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
-msgid "Online Now"
+#: ../../include/widgets.php:504
+msgid "Check Mail"
 msgstr ""
 
-#: ../../include/identity.php:752 ../../include/identity.php:832
-#: ../../mod/ping.php:256
-msgid "g A l F d"
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/identity.php:753 ../../include/identity.php:833
-msgid "F d"
+#: ../../include/Contact.php:120
+msgid "New window"
 msgstr ""
 
-#: ../../include/identity.php:798 ../../include/identity.php:873
-#: ../../mod/ping.php:278
-msgid "[today]"
+#: ../../include/Contact.php:121
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/identity.php:810
-msgid "Birthday Reminders"
+#: ../../include/features.php:23
+msgid "General Features"
 msgstr ""
 
-#: ../../include/identity.php:811
-msgid "Birthdays this week:"
+#: ../../include/features.php:25
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/identity.php:866
-msgid "[No description]"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/identity.php:884
-msgid "Event Reminders"
-msgstr ""
-
-#: ../../include/identity.php:885
-msgid "Events this week:"
-msgstr ""
-
-#: ../../include/identity.php:898 ../../include/identity.php:982
-#: ../../mod/profperm.php:107
-msgid "Profile"
-msgstr ""
-
-#: ../../include/identity.php:906 ../../mod/settings.php:916
-msgid "Full Name:"
-msgstr ""
-
-#: ../../include/identity.php:913
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/identity.php:914
-msgid "j F"
-msgstr ""
-
-#: ../../include/identity.php:921
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/identity.php:925
-msgid "Age:"
-msgstr ""
-
-#: ../../include/identity.php:934
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/identity.php:937 ../../mod/profiles.php:526
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/identity.php:941 ../../mod/profiles.php:528
-msgid "Hometown:"
-msgstr ""
-
-#: ../../include/identity.php:943
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/identity.php:945 ../../mod/profiles.php:529
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/identity.php:947
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/identity.php:949 ../../mod/directory.php:164
-msgid "About:"
-msgstr ""
-
-#: ../../include/identity.php:951
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/identity.php:953 ../../mod/profiles.php:532
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/identity.php:955 ../../mod/profiles.php:533
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/identity.php:958
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/identity.php:960
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/identity.php:962
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/identity.php:964
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/identity.php:966
-msgid "Television:"
-msgstr ""
-
-#: ../../include/identity.php:968
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/identity.php:970
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/identity.php:972
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/identity.php:974
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/reddav.php:1018
-msgid "Edit File properties"
-msgstr ""
-
-#: ../../include/oembed.php:157
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:166
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/features.php:23
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Content Expiration"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr ""
-
-#: ../../include/features.php:26
-msgid "Multiple Profiles"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
 msgstr ""
 
 #: ../../include/features.php:26
@@ -1048,11 +903,6 @@ msgstr ""
 msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/features.php:43 ../../include/widgets.php:476
-#: ../../mod/sources.php:81
-msgid "Channel Sources"
-msgstr ""
-
 #: ../../include/features.php:43
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
@@ -1086,10 +936,6 @@ msgstr ""
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/features.php:52 ../../include/widgets.php:252
-msgid "Saved Searches"
-msgstr ""
-
 #: ../../include/features.php:52
 msgid "Save search terms for re-use"
 msgstr ""
@@ -1154,11 +1000,6 @@ msgstr ""
 msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/features.php:66 ../../include/widgets.php:283
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
-msgstr ""
-
 #: ../../include/features.php:66
 msgid "Ability to file posts under folders"
 msgstr ""
@@ -1187,1940 +1028,2145 @@ msgstr ""
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/contact_selectors.php:30
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: ../../include/group.php:223
-msgid "Default privacy group for new contacts"
+#: ../../include/contact_selectors.php:31
+msgid "Block immediately"
 msgstr ""
 
-#: ../../include/group.php:242 ../../mod/admin.php:750
-msgid "All Channels"
+#: ../../include/contact_selectors.php:32
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/group.php:264
-msgid "edit"
+#: ../../include/contact_selectors.php:33
+msgid "Known to me, but no opinion"
 msgstr ""
 
-#: ../../include/group.php:285
-msgid "Collections"
+#: ../../include/contact_selectors.php:34
+msgid "OK, probably harmless"
 msgstr ""
 
-#: ../../include/group.php:286
-msgid "Edit collection"
+#: ../../include/contact_selectors.php:35
+msgid "Reputable, has my trust"
 msgstr ""
 
-#: ../../include/group.php:287
-msgid "Create a new collection"
+#: ../../include/contact_selectors.php:54
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/group.php:288
-msgid "Channels not in any collection"
+#: ../../include/contact_selectors.php:55
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/group.php:290 ../../include/widgets.php:253
-msgid "add"
+#: ../../include/contact_selectors.php:56
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/notify.php:23
-msgid "created a new post"
+#: ../../include/contact_selectors.php:57
+msgid "Daily"
 msgstr ""
 
-#: ../../include/notify.php:24
-#, php-format
-msgid "commented on %s's post"
+#: ../../include/contact_selectors.php:58
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/photos.php:89
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/contact_selectors.php:59
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/photos.php:96
-msgid "Image file is empty."
+#: ../../include/contact_selectors.php:74
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
-msgid "Unable to process image"
+#: ../../include/contact_selectors.php:75
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/photos.php:185
-msgid "Photo storage failed."
+#: ../../include/contact_selectors.php:76
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/photos.php:302 ../../include/conversation.php:1478
-msgid "Photo Albums"
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1426
+msgid "Email"
 msgstr ""
 
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1169
-msgid "Upload New Photos"
+#: ../../include/contact_selectors.php:78
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
+#: ../../include/contact_selectors.php:79
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
+#: ../../include/contact_selectors.php:80
+msgid "Zot!"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
+#: ../../include/contact_selectors.php:81
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
+#: ../../include/contact_selectors.php:82
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
+#: ../../include/contact_selectors.php:83
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
+#: ../../include/datetime.php:152 ../../include/datetime.php:284
+msgid "year"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
+#: ../../include/datetime.php:157 ../../include/datetime.php:285
+msgid "month"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
+#: ../../include/datetime.php:162 ../../include/datetime.php:287
+msgid "day"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: ../../include/datetime.php:275
+msgid "never"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
+#: ../../include/datetime.php:281
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
+#: ../../include/datetime.php:284
+msgid "years"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
+#: ../../include/datetime.php:285
+msgid "months"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../include/datetime.php:286
+msgid "week"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
+#: ../../include/datetime.php:286
+msgid "weeks"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
+#: ../../include/datetime.php:287
+msgid "days"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
+#: ../../include/datetime.php:288
+msgid "hour"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
+#: ../../include/datetime.php:288
+msgid "hours"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
+#: ../../include/datetime.php:289
+msgid "minute"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
+#: ../../include/datetime.php:289
+msgid "minutes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
+#: ../../include/datetime.php:290
+msgid "second"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
+#: ../../include/datetime.php:290
+msgid "seconds"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
+#: ../../include/datetime.php:299
+#, php-format
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
+#: ../../include/dba/dba_driver.php:50
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
+#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
+#: ../../include/event.php:40 ../../include/identity.php:679
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+msgid "Location:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
+#: ../../include/group.php:223
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
+#: ../../include/group.php:242 ../../mod/admin.php:750
+msgid "All Channels"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
+#: ../../include/group.php:264
+msgid "edit"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
+#: ../../include/group.php:285
+msgid "Collections"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
+#: ../../include/group.php:286
+msgid "Edit collection"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
+#: ../../include/group.php:287
+msgid "Create a new collection"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
+#: ../../include/group.php:288
+msgid "Channels not in any collection"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
+#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+msgid "Comment"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/contact_widgets.php:125
+msgid "show more"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
+#: ../../include/js_strings.php:8
+msgid "show fewer"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
+#: ../../include/js_strings.php:9
+msgid "Password too short"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
+#: ../../include/js_strings.php:10
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
+#: ../../include/js_strings.php:11 ../../mod/photos.php:39
+msgid "everybody"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
+#: ../../include/js_strings.php:12
+msgid "Secret Passphrase"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
+#: ../../include/js_strings.php:13
+msgid "Passphrase hint"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
+#: ../../include/js_strings.php:15
+msgid "timeago.prefixAgo"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
+#: ../../include/js_strings.php:16
+msgid "timeago.suffixAgo"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
+#: ../../include/js_strings.php:17
+msgid "ago"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
+#: ../../include/js_strings.php:18
+msgid "from now"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
+#: ../../include/js_strings.php:19
+msgid "less than a minute"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
+#: ../../include/js_strings.php:20
+msgid "about a minute"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
+#: ../../include/js_strings.php:21
+#, php-format
+msgid "%d minutes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
+#: ../../include/js_strings.php:22
+msgid "about an hour"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
+#: ../../include/js_strings.php:23
+#, php-format
+msgid "about %d hours"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
+#: ../../include/js_strings.php:24
+msgid "a day"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
+#: ../../include/js_strings.php:25
+#, php-format
+msgid "%d days"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
+#: ../../include/js_strings.php:26
+msgid "about a month"
+msgstr ""
+
+#: ../../include/js_strings.php:27
+#, php-format
+msgid "%d months"
+msgstr ""
+
+#: ../../include/js_strings.php:28
+msgid "about a year"
+msgstr ""
+
+#: ../../include/js_strings.php:29
+#, php-format
+msgid "%d years"
+msgstr ""
+
+#: ../../include/js_strings.php:30
+msgid " "
+msgstr ""
+
+#: ../../include/js_strings.php:31
+msgid "timeago.numbers"
+msgstr ""
+
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr ""
+
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/message.php:42
+msgid "Unable to determine sender."
+msgstr ""
+
+#: ../../include/message.php:143
+msgid "Stored post could not be verified."
+msgstr ""
+
+#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
+#: ../../mod/photos.php:652 ../../mod/photos.php:674
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../include/attach.php:98 ../../include/attach.php:129
+#: ../../include/attach.php:185 ../../include/attach.php:200
+#: ../../include/attach.php:233 ../../include/attach.php:247
+#: ../../include/attach.php:268 ../../include/attach.php:463
+#: ../../include/attach.php:541 ../../include/chat.php:113
+#: ../../include/photos.php:15 ../../include/items.php:3492
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
+#: ../../mod/chat.php:87 ../../mod/chat.php:92
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
+#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
+#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
+msgid "Permission denied."
 msgstr ""
 
-#: ../../include/attach.php:179 ../../include/attach.php:227
+#: ../../include/attach.php:180 ../../include/attach.php:228
 msgid "Item was not found."
 msgstr ""
 
-#: ../../include/attach.php:280
+#: ../../include/attach.php:281
 msgid "No source file."
 msgstr ""
 
-#: ../../include/attach.php:297
+#: ../../include/attach.php:298
 msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/attach.php:315
+#: ../../include/attach.php:316
 msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/attach.php:326
+#: ../../include/attach.php:327
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/attach.php:338
+#: ../../include/attach.php:339
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/attach.php:422
+#: ../../include/attach.php:423
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/attach.php:434
+#: ../../include/attach.php:435
 msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/attach.php:478 ../../include/attach.php:495
+#: ../../include/attach.php:479 ../../include/attach.php:496
 msgid "Path not available."
 msgstr ""
 
-#: ../../include/attach.php:545
+#: ../../include/attach.php:546
 msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/attach.php:563
+#: ../../include/attach.php:564
 msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/attach.php:588
+#: ../../include/attach.php:589
 msgid "Path not found."
 msgstr ""
 
-#: ../../include/attach.php:633
+#: ../../include/attach.php:634
 msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/attach.php:637
+#: ../../include/attach.php:638
 msgid "database storage failed."
 msgstr ""
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
+#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
+#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
+#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
+#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
+#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
+#: ../../include/bbcode.php:626
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/taxonomy.php:227
-msgid "Keywords"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/taxonomy.php:252
-msgid "have"
+#: ../../include/bbcode.php:170
+msgid "QR code"
 msgstr ""
 
-#: ../../include/taxonomy.php:252
-msgid "has"
+#: ../../include/bbcode.php:213
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/taxonomy.php:253
-msgid "want"
+#: ../../include/bbcode.php:215
+msgid "post"
 msgstr ""
 
-#: ../../include/taxonomy.php:253
-msgid "wants"
+#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
-msgid "like"
+#: ../../include/bookmarks.php:31
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/taxonomy.php:254
-msgid "likes"
+#: ../../include/conversation.php:123
+msgid "channel"
 msgstr ""
 
-#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
-msgid "dislike"
+#: ../../include/conversation.php:161 ../../mod/like.php:134
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/taxonomy.php:255
-msgid "dislikes"
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/auth.php:76
-msgid "Logged out."
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/auth.php:188
-msgid "Failed authentication"
+#: ../../include/conversation.php:236
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/auth.php:203
-msgid "Login failed."
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
 msgstr ""
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
+#: ../../include/conversation.php:631 ../../include/ItemObject.php:114
+msgid "Select"
 msgstr ""
 
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
+#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
+#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
+#: ../../mod/admin.php:745 ../../mod/connedit.php:359
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+msgid "Delete"
 msgstr ""
 
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
+#: ../../include/conversation.php:642 ../../include/ItemObject.php:161
+msgid "Message is verified"
 msgstr ""
 
-#: ../../include/account.php:64
-msgid "An invitation is required."
+#: ../../include/conversation.php:662
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
+#: ../../include/conversation.php:676
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/account.php:119
-msgid "Please enter the required information."
+#: ../../include/conversation.php:677
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/account.php:187
-msgid "Failed to store account information."
+#: ../../include/conversation.php:686 ../../include/ItemObject.php:226
+#, php-format
+msgid " from %s"
 msgstr ""
 
-#: ../../include/account.php:273
+#: ../../include/conversation.php:689 ../../include/ItemObject.php:229
 #, php-format
-msgid "Registration request at %s"
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/account.php:275 ../../include/account.php:302
-#: ../../include/account.php:359
-msgid "Administrator"
+#: ../../include/conversation.php:690 ../../include/ItemObject.php:230
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/account.php:297
-msgid "your registration password"
+#: ../../include/conversation.php:705
+msgid "View in context"
 msgstr ""
 
-#: ../../include/account.php:300 ../../include/account.php:357
-#, php-format
-msgid "Registration details for %s"
+#: ../../include/conversation.php:707 ../../include/conversation.php:1120
+#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
+#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
+#: ../../mod/photos.php:971
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/account.php:366
-msgid "Account approved."
+#: ../../include/conversation.php:834
+msgid "remove"
 msgstr ""
 
-#: ../../include/account.php:400
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../include/conversation.php:838
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
+#: ../../include/conversation.php:839
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
+#: ../../include/conversation.php:930
+msgid "View Source"
 msgstr ""
 
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
+#: ../../include/conversation.php:931
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
+#: ../../include/conversation.php:932
+msgid "View Status"
 msgstr ""
 
-#: ../../include/dir_fns.php:30
-msgid "Enable Safe Search"
+#: ../../include/conversation.php:934
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/dir_fns.php:32
-msgid "Disable Safe Search"
+#: ../../include/conversation.php:935
+msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/dir_fns.php:34
-msgid "Safe Mode"
+#: ../../include/conversation.php:936
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/enotify.php:40
-msgid "Red Matrix Notification"
+#: ../../include/conversation.php:937
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/enotify.php:41
-msgid "redmatrix"
+#: ../../include/conversation.php:938
+msgid "Poke"
 msgstr ""
 
-#: ../../include/enotify.php:43
-msgid "Thank You,"
+#: ../../include/conversation.php:1000
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/enotify.php:45
+#: ../../include/conversation.php:1000
 #, php-format
-msgid "%s Administrator"
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/enotify.php:80
+#: ../../include/conversation.php:1004
 #, php-format
-msgid "%s "
-msgstr ""
+msgid "%2$d people like this."
+msgid_plural "%2$d people like this."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/enotify.php:84
+#: ../../include/conversation.php:1006
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
+msgid "%2$d people don't like this."
+msgid_plural "%2$d people don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1012
+msgid "and"
 msgstr ""
 
-#: ../../include/enotify.php:86
+#: ../../include/conversation.php:1015
 #, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1016
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/enotify.php:87
+#: ../../include/conversation.php:1016
 #, php-format
-msgid "%1$s sent you %2$s."
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/enotify.php:87
-msgid "a private message"
+#: ../../include/conversation.php:1066
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/enotify.php:88
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
+#: ../../mod/mail.php:269
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/enotify.php:142
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/conversation.php:1068
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/enotify.php:150
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/conversation.php:1069
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/enotify.php:159
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/conversation.php:1070
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/enotify.php:170
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/enotify.php:171
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/conversation.php:1072
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/enotify.php:174 ../../include/enotify.php:189
-#: ../../include/enotify.php:215 ../../include/enotify.php:234
-#: ../../include/enotify.php:248
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/conversation.php:1073 ../../mod/editpost.php:52
+#: ../../mod/mail.php:172 ../../mod/mail.php:270
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/enotify.php:180
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
+#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+msgid "Preview"
 msgstr ""
 
-#: ../../include/enotify.php:182
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+msgid "Share"
 msgstr ""
 
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
+msgid "Page link title"
 msgstr ""
 
-#: ../../include/enotify.php:208
-#, php-format
-msgid "[Red:Notify] %s tagged you"
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:104
+#: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:145 ../../mod/editblock.php:121
+msgid "Upload photo"
 msgstr ""
 
-#: ../../include/enotify.php:209
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/conversation.php:1102
+msgid "upload photo"
 msgstr ""
 
-#: ../../include/enotify.php:210
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:105
+#: ../../mod/mail.php:220 ../../mod/mail.php:333 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:146 ../../mod/editblock.php:122
+msgid "Attach file"
 msgstr ""
 
-#: ../../include/enotify.php:223
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
+#: ../../include/conversation.php:1104
+msgid "attach file"
 msgstr ""
 
-#: ../../include/enotify.php:224
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/conversation.php:1105 ../../mod/editpost.php:106
+#: ../../mod/mail.php:221 ../../mod/mail.php:334 ../../mod/editlayout.php:109
+#: ../../mod/editwebpage.php:147 ../../mod/editblock.php:123
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/conversation.php:1106
+msgid "web link"
 msgstr ""
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
+#: ../../include/conversation.php:1107
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/conversation.php:1108
+msgid "video link"
 msgstr ""
 
-#: ../../include/enotify.php:243
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/conversation.php:1109
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/enotify.php:255
-msgid "[Red:Notify] Introduction received"
+#: ../../include/conversation.php:1110
+msgid "audio link"
 msgstr ""
 
-#: ../../include/enotify.php:256
-#, php-format
-msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:110
+#: ../../mod/editlayout.php:113 ../../mod/editwebpage.php:151
+#: ../../mod/editblock.php:127
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+#: ../../include/conversation.php:1112
+msgid "set location"
 msgstr ""
 
-#: ../../include/enotify.php:261 ../../include/enotify.php:280
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:111
+#: ../../mod/editlayout.php:114 ../../mod/editwebpage.php:152
+#: ../../mod/editblock.php:128
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: ../../include/conversation.php:1114
+msgid "clear location"
 msgstr ""
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Friend suggestion received"
+#: ../../include/conversation.php:1116 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:127 ../../mod/editwebpage.php:169
+#: ../../mod/editblock.php:142
+msgid "Set title"
 msgstr ""
 
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:126
+#: ../../mod/editlayout.php:130 ../../mod/editwebpage.php:171
+#: ../../mod/editblock.php:145
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/conversation.php:1121 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:116 ../../mod/editwebpage.php:154
+#: ../../mod/editblock.php:130
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/enotify.php:278
-msgid "Name:"
+#: ../../include/conversation.php:1122
+msgid "permissions"
 msgstr ""
 
-#: ../../include/enotify.php:279
-msgid "Photo:"
+#: ../../include/conversation.php:1130 ../../mod/editpost.php:121
+#: ../../mod/editlayout.php:124 ../../mod/editwebpage.php:164
+#: ../../mod/editblock.php:139
+msgid "Public post"
 msgstr ""
 
-#: ../../include/enotify.php:282
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/conversation.php:1132 ../../mod/editpost.php:127
+#: ../../mod/editlayout.php:131 ../../mod/editwebpage.php:172
+#: ../../mod/editblock.php:146
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:138
+#: ../../mod/mail.php:226 ../../mod/mail.php:339 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:156
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:236
-msgid "Suggestions"
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
+msgid "OK"
 msgstr ""
 
-#: ../../include/widgets.php:124
-msgid "See more..."
+#: ../../include/conversation.php:1150 ../../mod/settings.php:514
+#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/widgets.php:146
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/conversation.php:1381
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
+#: ../../include/conversation.php:1384
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
+#: ../../include/conversation.php:1387
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/conversation.php:1390
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/widgets.php:171
-msgid "Notes"
+#: ../../include/conversation.php:1394
+msgid "Personal"
 msgstr ""
 
-#: ../../include/widgets.php:173 ../../include/text.php:738
-#: ../../include/text.php:752 ../../mod/filer.php:36
-msgid "Save"
+#: ../../include/conversation.php:1397
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
+#: ../../include/conversation.php:1400 ../../mod/menu.php:61
+#: ../../mod/connections.php:211
+msgid "New"
 msgstr ""
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
+#: ../../include/conversation.php:1403
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/widgets.php:318 ../../include/items.php:3575
-msgid "Archives"
+#: ../../include/conversation.php:1410
+msgid "Starred"
 msgstr ""
 
-#: ../../include/widgets.php:370
-msgid "Refresh"
+#: ../../include/conversation.php:1413
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/widgets.php:371 ../../mod/connedit.php:386
-msgid "Me"
+#: ../../include/conversation.php:1420
+msgid "Spam"
 msgstr ""
 
-#: ../../include/widgets.php:372 ../../mod/connedit.php:388
-msgid "Best Friends"
+#: ../../include/conversation.php:1423
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/widgets.php:374
-msgid "Co-workers"
+#: ../../include/conversation.php:1454
+msgid "Channel"
 msgstr ""
 
-#: ../../include/widgets.php:375 ../../mod/connedit.php:390
-msgid "Former Friends"
+#: ../../include/conversation.php:1457
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/widgets.php:376 ../../mod/connedit.php:391
-msgid "Acquaintances"
+#: ../../include/conversation.php:1466
+msgid "About"
 msgstr ""
 
-#: ../../include/widgets.php:377
-msgid "Everybody"
+#: ../../include/conversation.php:1469
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/widgets.php:409
-msgid "Account settings"
+#: ../../include/conversation.php:1478 ../../include/photos.php:302
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/widgets.php:415
-msgid "Channel settings"
+#: ../../include/conversation.php:1487
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/widgets.php:421
-msgid "Additional features"
+#: ../../include/conversation.php:1496 ../../include/conversation.php:1499
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:427
-msgid "Feature settings"
+#: ../../include/conversation.php:1509
+msgid "Events and Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:433
-msgid "Display settings"
+#: ../../include/conversation.php:1517
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:439
-msgid "Connected apps"
+#: ../../include/conversation.php:1528
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/widgets.php:445
-msgid "Export channel"
+#: ../../include/identity.php:29 ../../mod/item.php:1161
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
+#: ../../include/identity.php:62
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
+#: ../../include/identity.php:64
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/widgets.php:504
-msgid "Check Mail"
+#: ../../include/identity.php:143
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/widgets.php:585
-msgid "Chat Rooms"
+#: ../../include/identity.php:153
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/api.php:974
-msgid "Public Timeline"
+#: ../../include/identity.php:167
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:20
-msgid "Find Channels"
+#: ../../include/identity.php:226
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter name or interest"
+#: ../../include/identity.php:285
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Connect/Follow"
+#: ../../include/identity.php:477
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/contact_widgets.php:23
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/identity.php:489
+msgid " Sorry, you don't have the permission to view this profile. "
 msgstr ""
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:355
-msgid "Find"
+#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/achievements.php:8 ../../mod/blocks.php:10
+#: ../../mod/profile.php:16 ../../mod/filestorage.php:40
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
-msgid "Channel Suggestions"
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Random Profile"
+#: ../../include/identity.php:648
+msgid "Profiles"
 msgstr ""
 
-#: ../../include/contact_widgets.php:28
-msgid "Invite Friends"
+#: ../../include/identity.php:648
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/contact_widgets.php:120
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
-#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:170
-#: ../../mod/settings.php:571 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:103 ../../mod/blocks.php:93
-#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
-msgid "Edit"
+#: ../../include/identity.php:652
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/plugin.php:475 ../../include/plugin.php:477
-msgid "Click here to upgrade."
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
+msgid "Profile Image"
 msgstr ""
 
-#: ../../include/plugin.php:483
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/plugin.php:488
-msgid "This action is not available under your subscription plan."
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
+#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../mod/directory.php:158
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/follow.php:26
-msgid "Channel location missing."
+#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../mod/directory.php:160
+msgid "Status:"
 msgstr ""
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
+#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../mod/directory.php:162
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:262
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/follow.php:129
-msgid "local account not found."
+#: ../../include/identity.php:753 ../../include/identity.php:833
+msgid "F d"
 msgstr ""
 
-#: ../../include/follow.php:138
-msgid "Cannot connect to yourself."
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:284
+msgid "[today]"
 msgstr ""
 
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
+#: ../../include/identity.php:810
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
+#: ../../include/identity.php:811
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
+#: ../../include/identity.php:866
+msgid "[No description]"
 msgstr ""
 
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
+#: ../../include/identity.php:884
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
+#: ../../include/identity.php:885
+msgid "Events this week:"
 msgstr ""
 
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
+#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../mod/profperm.php:107
+msgid "Profile"
 msgstr ""
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
+#: ../../include/identity.php:906 ../../mod/settings.php:920
+msgid "Full Name:"
 msgstr ""
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/identity.php:913
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
+#: ../../include/identity.php:914
+msgid "j F"
 msgstr ""
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
+#: ../../include/identity.php:921
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
+#: ../../include/identity.php:925
+msgid "Age:"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/identity.php:934
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
+msgid "Hometown:"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
+#: ../../include/identity.php:943
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
+#: ../../include/identity.php:947
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Can source my \"public\" posts in derived channels"
+#: ../../include/identity.php:949 ../../mod/directory.php:164
+msgid "About:"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/identity.php:951
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/permissions.php:32
-msgid "Can administer my channel resources"
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/permissions.php:32
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
-#: ../../view/theme/apw/php/config.php:176
-msgid "Default"
+#: ../../include/identity.php:958
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:346
-msgid "Permission denied"
+#: ../../include/identity.php:960
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:151
-#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
-#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
-msgid "Item not found."
+#: ../../include/identity.php:962
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/items.php:3748 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
+#: ../../include/identity.php:964
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/items.php:3763
-msgid "Collection is empty."
+#: ../../include/identity.php:966
+msgid "Television:"
 msgstr ""
 
-#: ../../include/items.php:3770
-#, php-format
-msgid "Collection: %s"
+#: ../../include/identity.php:968
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/items.php:3781
-#, php-format
-msgid "Connection: %s"
+#: ../../include/identity.php:970
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/items.php:3784
-msgid "Connection not found."
+#: ../../include/identity.php:972
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/security.php:280
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/identity.php:974
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/text.php:315
-msgid "prev"
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/text.php:317
-msgid "first"
+#: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
+#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/settings.php:575 ../../mod/editpost.php:103
+#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
+#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
+msgid "Edit"
 msgstr ""
 
-#: ../../include/text.php:346
-msgid "last"
+#: ../../include/ItemObject.php:118
+msgid "save to folder"
 msgstr ""
 
-#: ../../include/text.php:349
-msgid "next"
+#: ../../include/ItemObject.php:146
+msgid "add star"
 msgstr ""
 
-#: ../../include/text.php:361
-msgid "older"
+#: ../../include/ItemObject.php:147
+msgid "remove star"
 msgstr ""
 
-#: ../../include/text.php:363
-msgid "newer"
+#: ../../include/ItemObject.php:148
+msgid "toggle star status"
 msgstr ""
 
-#: ../../include/text.php:654
-msgid "No connections"
+#: ../../include/ItemObject.php:152
+msgid "starred"
 msgstr ""
 
-#: ../../include/text.php:665
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:677
-msgid "View Connections"
+#: ../../include/ItemObject.php:169
+msgid "add tag"
 msgstr ""
 
-#: ../../include/text.php:818
-msgid "poke"
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/text.php:818 ../../include/conversation.php:240
-msgid "poked"
+#: ../../include/ItemObject.php:184 ../../include/taxonomy.php:254
+msgid "like"
 msgstr ""
 
-#: ../../include/text.php:819
-msgid "ping"
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../include/text.php:819
-msgid "pinged"
+#: ../../include/ItemObject.php:185 ../../include/taxonomy.php:255
+msgid "dislike"
 msgstr ""
 
-#: ../../include/text.php:820
-msgid "prod"
+#: ../../include/ItemObject.php:187
+msgid "Share this"
 msgstr ""
 
-#: ../../include/text.php:820
-msgid "prodded"
+#: ../../include/ItemObject.php:187
+msgid "share"
 msgstr ""
 
-#: ../../include/text.php:821
-msgid "slap"
+#: ../../include/ItemObject.php:211 ../../include/ItemObject.php:212
+#, php-format
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/text.php:821
-msgid "slapped"
+#: ../../include/ItemObject.php:213
+msgid "to"
 msgstr ""
 
-#: ../../include/text.php:822
-msgid "finger"
+#: ../../include/ItemObject.php:214
+msgid "via"
 msgstr ""
 
-#: ../../include/text.php:822
-msgid "fingered"
+#: ../../include/ItemObject.php:215
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/text.php:823
-msgid "rebuff"
+#: ../../include/ItemObject.php:216
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/text.php:823
-msgid "rebuffed"
+#: ../../include/ItemObject.php:249
+msgid "Bookmark Links"
 msgstr ""
 
-#: ../../include/text.php:835
-msgid "happy"
-msgstr ""
+#: ../../include/ItemObject.php:279
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/text.php:836
-msgid "sad"
+#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
+#: ../../mod/photos.php:1074
+msgid "This is you"
 msgstr ""
 
-#: ../../include/text.php:837
-msgid "mellow"
+#: ../../include/ItemObject.php:547 ../../mod/events.php:469
+#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
+#: ../../mod/settings.php:513 ../../mod/settings.php:625
+#: ../../mod/settings.php:653 ../../mod/settings.php:677
+#: ../../mod/settings.php:748 ../../mod/settings.php:912
+#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
+#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
+#: ../../mod/connedit.php:437 ../../mod/profiles.php:506
+#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
+#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
+#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
+#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/apw/php/config.php:231
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/blogga/php/config.php:67
+msgid "Submit"
 msgstr ""
 
-#: ../../include/text.php:838
-msgid "tired"
+#: ../../include/ItemObject.php:548
+msgid "Bold"
 msgstr ""
 
-#: ../../include/text.php:839
-msgid "perky"
+#: ../../include/ItemObject.php:549
+msgid "Italic"
 msgstr ""
 
-#: ../../include/text.php:840
-msgid "angry"
+#: ../../include/ItemObject.php:550
+msgid "Underline"
 msgstr ""
 
-#: ../../include/text.php:841
-msgid "stupified"
+#: ../../include/ItemObject.php:551
+msgid "Quote"
 msgstr ""
 
-#: ../../include/text.php:842
-msgid "puzzled"
+#: ../../include/ItemObject.php:552
+msgid "Code"
 msgstr ""
 
-#: ../../include/text.php:843
-msgid "interested"
+#: ../../include/ItemObject.php:553
+msgid "Image"
 msgstr ""
 
-#: ../../include/text.php:844
-msgid "bitter"
+#: ../../include/ItemObject.php:554
+msgid "Link"
 msgstr ""
 
-#: ../../include/text.php:845
-msgid "cheerful"
+#: ../../include/ItemObject.php:555
+msgid "Video"
 msgstr ""
 
-#: ../../include/text.php:846
-msgid "alive"
+#: ../../include/api.php:974
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/text.php:847
-msgid "annoyed"
+#: ../../include/network.php:640
+msgid "view full size"
 msgstr ""
 
-#: ../../include/text.php:848
-msgid "anxious"
+#: ../../include/notify.php:23
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/text.php:849
-msgid "cranky"
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/text.php:850
-msgid "disturbed"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
 msgstr ""
 
-#: ../../include/text.php:851
-msgid "frustrated"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
 msgstr ""
 
-#: ../../include/text.php:852
-msgid "motivated"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/text.php:853
-msgid "relaxed"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/text.php:854
-msgid "surprised"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Monday"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Tuesday"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Wednesday"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Thursday"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Friday"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Saturday"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/text.php:1017
-msgid "Sunday"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "January"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "February"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "March"
+#: ../../include/profile_selectors.php:23
+msgid "Males"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "April"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "May"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "June"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "July"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "August"
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "September"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "October"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "November"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/text.php:1021
-msgid "December"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "unknown.???"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/text.php:1100
-msgid "bytes"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "remove category"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/text.php:1157
-msgid "remove from file"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
 msgstr ""
 
-#: ../../include/text.php:1215 ../../include/text.php:1227
-msgid "Click to open/close"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/text.php:1403 ../../mod/events.php:332
-msgid "link to source"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
 msgstr ""
 
-#: ../../include/text.php:1422
-msgid "Select a page layout: "
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/text.php:1425 ../../include/text.php:1490
-msgid "default"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/text.php:1461
-msgid "Page content type: "
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/text.php:1502
-msgid "Select an alternate language"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
 msgstr ""
 
-#: ../../include/text.php:1654 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/text.php:1657 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/text.php:1660 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/text.php:1662 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
 msgstr ""
 
-#: ../../include/text.php:1667
-msgid "activity"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/text.php:1929
-msgid "Design"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
 msgstr ""
 
-#: ../../include/text.php:1931
-msgid "Blocks"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/text.php:1932
-msgid "Menus"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
 msgstr ""
 
-#: ../../include/text.php:1933
-msgid "Layouts"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/text.php:1934
-msgid "Pages"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
 msgstr ""
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
-msgid "Private Message"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
 msgstr ""
 
-#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:745
-#: ../../mod/group.php:176 ../../mod/photos.php:1023
-#: ../../mod/filestorage.php:171 ../../mod/settings.php:572
-msgid "Delete"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/ItemObject.php:114 ../../include/conversation.php:631
-msgid "Select"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/ItemObject.php:118
-msgid "save to folder"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/ItemObject.php:146
-msgid "add star"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
 msgstr ""
 
-#: ../../include/ItemObject.php:147
-msgid "remove star"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/ItemObject.php:148
-msgid "toggle star status"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/ItemObject.php:152
-msgid "starred"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/ItemObject.php:161 ../../include/conversation.php:642
-msgid "Message is verified"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/ItemObject.php:169
-msgid "add tag"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:951
-msgid "I like this (toggle)"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:952
-msgid "I don't like this (toggle)"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/ItemObject.php:178
-msgid "Share this"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/ItemObject.php:178
-msgid "share"
+#: ../../include/chat.php:10
+msgid "Missing room name"
 msgstr ""
 
-#: ../../include/ItemObject.php:202 ../../include/ItemObject.php:203
-#, php-format
-msgid "View %s's profile - %s"
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
 msgstr ""
 
-#: ../../include/ItemObject.php:204
-msgid "to"
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
 msgstr ""
 
-#: ../../include/ItemObject.php:205
-msgid "via"
+#: ../../include/chat.php:102
+msgid "Room not found."
 msgstr ""
 
-#: ../../include/ItemObject.php:206
-msgid "Wall-to-Wall"
+#: ../../include/chat.php:123
+msgid "Room is full"
 msgstr ""
 
-#: ../../include/ItemObject.php:207
-msgid "via Wall-To-Wall:"
+#: ../../include/taxonomy.php:210
+msgid "Tags"
 msgstr ""
 
-#: ../../include/ItemObject.php:217 ../../include/conversation.php:686
-#, php-format
-msgid " from %s"
+#: ../../include/taxonomy.php:227
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/ItemObject.php:220 ../../include/conversation.php:689
-#, php-format
-msgid "last edited: %s"
+#: ../../include/taxonomy.php:252
+msgid "have"
 msgstr ""
 
-#: ../../include/ItemObject.php:221 ../../include/conversation.php:690
-#, php-format
-msgid "Expires: %s"
+#: ../../include/taxonomy.php:252
+msgid "has"
 msgstr ""
 
-#: ../../include/ItemObject.php:248 ../../include/conversation.php:707
-#: ../../include/conversation.php:1120 ../../mod/photos.php:954
-#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:153
-#: ../../mod/editblock.php:129
-msgid "Please wait"
+#: ../../include/taxonomy.php:253
+msgid "want"
 msgstr ""
 
-#: ../../include/ItemObject.php:269
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/taxonomy.php:253
+msgid "wants"
+msgstr ""
 
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:970
-#: ../../mod/photos.php:1057
-msgid "This is you"
+#: ../../include/taxonomy.php:254
+msgid "likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:537 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
-#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:431 ../../mod/admin.php:738 ../../mod/admin.php:878
-#: ../../mod/admin.php:1077 ../../mod/admin.php:1164 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:933
-#: ../../mod/photos.php:973 ../../mod/photos.php:1060 ../../mod/chat.php:107
-#: ../../mod/chat.php:133 ../../mod/profiles.php:506
-#: ../../mod/filestorage.php:131 ../../mod/import.php:387
-#: ../../mod/settings.php:509 ../../mod/settings.php:621
-#: ../../mod/settings.php:649 ../../mod/settings.php:673
-#: ../../mod/settings.php:744 ../../mod/settings.php:908
-#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/poke.php:166
-#: ../../mod/fsuggest.php:108 ../../mod/mood.php:142
-#: ../../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
-msgid "Submit"
+#: ../../include/taxonomy.php:255
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:538
-msgid "Bold"
+#: ../../include/auth.php:76
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/ItemObject.php:539
-msgid "Italic"
+#: ../../include/auth.php:188
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/ItemObject.php:540
-msgid "Underline"
+#: ../../include/auth.php:203
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/ItemObject.php:541
-msgid "Quote"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/ItemObject.php:542
-msgid "Code"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/ItemObject.php:543
-msgid "Image"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/ItemObject.php:544
-msgid "Link"
+#: ../../include/account.php:64
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/ItemObject.php:545
-msgid "Video"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/ItemObject.php:546 ../../include/conversation.php:1083
-#: ../../mod/webpages.php:122 ../../mod/photos.php:974
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:132
-#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
-msgid "Preview"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/ItemObject.php:549 ../../include/conversation.php:1147
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:140
-msgid "Encrypt text"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/conversation.php:123
-msgid "channel"
+#: ../../include/account.php:273
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/conversation.php:161 ../../mod/like.php:134
+#: ../../include/account.php:275 ../../include/account.php:302
+#: ../../include/account.php:359
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/account.php:297
+msgid "your registration password"
+msgstr ""
+
+#: ../../include/account.php:300 ../../include/account.php:357
 #, php-format
-msgid "%1$s likes %2$s's %3$s"
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:136
+#: ../../include/account.php:366
+msgid "Account approved."
+msgstr ""
+
+#: ../../include/account.php:400
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/conversation.php:201
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/enotify.php:40
+msgid "Red Matrix Notification"
+msgstr ""
+
+#: ../../include/enotify.php:41
+msgid "redmatrix"
+msgstr ""
+
+#: ../../include/enotify.php:43
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/enotify.php:45
 #, php-format
-msgid "%1$s is now connected with %2$s"
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/conversation.php:236
+#: ../../include/enotify.php:80
 #, php-format
-msgid "%1$s poked %2$s"
+msgid "%s "
 msgstr ""
 
-#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#: ../../include/enotify.php:84
 #, php-format
-msgid "%1$s is currently %2$s"
+msgid "[Red:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/conversation.php:662
+#: ../../include/enotify.php:86
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/conversation.php:676
-msgid "Categories:"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/conversation.php:677
-msgid "Filed under:"
+#: ../../include/enotify.php:87
+msgid "a private message"
 msgstr ""
 
-#: ../../include/conversation.php:705
-msgid "View in context"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/conversation.php:834
-msgid "remove"
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/conversation.php:838
-msgid "Loading..."
+#: ../../include/enotify.php:150
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/conversation.php:839
-msgid "Delete Selected Items"
+#: ../../include/enotify.php:159
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/conversation.php:930
-msgid "View Source"
+#: ../../include/enotify.php:170
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:931
-msgid "Follow Thread"
+#: ../../include/enotify.php:171
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/conversation.php:932
-msgid "View Status"
+#: ../../include/enotify.php:174 ../../include/enotify.php:189
+#: ../../include/enotify.php:215 ../../include/enotify.php:234
+#: ../../include/enotify.php:248
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/conversation.php:934
-msgid "View Photos"
+#: ../../include/enotify.php:180
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/conversation.php:935
-msgid "Matrix Activity"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/conversation.php:936
-msgid "Edit Contact"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/conversation.php:937
-msgid "Send PM"
+#: ../../include/enotify.php:208
+#, php-format
+msgid "[Red:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/conversation.php:938
-msgid "Poke"
+#: ../../include/enotify.php:209
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/conversation.php:1000
+#: ../../include/enotify.php:210
 #, php-format
-msgid "%s likes this."
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/conversation.php:1000
+#: ../../include/enotify.php:223
 #, php-format
-msgid "%s doesn't like this."
+msgid "[Red:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/conversation.php:1004
+#: ../../include/enotify.php:224
 #, php-format
-msgid "%2$d people like this."
-msgid_plural "%2$d people like this."
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr ""
 
-#: ../../include/conversation.php:1006
+#: ../../include/enotify.php:225
 #, php-format
-msgid "%2$d people don't like this."
-msgid_plural "%2$d people don't like this."
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr ""
 
-#: ../../include/conversation.php:1012
-msgid "and"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/conversation.php:1015
+#: ../../include/enotify.php:242
 #, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
 
-#: ../../include/conversation.php:1016
+#: ../../include/enotify.php:243
 #, php-format
-msgid "%s like this."
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/conversation.php:1016
+#: ../../include/enotify.php:255
+msgid "[Red:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:256
 #, php-format
-msgid "%s don't like this."
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/conversation.php:1066
-msgid "Visible to everybody"
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/conversation.php:1067 ../../mod/mail.php:171
-#: ../../mod/mail.php:269
-msgid "Please enter a link URL:"
+#: ../../include/enotify.php:261 ../../include/enotify.php:280
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/conversation.php:1068
-msgid "Please enter a video link/URL:"
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/conversation.php:1069
-msgid "Please enter an audio link/URL:"
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/conversation.php:1070
-msgid "Tag term:"
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/conversation.php:1071 ../../mod/filer.php:35
-msgid "Save to Folder:"
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/conversation.php:1072
-msgid "Where are you right now?"
+#: ../../include/enotify.php:278
+msgid "Name:"
 msgstr ""
 
-#: ../../include/conversation.php:1073 ../../mod/mail.php:172
-#: ../../mod/mail.php:270 ../../mod/editpost.php:52
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/enotify.php:279
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/conversation.php:1097 ../../mod/photos.php:953
-msgid "Share"
+#: ../../include/enotify.php:282
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
-msgid "Page link title"
+#: ../../include/photos.php:89
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/conversation.php:1101 ../../mod/mail.php:219
-#: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:104 ../../mod/editwebpage.php:145
-#: ../../mod/editblock.php:121
-msgid "Upload photo"
+#: ../../include/photos.php:96
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/conversation.php:1102
-msgid "upload photo"
+#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/conversation.php:1103 ../../mod/mail.php:220
-#: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:146
-#: ../../mod/editblock.php:122
-msgid "Attach file"
+#: ../../include/photos.php:185
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:1104
-msgid "attach file"
+#: ../../include/photos.php:306 ../../mod/photos.php:690
+#: ../../mod/photos.php:1187
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/conversation.php:1105 ../../mod/mail.php:221
-#: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:147
-#: ../../mod/editblock.php:123
-msgid "Insert web link"
+#: ../../include/reddav.php:1018
+msgid "Edit File properties"
 msgstr ""
 
-#: ../../include/conversation.php:1106
-msgid "web link"
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:20
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/conversation.php:1107
-msgid "Insert video link"
+#: ../../include/contact_widgets.php:21
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/conversation.php:1108
-msgid "video link"
+#: ../../include/contact_widgets.php:22
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/conversation.php:1109
-msgid "Insert audio link"
+#: ../../include/contact_widgets.php:23
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/conversation.php:1110
-msgid "audio link"
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
+#: ../../mod/directory.php:211 ../../mod/connections.php:357
+msgid "Find"
 msgstr ""
 
-#: ../../include/conversation.php:1111 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:110 ../../mod/editwebpage.php:151
-#: ../../mod/editblock.php:127
-msgid "Set your location"
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../include/conversation.php:1112
-msgid "set location"
+#: ../../include/contact_widgets.php:27
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/conversation.php:1113 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:111 ../../mod/editwebpage.php:152
-#: ../../mod/editblock.php:128
-msgid "Clear browser location"
+#: ../../include/contact_widgets.php:28
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/conversation.php:1114
-msgid "clear location"
+#: ../../include/contact_widgets.php:120
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/page_widgets.php:6
+msgid "New Page"
 msgstr ""
 
-#: ../../include/conversation.php:1116 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:124 ../../mod/editwebpage.php:169
-#: ../../mod/editblock.php:142
-msgid "Set title"
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/conversation.php:1119 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:126 ../../mod/editwebpage.php:171
-#: ../../mod/editblock.php:145
-msgid "Categories (comma-separated list)"
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/conversation.php:1121 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:154
-#: ../../mod/editblock.php:130
-msgid "Permission settings"
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/conversation.php:1122
-msgid "permissions"
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/conversation.php:1130 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:164
-#: ../../mod/editblock.php:139
-msgid "Public post"
+#: ../../include/follow.php:26
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/conversation.php:1132 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:127 ../../mod/editwebpage.php:172
-#: ../../mod/editblock.php:146
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
 msgstr ""
 
-#: ../../include/conversation.php:1145 ../../mod/mail.php:226
-#: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:138 ../../mod/editwebpage.php:182
-#: ../../mod/editblock.php:156
-msgid "Set expiration date"
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
 msgstr ""
 
-#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
-msgid "OK"
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
+msgstr ""
+
+#: ../../include/follow.php:129
+msgid "local account not found."
+msgstr ""
+
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
+msgstr ""
+
+#: ../../include/security.php:280
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:64
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
+msgstr ""
+
+#: ../../include/oembed.php:157
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:166
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
+msgstr ""
+
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
+msgstr ""
+
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
+msgstr ""
+
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
+msgstr ""
+
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
+msgstr ""
+
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
 msgstr ""
 
-#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:510
-#: ../../mod/settings.php:536 ../../mod/editpost.php:143
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
-msgid "Cancel"
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../include/conversation.php:1381
-msgid "Commented Order"
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/conversation.php:1384
-msgid "Sort by Comment Date"
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
 msgstr ""
 
-#: ../../include/conversation.php:1387
-msgid "Posted Order"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../include/conversation.php:1390
-msgid "Sort by Post Date"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
 msgstr ""
 
-#: ../../include/conversation.php:1394
-msgid "Personal"
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
 msgstr ""
 
-#: ../../include/conversation.php:1397
-msgid "Posts that mention or involve you"
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
 msgstr ""
 
-#: ../../include/conversation.php:1400 ../../mod/menu.php:57
-#: ../../mod/connections.php:209
-msgid "New"
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
 msgstr ""
 
-#: ../../include/conversation.php:1403
-msgid "Activity Stream - by date"
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
 msgstr ""
 
-#: ../../include/conversation.php:1410
-msgid "Starred"
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
 msgstr ""
 
-#: ../../include/conversation.php:1413
-msgid "Favourite Posts"
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
 msgstr ""
 
-#: ../../include/conversation.php:1420
-msgid "Spam"
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
 msgstr ""
 
-#: ../../include/conversation.php:1423
-msgid "Posts flagged as SPAM"
+#: ../../include/permissions.php:32
+msgid "Can send me bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1454
-msgid "Channel"
+#: ../../include/permissions.php:33
+msgid "Can administer my channel resources"
 msgstr ""
 
-#: ../../include/conversation.php:1457
-msgid "Status Messages and Posts"
+#: ../../include/permissions.php:33
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/conversation.php:1466
-msgid "About"
+#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../index.php:350
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/conversation.php:1469
-msgid "Profile Details"
+#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/conversation.php:1484 ../../mod/fbrowser.php:114
-msgid "Files"
+#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/conversation.php:1487
-msgid "Files and Storage"
+#: ../../include/items.php:3801
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/conversation.php:1496
-msgid "Events and Calendar"
+#: ../../include/items.php:3808
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:1503
-msgid "Webpages"
+#: ../../include/items.php:3819
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:1506
-msgid "Manage Webpages"
+#: ../../include/items.php:3822
+msgid "Connection not found."
 msgstr ""
 
 #: ../../include/zot.php:545
@@ -3347,739 +3393,591 @@ msgid ""
 "com"
 msgstr ""
 
-#: ../../mod/cloud.php:112
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
-msgstr ""
-
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
-msgstr ""
-
-#: ../../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"
+#: ../../mod/item.php:145
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/connedit.php:259
-msgid "Channel has been hidden"
+#: ../../mod/item.php:346
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/connedit.php:273
-msgid "Channel has been approved"
+#: ../../mod/item.php:388
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/connedit.php:274
-msgid "Channel has been unapproved"
+#: ../../mod/item.php:819
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/connedit.php:292
-msgid "Contact has been removed."
+#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/connedit.php:312
+#: ../../mod/item.php:1166
 #, 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:747
-msgid "Unblock"
-msgstr ""
-
-#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:746
-msgid "Block"
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/connedit.php:333
-msgid "Block or Unblock this connection"
+#: ../../mod/item.php:1172
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../mod/connedit.php:337 ../../mod/connedit.php:473
-msgid "Unignore"
+#: ../../mod/menu.php:21
+msgid "Menu updated."
 msgstr ""
 
-#: ../../mod/connedit.php:337 ../../mod/connedit.php:473
-#: ../../mod/notifications.php:51
-msgid "Ignore"
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
 msgstr ""
 
-#: ../../mod/connedit.php:340
-msgid "Ignore or Unignore this connection"
+#: ../../mod/menu.php:30
+msgid "Menu created."
 msgstr ""
 
-#: ../../mod/connedit.php:343
-msgid "Unarchive"
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
 msgstr ""
 
-#: ../../mod/connedit.php:343
-msgid "Archive"
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
 msgstr ""
 
-#: ../../mod/connedit.php:346
-msgid "Archive or Unarchive this connection"
+#: ../../mod/menu.php:60
+msgid "Drop"
 msgstr ""
 
-#: ../../mod/connedit.php:349
-msgid "Unhide"
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
 msgstr ""
 
-#: ../../mod/connedit.php:349
-msgid "Hide"
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
 msgstr ""
 
-#: ../../mod/connedit.php:352
-msgid "Hide or Unhide this connection"
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
 msgstr ""
 
-#: ../../mod/connedit.php:359
-msgid "Delete this connection"
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
 msgstr ""
 
-#: ../../mod/connedit.php:392
-msgid "Unknown"
+#: ../../mod/menu.php:80
+msgid "New Menu"
 msgstr ""
 
-#: ../../mod/connedit.php:402 ../../mod/connedit.php:431
-msgid "Approve this connection"
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
 msgstr ""
 
-#: ../../mod/connedit.php:402
-msgid "Accept connection to allow communication"
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../mod/connedit.php:418
-msgid "Automatic Permissions Settings"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
 msgstr ""
 
-#: ../../mod/connedit.php:418
-#, php-format
-msgid "Connections: settings for %s"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
 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."
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/connedit.php:424
-msgid "Slide to adjust your degree of friendship"
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../mod/connedit.php:430
-msgid "inherited"
+#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
+msgid "Create"
 msgstr ""
 
-#: ../../mod/connedit.php:432
-msgid "Connection has no individual permissions!"
+#: ../../mod/menu.php:92 ../../mod/mitem.php:14
+msgid "Menu not found."
 msgstr ""
 
-#: ../../mod/connedit.php:433
-msgid ""
-"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
 msgstr ""
 
-#: ../../mod/connedit.php:435
-msgid "Profile Visibility"
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../mod/connedit.php:436
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
 msgstr ""
 
-#: ../../mod/connedit.php:437
-msgid "Contact Information / Notes"
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../mod/connedit.php:438
-msgid "Edit contact notes"
+#: ../../mod/menu.php:114 ../../mod/mitem.php:186
+msgid "Modify"
 msgstr ""
 
-#: ../../mod/connedit.php:440
-msgid "Their Settings"
+#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
+#: ../../mod/dirprofile.php:181
+msgid "Not found."
 msgstr ""
 
-#: ../../mod/connedit.php:441
-msgid "My Settings"
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
+#: ../../mod/blocks.php:96
+msgid "View"
 msgstr ""
 
-#: ../../mod/connedit.php:443
-msgid "Forum Members"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/connedit.php:444
-msgid "Soapbox"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/connedit.php:445
-msgid "Full Sharing"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/connedit.php:446
-msgid "Cautious Sharing"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
-
-#: ../../mod/connedit.php:447
-msgid "Follow Only"
+
+#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
+#: ../../mod/profiles.php:483
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/connedit.php:448
-msgid "Individual Permissions"
+#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
+#: ../../mod/profiles.php:484
+msgid "No"
 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."
+#: ../../mod/apps.php:8
+msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/connedit.php:450
-msgid "Advanced Permissions"
+#: ../../mod/apps.php:13
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/connedit.php:451
-msgid "Quick Links"
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/connedit.php:455
-#, php-format
-msgid "Visit %s's profile - %s"
+#: ../../mod/cloud.php:112
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
 msgstr ""
 
-#: ../../mod/connedit.php:456
-msgid "Block/Unblock contact"
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
 msgstr ""
 
-#: ../../mod/connedit.php:457
-msgid "Ignore contact"
+#: ../../mod/bookmarks.php:53
+msgid "My Bookmarks"
 msgstr ""
 
-#: ../../mod/connedit.php:458
-msgid "Repair URL settings"
+#: ../../mod/bookmarks.php:64
+msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/connedit.php:459
-msgid "View conversations"
+#: ../../mod/settings.php:71
+msgid "Name is required"
 msgstr ""
 
-#: ../../mod/connedit.php:461
-msgid "Delete contact"
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/connedit.php:464
-msgid "Last update:"
+#: ../../mod/settings.php:79 ../../mod/settings.php:539
+msgid "Update"
 msgstr ""
 
-#: ../../mod/connedit.php:466
-msgid "Update public posts"
+#: ../../mod/settings.php:192
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/connedit.php:468
-msgid "Update now"
+#: ../../mod/settings.php:196
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/connedit.php:474
-msgid "Currently blocked"
+#: ../../mod/settings.php:209
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/connedit.php:475
-msgid "Currently ignored"
+#: ../../mod/settings.php:211
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/connedit.php:476
-msgid "Currently archived"
+#: ../../mod/settings.php:225
+msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/connedit.php:477
-msgid "Currently pending"
+#: ../../mod/settings.php:228
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/connedit.php:478
-msgid "Hide this contact from others"
+#: ../../mod/settings.php:237
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/connedit.php:478
-msgid ""
-"Replies/likes to your public posts may still be visible"
+#: ../../mod/settings.php:441
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
-#: ../../mod/blocks.php:96
-msgid "View"
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:574
+msgid "Add application"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+msgid "Name"
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/settings.php:515
+msgid "Name of application"
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/settings.php:516 ../../mod/settings.php:542
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../mod/settings.php:516 ../../mod/settings.php:517
+msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:870
-#: ../../mod/settings.php:875
-msgid "Yes"
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:870
-#: ../../mod/settings.php:875
-msgid "No"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Redirect"
 msgstr ""
 
-#: ../../mod/apps.php:8
-msgid "No installed applications."
+#: ../../mod/settings.php:518
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/apps.php:13
-msgid "Applications"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
+#: ../../mod/settings.php:519
+msgid "Optional"
 msgstr ""
 
-#: ../../mod/page.php:47 ../../mod/chanview.php:77 ../../mod/home.php:50
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
+#: ../../mod/settings.php:530
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
+#: ../../mod/settings.php:573
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
+#: ../../mod/settings.php:577
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
+#: ../../mod/settings.php:578
+msgid "No name"
 msgstr ""
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
+#: ../../mod/settings.php:579
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/setup.php:171
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+#: ../../mod/settings.php:590
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
+#: ../../mod/settings.php:598
+msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
+#: ../../mod/settings.php:621
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/setup.php:187
-msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
+#: ../../mod/settings.php:622
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:606
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../mod/settings.php:623
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/setup.php:254
-msgid "System check"
+#: ../../mod/settings.php:624
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/setup.php:259
-msgid "Check again"
+#: ../../mod/settings.php:624
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/setup.php:281
-msgid "Database connection"
+#: ../../mod/settings.php:626 ../../mod/settings.php:921
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/setup.php:282
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
+#: ../../mod/settings.php:627
+msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/settings.php:628
+msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/setup.php:284
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../mod/settings.php:644
+msgid "Off"
 msgstr ""
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
+#: ../../mod/settings.php:644
+msgid "On"
 msgstr ""
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
+#: ../../mod/settings.php:651
+msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
+#: ../../mod/settings.php:676
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
+#: ../../mod/settings.php:706 ../../mod/admin.php:379
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
+#: ../../mod/settings.php:746
+msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
+#: ../../mod/settings.php:752
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
+#: ../../mod/settings.php:753
+msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
+#: ../../mod/settings.php:754
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: ../../mod/settings.php:754
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
+#: ../../mod/settings.php:755
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
+#: ../../mod/settings.php:755
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
+#: ../../mod/settings.php:756
+msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
+#: ../../mod/settings.php:792
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/setup.php:381
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/settings.php:793
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/setup.php:382
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
+#: ../../mod/settings.php:794
+msgid "Anybody in your address book"
 msgstr ""
 
-#: ../../mod/setup.php:386
-msgid "PHP executable path"
+#: ../../mod/settings.php:795
+msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/setup.php:386
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../mod/settings.php:796
+msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/setup.php:391
-msgid "Command line PHP"
+#: ../../mod/settings.php:797
+msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/setup.php:400
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/settings.php:874
+msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/setup.php:401
-msgid "This is required for message delivery to work."
+#: ../../mod/settings.php:879
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/setup.php:403
-msgid "PHP register_argc_argv"
+#: ../../mod/settings.php:883 ../../mod/profile_photo.php:288
+msgid "or"
 msgstr ""
 
-#: ../../mod/setup.php:424
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/settings.php:888
+msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/setup.php:425
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/settings.php:910
+msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/setup.php:427
-msgid "Generate encryption keys"
+#: ../../mod/settings.php:919
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/setup.php:434
-msgid "libCurl PHP module"
+#: ../../mod/settings.php:922
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/setup.php:435
-msgid "GD graphics PHP module"
+#: ../../mod/settings.php:923
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/setup.php:436
-msgid "OpenSSL PHP module"
+#: ../../mod/settings.php:924
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/setup.php:437
-msgid "mysqli PHP module"
+#: ../../mod/settings.php:926
+msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/setup.php:438
-msgid "mb_string PHP module"
+#: ../../mod/settings.php:926
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/setup.php:439
-msgid "mcrypt PHP module"
+#: ../../mod/settings.php:928
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/setup.php:444 ../../mod/setup.php:446
-msgid "Apache mod_rewrite module"
+#: ../../mod/settings.php:930
+msgid "Hide my online presence"
 msgstr ""
 
-#: ../../mod/setup.php:444
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/settings.php:930
+msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../mod/setup.php:450 ../../mod/setup.php:453
-msgid "proc_open"
+#: ../../mod/settings.php:932
+msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/setup.php:450
+#: ../../mod/settings.php:933
 msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr ""
-
-#: ../../mod/setup.php:458
-msgid "Error: libCURL PHP module required but not installed."
+"Very Public - extremely permissive (should be used with caution)"
 msgstr ""
 
-#: ../../mod/setup.php:462
+#: ../../mod/settings.php:934
 msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
 msgstr ""
 
-#: ../../mod/setup.php:466
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/settings.php:935
+msgid "Private - default private, never open or public"
 msgstr ""
 
-#: ../../mod/setup.php:470
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/settings.php:936
+msgid "Blocked - default blocked to/from everybody"
 msgstr ""
 
-#: ../../mod/setup.php:474
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/settings.php:939
+msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/setup.php:478
-msgid "Error: mcrypt PHP module required but not installed."
+#: ../../mod/settings.php:941
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/setup.php:494
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../mod/settings.php:941
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/setup.php:495
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../mod/settings.php:942
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/setup.php:496
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
+#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/setup.php:497
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
+#: ../../mod/settings.php:954
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/setup.php:500
-msgid ".htconfig.php is writable"
+#: ../../mod/settings.php:954
+msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/setup.php:510
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: ../../mod/settings.php:957
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/setup.php:511
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
+#: ../../mod/settings.php:958
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/setup.php:512 ../../mod/setup.php:530
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../mod/settings.php:959
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/setup.php:513
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+#: ../../mod/settings.php:960
+msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/setup.php:516
-msgid "view/tpl/smarty3 is writable"
+#: ../../mod/settings.php:961
+msgid "making an interesting profile change"
 msgstr ""
 
-#: ../../mod/setup.php:529
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to "
-"have write access to the store directory under the Red top level folder"
+#: ../../mod/settings.php:962
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/setup.php:533
-msgid "store is writable"
+#: ../../mod/settings.php:963
+msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/setup.php:548
-msgid "SSL certificate validation"
+#: ../../mod/settings.php:964
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/setup.php:548
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../mod/settings.php:965
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/setup.php:555
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+#: ../../mod/settings.php:966
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/setup.php:557
-msgid "Url rewrite is working"
+#: ../../mod/settings.php:967
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/setup.php:567
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
+#: ../../mod/settings.php:968
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/setup.php:591
-msgid "Errors encountered creating database tables."
+#: ../../mod/settings.php:969
+msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/setup.php:604
-msgid "
                                      What next
                                      "
+#: ../../mod/settings.php:970
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/setup.php:605
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/settings.php:973
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
-msgid "Edit post"
+#: ../../mod/settings.php:974
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
 #: ../../mod/subthread.php:105
@@ -4093,6 +3991,11 @@ msgstr ""
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:35
+msgid "Channel not found."
+msgstr ""
+
 #: ../../mod/chanview.php:93
 msgid "toggle full screen mode"
 msgstr ""
@@ -4102,9 +4005,39 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr ""
+
+#: ../../mod/chat.php:120
+msgid "Leave Room"
+msgstr ""
+
+#: ../../mod/chat.php:121
+msgid "I am away right now"
+msgstr ""
+
+#: ../../mod/chat.php:122
+msgid "I am online"
+msgstr ""
+
+#: ../../mod/chat.php:146 ../../mod/chat.php:166
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../mod/chat.php:147
+msgid "Chatroom Name"
+msgstr ""
+
+#: ../../mod/chat.php:162
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr ""
+
 #: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/photos.php:442 ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/directory.php:15 ../../mod/display.php:9
 #: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:442
 msgid "Public access denied."
 msgstr ""
 
@@ -4133,7 +4066,7 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
 msgid "Remove"
 msgstr ""
 
@@ -4215,63 +4148,184 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/sources.php:28
-msgid "Failed to create source. No channel selected."
+#: ../../mod/chatsvc.php:102
+msgid "Away"
+msgstr ""
+
+#: ../../mod/chatsvc.php:106
+msgid "Online"
+msgstr ""
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr ""
+
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr ""
+
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr ""
+
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr ""
+
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr ""
+
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr ""
+
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr ""
+
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr ""
+
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr ""
+
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr ""
+
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr ""
+
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr ""
+
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr ""
+
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr ""
+
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr ""
+
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr ""
+
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr ""
+
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
 msgstr ""
 
-#: ../../mod/sources.php:41
-msgid "Source created."
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
 msgstr ""
 
-#: ../../mod/sources.php:53
-msgid "Source updated."
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../mod/sources.php:82
-msgid "Manage remote sources of content for your channel."
+#: ../../mod/group.php:107
+msgid "Collection removed."
 msgstr ""
 
-#: ../../mod/sources.php:83 ../../mod/sources.php:93
-msgid "New Source"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
 msgstr ""
 
-#: ../../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."
+#: ../../mod/group.php:182
+msgid "Collection Editor"
 msgstr ""
 
-#: ../../mod/sources.php:95 ../../mod/sources.php:127
-msgid "Only import content with these words (one per line)"
+#: ../../mod/group.php:196
+msgid "Members"
 msgstr ""
 
-#: ../../mod/sources.php:95 ../../mod/sources.php:127
-msgid "Leave blank to import all public content"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../mod/sources.php:96 ../../mod/sources.php:130
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/sources.php:116 ../../mod/sources.php:143
-msgid "Source not found."
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/sources.php:123
-msgid "Edit Source"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/sources.php:124
-msgid "Delete Source"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/sources.php:151
-msgid "Source removed"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/sources.php:153
-msgid "Unable to remove source."
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
 msgstr ""
 
 #: ../../mod/admin.php:48
@@ -4348,10 +4402,6 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:379 ../../mod/settings.php:702
-msgid "No special theme for mobile devices"
-msgstr ""
-
 #: ../../mod/admin.php:381
 msgid "No special theme for accessibility"
 msgstr ""
@@ -4707,6 +4757,16 @@ msgstr ""
 msgid "Deny"
 msgstr ""
 
+#: ../../mod/admin.php:746 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
+msgstr ""
+
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
+msgstr ""
+
 #: ../../mod/admin.php:750
 msgid "Register date"
 msgstr ""
@@ -4806,634 +4866,445 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/mitem.php:14 ../../mod/menu.php:87
-msgid "Menu not found."
-msgstr ""
-
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
-msgstr ""
-
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
-msgstr ""
-
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:181
-msgid "Not found."
-msgstr ""
-
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
-msgstr ""
-
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
-msgstr ""
-
-#: ../../mod/mitem.php:102
-msgid "Edit element"
-msgstr ""
-
-#: ../../mod/mitem.php:103
-msgid "Drop element"
-msgstr ""
-
-#: ../../mod/mitem.php:104
-msgid "New element"
-msgstr ""
-
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
-msgstr ""
-
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
-msgstr ""
-
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:937
-msgid "(click to open/close)"
-msgstr ""
-
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
-msgstr ""
-
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
-msgstr ""
-
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
-msgstr ""
-
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
-msgstr ""
-
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../mod/mitem.php:142 ../../mod/menu.php:79 ../../mod/new_channel.php:117
-msgid "Create"
-msgstr ""
-
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
-msgstr ""
-
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
-msgstr ""
-
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
-msgstr ""
-
-#: ../../mod/mitem.php:186 ../../mod/menu.php:107
-msgid "Modify"
-msgstr ""
-
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr ""
-
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr ""
-
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr ""
-
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr ""
-
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr ""
-
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr ""
-
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr ""
-
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr ""
-
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr ""
-
-#: ../../mod/group.php:196
-msgid "Members"
-msgstr ""
-
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
-msgstr ""
-
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
-msgstr ""
-
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:97
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:119 ../../mod/photos.php:668
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:159 ../../mod/photos.php:934
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:452
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:499
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:573
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+#: ../../mod/filer.php:35
+msgid "- select -"
 msgstr ""
 
-#: ../../mod/photos.php:576
+#: ../../mod/home.php:89
 #, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:595
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:599 ../../mod/photos.php:663
-msgid "New album name: "
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/photos.php:600
-msgid "or existing album name: "
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/photos.php:601
-msgid "Do not show a status post for this upload"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../mod/photos.php:603 ../../mod/photos.php:929
-#: ../../mod/filestorage.php:124
-msgid "Permissions"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
 msgstr ""
 
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1105
-#: ../../mod/photos.php:1120
-msgid "Contact Photos"
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/photos.php:678
-msgid "Edit Album"
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/photos.php:684
-msgid "Show Newest First"
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/photos.php:686
-msgid "Show Oldest First"
+#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/photos.php:729 ../../mod/photos.php:1152
-msgid "View Photo"
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/photos.php:775
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../mod/directory.php:207
+msgid "Finding:"
 msgstr ""
 
-#: ../../mod/photos.php:777
-msgid "Photo not available"
+#: ../../mod/directory.php:215
+msgid "next page"
 msgstr ""
 
-#: ../../mod/photos.php:837
-msgid "Use as profile photo"
+#: ../../mod/directory.php:215
+msgid "previous page"
 msgstr ""
 
-#: ../../mod/photos.php:861
-msgid "View Full Size"
+#: ../../mod/directory.php:222
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/photos.php:917
-msgid "Edit photo"
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/photos.php:919
-msgid "Rotate CW (right)"
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/photos.php:920
-msgid "Rotate CCW (left)"
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/photos.php:922
-msgid "New album name"
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/photos.php:925
-msgid "Caption"
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/photos.php:927
-msgid "Add a Tag"
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/photos.php:931
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
 msgstr ""
 
-#: ../../mod/photos.php:1158
-msgid "View Album"
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
 msgstr ""
 
-#: ../../mod/photos.php:1167
-msgid "Recent Photos"
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
 msgstr ""
 
-#: ../../mod/chat.php:130
-msgid "New Chatroom"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
 msgstr ""
 
-#: ../../mod/chat.php:131
-msgid "Chatroom Name"
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
 msgstr ""
 
-#: ../../mod/filer.php:35
-msgid "- select -"
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
 msgstr ""
 
-#: ../../mod/menu.php:17
-msgid "Menu updated."
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
 msgstr ""
 
-#: ../../mod/menu.php:21
-msgid "Unable to update menu."
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
 msgstr ""
 
-#: ../../mod/menu.php:26
-msgid "Menu created."
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
 msgstr ""
 
-#: ../../mod/menu.php:30
-msgid "Unable to create menu."
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
 msgstr ""
 
-#: ../../mod/menu.php:53
-msgid "Manage Menus"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/menu.php:56
-msgid "Drop"
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/menu.php:58
-msgid "Create a new menu"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/menu.php:59
-msgid "Delete this menu"
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/menu.php:60 ../../mod/menu.php:104
-msgid "Edit menu contents"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/menu.php:61
-msgid "Edit this menu"
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/menu.php:76
-msgid "New Menu"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
 msgstr ""
 
-#: ../../mod/menu.php:77 ../../mod/menu.php:105
-msgid "Menu name"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
 msgstr ""
 
-#: ../../mod/menu.php:77 ../../mod/menu.php:105
-msgid "Must be unique, only seen by you"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/menu.php:78 ../../mod/menu.php:106
-msgid "Menu title"
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
 msgstr ""
 
-#: ../../mod/menu.php:78 ../../mod/menu.php:106
-msgid "Menu title as seen by others"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/menu.php:93
-msgid "Menu deleted."
+#: ../../mod/connedit.php:346
+msgid "Archive"
 msgstr ""
 
-#: ../../mod/menu.php:95
-msgid "Menu could not be deleted."
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
 msgstr ""
 
-#: ../../mod/menu.php:101
-msgid "Edit Menu"
+#: ../../mod/connedit.php:352
+msgid "Unhide"
 msgstr ""
 
-#: ../../mod/menu.php:103
-msgid "Add or remove entries to this menu"
+#: ../../mod/connedit.php:352
+msgid "Hide"
 msgstr ""
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
 msgstr ""
 
-#: ../../mod/directory.php:143 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
-msgid "Gender: "
+#: ../../mod/connedit.php:395
+msgid "Unknown"
 msgstr ""
 
-#: ../../mod/directory.php:207
-msgid "Finding:"
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/directory.php:215
-msgid "next page"
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/directory.php:215
-msgid "previous page"
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
 msgstr ""
 
-#: ../../mod/directory.php:222
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/connedit.php:421
+#, php-format
+msgid "Connections: settings for %s"
 msgstr ""
 
-#: ../../mod/connections.php:189 ../../mod/connections.php:261
-msgid "Blocked"
+#: ../../mod/connedit.php:425
+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:194 ../../mod/connections.php:268
-msgid "Ignored"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connections.php:199 ../../mod/connections.php:282
-msgid "Hidden"
+#: ../../mod/connedit.php:433
+msgid "inherited"
 msgstr ""
 
-#: ../../mod/connections.php:204 ../../mod/connections.php:275
-msgid "Archived"
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
 msgstr ""
 
-#: ../../mod/connections.php:215
-msgid "All"
+#: ../../mod/connedit.php:436
+msgid ""
+"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."
 msgstr ""
 
-#: ../../mod/connections.php:239
-msgid "Suggest new connections"
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/connections.php:245
-msgid "Show pending (new) connections"
+#: ../../mod/connedit.php:439
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/connections.php:248 ../../mod/profperm.php:134
-msgid "All Connections"
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/connections.php:251
-msgid "Show all connections"
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/connections.php:254
-msgid "Unblocked"
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connections.php:257
-msgid "Only show unblocked connections"
+#: ../../mod/connedit.php:444
+msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connections.php:264
-msgid "Only show blocked connections"
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
 msgstr ""
 
-#: ../../mod/connections.php:271
-msgid "Only show ignored connections"
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
 msgstr ""
 
-#: ../../mod/connections.php:278
-msgid "Only show archived connections"
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
 msgstr ""
 
-#: ../../mod/connections.php:285
-msgid "Only show hidden connections"
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
 msgstr ""
 
-#: ../../mod/connections.php:329
-#, php-format
-msgid "%1$s [%2$s]"
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
 msgstr ""
 
-#: ../../mod/connections.php:330
-msgid "Edit contact"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connections.php:353
-msgid "Search your connections"
+#: ../../mod/connedit.php:452
+msgid ""
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than individual "
+"settings. Changing those inherited settings on this page will have no effect."
 msgstr ""
 
-#: ../../mod/connections.php:354
-msgid "Finding: "
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
 msgstr ""
 
-#: ../../mod/layouts.php:52
-msgid "Layout Help"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
 msgstr ""
 
-#: ../../mod/layouts.php:55
-msgid "Help with this feature"
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
 msgstr ""
 
-#: ../../mod/layouts.php:74
-msgid "Layout Name"
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
-msgid "Help:"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/help.php:68 ../../index.php:223
-msgid "Not Found"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/rmagic.php:56
-msgid "Remote Authentication"
+#: ../../mod/connedit.php:462
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/rmagic.php:57
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/rmagic.php:58
-msgid "Authenticate"
+#: ../../mod/connedit.php:467
+msgid "Last update:"
 msgstr ""
 
-#: ../../mod/network.php:79
-msgid "No such group"
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
+#: ../../mod/connedit.php:471
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/network.php:180
-msgid "Collection: "
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/network.php:193
-msgid "Connection: "
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
 msgstr ""
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/post.php:226
+#: ../../mod/connedit.php:481
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+"Replies/likes to your public posts may still be visible"
 msgstr ""
 
-#: ../../mod/post.php:256
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
 msgstr ""
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
 msgstr ""
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
 msgstr ""
 
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/siteinfo.php:94
-msgid "Red"
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/siteinfo.php:95
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
+#: ../../mod/rmagic.php:56
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../mod/siteinfo.php:98
-msgid "Running at web location"
+#: ../../mod/rmagic.php:57
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../mod/siteinfo.php:99
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
+#: ../../mod/rmagic.php:58
+msgid "Authenticate"
 msgstr ""
 
-#: ../../mod/siteinfo.php:100
-msgid "Bug reports and issues: please visit"
+#: ../../mod/page.php:35
+msgid "Invalid item."
 msgstr ""
 
-#: ../../mod/siteinfo.php:103
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
-"librelist - dot com"
+#: ../../mod/network.php:79
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/siteinfo.php:104
-msgid "Site Administrators"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
+#: ../../mod/network.php:172
+msgid "Collection is empty"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/network.php:180
+msgid "Collection: "
 msgstr ""
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr ""
+
+#: ../../mod/network.php:196
+msgid "Invalid connection."
 msgstr ""
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:138
@@ -5684,666 +5555,728 @@ msgstr ""
 msgid "Include desirable objects in your profile"
 msgstr ""
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
+#: ../../mod/follow.php:25
+msgid "Channel added."
 msgstr ""
 
-#: ../../mod/new_channel.php:108
+#: ../../mod/post.php:226
 msgid ""
-"A channel is your own collection of related web pages. A channel can be used "
-"to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
 msgstr ""
 
-#: ../../mod/new_channel.php:111
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\" "
+#: ../../mod/post.php:256
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../mod/new_channel.php:114
-msgid ""
-"Or import an existing channel from another location"
+#: ../../mod/sources.php:45
+msgid "Source created."
 msgstr ""
 
-#: ../../mod/filestorage.php:68
-msgid "Permission Denied."
+#: ../../mod/sources.php:57
+msgid "Source updated."
 msgstr ""
 
-#: ../../mod/filestorage.php:85
-msgid "File not found."
+#: ../../mod/sources.php:82
+msgid "*"
 msgstr ""
 
-#: ../../mod/filestorage.php:119
-msgid "Edit file permissions"
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../mod/filestorage.php:126
-msgid "Include all files and sub folders"
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
 msgstr ""
 
-#: ../../mod/filestorage.php:127
-msgid "Return to file list"
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../mod/filestorage.php:129
-msgid "Copy/paste this code to attach file to a post"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../mod/filestorage.php:130
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../mod/filestorage.php:167
-msgid "Download"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
 msgstr ""
 
-#: ../../mod/filestorage.php:173
-msgid "Used: "
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
 msgstr ""
 
-#: ../../mod/filestorage.php:174
-msgid "[directory]"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
 msgstr ""
 
-#: ../../mod/filestorage.php:176
-msgid "Limit: "
+#: ../../mod/sources.php:131
+msgid "Delete Source"
 msgstr ""
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
+#: ../../mod/sources.php:158
+msgid "Source removed"
 msgstr ""
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
 msgstr ""
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../mod/magic.php:70
+msgid "Hub not found."
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1431
-msgid "Password Reset"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
 msgstr ""
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
+#: ../../mod/setup.php:171
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/setup.php:187
 msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
 msgstr ""
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
+#: ../../mod/setup.php:254
+msgid "System check"
 msgstr ""
 
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/setup.php:259
+msgid "Check again"
 msgstr ""
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
+#: ../../mod/setup.php:281
+msgid "Database connection"
 msgstr ""
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/import.php:36
-msgid "Nothing to import."
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/import.php:58
-msgid "Unable to download data from old server"
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/import.php:64
-msgid "Imported file is empty."
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/import.php:88
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
 msgstr ""
 
-#: ../../mod/import.php:106
-msgid "Channel clone failed. Import failed."
+#: ../../mod/setup.php:289
+msgid "Database Port"
 msgstr ""
 
-#: ../../mod/import.php:116
-msgid "Cloned channel not found. Import failed."
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../mod/import.php:358
-msgid "Import completed."
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/import.php:371
-msgid "You must be logged in to use this feature."
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/import.php:376
-msgid "Import Channel"
+#: ../../mod/setup.php:292
+msgid "Database Name"
+msgstr ""
+
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/import.php:377
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
 msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file. Only identity and connections/relationships will be "
-"imported. Importation of content is not yet available."
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../mod/import.php:378
-msgid "File to Upload"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
 msgstr ""
 
-#: ../../mod/import.php:379
-msgid "Or provide the old server/hub details"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../mod/import.php:380
-msgid "Your old identity address (xyz@example.com)"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/import.php:381
-msgid "Your old login email address"
+#: ../../mod/setup.php:325
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/import.php:382
-msgid "Your old login password"
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/import.php:383
+#: ../../mod/setup.php:385
 msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
-msgstr ""
-
-#: ../../mod/import.php:384
-msgid "Make this hub my primary location"
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../mod/manage.php:63
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/manage.php:71
-msgid "Create a new channel"
+#: ../../mod/setup.php:389
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../mod/manage.php:76
-msgid "Channel Manager"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/manage.php:77
-msgid "Current Channel"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/manage.php:79
-msgid "Attach to one of your channels by selecting it."
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/manage.php:80
-msgid "Default Channel"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/manage.php:81
-msgid "Make Default"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/vote.php:97
-msgid "Total votes"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/vote.php:98
-msgid "Average Rating"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/match.php:16
-msgid "Profile Match"
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/match.php:24
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/match.php:61
-msgid "is interested in:"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/match.php:69
-msgid "No matches"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/zfinger.php:23
-msgid "invalid target signature"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:535
-msgid "Update"
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:192
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
 msgstr ""
 
-#: ../../mod/settings.php:196
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
 
-#: ../../mod/settings.php:209
-msgid "Password changed."
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:211
-msgid "Password update failed. Please try again."
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:225
-msgid "Not valid email."
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:228
-msgid "Protected email address. Cannot change to that email."
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:237
-msgid "System failure storing new email. Please try again."
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:437
-msgid "Settings updated."
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:508 ../../mod/settings.php:534
-#: ../../mod/settings.php:570
-msgid "Add application"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/settings.php:511 ../../mod/settings.php:537
-msgid "Name"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/settings.php:511
-msgid "Name of application"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
-msgid "Consumer Key"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:513
-msgid "Automatically generated - change if desired. Max length 20"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/settings.php:513 ../../mod/settings.php:539
-msgid "Consumer Secret"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/settings.php:514 ../../mod/settings.php:540
-msgid "Redirect"
+#: ../../mod/setup.php:514
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
 msgstr ""
 
-#: ../../mod/settings.php:514
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-msgid "Icon url"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../mod/settings.php:515
-msgid "Optional"
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
 msgstr ""
 
-#: ../../mod/settings.php:526
-msgid "You can't edit this application."
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to "
+"have write access to the store directory under the Red top level folder"
 msgstr ""
 
-#: ../../mod/settings.php:569
-msgid "Connected Apps"
+#: ../../mod/setup.php:536
+msgid "store is writable"
 msgstr ""
 
-#: ../../mod/settings.php:573
-msgid "Client key starts with"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../mod/settings.php:574
-msgid "No name"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../mod/settings.php:575
-msgid "Remove authorization"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: ../../mod/settings.php:586
-msgid "No feature settings configured"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/settings.php:594
-msgid "Feature Settings"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/settings.php:617
-msgid "Account Settings"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/settings.php:618
-msgid "Password Settings"
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
 msgstr ""
 
-#: ../../mod/settings.php:619
-msgid "New Password:"
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/settings.php:620
-msgid "Confirm:"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
 msgstr ""
 
-#: ../../mod/settings.php:620
-msgid "Leave password fields blank unless changing"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/settings.php:622 ../../mod/settings.php:917
-msgid "Email Address:"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/settings.php:623
-msgid "Remove Account"
+#: ../../mod/siteinfo.php:109
+msgid "Red"
 msgstr ""
 
-#: ../../mod/settings.php:624
-msgid "Warning: This action is permanent and cannot be reversed."
+#: ../../mod/siteinfo.php:110
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
 msgstr ""
 
-#: ../../mod/settings.php:640
-msgid "Off"
+#: ../../mod/siteinfo.php:113
+msgid "Running at web location"
 msgstr ""
 
-#: ../../mod/settings.php:640
-msgid "On"
+#: ../../mod/siteinfo.php:114
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
 msgstr ""
 
-#: ../../mod/settings.php:647
-msgid "Additional Features"
+#: ../../mod/siteinfo.php:115
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/settings.php:672
-msgid "Connector Settings"
+#: ../../mod/siteinfo.php:118
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../mod/settings.php:742
-msgid "Display Settings"
+#: ../../mod/siteinfo.php:120
+msgid "Site Administrators"
 msgstr ""
 
-#: ../../mod/settings.php:748
-msgid "Display Theme:"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
 msgstr ""
 
-#: ../../mod/settings.php:749
-msgid "Mobile Theme:"
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used "
+"to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
 msgstr ""
 
-#: ../../mod/settings.php:750
-msgid "Update browser every xx seconds"
+#: ../../mod/new_channel.php:111
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\" "
 msgstr ""
 
-#: ../../mod/settings.php:750
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../mod/settings.php:751
-msgid "Maximum number of conversations to load at any time:"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
 msgstr ""
 
-#: ../../mod/settings.php:751
-msgid "Maximum of 100 items"
+#: ../../mod/new_channel.php:114
+msgid ""
+"Or import an existing channel from another location"
 msgstr ""
 
-#: ../../mod/settings.php:752
-msgid "Don't show emoticons"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/settings.php:788
-msgid "Nobody except yourself"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/settings.php:789
-msgid "Only those you specifically allow"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../mod/settings.php:790
-msgid "Anybody in your address book"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/settings.php:791
-msgid "Anybody on this website"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/settings.php:792
-msgid "Anybody in this network"
+#: ../../mod/lostpass.php:85 ../../boot.php:1434
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/settings.php:793
-msgid "Anybody on the internet"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/settings.php:870
-msgid "Publish your default profile in the network directory"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/settings.php:875
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/settings.php:879 ../../mod/profile_photo.php:288
-msgid "or"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/settings.php:884
-msgid "Your channel address is"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/settings.php:906
-msgid "Channel Settings"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
 msgstr ""
 
-#: ../../mod/settings.php:915
-msgid "Basic Settings"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/settings.php:918
-msgid "Your Timezone:"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/settings.php:919
-msgid "Default Post Location:"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
 msgstr ""
 
-#: ../../mod/settings.php:920
-msgid "Use Browser Location:"
+#: ../../mod/lostpass.php:125
+msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:922
-msgid "Adult Content"
+#: ../../mod/import.php:36
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../mod/settings.php:922
-msgid "This channel publishes adult content."
+#: ../../mod/import.php:58
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../mod/settings.php:924
-msgid "Security and Privacy Settings"
+#: ../../mod/import.php:64
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../mod/settings.php:926
-msgid "Hide my online presence"
+#: ../../mod/import.php:88
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../mod/settings.php:926
-msgid "Prevents showing if you are available for chat"
+#: ../../mod/import.php:106
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../mod/settings.php:928
-msgid "Quick Privacy Settings:"
+#: ../../mod/import.php:116
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../mod/settings.php:929
-msgid "Very Public - extremely permissive"
+#: ../../mod/import.php:358
+msgid "Import completed."
 msgstr ""
 
-#: ../../mod/settings.php:930
-msgid "Typical - default public, privacy when desired"
+#: ../../mod/import.php:371
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../mod/settings.php:931
-msgid "Private - default private, rarely open or public"
+#: ../../mod/import.php:376
+msgid "Import Channel"
 msgstr ""
 
-#: ../../mod/settings.php:932
-msgid "Blocked - default blocked to/from everybody"
+#: ../../mod/import.php:377
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You "
+"may retrieve the channel identity from the old server/hub via the network or "
+"provide an export file. Only identity and connections/relationships will be "
+"imported. Importation of content is not yet available."
 msgstr ""
 
-#: ../../mod/settings.php:935
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/import.php:378
+msgid "File to Upload"
 msgstr ""
 
-#: ../../mod/settings.php:935
-msgid "May reduce spam activity"
+#: ../../mod/import.php:379
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../mod/settings.php:936
-msgid "Default Post Permissions"
+#: ../../mod/import.php:380
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../mod/settings.php:948
-msgid "Maximum private messages per day from unknown people:"
+#: ../../mod/import.php:381
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../mod/settings.php:948
-msgid "Useful to reduce spamming"
+#: ../../mod/import.php:382
+msgid "Your old login password"
 msgstr ""
 
-#: ../../mod/settings.php:951
-msgid "Notification Settings"
+#: ../../mod/import.php:383
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
 msgstr ""
 
-#: ../../mod/settings.php:952
-msgid "By default post a status message when:"
+#: ../../mod/import.php:384
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../mod/settings.php:953
-msgid "accepting a friend request"
+#: ../../mod/manage.php:63
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../mod/settings.php:954
-msgid "joining a forum/community"
+#: ../../mod/manage.php:71
+msgid "Create a new channel"
 msgstr ""
 
-#: ../../mod/settings.php:955
-msgid "making an interesting profile change"
+#: ../../mod/manage.php:76
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../mod/settings.php:956
-msgid "Send a notification email when:"
+#: ../../mod/manage.php:77
+msgid "Current Channel"
 msgstr ""
 
-#: ../../mod/settings.php:957
-msgid "You receive an introduction"
+#: ../../mod/manage.php:79
+msgid "Attach to one of your channels by selecting it."
 msgstr ""
 
-#: ../../mod/settings.php:958
-msgid "Your introductions are confirmed"
+#: ../../mod/manage.php:80
+msgid "Default Channel"
 msgstr ""
 
-#: ../../mod/settings.php:959
-msgid "Someone writes on your profile wall"
+#: ../../mod/manage.php:81
+msgid "Make Default"
 msgstr ""
 
-#: ../../mod/settings.php:960
-msgid "Someone writes a followup comment"
+#: ../../mod/vote.php:97
+msgid "Total votes"
 msgstr ""
 
-#: ../../mod/settings.php:961
-msgid "You receive a private message"
+#: ../../mod/vote.php:98
+msgid "Average Rating"
 msgstr ""
 
-#: ../../mod/settings.php:962
-msgid "You receive a friend suggestion"
+#: ../../mod/match.php:16
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/settings.php:963
-msgid "You are tagged in a post"
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../mod/settings.php:964
-msgid "You are poked/prodded/etc. in a post"
+#: ../../mod/match.php:61
+msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/settings.php:967
-msgid "Advanced Account/Page Type Settings"
+#: ../../mod/match.php:69
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/settings.php:968
-msgid "Change the behaviour of this account for special situations"
+#: ../../mod/zfinger.php:23
+msgid "invalid target signature"
 msgstr ""
 
 #: ../../mod/mail.php:33
@@ -6420,11 +6353,6 @@ msgstr ""
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/editlayout.php:36 ../../mod/editpost.php:20
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
-msgstr ""
-
 #: ../../mod/editlayout.php:72
 msgid "Edit Layout"
 msgstr ""
@@ -6433,21 +6361,6 @@ msgstr ""
 msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/editlayout.php:110 ../../mod/editpost.php:107
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/editlayout.php:111 ../../mod/editpost.php:108
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/editlayout.php:112 ../../mod/editpost.php:109
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
 #: ../../mod/editlayout.php:147
 msgid "Delete Layout"
 msgstr ""
@@ -6491,49 +6404,114 @@ msgstr ""
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:284
-msgid "Upload"
+#: ../../mod/profile_photo.php:284
+msgid "Upload"
+msgstr ""
+
+#: ../../mod/profile_photo.php:288
+msgid "skip this step"
+msgstr ""
+
+#: ../../mod/profile_photo.php:288
+msgid "select a photo from your photo albums"
+msgstr ""
+
+#: ../../mod/profile_photo.php:302
+msgid "Crop Image"
+msgstr ""
+
+#: ../../mod/profile_photo.php:303
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+
+#: ../../mod/profile_photo.php:305
+msgid "Done Editing"
+msgstr ""
+
+#: ../../mod/profile_photo.php:340
+msgid "Image uploaded successfully."
+msgstr ""
+
+#: ../../mod/profile_photo.php:342
+msgid "Image upload failed."
+msgstr ""
+
+#: ../../mod/profile_photo.php:351
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr ""
+
+#: ../../mod/connections.php:191 ../../mod/connections.php:263
+msgid "Blocked"
+msgstr ""
+
+#: ../../mod/connections.php:196 ../../mod/connections.php:270
+msgid "Ignored"
+msgstr ""
+
+#: ../../mod/connections.php:201 ../../mod/connections.php:284
+msgid "Hidden"
+msgstr ""
+
+#: ../../mod/connections.php:206 ../../mod/connections.php:277
+msgid "Archived"
+msgstr ""
+
+#: ../../mod/connections.php:217
+msgid "All"
+msgstr ""
+
+#: ../../mod/connections.php:241
+msgid "Suggest new connections"
+msgstr ""
+
+#: ../../mod/connections.php:247
+msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:288
-msgid "skip this step"
+#: ../../mod/connections.php:253
+msgid "Show all connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:288
-msgid "select a photo from your photo albums"
+#: ../../mod/connections.php:256
+msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/profile_photo.php:302
-msgid "Crop Image"
+#: ../../mod/connections.php:259
+msgid "Only show unblocked connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:303
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/connections.php:266
+msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:305
-msgid "Done Editing"
+#: ../../mod/connections.php:273
+msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:340
-msgid "Image uploaded successfully."
+#: ../../mod/connections.php:280
+msgid "Only show archived connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:342
-msgid "Image upload failed."
+#: ../../mod/connections.php:287
+msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../mod/profile_photo.php:351
+#: ../../mod/connections.php:331
 #, php-format
-msgid "Image size reduction [%s] failed."
+msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/connections.php:332
+msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/connections.php:355
+msgid "Search your connections"
+msgstr ""
+
+#: ../../mod/connections.php:356
+msgid "Finding: "
 msgstr ""
 
 #: ../../mod/notifications.php:26
@@ -6600,10 +6578,6 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
-#: ../../mod/wall_upload.php:41 ../../mod/item.php:1075
-msgid "Wall Photos"
-msgstr ""
-
 #: ../../mod/channel.php:85
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
@@ -6649,20 +6623,77 @@ msgstr ""
 msgid "Delete Block"
 msgstr ""
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
+#: ../../mod/dirprofile.php:114
+msgid "Status: "
 msgstr ""
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
+#: ../../mod/dirprofile.php:115
+msgid "Sexual Preference: "
 msgstr ""
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
+#: ../../mod/dirprofile.php:117
+msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
+#: ../../mod/dirprofile.php:118
+msgid "Hometown: "
+msgstr ""
+
+#: ../../mod/dirprofile.php:120
+msgid "About: "
+msgstr ""
+
+#: ../../mod/dirprofile.php:168
+msgid "Keywords: "
+msgstr ""
+
+#: ../../mod/filestorage.php:68
+msgid "Permission Denied."
+msgstr ""
+
+#: ../../mod/filestorage.php:85
+msgid "File not found."
+msgstr ""
+
+#: ../../mod/filestorage.php:119
+msgid "Edit file permissions"
+msgstr ""
+
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
+#: ../../mod/photos.php:946
+msgid "Permissions"
+msgstr ""
+
+#: ../../mod/filestorage.php:126
+msgid "Include all files and sub folders"
+msgstr ""
+
+#: ../../mod/filestorage.php:127
+msgid "Return to file list"
+msgstr ""
+
+#: ../../mod/filestorage.php:129
+msgid "Copy/paste this code to attach file to a post"
+msgstr ""
+
+#: ../../mod/filestorage.php:130
+msgid "Copy/paste this URL to link file from a web page"
+msgstr ""
+
+#: ../../mod/filestorage.php:167
+msgid "Download"
+msgstr ""
+
+#: ../../mod/filestorage.php:173
+msgid "Used: "
+msgstr ""
+
+#: ../../mod/filestorage.php:174
+msgid "[directory]"
+msgstr ""
+
+#: ../../mod/filestorage.php:176
+msgid "Limit: "
 msgstr ""
 
 #: ../../mod/suggest.php:35
@@ -6814,178 +6845,251 @@ msgstr ""
 msgid "Remove Channel"
 msgstr ""
 
-#: ../../mod/item.php:145
-msgid "Unable to locate original post."
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/item.php:346
-msgid "Empty post discarded."
+#: ../../mod/photos.php:97
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/item.php:388
-msgid "Executable content type not permitted to this channel."
+#: ../../mod/photos.php:119 ../../mod/photos.php:668
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/item.php:819
-msgid "System error. Post not saved."
+#: ../../mod/photos.php:159 ../../mod/photos.php:951
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:452
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:499
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/item.php:1155
+#: ../../mod/photos.php:573
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/item.php:1161
+#: ../../mod/photos.php:576
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/mood.php:138
-msgid "Mood"
+#: ../../mod/photos.php:595
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/mood.php:139
-msgid "Set your current mood and tell your friends"
+#: ../../mod/photos.php:599 ../../mod/photos.php:663
+msgid "New album name: "
 msgstr ""
 
-#: ../../mod/ping.php:186
-msgid "sent you a private message"
+#: ../../mod/photos.php:600
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/ping.php:244
-msgid "added your channel"
+#: ../../mod/photos.php:601
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/ping.php:288
-msgid "posted an event"
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
+#: ../../mod/photos.php:1138
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/dirprofile.php:114
-msgid "Status: "
+#: ../../mod/photos.php:678
+msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/dirprofile.php:115
-msgid "Sexual Preference: "
+#: ../../mod/photos.php:684
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/dirprofile.php:117
-msgid "Homepage: "
+#: ../../mod/photos.php:686
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/dirprofile.php:118
-msgid "Hometown: "
+#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+msgid "View Photo"
 msgstr ""
 
-#: ../../mod/dirprofile.php:120
-msgid "About: "
+#: ../../mod/photos.php:775
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/dirprofile.php:168
-msgid "Keywords: "
+#: ../../mod/photos.php:777
+msgid "Photo not available"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:74
-msgid "Scheme Default"
+#: ../../mod/photos.php:837
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:861
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:935
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:937
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:938
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:940
+msgid "New album name"
+msgstr ""
+
+#: ../../mod/photos.php:943
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:945
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:948
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+
+#: ../../mod/photos.php:1101
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1176
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1185
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../mod/mood.php:138
+msgid "Mood"
+msgstr ""
+
+#: ../../mod/mood.php:139
+msgid "Set your current mood and tell your friends"
+msgstr ""
+
+#: ../../mod/ping.php:192
+msgid "sent you a private message"
+msgstr ""
+
+#: ../../mod/ping.php:250
+msgid "added your channel"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:75
-msgid "red"
+#: ../../mod/ping.php:294
+msgid "posted an event"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:76
-msgid "black"
+msgid "Scheme Default"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:77
+#: ../../view/theme/redbasic/php/config.php:87
 msgid "silver"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:98
 #: ../../view/theme/apw/php/config.php:234
 #: ../../view/theme/blogga/view/theme/blog/config.php:69
 #: ../../view/theme/blogga/php/config.php:69
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/apw/php/config.php:235
 msgid "Set scheme"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Navigation bar colour"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "link colour"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Set font-colour for banner"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Set the background colour"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Set the background image"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Set the background colour of items"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Set the opacity of items"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Set the basic colour for item icons"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Set the hover colour for item icons"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Set font-size for the entire application"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
 #: ../../view/theme/apw/php/config.php:236
 msgid "Set font-size for posts and comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Set font-colour for posts and comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set radius of corners"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set shadow depth of photos"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set maximum width of conversation regions"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set size of conversation author photo"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Sloppy photo albums"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Are you a clean desk or a messy desk person?"
 msgstr ""
 
@@ -7129,41 +7233,41 @@ msgstr ""
 msgid "Header image only on profile pages"
 msgstr ""
 
-#: ../../boot.php:1229
+#: ../../boot.php:1232
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1232
+#: ../../boot.php:1235
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1396
+#: ../../boot.php:1399
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1424
+#: ../../boot.php:1427
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1425
+#: ../../boot.php:1428
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1430
+#: ../../boot.php:1433
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1495
+#: ../../boot.php:1498
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1496
+#: ../../boot.php:1499
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:1892
+#: ../../boot.php:1899
 msgid "toggle mobile"
 msgstr ""
diff --git a/version.inc b/version.inc
index 424737526..a760a1660 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-06.580
+2014-02-07.581
-- 
cgit v1.2.3


From c80325b4279b6f19540416064382755ca5e6eccd Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 7 Feb 2014 01:49:34 -0800
Subject: order menu_list by description, not name

---
 include/menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/menu.php b/include/menu.php
index 813d7bcdb..b879af845 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -116,7 +116,7 @@ function menu_list($channel_id, $name = '', $flags = 0) {
 	$sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : '');
 	$sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : '');
 
-	$r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_name",
+	$r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_desc",
 		intval($channel_id)
 	);
 	return $r;
-- 
cgit v1.2.3


From f62ec4132ed571288737423de386054a4cc8b0d5 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Fri, 7 Feb 2014 21:28:39 +0100
Subject: let oneself be added to a collection in exchange for deleted contacts

---
 include/group.php | 4 ++--
 mod/group.php     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/group.php b/include/group.php
index 56a7555bc..56f177ab0 100644
--- a/include/group.php
+++ b/include/group.php
@@ -188,11 +188,11 @@ function group_get_members($gid) {
 	if(intval($gid)) {
 		$r = q("SELECT * FROM `group_member` 
 			LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
-			WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( abook_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ",
+			WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( xchan_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ",
 			intval($gid),
 			intval(local_user()),
 			intval(local_user()),
-			intval(ABOOK_FLAG_SELF),
+			intval(XCHAN_FLAGS_DELETED),
 			intval(ABOOK_FLAG_BLOCKED),
 			intval(ABOOK_FLAG_PENDING)
 		);
diff --git a/mod/group.php b/mod/group.php
index 66e5fbf8e..15e4ff2a3 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -117,10 +117,10 @@ function group_content(&$a) {
 
 		check_form_security_token_ForbiddenOnErr('group_member_change', 't');
 
-		$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1",
+		$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1",
 			dbesc(argv(2)),
 			intval(local_user()),
-			intval(ABOOK_FLAG_SELF),
+			intval(XCHAN_FLAGS_DELETED),
 			intval(ABOOK_FLAG_BLOCKED),
 			intval(ABOOK_FLAG_PENDING)
 		);
@@ -210,10 +210,10 @@ function group_content(&$a) {
 			group_rmv_member(local_user(),$group['name'],$member['xchan_hash']);
 	}
 
-	$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND  not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) order by xchan_name asc",
+	$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND  not (abook_flags & %d) and not (xchan_flags & %d) and not (abook_flags & %d) order by xchan_name asc",
 		intval(local_user()),
 		intval(ABOOK_FLAG_BLOCKED),
-		intval(ABOOK_FLAG_SELF),
+		intval(XCHAN_FLAGS_DELETED),
 		intval(ABOOK_FLAG_PENDING)
 	);
 
-- 
cgit v1.2.3


From 63589d4f2e05ec9bb2c8da193f566da512de5364 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 7 Feb 2014 13:37:33 -0800
Subject: from olivier: use double quotes in js strings, updated FR translation
 from me: provide future ability to have an optional edit link/icon next to
 menus (such as bookmarks)

---
 include/menu.php        |     3 +-
 mod/directory.php       |     1 +
 view/fr/messages.po     | 10012 +++++++++++++++++++++++++++-------------------
 view/fr/strings.php     |  2761 ++++++++-----
 view/tpl/js_strings.tpl |    48 +-
 5 files changed, 7672 insertions(+), 5153 deletions(-)

diff --git a/include/menu.php b/include/menu.php
index b879af845..e9049bf8e 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -24,7 +24,7 @@ function menu_fetch($name,$uid,$observer_xchan) {
 	return null;
 }
 	
-function menu_render($menu) {
+function menu_render($menu, $edit = false) {
 	if(! $menu)
 		return '';
 
@@ -38,6 +38,7 @@ function menu_render($menu) {
 
 	return replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
+		'$edit' => $edit,
 		'$items' => $menu['items']
 	));
 }
diff --git a/mod/directory.php b/mod/directory.php
index ff51b55db..8fc62e95b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -46,6 +46,7 @@ function directory_content(&$a) {
 
 	$tpl = get_markup_template('directory_header.tpl');
 
+		
 
 	$dirmode = intval(get_config('system','directory_mode'));
 
diff --git a/view/fr/messages.po b/view/fr/messages.po
index 2d3909ca2..9df80657e 100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -1,5301 +1,7279 @@
-# FRIENDICA Distributed Social Network
-# Copyright (C) 2010, 2011 Mike Macgirvin
-# This file is distributed under the same license as the Friendika package.
+# Red Matrix Project
+# Copyright (C) 2012-2014 the Red Matrix Project
+# This file is distributed under the same license as the Red package.
 # 
 # Translators:
-# Olivier  , 2011.
+# Olivier , 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2011-11-15 17:20+0100\n"
-"PO-Revision-Date: 2011-11-17 08:22+0000\n"
-"Last-Translator: olivierm \n"
-"Language-Team: French (http://www.transifex.net/projects/p/friendica/team/fr/)\n"
+"Project-Id-Version: Red Matrix\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-07 00:03-0800\n"
+"PO-Revision-Date: 2014-02-07 20:34+0000\n"
+"Last-Translator: Olivier \n"
+"Language-Team: French (http://www.transifex.com/projects/p/red-matrix/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../../index.php:213 ../../mod/help.php:38
-msgid "Not Found"
-msgstr "Non trouvé"
-
-#: ../../index.php:216 ../../mod/help.php:41
-msgid "Page not found."
-msgstr "Page introuvable."
+#: ../../include/acl_selectors.php:235
+msgid "Visible to everybody"
+msgstr "Visible par tous"
 
-#: ../../index.php:279 ../../mod/profperm.php:19 ../../mod/group.php:67
-msgid "Permission denied"
-msgstr "Permission refusée"
-
-#: ../../index.php:280 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:137 ../../mod/profile_photo.php:148
-#: ../../mod/profile_photo.php:159 ../../mod/wall_attach.php:43
-#: ../../mod/suggest.php:28 ../../mod/regmod.php:111 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/settings.php:41
-#: ../../mod/settings.php:46 ../../mod/settings.php:376
-#: ../../mod/photos.php:123 ../../mod/photos.php:858 ../../mod/display.php:111
-#: ../../mod/editpost.php:10 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/contacts.php:115 ../../mod/register.php:27
-#: ../../mod/allfriends.php:9 ../../mod/install.php:96 ../../mod/network.php:6
-#: ../../mod/events.php:109 ../../mod/notifications.php:62
-#: ../../mod/crepair.php:113 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/notes.php:20 ../../mod/fsuggest.php:78 ../../mod/item.php:113
-#: ../../mod/message.php:9 ../../mod/message.php:42
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewconnections.php:21
-#: ../../mod/group.php:19 ../../mod/attach.php:33 ../../mod/common.php:9
-#: ../../addon/facebook/facebook.php:331 ../../include/items.php:2874
-msgid "Permission denied."
-msgstr "Permission refusée."
+#: ../../include/acl_selectors.php:236
+msgid "show"
+msgstr "montrer"
 
-#: ../../boot.php:419
-msgid "Delete this item?"
-msgstr "Effacer cet élément?"
+#: ../../include/acl_selectors.php:237
+msgid "don't show"
+msgstr "cacher"
 
-#: ../../boot.php:420 ../../mod/photos.php:1202 ../../mod/photos.php:1241
-#: ../../mod/photos.php:1272 ../../include/conversation.php:433
-msgid "Comment"
-msgstr "Commenter"
+#: ../../include/activities.php:39
+msgid " and "
+msgstr "et"
 
-#: ../../boot.php:662
-msgid "Create a New Account"
-msgstr "Créer un nouveau compte"
+#: ../../include/activities.php:47
+msgid "public profile"
+msgstr "profil public"
 
-#: ../../boot.php:663 ../../mod/register.php:530 ../../include/nav.php:77
-msgid "Register"
-msgstr "S'inscrire"
+#: ../../include/activities.php:52
+#, php-format
+msgid "%1$s changed %2$s to “%3$s”"
+msgstr "%1$s a changé %2$s en “%3$s”"
 
-#: ../../boot.php:679 ../../include/nav.php:44
-msgid "Logout"
-msgstr "Se déconnecter"
+#: ../../include/activities.php:53
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Visiter %1$s de %2$s"
 
-#: ../../boot.php:680 ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-msgid "Login"
-msgstr "Connexion"
+#: ../../include/activities.php:56
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s a mis-à-jour %2$s, modifiant %3$s."
 
-#: ../../boot.php:682
-msgid "Nickname or Email address: "
-msgstr "Pseudo ou courriel: "
+#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1423
+msgid "Logout"
+msgstr "Déconnexion"
 
-#: ../../boot.php:683
-msgid "Password: "
-msgstr "Mot de passe: "
+#: ../../include/nav.php:72 ../../include/nav.php:91
+msgid "End this session"
+msgstr "Mettre fin à la session"
 
-#: ../../boot.php:686
-msgid "OpenID: "
-msgstr "OpenID: "
+#: ../../include/nav.php:75 ../../include/nav.php:125
+msgid "Home"
+msgstr "Canal"
 
-#: ../../boot.php:692
-msgid "Forgot your password?"
-msgstr "Mot de passe oublié?"
+#: ../../include/nav.php:75
+msgid "Your posts and conversations"
+msgstr "Vos publications et conversations"
 
-#: ../../boot.php:693 ../../mod/lostpass.php:82
-msgid "Password Reset"
-msgstr "Réinitialiser le mot de passe"
+#: ../../include/nav.php:76 ../../include/conversation.php:933
+#: ../../mod/connedit.php:312 ../../mod/connedit.php:426
+msgid "View Profile"
+msgstr "Voir profil"
 
-#: ../../boot.php:815 ../../mod/profile.php:10 ../../mod/hcard.php:10
-msgid "No profile"
-msgstr "Aucun profil"
+#: ../../include/nav.php:76
+msgid "Your profile page"
+msgstr "Votre profil"
 
-#: ../../boot.php:839
-msgid "Edit profile"
-msgstr "Editer le profil"
+#: ../../include/nav.php:78
+msgid "Edit Profiles"
+msgstr "Éditer profils"
 
-#: ../../boot.php:890 ../../include/contact_widgets.php:9
-msgid "Connect"
-msgstr "Relier"
+#: ../../include/nav.php:78
+msgid "Manage/Edit profiles"
+msgstr "Gérer/éditer profils"
 
-#: ../../boot.php:900 ../../include/nav.php:129
-msgid "Profiles"
-msgstr "Profils"
+#: ../../include/nav.php:79 ../../include/conversation.php:1475
+#: ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr "Photos"
 
-#: ../../boot.php:900 ../../include/nav.php:129
-msgid "Manage/edit profiles"
-msgstr "Gérer/éditer les profils"
+#: ../../include/nav.php:79
+msgid "Your photos"
+msgstr "Vos photos"
 
-#: ../../boot.php:906 ../../mod/profiles.php:462
-msgid "Change profile photo"
-msgstr "Changer de photo de profil"
+#: ../../include/nav.php:80 ../../include/conversation.php:1484
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr "Fichiers"
 
-#: ../../boot.php:907 ../../mod/profiles.php:463
-msgid "Create New Profile"
-msgstr "Créer un nouveau profil"
+#: ../../include/nav.php:80
+msgid "Your files"
+msgstr "Vos fichiers"
 
-#: ../../boot.php:917 ../../mod/profiles.php:473
-msgid "Profile Image"
-msgstr "Image du profil"
+#: ../../include/nav.php:81
+msgid "Chat"
+msgstr "Discussion"
 
-#: ../../boot.php:920 ../../mod/profiles.php:475
-msgid "visible to everybody"
-msgstr "visible par tous"
+#: ../../include/nav.php:81
+msgid "Your chatrooms"
+msgstr "Vos salons"
 
-#: ../../boot.php:921 ../../mod/profiles.php:476
-msgid "Edit visibility"
-msgstr "Changer la visibilité"
+#: ../../include/nav.php:82 ../../include/nav.php:175
+#: ../../include/conversation.php:1506 ../../mod/events.php:354
+msgid "Events"
+msgstr "Événements"
 
-#: ../../boot.php:940 ../../mod/events.php:325 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:249
-msgid "Location:"
-msgstr "Localisation:"
+#: ../../include/nav.php:82
+msgid "Your events"
+msgstr "Vos événements"
 
-#: ../../boot.php:942 ../../include/profile_advanced.php:17
-msgid "Gender:"
-msgstr "Genre:"
+#: ../../include/nav.php:83 ../../include/conversation.php:1514
+msgid "Bookmarks"
+msgstr "Marque-pages"
 
-#: ../../boot.php:945 ../../include/profile_advanced.php:37
-msgid "Status:"
-msgstr "Statut:"
+#: ../../include/nav.php:83
+msgid "Your bookmarks"
+msgstr "Vos marque-pages"
 
-#: ../../boot.php:947 ../../include/profile_advanced.php:45
-msgid "Homepage:"
-msgstr "Page personnelle:"
+#: ../../include/nav.php:85 ../../include/conversation.php:1525
+msgid "Webpages"
+msgstr "Pages web"
 
-#: ../../boot.php:1006 ../../boot.php:1068
-msgid "g A l F d"
-msgstr "g A | F d"
+#: ../../include/nav.php:85
+msgid "Your webpages"
+msgstr "Vos pages web"
 
-#: ../../boot.php:1007 ../../boot.php:1069
-msgid "F d"
-msgstr "F d"
+#: ../../include/nav.php:89 ../../boot.php:1424
+msgid "Login"
+msgstr "Connexion"
 
-#: ../../boot.php:1030
-msgid "Birthday Reminders"
-msgstr "Rappels d'anniversaires"
+#: ../../include/nav.php:89
+msgid "Sign in"
+msgstr "Connexion"
 
-#: ../../boot.php:1031
-msgid "Birthdays this week:"
-msgstr "Anniversaires cette semaine:"
+#: ../../include/nav.php:106
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - cliquer pour déconnecter"
 
-#: ../../boot.php:1047 ../../boot.php:1111
-msgid "[today]"
-msgstr "[aujourd'hui]"
+#: ../../include/nav.php:111
+msgid "Click to authenticate to your home hub"
+msgstr "S'authentifier auprès de son hébergement"
 
-#: ../../boot.php:1092
-msgid "Event Reminders"
-msgstr "Rappels d'événements"
+#: ../../include/nav.php:125
+msgid "Home Page"
+msgstr "Page d'accueil"
 
-#: ../../boot.php:1093
-msgid "Events this week:"
-msgstr "Evénements cette semaine:"
+#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1400
+msgid "Register"
+msgstr "Inscription"
 
-#: ../../boot.php:1105
-msgid "[No description]"
-msgstr "[Sans description]"
+#: ../../include/nav.php:129
+msgid "Create an account"
+msgstr "Créer un compte"
 
-#: ../../boot.php:1282 ../../include/nav.php:47
-msgid "Status"
-msgstr "Statut"
+#: ../../include/nav.php:134 ../../mod/help.php:60 ../../mod/help.php:64
+msgid "Help"
+msgstr "Aide"
 
-#: ../../boot.php:1287 ../../mod/profperm.php:103
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:48
-msgid "Profile"
-msgstr "Profil"
+#: ../../include/nav.php:134
+msgid "Help and documentation"
+msgstr "Aide et documentation"
 
-#: ../../boot.php:1292 ../../include/nav.php:49
-msgid "Photos"
-msgstr "Photos"
+#: ../../include/nav.php:137
+msgid "Apps"
+msgstr "Applications"
 
-#: ../../boot.php:1300 ../../mod/events.php:117 ../../include/nav.php:50
-msgid "Events"
-msgstr "Evènements"
+#: ../../include/nav.php:137
+msgid "Addon applications, utilities, games"
+msgstr "Applications supplémentaires, jeux, utilitaires"
 
-#: ../../boot.php:1305 ../../mod/notes.php:44
-msgid "Personal Notes"
-msgstr "Notes personnelles"
+#: ../../include/nav.php:139 ../../include/text.php:752
+#: ../../include/text.php:766 ../../mod/search.php:29
+msgid "Search"
+msgstr "Recherche"
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
-msgstr "Bienvenue à nouveau, %s"
+#: ../../include/nav.php:139
+msgid "Search site content"
+msgstr "Recherche parmi le contenu du site"
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
-msgstr "Gérer les identités et/ou les pages"
+#: ../../include/nav.php:142 ../../mod/directory.php:210
+msgid "Directory"
+msgstr "Annuaire"
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
-msgstr ""
-"(Bascule entre les différentes identités ou pages qui se partagent votre "
-"compte.)"
-
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
-msgstr "Choisir une identité à gérer: "
-
-#: ../../mod/manage.php:106 ../../mod/profiles.php:375
-#: ../../mod/settings.php:420 ../../mod/settings.php:559
-#: ../../mod/settings.php:707 ../../mod/photos.php:886
-#: ../../mod/photos.php:944 ../../mod/photos.php:1163
-#: ../../mod/photos.php:1203 ../../mod/photos.php:1242
-#: ../../mod/photos.php:1273 ../../mod/localtime.php:45
-#: ../../mod/invite.php:106 ../../mod/contacts.php:306
-#: ../../mod/install.php:137 ../../mod/events.php:330
-#: ../../mod/crepair.php:162 ../../mod/fsuggest.php:107
-#: ../../mod/admin.php:296 ../../mod/admin.php:461 ../../mod/admin.php:587
-#: ../../mod/admin.php:652 ../../mod/group.php:84 ../../mod/group.php:167
-#: ../../addon/tumblr/tumblr.php:89 ../../addon/twitter/twitter.php:179
-#: ../../addon/twitter/twitter.php:202 ../../addon/twitter/twitter.php:299
-#: ../../addon/statusnet/statusnet.php:282
-#: ../../addon/statusnet/statusnet.php:296
-#: ../../addon/statusnet/statusnet.php:322
-#: ../../addon/statusnet/statusnet.php:329
-#: ../../addon/statusnet/statusnet.php:351
-#: ../../addon/statusnet/statusnet.php:486 ../../addon/oembed/oembed.php:41
-#: ../../addon/uhremotestorage/uhremotestorage.php:58
-#: ../../addon/impressum/impressum.php:69
-#: ../../addon/facebook/facebook.php:404 ../../addon/nsfw/nsfw.php:53
-#: ../../addon/randplace/randplace.php:178 ../../addon/piwik/piwik.php:81
-#: ../../addon/wppost/wppost.php:101 ../../include/conversation.php:434
-msgid "Submit"
-msgstr "Envoyer"
+#: ../../include/nav.php:142
+msgid "Channel Locator"
+msgstr "Localisation de canaux"
 
-#: ../../mod/dirfind.php:23
-msgid "People Search"
-msgstr "Recherche de personnes"
+#: ../../include/nav.php:153
+msgid "Matrix"
+msgstr "Matrice"
 
-#: ../../mod/dirfind.php:57 ../../mod/match.php:57
-msgid "No matches"
-msgstr "Aucune correspondance"
+#: ../../include/nav.php:153
+msgid "Your matrix"
+msgstr "Votre matrice"
 
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:113
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "L'image dépasse la taille limite de %d"
+#: ../../include/nav.php:154
+msgid "Mark all matrix notifications seen"
+msgstr "Marquer toutes les notifications de la matrice comme vues"
 
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:122
-#: ../../mod/photos.php:647
-msgid "Unable to process image."
-msgstr "Impossible de traiter l'image."
+#: ../../include/nav.php:156
+msgid "Channel Home"
+msgstr "Mon canal"
 
-#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90
-#: ../../mod/wall_upload.php:97 ../../mod/item.php:299
-#: ../../include/message.php:82
-msgid "Wall Photos"
-msgstr "Photos du mur"
+#: ../../include/nav.php:156
+msgid "Channel home"
+msgstr "Mon canal"
 
-#: ../../mod/wall_upload.php:84 ../../mod/profile_photo.php:251
-#: ../../mod/photos.php:667
-msgid "Image upload failed."
-msgstr "Le téléversement de l'image a échoué."
+#: ../../include/nav.php:157
+msgid "Mark all channel notifications seen"
+msgstr "Marquer toutes les notifications du canal comme vues"
 
-#: ../../mod/profile.php:105 ../../mod/display.php:66
-msgid "Access to this profile has been restricted."
-msgstr "L'accès au profil a été restreint."
+#: ../../include/nav.php:160
+msgid "Intros"
+msgstr "Introductions"
 
-#: ../../mod/profile.php:127
-msgid "Tips for New Members"
-msgstr "Conseils aux nouveaux"
+#: ../../include/nav.php:160 ../../mod/connections.php:244
+msgid "New Connections"
+msgstr "Nouvelles relations"
 
-#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:340
-msgid "Disallowed profile URL."
-msgstr "URL de profil interdite."
+#: ../../include/nav.php:163
+msgid "Notices"
+msgstr "Notifications"
 
-#: ../../mod/follow.php:39
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Ce site n'est pas configuré pour dialoguer avec d'autres réseaux."
+#: ../../include/nav.php:163
+msgid "Notifications"
+msgstr "Notifications"
 
-#: ../../mod/follow.php:40 ../../mod/follow.php:50
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Aucun protocole de communication ni aucun flux n'a pu être découvert."
+#: ../../include/nav.php:164
+msgid "See all notifications"
+msgstr "Voir toutes les notifications"
 
-#: ../../mod/follow.php:48
-msgid "The profile address specified does not provide adequate information."
-msgstr ""
-"L'adresse de profil indiquée ne fournit par les informations adéquates."
+#: ../../include/nav.php:165
+msgid "Mark all system notifications seen"
+msgstr "Marquer toutes les notifications système comme vues"
 
-#: ../../mod/follow.php:52
-msgid "An author or name was not found."
-msgstr "Aucun auteur ou nom d'auteur n'a pu être trouvé."
+#: ../../include/nav.php:167
+msgid "Mail"
+msgstr "Messages"
 
-#: ../../mod/follow.php:54
-msgid "No browser URL could be matched to this address."
-msgstr "Aucune URL de navigation ne correspond à cette adresse."
+#: ../../include/nav.php:167
+msgid "Private mail"
+msgstr "Messages privés"
 
-#: ../../mod/follow.php:61
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr ""
-"L'adresse de profil spécifiée correspond à un réseau qui a été désactivé sur"
-" ce site."
+#: ../../include/nav.php:168
+msgid "See all private messages"
+msgstr "Voir tous les messages privés"
 
-#: ../../mod/follow.php:66
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-"Profil limité. Cette personne ne sera pas capable de recevoir des "
-"notifications directes/personnelles de votre part."
+#: ../../include/nav.php:169
+msgid "Mark all private messages seen"
+msgstr "Marquer tous les messages privés comme vus"
 
-#: ../../mod/follow.php:133
-msgid "Unable to retrieve contact information."
-msgstr "Impossible de récupérer les informations du contact."
+#: ../../include/nav.php:170
+msgid "Inbox"
+msgstr "Boîte de réception"
 
-#: ../../mod/follow.php:179
-msgid "following"
-msgstr "following"
+#: ../../include/nav.php:171
+msgid "Outbox"
+msgstr "Boîte d'envoi"
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
-msgstr "Image envoyée, mais impossible de la retailler."
-
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
-#: ../../mod/photos.php:144 ../../mod/photos.php:591 ../../mod/photos.php:936
-#: ../../mod/photos.php:951 ../../mod/register.php:318
-#: ../../mod/register.php:325 ../../mod/register.php:332
-#: ../../addon/communityhome/communityhome.php:111
-msgid "Profile Photos"
-msgstr "Photos du profil"
+#: ../../include/nav.php:172 ../../include/widgets.php:509
+msgid "New Message"
+msgstr "Nouveau message"
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Réduction de la taille de l'image [%s] échouée."
+#: ../../include/nav.php:175
+msgid "Event Calendar"
+msgstr "Calendrier des événements"
 
-#: ../../mod/profile_photo.php:89
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-"Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du "
-"navigateur, si d'aventure la nouvelle photo n'apparaissait pas "
-"immédiatement."
+#: ../../include/nav.php:176
+msgid "See all events"
+msgstr "Voir tous les événements"
 
-#: ../../mod/profile_photo.php:99
-msgid "Unable to process image"
-msgstr "Impossible de traiter l'image"
+#: ../../include/nav.php:177
+msgid "Mark all events seen"
+msgstr "Marquer tous les événements comme vus"
 
-#: ../../mod/profile_photo.php:203
-msgid "Upload File:"
-msgstr "Fichier à téléverser:"
+#: ../../include/nav.php:179
+msgid "Channel Select"
+msgstr "Changer de canal"
 
-#: ../../mod/profile_photo.php:204
-msgid "Upload Profile Photo"
-msgstr "Téléverser une photo de profil"
+#: ../../include/nav.php:179
+msgid "Manage Your Channels"
+msgstr "Gérer vos canaux"
 
-#: ../../mod/profile_photo.php:205
-msgid "Upload"
-msgstr "Téléverser"
+#: ../../include/nav.php:181 ../../include/widgets.php:487
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Settings"
+msgstr "Réglages"
 
-#: ../../mod/profile_photo.php:206 ../../mod/settings.php:686
-msgid "or"
-msgstr "ou"
+#: ../../include/nav.php:181
+msgid "Account/Channel Settings"
+msgstr "Compte/Canal"
 
-#: ../../mod/profile_photo.php:206
-msgid "skip this step"
-msgstr "ignorer cette étape"
+#: ../../include/nav.php:183 ../../mod/connections.php:351
+msgid "Connections"
+msgstr "Relations"
 
-#: ../../mod/profile_photo.php:206
-msgid "select a photo from your photo albums"
-msgstr "choisissez une photo depuis vos albums"
+#: ../../include/nav.php:183
+msgid "Manage/Edit Friends and Connections"
+msgstr "Gérer les amis et relations"
 
-#: ../../mod/profile_photo.php:219
-msgid "Crop Image"
-msgstr "(Re)cadrer l'image"
+#: ../../include/nav.php:190 ../../mod/admin.php:112
+msgid "Admin"
+msgstr "Admin"
 
-#: ../../mod/profile_photo.php:220
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Ajustez le cadre de l'image pour une visualisation optimale."
+#: ../../include/nav.php:190
+msgid "Site Setup and Configuration"
+msgstr "Configuration du site"
 
-#: ../../mod/profile_photo.php:221
-msgid "Done Editing"
-msgstr "Édition terminée"
+#: ../../include/nav.php:216
+msgid "Nothing new here"
+msgstr "Rien de neuf ici"
 
-#: ../../mod/profile_photo.php:249
-msgid "Image uploaded successfully."
-msgstr "Image téléversée avec succès."
+#: ../../include/nav.php:221
+msgid "Please wait..."
+msgstr "Merci de patienter..."
 
-#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenue sur %s"
+#: ../../include/text.php:315
+msgid "prev"
+msgstr "préc."
 
-#: ../../mod/update_community.php:18 ../../mod/update_network.php:22
-#: ../../mod/update_profile.php:41 ../../mod/update_notes.php:41
-msgid "[Embedded content - reload page to view]"
-msgstr "[contenu incorporé - rechargez la page pour le voir]"
+#: ../../include/text.php:317
+msgid "first"
+msgstr "premier"
 
-#: ../../mod/wall_attach.php:57
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "La taille du fichier dépasse la limite de %d"
+#: ../../include/text.php:346
+msgid "last"
+msgstr "dernier"
 
-#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
-msgid "File upload failed."
-msgstr "Le téléversement a échoué."
+#: ../../include/text.php:349
+msgid "next"
+msgstr "suiv."
 
-#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35
-msgid "Friend Suggestions"
-msgstr "Suggestions d'amitiés/contacts"
+#: ../../include/text.php:361
+msgid "older"
+msgstr "plus ancien"
 
-#: ../../mod/suggest.php:42
-msgid ""
-"No suggestions. This works best when you have more than one contact/friend."
-msgstr ""
-"Pas de suggestion. Ceci fonctionne mieux quand vous avez plus d'un "
-"ami/contact."
+#: ../../include/text.php:363
+msgid "newer"
+msgstr "plus récent"
 
-#: ../../mod/suggest.php:55
-msgid "Ignore/Hide"
-msgstr "Ignorer/cacher"
+#: ../../include/text.php:670
+msgid "No connections"
+msgstr "Sans relations"
 
-#: ../../mod/regmod.php:52 ../../mod/register.php:369
+#: ../../include/text.php:681
 #, php-format
-msgid "Registration details for %s"
-msgstr "Détails d'inscription pour %s"
-
-#: ../../mod/regmod.php:54 ../../mod/register.php:371
-#: ../../mod/register.php:425 ../../mod/dfrn_request.php:553
-#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
-#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1767
-#: ../../include/items.php:2114 ../../include/items.php:2440
-msgid "Administrator"
-msgstr "Administrateur"
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d relation"
+msgstr[1] "%d relations"
 
-#: ../../mod/regmod.php:61
-msgid "Account approved."
-msgstr "Inscription validée."
+#: ../../include/text.php:693
+msgid "View Connections"
+msgstr "Voir les relations"
 
-#: ../../mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Inscription révoquée pour %s"
+#: ../../include/text.php:754 ../../include/text.php:768
+#: ../../include/widgets.php:173 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Sauver"
 
-#: ../../mod/regmod.php:105
-msgid "Please login."
-msgstr "Merci de vous connecter."
+#: ../../include/text.php:834
+msgid "poke"
+msgstr "tapoter"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr "Profil introuvable."
+#: ../../include/text.php:834 ../../include/conversation.php:240
+msgid "poked"
+msgstr "tapoté"
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
-msgstr "Le nom du profil est requis."
+#: ../../include/text.php:835
+msgid "ping"
+msgstr "solliciter"
 
-#: ../../mod/profiles.php:198
-msgid "Profile updated."
-msgstr "Profil mis à jour."
+#: ../../include/text.php:835
+msgid "pinged"
+msgstr "sollicité"
 
-#: ../../mod/profiles.php:256
-msgid "Profile deleted."
-msgstr "Profil supprimé."
+#: ../../include/text.php:836
+msgid "prod"
+msgstr "aiguillonner"
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
-msgid "Profile-"
-msgstr "Profil-"
+#: ../../include/text.php:836
+msgid "prodded"
+msgstr "aiguillonné"
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
-msgid "New profile created."
-msgstr "Nouveau profil créé."
+#: ../../include/text.php:837
+msgid "slap"
+msgstr "baffer"
 
-#: ../../mod/profiles.php:309
-msgid "Profile unavailable to clone."
-msgstr "Ce profil ne peut être cloné."
+#: ../../include/text.php:837
+msgid "slapped"
+msgstr "baffé"
 
-#: ../../mod/profiles.php:356
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Cacher ma liste d'amis/contacts des visiteurs de ce profil?"
+#: ../../include/text.php:838
+msgid "finger"
+msgstr "pointer"
 
-#: ../../mod/profiles.php:357 ../../mod/settings.php:629
-#: ../../mod/settings.php:635 ../../mod/settings.php:643
-#: ../../mod/settings.php:647 ../../mod/settings.php:652
-#: ../../mod/settings.php:658 ../../mod/register.php:500
-#: ../../mod/dfrn_request.php:645 ../../mod/api.php:105
-msgid "Yes"
-msgstr "Oui"
+#: ../../include/text.php:838
+msgid "fingered"
+msgstr "pointé"
 
-#: ../../mod/profiles.php:358 ../../mod/settings.php:629
-#: ../../mod/settings.php:635 ../../mod/settings.php:643
-#: ../../mod/settings.php:647 ../../mod/settings.php:652
-#: ../../mod/settings.php:658 ../../mod/register.php:501
-#: ../../mod/dfrn_request.php:646 ../../mod/api.php:106
-msgid "No"
-msgstr "Non"
+#: ../../include/text.php:839
+msgid "rebuff"
+msgstr "rejetter"
 
-#: ../../mod/profiles.php:374
-msgid "Edit Profile Details"
-msgstr "Éditer les détails du profil"
+#: ../../include/text.php:839
+msgid "rebuffed"
+msgstr "rejetté"
 
-#: ../../mod/profiles.php:376
-msgid "View this profile"
-msgstr "Voir ce profil"
+#: ../../include/text.php:851
+msgid "happy"
+msgstr "bonheur"
 
-#: ../../mod/profiles.php:377
-msgid "Create a new profile using these settings"
-msgstr "Créer un nouveau profil en utilisant ces réglages"
+#: ../../include/text.php:852
+msgid "sad"
+msgstr "triste"
 
-#: ../../mod/profiles.php:378
-msgid "Clone this profile"
-msgstr "Cloner ce profil"
+#: ../../include/text.php:853
+msgid "mellow"
+msgstr "mélancolie"
 
-#: ../../mod/profiles.php:379
-msgid "Delete this profile"
-msgstr "Supprimer ce profil"
+#: ../../include/text.php:854
+msgid "tired"
+msgstr "fatigue"
 
-#: ../../mod/profiles.php:380
-msgid "Profile Name:"
-msgstr "Nom du profil:"
+#: ../../include/text.php:855
+msgid "perky"
+msgstr "impertinence"
 
-#: ../../mod/profiles.php:381
-msgid "Your Full Name:"
-msgstr "Votre nom complet:"
+#: ../../include/text.php:856
+msgid "angry"
+msgstr "colère"
 
-#: ../../mod/profiles.php:382
-msgid "Title/Description:"
-msgstr "Titre/Description:"
+#: ../../include/text.php:857
+msgid "stupified"
+msgstr "stupeur"
 
-#: ../../mod/profiles.php:383
-msgid "Your Gender:"
-msgstr "Votre genre:"
+#: ../../include/text.php:858
+msgid "puzzled"
+msgstr "perplexité"
 
-#: ../../mod/profiles.php:384
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Anniversaire (%s):"
+#: ../../include/text.php:859
+msgid "interested"
+msgstr "intérêt"
 
-#: ../../mod/profiles.php:385
-msgid "Street Address:"
-msgstr "Adresse postale:"
+#: ../../include/text.php:860
+msgid "bitter"
+msgstr "amertune"
 
-#: ../../mod/profiles.php:386
-msgid "Locality/City:"
-msgstr "Ville/Localité:"
+#: ../../include/text.php:861
+msgid "cheerful"
+msgstr "entrain"
 
-#: ../../mod/profiles.php:387
-msgid "Postal/Zip Code:"
-msgstr "Code postal:"
+#: ../../include/text.php:862
+msgid "alive"
+msgstr "vivacité"
 
-#: ../../mod/profiles.php:388
-msgid "Country:"
-msgstr "Pays:"
+#: ../../include/text.php:863
+msgid "annoyed"
+msgstr "agaçement"
 
-#: ../../mod/profiles.php:389
-msgid "Region/State:"
-msgstr "Région/État:"
+#: ../../include/text.php:864
+msgid "anxious"
+msgstr "anxiété"
 
-#: ../../mod/profiles.php:390
-msgid "♥ Marital Status:"
-msgstr "♥ Statut marital:"
+#: ../../include/text.php:865
+msgid "cranky"
+msgstr "mauvais poil"
 
-#: ../../mod/profiles.php:391
-msgid "Who: (if applicable)"
-msgstr "Qui: (si pertinent)"
+#: ../../include/text.php:866
+msgid "disturbed"
+msgstr "perturbation"
 
-#: ../../mod/profiles.php:392
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../include/text.php:867
+msgid "frustrated"
+msgstr "frustration"
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
-msgid "Sexual Preference:"
-msgstr "Préférence sexuelle:"
+#: ../../include/text.php:868
+msgid "motivated"
+msgstr "motivation"
 
-#: ../../mod/profiles.php:394
-msgid "Homepage URL:"
-msgstr "Page personnelle:"
+#: ../../include/text.php:869
+msgid "relaxed"
+msgstr "détente"
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47
-msgid "Political Views:"
-msgstr "Opinions politiques:"
+#: ../../include/text.php:870
+msgid "surprised"
+msgstr "surprise"
 
-#: ../../mod/profiles.php:396
-msgid "Religious Views:"
-msgstr "Opinions religieuses:"
+#: ../../include/text.php:1031
+msgid "Monday"
+msgstr "Lundi"
 
-#: ../../mod/profiles.php:397
-msgid "Public Keywords:"
-msgstr "Mots-clés publics:"
+#: ../../include/text.php:1031
+msgid "Tuesday"
+msgstr "Mardi"
 
-#: ../../mod/profiles.php:398
-msgid "Private Keywords:"
-msgstr "Mots-clés privés:"
+#: ../../include/text.php:1031
+msgid "Wednesday"
+msgstr "Mercredi"
 
-#: ../../mod/profiles.php:399
-msgid "Example: fishing photography software"
-msgstr "Exemple: football dessin programmation"
+#: ../../include/text.php:1031
+msgid "Thursday"
+msgstr "Jeudi"
 
-#: ../../mod/profiles.php:400
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr ""
-"(Utilisés pour vous suggérer des amis potentiels, peuvent être vus par "
-"autrui)"
+#: ../../include/text.php:1031
+msgid "Friday"
+msgstr "Vendredi"
 
-#: ../../mod/profiles.php:401
-msgid "(Used for searching profiles, never shown to others)"
-msgstr ""
-"(Utilisés pour rechercher dans les profils, ne seront jamais montrés à "
-"autrui)"
+#: ../../include/text.php:1031
+msgid "Saturday"
+msgstr "Samedi"
 
-#: ../../mod/profiles.php:402
-msgid "Tell us about yourself..."
-msgstr "Parlez-nous de vous..."
+#: ../../include/text.php:1031
+msgid "Sunday"
+msgstr "Dimanche"
 
-#: ../../mod/profiles.php:403
-msgid "Hobbies/Interests"
-msgstr "Passe-temps/Centres d'intérêt"
+#: ../../include/text.php:1035
+msgid "January"
+msgstr "Janvier"
 
-#: ../../mod/profiles.php:404
-msgid "Contact information and Social Networks"
-msgstr "Coordonées/Réseaux sociaux"
+#: ../../include/text.php:1035
+msgid "February"
+msgstr "Février"
 
-#: ../../mod/profiles.php:405
-msgid "Musical interests"
-msgstr "Goûts musicaux"
+#: ../../include/text.php:1035
+msgid "March"
+msgstr "Mars"
 
-#: ../../mod/profiles.php:406
-msgid "Books, literature"
-msgstr "Lectures"
+#: ../../include/text.php:1035
+msgid "April"
+msgstr "Avril"
 
-#: ../../mod/profiles.php:407
-msgid "Television"
-msgstr "Télévision"
+#: ../../include/text.php:1035
+msgid "May"
+msgstr "Mai"
 
-#: ../../mod/profiles.php:408
-msgid "Film/dance/culture/entertainment"
-msgstr "Cinéma/Danse/Culture/Divertissement"
+#: ../../include/text.php:1035
+msgid "June"
+msgstr "Juin"
 
-#: ../../mod/profiles.php:409
-msgid "Love/romance"
-msgstr "Amour/Romance"
+#: ../../include/text.php:1035
+msgid "July"
+msgstr "Juillet"
 
-#: ../../mod/profiles.php:410
-msgid "Work/employment"
-msgstr "Activité professionnelle/Occupation"
+#: ../../include/text.php:1035
+msgid "August"
+msgstr "Août"
 
-#: ../../mod/profiles.php:411
-msgid "School/education"
-msgstr "Études/Formation"
+#: ../../include/text.php:1035
+msgid "September"
+msgstr "Septembre"
 
-#: ../../mod/profiles.php:416
-msgid ""
-"This is your public profile.
                                      It may "
-"be visible to anybody using the internet."
-msgstr ""
-"Ceci est votre profil public.
                                      Il peut"
-" être visible par n'importe quel utilisateur d'Internet."
+#: ../../include/text.php:1035
+msgid "October"
+msgstr "Octobre"
 
-#: ../../mod/profiles.php:426 ../../mod/directory.php:122
-msgid "Age: "
-msgstr "Age: "
+#: ../../include/text.php:1035
+msgid "November"
+msgstr "Novembre"
 
-#: ../../mod/profiles.php:461
-msgid "Edit/Manage Profiles"
-msgstr "Editer/gérer les profils"
+#: ../../include/text.php:1035
+msgid "December"
+msgstr "Décembre"
 
-#: ../../mod/notice.php:15 ../../mod/display.php:28 ../../mod/display.php:115
-#: ../../mod/viewsrc.php:15 ../../mod/admin.php:111 ../../mod/admin.php:502
-#: ../../include/items.php:2786
-msgid "Item not found."
-msgstr "Élément introuvable."
+#: ../../include/text.php:1113
+msgid "unknown.???"
+msgstr "inconnu.???"
 
-#: ../../mod/settings.php:9 ../../mod/photos.php:62
-msgid "everybody"
-msgstr "tout le monde"
+#: ../../include/text.php:1114
+msgid "bytes"
+msgstr "octets"
 
-#: ../../mod/settings.php:67
-msgid "Missing some important data!"
-msgstr "Il manque certaines informations importantes!"
+#: ../../include/text.php:1149
+msgid "remove category"
+msgstr "suppr. catégorie"
 
-#: ../../mod/settings.php:70 ../../mod/settings.php:446 ../../mod/admin.php:62
-msgid "Update"
-msgstr "Mises-à-jour"
+#: ../../include/text.php:1171
+msgid "remove from file"
+msgstr "supprimer du fichier"
 
-#: ../../mod/settings.php:165
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Impossible de se connecter au compte courriel configuré."
+#: ../../include/text.php:1229 ../../include/text.php:1241
+msgid "Click to open/close"
+msgstr "Cliquer pour ouvrir/fermer"
 
-#: ../../mod/settings.php:170
-msgid "Email settings updated."
-msgstr "Réglages de courriel mis-à-jour."
+#: ../../include/text.php:1417 ../../mod/events.php:332
+msgid "link to source"
+msgstr "lien vers source"
 
-#: ../../mod/settings.php:188
-msgid "Passwords do not match. Password unchanged."
-msgstr "Les mots de passe ne correspondent pas. Aucun changement appliqué."
+#: ../../include/text.php:1436
+msgid "Select a page layout: "
+msgstr "Choisir une mise en page :"
 
-#: ../../mod/settings.php:193
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Les mots de passe vides sont interdits. Aucun changement appliqué."
+#: ../../include/text.php:1439 ../../include/text.php:1504
+msgid "default"
+msgstr "défaut"
 
-#: ../../mod/settings.php:204
-msgid "Password changed."
-msgstr "Mots de passe changés."
+#: ../../include/text.php:1475
+msgid "Page content type: "
+msgstr "Type de contenu :"
 
-#: ../../mod/settings.php:206
-msgid "Password update failed. Please try again."
-msgstr "Le changement de mot de passe a échoué. Merci de recommencer."
+#: ../../include/text.php:1516
+msgid "Select an alternate language"
+msgstr "Choisir une langue alternative"
 
-#: ../../mod/settings.php:253
-msgid " Please use a shorter name."
-msgstr " Merci d'utiliser un nom plus court."
+#: ../../include/text.php:1637 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
+msgstr "photo"
 
-#: ../../mod/settings.php:255
-msgid " Name too short."
-msgstr " Nom trop court."
+#: ../../include/text.php:1640 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr "événement"
 
-#: ../../mod/settings.php:261
-msgid " Not valid email."
-msgstr " Email invalide."
+#: ../../include/text.php:1643 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr "statut"
 
-#: ../../mod/settings.php:263
-msgid " Cannot change to that email."
-msgstr " Impossible de changer pour cet email."
+#: ../../include/text.php:1645 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr "commentaire"
 
-#: ../../mod/settings.php:323 ../../addon/twitter/twitter.php:294
-#: ../../addon/impressum/impressum.php:64
-#: ../../addon/facebook/facebook.php:320 ../../addon/piwik/piwik.php:94
-msgid "Settings updated."
-msgstr "Réglages mis à jour."
+#: ../../include/text.php:1650
+msgid "activity"
+msgstr "activité"
 
-#: ../../mod/settings.php:382 ../../include/nav.php:128
-msgid "Account settings"
-msgstr "Réglages du compte"
+#: ../../include/text.php:1907
+msgid "Design"
+msgstr "Conception"
 
-#: ../../mod/settings.php:387
-msgid "Connector settings"
-msgstr "Réglages des connecteurs"
+#: ../../include/text.php:1909
+msgid "Blocks"
+msgstr "Blocs"
 
-#: ../../mod/settings.php:392
-msgid "Plugin settings"
-msgstr "Réglages des extensions"
+#: ../../include/text.php:1910
+msgid "Menus"
+msgstr "Menus"
 
-#: ../../mod/settings.php:397
-msgid "Connections"
-msgstr "Connexions"
+#: ../../include/text.php:1911
+msgid "Layouts"
+msgstr "Mises-en-page"
 
-#: ../../mod/settings.php:402
-msgid "Export personal data"
-msgstr "Exporter les données personnelles"
+#: ../../include/text.php:1912
+msgid "Pages"
+msgstr "Pages"
 
-#: ../../mod/settings.php:419 ../../mod/settings.php:445
-#: ../../mod/settings.php:478
-msgid "Add application"
-msgstr "Ajouter une application"
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr "Catégories"
 
-#: ../../mod/settings.php:421 ../../mod/settings.php:447
-#: ../../mod/dfrn_request.php:655 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:45
-msgid "Cancel"
-msgstr "Annuler"
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:183 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr "Relier"
 
-#: ../../mod/settings.php:422 ../../mod/settings.php:448
-#: ../../mod/crepair.php:144 ../../mod/admin.php:464 ../../mod/admin.php:473
-msgid "Name"
-msgstr "Nom"
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorer/Cacher"
 
-#: ../../mod/settings.php:423 ../../mod/settings.php:449
-#: ../../addon/statusnet/statusnet.php:480
-msgid "Consumer Key"
-msgstr "Clé utilisateur"
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
+msgstr "Suggestion"
 
-#: ../../mod/settings.php:424 ../../mod/settings.php:450
-#: ../../addon/statusnet/statusnet.php:479
-msgid "Consumer Secret"
-msgstr "Secret utilisateur"
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr "Voir plus..."
 
-#: ../../mod/settings.php:425 ../../mod/settings.php:451
-msgid "Redirect"
-msgstr "Rediriger"
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Vous avez %1$.0f des %2$.0f relations autorisées."
 
-#: ../../mod/settings.php:426 ../../mod/settings.php:452
-msgid "Icon url"
-msgstr "URL de l'icône"
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr "Ajouter une nouvelle relation"
 
-#: ../../mod/settings.php:437
-msgid "You can't edit this application."
-msgstr "Vous ne pouvez pas éditer cette application."
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr "Adresse du canal"
 
-#: ../../mod/settings.php:477
-msgid "Connected Apps"
-msgstr "Applications connectées"
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Exemple : bob@exemple.com, http://exemple.com/barbara"
 
-#: ../../mod/settings.php:479 ../../mod/editpost.php:90
-#: ../../include/conversation.php:441 ../../include/group.php:190
-msgid "Edit"
-msgstr "Éditer"
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr "Notes"
 
-#: ../../mod/settings.php:480 ../../mod/photos.php:1300
-#: ../../mod/admin.php:468 ../../mod/group.php:154
-#: ../../include/conversation.php:211 ../../include/conversation.php:454
-msgid "Delete"
-msgstr "Supprimer"
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr "Retirer le terme"
 
-#: ../../mod/settings.php:481
-msgid "Client key starts with"
-msgstr "La clé cliente commence par"
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
+msgstr "Recherches sauvées"
 
-#: ../../mod/settings.php:482
-msgid "No name"
-msgstr "Sans nom"
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
+msgstr "ajouter"
 
-#: ../../mod/settings.php:483
-msgid "Remove authorization"
-msgstr "Révoquer l'autorisation"
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Dossiers sauvegardés"
 
-#: ../../mod/settings.php:495
-msgid "No Plugin settings configured"
-msgstr "Pas de réglages d'extensions configurés"
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr "Tout"
 
-#: ../../mod/settings.php:502 ../../addon/widgets/widgets.php:122
-msgid "Plugin Settings"
-msgstr "Réglages des extensions"
+#: ../../include/widgets.php:318 ../../include/items.php:3613
+msgid "Archives"
+msgstr "Archives"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:516
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Le support natif pour la connectivité %s est %s"
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr "Actualiser"
 
-#: ../../mod/settings.php:515 ../../mod/dfrn_request.php:651
-#: ../../include/contact_selectors.php:78
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
+msgstr "Moi"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:516
-msgid "enabled"
-msgstr "activé"
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
+msgstr "Mes meilleurs amis"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:516
-msgid "disabled"
-msgstr "désactivé"
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
+msgid "Friends"
+msgstr "Amis"
 
-#: ../../mod/settings.php:516
-msgid "StatusNet"
-msgstr "StatusNet"
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr "Mes collègues"
 
-#: ../../mod/settings.php:542
-msgid "Connector Settings"
-msgstr "Réglages des connecteurs"
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
+msgstr "Mes anciens amis"
 
-#: ../../mod/settings.php:548
-msgid "Email/Mailbox Setup"
-msgstr "Réglages de courriel/boîte à lettre"
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
+msgstr "Mes accointances"
 
-#: ../../mod/settings.php:549
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
-msgstr ""
-"Si vous souhaitez communiquer avec vos contacts \"courriel\" (facultatif), "
-"merci de nous indiquer comment vous connecter à votre boîte."
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr "Tout le monde"
 
-#: ../../mod/settings.php:550
-msgid "Last successful email check:"
-msgstr "Dernière vérification réussie des courriels:"
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr "Compte"
 
-#: ../../mod/settings.php:551
-msgid "Email access is disabled on this site."
-msgstr "L'accès courriel est désactivé sur ce site."
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr "Canal"
 
-#: ../../mod/settings.php:552
-msgid "IMAP server name:"
-msgstr "Nom du serveur IMAP:"
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr "Fonc. supplémentaires"
 
-#: ../../mod/settings.php:553
-msgid "IMAP port:"
-msgstr "Port IMAP:"
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr "Fonctionnalités"
 
-#: ../../mod/settings.php:554
-msgid "Security:"
-msgstr "Sécurité:"
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr "Affichage"
 
-#: ../../mod/settings.php:554
-msgid "None"
-msgstr "Aucun(e)"
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr "Applications"
 
-#: ../../mod/settings.php:555
-msgid "Email login name:"
-msgstr "Nom de connexion:"
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr "Exporter canal"
 
-#: ../../mod/settings.php:556
-msgid "Email password:"
-msgstr "Mot de passe:"
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr "Permissions automatiques (avancé)"
 
-#: ../../mod/settings.php:557
-msgid "Reply-to address:"
-msgstr "Adresse de réponse:"
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr "Canal Premium"
 
-#: ../../mod/settings.php:558
-msgid "Send public posts to all email contacts:"
-msgstr "Les notices publiques vont à tous les contacts courriel:"
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Canaux sources"
 
-#: ../../mod/settings.php:596 ../../mod/admin.php:126 ../../mod/admin.php:443
-msgid "Normal Account"
-msgstr "Compte normal"
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr "Vérifier courriel"
 
-#: ../../mod/settings.php:597
-msgid "This account is a normal personal profile"
-msgstr ""
-"Ce compte correspond à un profil normal, pour une seule personne (physique, "
-"généralement)"
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Salons"
 
-#: ../../mod/settings.php:600 ../../mod/admin.php:127 ../../mod/admin.php:444
-msgid "Soapbox Account"
-msgstr "Compte \"boîte à savon\""
+#: ../../include/Contact.php:120
+msgid "New window"
+msgstr "Nouvelle fenêtre"
 
-#: ../../mod/settings.php:601
-msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr ""
-"Accepter automatiquement toutes les demandes d'amitié/connexion comme étant "
-"des fans 'en lecture seule'"
+#: ../../include/Contact.php:121
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Ouvrir l'emplacement dans une fenêtre (ou un onglet) différent"
 
-#: ../../mod/settings.php:604 ../../mod/admin.php:128 ../../mod/admin.php:445
-msgid "Community/Celebrity Account"
-msgstr "Compte de communauté/célébrité"
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr "Fonctionnalités générales"
 
-#: ../../mod/settings.php:605
-msgid ""
-"Automatically approve all connection/friend requests as read-write fans"
-msgstr ""
-"Accepter automatiquement toutes les demandes d'amitié/connexion comme étant "
-"des fans en 'lecture/écriture'"
+#: ../../include/features.php:25
+msgid "Content Expiration"
+msgstr "Expiration de contenu"
 
-#: ../../mod/settings.php:608 ../../mod/admin.php:129 ../../mod/admin.php:446
-msgid "Automatic Friend Account"
-msgstr "Compte auto-amical"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Supprimer les contributions/commentaires et/ou messages privés à un moment futur"
 
-#: ../../mod/settings.php:609
-msgid "Automatically approve all connection/friend requests as friends"
-msgstr ""
-"Accepter automatiquement toutes les demandes d'amitié/connexion comme étant "
-"des amis"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
+msgstr "Profils multiples"
 
-#: ../../mod/settings.php:619
-msgid "OpenID:"
-msgstr "OpenID:"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
+msgstr "Possibilité de créer plusieurs profils"
 
-#: ../../mod/settings.php:619
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr ""
-"&nbsp;(Facultatif) Autoriser cet OpenID à se connecter à ce compte."
+#: ../../include/features.php:27
+msgid "Web Pages"
+msgstr "Pages web"
 
-#: ../../mod/settings.php:629
-msgid "Publish your default profile in your local site directory?"
-msgstr "Publier votre profil par défaut sur l'annuaire local de ce site?"
+#: ../../include/features.php:27
+msgid "Provide managed web pages on your channel"
+msgstr "Fournir des pages web, sous votre contrôle, sur votre canal"
 
-#: ../../mod/settings.php:635
-msgid "Publish your default profile in the global social directory?"
-msgstr "Publier votre profil par défaut sur l'annuaire social global?"
+#: ../../include/features.php:28
+msgid "Private Notes"
+msgstr "Notes privées"
 
-#: ../../mod/settings.php:643
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr ""
-"Cacher votre liste de contacts/amis des visiteurs de votre profil par "
-"défaut?"
+#: ../../include/features.php:28
+msgid "Enables a tool to store notes and reminders"
+msgstr "Active un outil pour stocker notes et mémos"
 
-#: ../../mod/settings.php:647
-msgid "Hide profile details and all your messages from unknown viewers?"
-msgstr ""
-"Masquer les détails du profil ainsi que tous vos messages aux visiteurs "
-"inconnus?"
+#: ../../include/features.php:33
+msgid "Extended Identity Sharing"
+msgstr "Partage d'identité étendue"
 
-#: ../../mod/settings.php:652
-msgid "Allow friends to post to your profile page?"
-msgstr "Autoriser vos amis à publier sur votre profil?"
+#: ../../include/features.php:33
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
+msgstr "Partage votre identité avec tous les sites web du Monde. Si décoché, l'identité sera seulement partagée avec les sites de la matrice."
 
-#: ../../mod/settings.php:658
-msgid "Allow friends to tag your posts?"
-msgstr "Autoriser vos amis à tagguer vos notices?"
+#: ../../include/features.php:34
+msgid "Expert Mode"
+msgstr "Mode expert"
 
-#: ../../mod/settings.php:667
-msgid "Profile is not published."
-msgstr "Ce profil n'est pas publié."
+#: ../../include/features.php:34
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Activer le mode expert pour accéder aux options avancées"
 
-#: ../../mod/settings.php:691
-msgid "Your Identity Address is"
-msgstr "L'adresse de votre identité est"
+#: ../../include/features.php:35
+msgid "Premium Channel"
+msgstr "Canal Premium"
 
-#: ../../mod/settings.php:705
-msgid "Account Settings"
-msgstr "Réglages du compte"
+#: ../../include/features.php:35
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Vous permet d'appliquer des règles et restrictions aux relations de votre canal"
 
-#: ../../mod/settings.php:713
-msgid "Password Settings"
-msgstr "Réglages de mot de passe"
+#: ../../include/features.php:40
+msgid "Post Composition Features"
+msgstr "Fonctionnalités de composition"
 
-#: ../../mod/settings.php:714
-msgid "New Password:"
-msgstr "Nouveau mot de passe:"
+#: ../../include/features.php:41
+msgid "Richtext Editor"
+msgstr "Éditeur enrichi"
 
-#: ../../mod/settings.php:715
-msgid "Confirm:"
-msgstr "Confirmer:"
+#: ../../include/features.php:41
+msgid "Enable richtext editor"
+msgstr "Activer l'éditeur de texte enrichi"
 
-#: ../../mod/settings.php:715
-msgid "Leave password fields blank unless changing"
-msgstr ""
-"Laissez les champs de mot de passe vierges, sauf si vous désirez les changer"
+#: ../../include/features.php:42
+msgid "Post Preview"
+msgstr "Aperçu avant publication"
 
-#: ../../mod/settings.php:719
-msgid "Basic Settings"
-msgstr "Réglages basiques"
+#: ../../include/features.php:42
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Permettre de voir les publications/commentaires avant de les valider"
 
-#: ../../mod/settings.php:720 ../../include/profile_advanced.php:15
-msgid "Full Name:"
-msgstr "Nom complet:"
+#: ../../include/features.php:43
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importe automatiquement le contenus d'autres canaux ou flux dans le canal en cours"
 
-#: ../../mod/settings.php:721
-msgid "Email Address:"
-msgstr "Adresse courriel:"
+#: ../../include/features.php:44
+msgid "Even More Encryption"
+msgstr "Encore plus de chiffrement"
 
-#: ../../mod/settings.php:722
-msgid "Your Timezone:"
-msgstr "Votre fuseau horaire:"
+#: ../../include/features.php:44
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Permettre le chiffrement - optionnel - du contenu de bout-en-bout au moyen d'un secret partagé"
 
-#: ../../mod/settings.php:723
-msgid "Default Post Location:"
-msgstr "Publication par défaut depuis :"
+#: ../../include/features.php:49
+msgid "Network and Stream Filtering"
+msgstr "Filtrage du réseau et des flux"
 
-#: ../../mod/settings.php:724
-msgid "Use Browser Location:"
-msgstr "Utiliser la localisation géographique du navigateur:"
+#: ../../include/features.php:50
+msgid "Search by Date"
+msgstr "Chercher par date"
 
-#: ../../mod/settings.php:725
-msgid "Display Theme:"
-msgstr "Thème d'affichage:"
+#: ../../include/features.php:50
+msgid "Ability to select posts by date ranges"
+msgstr "Pouvoir choisir des publications par date"
 
-#: ../../mod/settings.php:729
-msgid "Security and Privacy Settings"
-msgstr "Réglages de sécurité et vie privée"
+#: ../../include/features.php:51
+msgid "Collections Filter"
+msgstr "Filtre des collections"
 
-#: ../../mod/settings.php:731
-msgid "Maximum Friend Requests/Day:"
-msgstr "Nombre maximal de requêtes d'amitié/jour:"
+#: ../../include/features.php:51
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Activer une boîte qui permet de filtrer les publications du réseau parmi les collections selectionnées"
 
-#: ../../mod/settings.php:731
-msgid "(to prevent spam abuse)"
-msgstr "(pour limiter l'impact du spam)"
+#: ../../include/features.php:52
+msgid "Save search terms for re-use"
+msgstr "Sauver des termes de recherche pour utilisation ultérieure"
 
-#: ../../mod/settings.php:732
-msgid "Default Post Permissions"
-msgstr "Permissions par défaut sur les articles"
+#: ../../include/features.php:53
+msgid "Network Personal Tab"
+msgstr "Onglet \"réseau personnel\""
 
-#: ../../mod/settings.php:733
-msgid "(click to open/close)"
-msgstr "(cliquer pour ouvrir/fermer)"
+#: ../../include/features.php:53
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Activer un onglet affichant seulement les publications du réseau sur lesquelles vous êtes intervenu"
 
-#: ../../mod/settings.php:739
-msgid "Automatically expire posts after days:"
-msgstr "Les notices expirent automatiquement au bout de (en jours):"
+#: ../../include/features.php:54
+msgid "Network New Tab"
+msgstr "Onglet \"nouveautés réseau\""
 
-#: ../../mod/settings.php:739
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr ""
-"Si elles sont vides, les notices n'expireront pas. Les notices expirées "
-"seront supprimées"
+#: ../../include/features.php:54
+msgid "Enable tab to display all new Network activity"
+msgstr "Activer un onglet avec toute activité récente sur le réseau"
 
-#: ../../mod/settings.php:748
-msgid "Notification Settings"
-msgstr "Réglages de notification"
+#: ../../include/features.php:55
+msgid "Affinity Tool"
+msgstr "Gérer l'affinité"
 
-#: ../../mod/settings.php:749
-msgid "Send a notification email when:"
-msgstr "Envoyer un courriel de notification quand:"
+#: ../../include/features.php:55
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filtrer le flux d'activité en fonction de la profondeur des relations"
 
-#: ../../mod/settings.php:750
-msgid "You receive an introduction"
-msgstr "Vous recevez une introduction"
+#: ../../include/features.php:56
+msgid "Suggest Channels"
+msgstr "Suggérer des canaux"
 
-#: ../../mod/settings.php:751
-msgid "Your introductions are confirmed"
-msgstr "Vos introductions sont confirmées"
+#: ../../include/features.php:56
+msgid "Show channel suggestions"
+msgstr "Montrer les suggestions de canaux"
 
-#: ../../mod/settings.php:752
-msgid "Someone writes on your profile wall"
-msgstr "Quelqu'un écrit sur votre mur"
+#: ../../include/features.php:61
+msgid "Post/Comment Tools"
+msgstr "Gérer les publications/commentaires"
 
-#: ../../mod/settings.php:753
-msgid "Someone writes a followup comment"
-msgstr "Quelqu'un vous commente"
+#: ../../include/features.php:63
+msgid "Edit Sent Posts"
+msgstr "Éditer les publications envoyées"
 
-#: ../../mod/settings.php:754
-msgid "You receive a private message"
-msgstr "Vous recevez un message privé"
+#: ../../include/features.php:63
+msgid "Edit and correct posts and comments after sending"
+msgstr "Permettre d'éditer/corriger les publications/commentaires après envoi"
 
-#: ../../mod/settings.php:758
-msgid "Advanced Page Settings"
-msgstr "Réglages avancés"
+#: ../../include/features.php:64
+msgid "Tagging"
+msgstr "Marquage"
 
-#: ../../mod/search.php:13 ../../mod/network.php:75
-msgid "Saved Searches"
-msgstr "Recherches"
+#: ../../include/features.php:64
+msgid "Ability to tag existing posts"
+msgstr "Permettre de marquer les publications existantes"
 
-#: ../../mod/search.php:16 ../../mod/network.php:81
-msgid "Remove term"
-msgstr "Retirer le terme"
+#: ../../include/features.php:65
+msgid "Post Categories"
+msgstr "Catégoriser les publications"
 
-#: ../../mod/search.php:71 ../../mod/photos.php:752 ../../mod/display.php:7
-#: ../../mod/dfrn_request.php:594 ../../mod/directory.php:31
-#: ../../mod/viewconnections.php:16 ../../mod/community.php:16
-msgid "Public access denied."
-msgstr "Accès public refusé."
+#: ../../include/features.php:65
+msgid "Add categories to your posts"
+msgstr "Ajouter des catégories à vos publications"
 
-#: ../../mod/search.php:83
-msgid "Search This Site"
-msgstr "Rechercher sur ce site"
+#: ../../include/features.php:66
+msgid "Ability to file posts under folders"
+msgstr "Permettre de classer les publications dans des dossiers"
 
-#: ../../mod/search.php:125 ../../mod/community.php:60
-msgid "No results."
-msgstr "Aucun résultat."
+#: ../../include/features.php:67
+msgid "Dislike Posts"
+msgstr "Détester une publication"
 
-#: ../../mod/photos.php:42
-msgid "Photo Albums"
-msgstr "Albums photo"
+#: ../../include/features.php:67
+msgid "Ability to dislike posts/comments"
+msgstr "Pouvoir détester les publications/commentaires"
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:144 ../../mod/photos.php:866
-#: ../../mod/photos.php:936 ../../mod/photos.php:951 ../../mod/photos.php:1351
-#: ../../mod/photos.php:1363 ../../addon/communityhome/communityhome.php:110
-msgid "Contact Photos"
-msgstr "Photos du contact"
+#: ../../include/features.php:68
+msgid "Star Posts"
+msgstr "Mettre en avant les publications"
 
-#: ../../mod/photos.php:133
-msgid "Contact information unavailable"
-msgstr "Informations de contact indisponibles"
+#: ../../include/features.php:68
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Pouvoir marquer certaines publications d'une étoile"
 
-#: ../../mod/photos.php:154
-msgid "Album not found."
-msgstr "Album introuvable."
+#: ../../include/features.php:69
+msgid "Tag Cloud"
+msgstr "Nuage de tags"
 
-#: ../../mod/photos.php:172 ../../mod/photos.php:945
-msgid "Delete Album"
-msgstr "Effacer l'album"
+#: ../../include/features.php:69
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Afficher un nuage de vos tags sur votre canal"
 
-#: ../../mod/photos.php:235 ../../mod/photos.php:1164
-msgid "Delete Photo"
-msgstr "Effacer la photo"
+#: ../../include/contact_selectors.php:30
+msgid "Unknown | Not categorised"
+msgstr "Inconnu / Non-classé"
 
-#: ../../mod/photos.php:522
-msgid "was tagged in a"
-msgstr "a été identifié dans"
+#: ../../include/contact_selectors.php:31
+msgid "Block immediately"
+msgstr "Bloquer directement"
 
-#: ../../mod/photos.php:522 ../../mod/tagger.php:70 ../../mod/like.php:127
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../include/conversation.php:31 ../../include/diaspora.php:1211
-msgid "photo"
-msgstr "photo"
+#: ../../include/contact_selectors.php:32
+msgid "Shady, spammer, self-marketer"
+msgstr "Douteux, spammeur, donne dans l'auto-promotion"
 
-#: ../../mod/photos.php:522
-msgid "by"
-msgstr "par"
+#: ../../include/contact_selectors.php:33
+msgid "Known to me, but no opinion"
+msgstr "M'est connu, n'ai pas d'opinion à son sujet"
 
-#: ../../mod/photos.php:625 ../../addon/js_upload/js_upload.php:312
-msgid "Image exceeds size limit of "
-msgstr "L'image dépasse la taille maximale de  "
+#: ../../include/contact_selectors.php:34
+msgid "OK, probably harmless"
+msgstr "OK, probablement anodin"
 
-#: ../../mod/photos.php:633
-msgid "Image file is empty."
-msgstr "Fichier image vide."
+#: ../../include/contact_selectors.php:35
+msgid "Reputable, has my trust"
+msgstr "Réputé, je lui fais confiance"
 
-#: ../../mod/photos.php:762
-msgid "No photos selected"
-msgstr "Aucune photo sélectionnée"
+#: ../../include/contact_selectors.php:54
+msgid "Frequently"
+msgstr "Constamment"
 
-#: ../../mod/photos.php:839
-msgid "Access to this item is restricted."
-msgstr "Accès restreint à cet élément."
+#: ../../include/contact_selectors.php:55
+msgid "Hourly"
+msgstr "Chaque heure"
 
-#: ../../mod/photos.php:893
-msgid "Upload Photos"
-msgstr "Téléverser des photos"
+#: ../../include/contact_selectors.php:56
+msgid "Twice daily"
+msgstr "Deux fois par jour"
 
-#: ../../mod/photos.php:896 ../../mod/photos.php:940
-msgid "New album name: "
-msgstr "Nom du nouvel album: "
+#: ../../include/contact_selectors.php:57
+msgid "Daily"
+msgstr "Chaque jour"
 
-#: ../../mod/photos.php:897
-msgid "or existing album name: "
-msgstr "ou nom d'un album existant: "
+#: ../../include/contact_selectors.php:58
+msgid "Weekly"
+msgstr "Chaque semaine"
 
-#: ../../mod/photos.php:898
-msgid "Do not show a status post for this upload"
-msgstr "Ne pas publier de notice pour cet envoi"
+#: ../../include/contact_selectors.php:59
+msgid "Monthly"
+msgstr "Chaque mois"
 
-#: ../../mod/photos.php:900 ../../mod/photos.php:1159
-msgid "Permissions"
-msgstr "Permissions"
+#: ../../include/contact_selectors.php:74
+msgid "Friendica"
+msgstr "Friendica"
 
-#: ../../mod/photos.php:955
-msgid "Edit Album"
-msgstr "Éditer l'album"
+#: ../../include/contact_selectors.php:75
+msgid "OStatus"
+msgstr "OStatus"
 
-#: ../../mod/photos.php:965 ../../mod/photos.php:1381
-msgid "View Photo"
-msgstr "Voir la photo"
+#: ../../include/contact_selectors.php:76
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
 
-#: ../../mod/photos.php:1000
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Interdit. L'accès à cet élément peut avoir été restreint."
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1426
+msgid "Email"
+msgstr "Courriel"
 
-#: ../../mod/photos.php:1002
-msgid "Photo not available"
-msgstr "Photo indisponible"
+#: ../../include/contact_selectors.php:78
+msgid "Diaspora"
+msgstr "Diaspora"
 
-#: ../../mod/photos.php:1052
-msgid "View photo"
-msgstr "Voir photo"
+#: ../../include/contact_selectors.php:79
+msgid "Facebook"
+msgstr "Facebook"
 
-#: ../../mod/photos.php:1052
-msgid "Edit photo"
-msgstr "Éditer la photo"
+#: ../../include/contact_selectors.php:80
+msgid "Zot!"
+msgstr "Zot!"
 
-#: ../../mod/photos.php:1053
-msgid "Use as profile photo"
-msgstr "Utiliser comme photo de profil"
+#: ../../include/contact_selectors.php:81
+msgid "LinkedIn"
+msgstr "Linkedin"
 
-#: ../../mod/photos.php:1059 ../../include/conversation.php:369
-msgid "Private Message"
-msgstr "Message privé"
+#: ../../include/contact_selectors.php:82
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
 
-#: ../../mod/photos.php:1070
-msgid "View Full Size"
-msgstr "Voir en taille réelle"
+#: ../../include/contact_selectors.php:83
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../../mod/photos.php:1138
-msgid "Tags: "
-msgstr "Étiquettes: "
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr "Divers"
 
-#: ../../mod/photos.php:1141
-msgid "[Remove any tag]"
-msgstr "[Retirer toutes les étiquettes]"
+#: ../../include/datetime.php:152 ../../include/datetime.php:284
+msgid "year"
+msgstr "année"
 
-#: ../../mod/photos.php:1152
-msgid "New album name"
-msgstr "Nom du nouvel album"
+#: ../../include/datetime.php:157 ../../include/datetime.php:285
+msgid "month"
+msgstr "mois"
 
-#: ../../mod/photos.php:1155
-msgid "Caption"
-msgstr "Titre"
+#: ../../include/datetime.php:162 ../../include/datetime.php:287
+msgid "day"
+msgstr "jour"
 
-#: ../../mod/photos.php:1157
-msgid "Add a Tag"
-msgstr "Ajouter une étiquette"
+#: ../../include/datetime.php:275
+msgid "never"
+msgstr "jamais"
 
-#: ../../mod/photos.php:1161
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr ""
-"Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances"
+#: ../../include/datetime.php:281
+msgid "less than a second ago"
+msgstr "à l'instant"
 
-#: ../../mod/photos.php:1181 ../../include/conversation.php:416
-msgid "I like this (toggle)"
-msgstr "I like this (bascule)"
+#: ../../include/datetime.php:284
+msgid "years"
+msgstr "années"
 
-#: ../../mod/photos.php:1182 ../../include/conversation.php:417
-msgid "I don't like this (toggle)"
-msgstr "I don't like this (bascule)"
+#: ../../include/datetime.php:285
+msgid "months"
+msgstr "mois"
 
-#: ../../mod/photos.php:1183 ../../include/conversation.php:814
-msgid "Share"
-msgstr "Partager"
-
-#: ../../mod/photos.php:1184 ../../mod/editpost.php:99
-#: ../../mod/message.php:137 ../../mod/message.php:270
-#: ../../include/conversation.php:251 ../../include/conversation.php:578
-#: ../../include/conversation.php:823
-msgid "Please wait"
-msgstr "Patientez"
+#: ../../include/datetime.php:286
+msgid "week"
+msgstr "semaine"
 
-#: ../../mod/photos.php:1200 ../../mod/photos.php:1239
-#: ../../mod/photos.php:1270 ../../include/conversation.php:431
-msgid "This is you"
-msgstr "C'est vous"
+#: ../../include/datetime.php:286
+msgid "weeks"
+msgstr "semaines"
 
-#: ../../mod/photos.php:1368
-msgid "Recent Photos"
-msgstr "Photos récentes"
+#: ../../include/datetime.php:287
+msgid "days"
+msgstr "jours"
 
-#: ../../mod/photos.php:1372
-msgid "Upload New Photos"
-msgstr "Téléverser de nouvelles photos"
+#: ../../include/datetime.php:288
+msgid "hour"
+msgstr "heure"
 
-#: ../../mod/photos.php:1385
-msgid "View Album"
-msgstr "Voir l'album"
+#: ../../include/datetime.php:288
+msgid "hours"
+msgstr "heures"
 
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendika"
-msgstr "Bienvenue sur Friendica"
+#: ../../include/datetime.php:289
+msgid "minute"
+msgstr "minute"
 
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
-msgstr "Checklist du nouvel utilisateur"
+#: ../../include/datetime.php:289
+msgid "minutes"
+msgstr "minutes"
 
-#: ../../mod/newmember.php:12
-msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page."
-msgstr ""
-"Nous souhaiterions vous donner quelques astuces et pointeurs pour rendre "
-"votre expérience la plus plaisante possible. Cliquez sur n'importe quel "
-"élément pour visiter la page correspondante."
+#: ../../include/datetime.php:290
+msgid "second"
+msgstr "seconde"
 
-#: ../../mod/newmember.php:16
-msgid ""
-"On your Settings page -  change your initial password. Also make a "
-"note of your Identity Address. This will be useful in making friends."
-msgstr ""
-"Sur votre page Réglages - changez votre mot de passe originel. "
-"Profitez-en pour prendre note de votre Adresse d'Identité. Elle vous sera "
-"utile pour vous faire de nouveaux amis."
+#: ../../include/datetime.php:290
+msgid "seconds"
+msgstr "secondes"
 
-#: ../../mod/newmember.php:18
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished"
-" directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
-msgstr ""
-"Vérifiez les autres réglages, tout particulièrement ceux liés à la vie "
-"privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. "
-"En général, vous devriez probablement publier votre profil - à moins que "
-"tous vos amis (potentiels) sachent déjà comment vous trouver."
+#: ../../include/datetime.php:299
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "il y a %1$d %2$s"
 
-#: ../../mod/newmember.php:20
-msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make"
-" friends than people who do not."
-msgstr ""
-"Téléversez (envoyez) une photo de profil si vous n'en avez pas déjà une. Les"
-" études montrent que les gens qui affichent de vraies photos d'eux sont dix "
-"fois plus susceptibles de se faire des amis."
+#: ../../include/dba/dba_driver.php:50
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Impossible de trouver les infos DNS du serveur de DB '%s'"
 
-#: ../../mod/newmember.php:23
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
-msgstr ""
-"Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook"
-" et nous pourrons (de manière facultative) importer tous vos amis et "
-"conversations Facebook."
+#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\à G\\hi"
 
-#: ../../mod/newmember.php:28
-msgid ""
-"Enter your email access information on your Settings page if you wish to "
-"import and interact with friends or mailing lists from your email INBOX"
-msgstr ""
-"Entrez les paramètres de votre adresse de courriel sur la page des Réglages "
-"si vous souhaitez importer et interagir avec vos contacts conventionnels."
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
+msgid "Starts:"
+msgstr "Début :"
 
-#: ../../mod/newmember.php:30
-msgid ""
-"Edit your default profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown"
-" visitors."
-msgstr ""
-"Éditez votre profil par défaut à votre convenance. Vérifiez"
-" les réglages concernant la visibilité de votre liste d'amis par les "
-"visiteurs inconnus."
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
+msgid "Finishes:"
+msgstr "Fin :"
 
-#: ../../mod/newmember.php:32
-msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
-msgstr ""
-"Choisissez quelques mots-clé publics pour votre profil par défaut. Ils "
-"pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer"
-" des contacts qui les partagent."
+#: ../../include/event.php:40 ../../include/identity.php:679
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+msgid "Location:"
+msgstr "Localisation :"
 
-#: ../../mod/newmember.php:34
+#: ../../include/group.php:25
 msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the Connect dialog."
-msgstr ""
-"Votre page Contacts est l'endroit rêvé pour gérer vos relations et contacts,"
-" et vous relier à des amis issus d'autres réseaux. En général, il suffit "
-"d'entrer leur adresse d'identité ou l'URL de leur site dans le champ "
-"Relier"
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Un groupe supprimé portant ce nom a été ressuscité. Les permissions liées aux éléments existants peuvent s'appliquer au groupe et aux membres futurs. Si ce n'est pas ce que vous attendiez, merci de recréer un nouveau groupe avec un nom différent."
 
-#: ../../mod/newmember.php:36
-msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a Connect or Follow link on "
-"their profile page. Provide your own Identity Address if requested."
-msgstr ""
-"La page Annuaire vous permet de trouver d'autres personnes au sein de ce "
-"réseaux ou parmi d'autres sites fédérés. Cherchez un lien Relier ou"
-" Suivre sur leur profil. Vous pourrez avoir besoin d'indiquer votre"
-" adresse d'identité."
+#: ../../include/group.php:223
+msgid "Default privacy group for new contacts"
+msgstr "Groupe de confidentialité par défaut pour les nouveaux contacts"
 
-#: ../../mod/newmember.php:38
-msgid ""
-"Once you have made some friends, organize them into private conversation "
-"groups from the sidebar of your Contacts page and then you can interact with"
-" each group privately on your Network page."
-msgstr ""
-"Une fois que vous avez trouvé quelques amis, organisez-les en groupes de "
-"conversation privés depuis le panneau latéral de la page Contacts. Vous "
-"pourrez ensuite interagir avec chaque groupe de manière privée depuis la "
-"page Réseau."
+#: ../../include/group.php:242 ../../mod/admin.php:750
+msgid "All Channels"
+msgstr "Tous canaux"
 
-#: ../../mod/newmember.php:40
-msgid ""
-"Our help pages may be consulted for detail on other program"
-" features and resources."
-msgstr ""
-"Nos pages d'aide peuvent être consultées pour davantage de "
-"détails sur les fonctionnalités ou les ressources."
+#: ../../include/group.php:264
+msgid "edit"
+msgstr "éditer"
 
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:227
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
+#: ../../include/group.php:285
+msgid "Collections"
+msgstr "Collections"
 
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
-msgstr "Conversion temporelle"
+#: ../../include/group.php:286
+msgid "Edit collection"
+msgstr "Éditer collection"
 
-#: ../../mod/localtime.php:26
-msgid ""
-"Friendika provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr ""
-"Friendica fournit ce service pour partager des événements avec d'autres "
-"réseaux et amis indépendament de leur fuseau horaire."
+#: ../../include/group.php:287
+msgid "Create a new collection"
+msgstr "Créer collection"
 
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
-msgstr "Temps UTC : %s"
+#: ../../include/group.php:288
+msgid "Channels not in any collection"
+msgstr "Canaux dans aucune collection"
 
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Zone de temps courante : %s"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Supprimer cet élément?"
 
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Temps local converti : %s"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
+#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+msgid "Comment"
+msgstr "Commenter"
 
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
-msgstr "Sélectionner votre zone :"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/contact_widgets.php:125
+msgid "show more"
+msgstr "montrer plus"
 
-#: ../../mod/display.php:108
-msgid "Item has been removed."
-msgstr "Cet élément a été enlevé."
+#: ../../include/js_strings.php:8
+msgid "show fewer"
+msgstr "montrer moins"
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
-msgstr "Élément introuvable"
+#: ../../include/js_strings.php:9
+msgid "Password too short"
+msgstr "Mot de passe trop court"
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
-msgstr "Éditer la publication"
+#: ../../include/js_strings.php:10
+msgid "Passwords do not match"
+msgstr "Les mots de passe ne correspondent pas"
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:800
-msgid "Post to Email"
-msgstr "Publier aussi par courriel"
+#: ../../include/js_strings.php:11 ../../mod/photos.php:39
+msgid "everybody"
+msgstr "tout le monde"
 
-#: ../../mod/editpost.php:91 ../../mod/message.php:135
-#: ../../mod/message.php:268 ../../include/conversation.php:815
-msgid "Upload photo"
-msgstr "Joindre photo"
+#: ../../include/js_strings.php:12
+msgid "Secret Passphrase"
+msgstr "Phrase de passe secrète"
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:816
-msgid "Attach file"
-msgstr "Joindre fichier"
+#: ../../include/js_strings.php:13
+msgid "Passphrase hint"
+msgstr "Indice pour la phrase de passe"
 
-#: ../../mod/editpost.php:93 ../../mod/message.php:136
-#: ../../mod/message.php:269 ../../include/conversation.php:817
-msgid "Insert web link"
-msgstr "Insérer lien web"
+#: ../../include/js_strings.php:15
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
 
-#: ../../mod/editpost.php:94
-msgid "Insert YouTube video"
-msgstr "Insérer une vidéo Youtube"
+#: ../../include/js_strings.php:16
+msgid "timeago.suffixAgo"
+msgstr "timeago.suffixAgo"
 
-#: ../../mod/editpost.php:95
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Insérer un lien vidéo Vorbis [.ogg]"
+#: ../../include/js_strings.php:17
+msgid "ago"
+msgstr "auparavant"
 
-#: ../../mod/editpost.php:96
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Insérer un lien audio Vorbis [.ogg]"
+#: ../../include/js_strings.php:18
+msgid "from now"
+msgstr "de maintenant"
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:820
-msgid "Set your location"
-msgstr "Définir votre localisation"
+#: ../../include/js_strings.php:19
+msgid "less than a minute"
+msgstr "moins d'une minute"
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:821
-msgid "Clear browser location"
-msgstr "Effacer la localisation du navigateur"
+#: ../../include/js_strings.php:20
+msgid "about a minute"
+msgstr "environ une minute"
 
-#: ../../mod/editpost.php:100 ../../include/conversation.php:824
-msgid "Permission settings"
-msgstr "Réglages des permissions"
+#: ../../include/js_strings.php:21
+#, php-format
+msgid "%d minutes"
+msgstr "%d minutes"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:832
-msgid "CC: email addresses"
-msgstr "CC: adresses de courriel"
+#: ../../include/js_strings.php:22
+msgid "about an hour"
+msgstr "environ une heure"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:833
-msgid "Public post"
-msgstr "Notice publique"
+#: ../../include/js_strings.php:23
+#, php-format
+msgid "about %d hours"
+msgstr "environ %d heures"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:835
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Exemple: bob@exemple.com, mary@exemple.com"
+#: ../../include/js_strings.php:24
+msgid "a day"
+msgstr "un jour"
 
-#: ../../mod/invite.php:35
+#: ../../include/js_strings.php:25
 #, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Adresse de courriel invalide."
+msgid "%d days"
+msgstr "%d jours"
 
-#: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
-msgstr "Vous pouvez rejoindre mon réseau sur %s"
+#: ../../include/js_strings.php:26
+msgid "about a month"
+msgstr "environ un mois"
 
-#: ../../mod/invite.php:69
+#: ../../include/js_strings.php:27
 #, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : L'envoi du message a échoué."
+msgid "%d months"
+msgstr "%d mois"
+
+#: ../../include/js_strings.php:28
+msgid "about a year"
+msgstr "environ un an"
 
-#: ../../mod/invite.php:73
+#: ../../include/js_strings.php:29
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d message envoyé."
-msgstr[1] "%d messages envoyés."
+msgid "%d years"
+msgstr "%d années"
 
-#: ../../mod/invite.php:92
-msgid "You have no more invitations available"
-msgstr "Vous n'avez plus d'invitations disponibles"
+#: ../../include/js_strings.php:30
+msgid " "
+msgstr ""
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr "Envoyer des invitations"
+#: ../../include/js_strings.php:31
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
 
-#: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
-msgstr "Entrez les adresses email, une par ligne:"
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "Pas de destinataire."
 
-#: ../../mod/invite.php:101 ../../mod/message.php:132
-#: ../../mod/message.php:265
-msgid "Your message:"
-msgstr "Votre message:"
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[sans objet]"
 
-#: ../../mod/invite.php:102
-#, php-format
-msgid "Please join my social network on %s"
-msgstr "Vous pouvez rejoindre mon réseau social sur %s"
+#: ../../include/message.php:42
+msgid "Unable to determine sender."
+msgstr "Impossible de déterminer l'émetteur."
 
-#: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
-msgstr "Pour accepter cette invitation, rendez vous sur:"
+#: ../../include/message.php:143
+msgid "Stored post could not be verified."
+msgstr "Le message stocké n'a pas pu être vérifié."
 
-#: ../../mod/invite.php:104
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Vous devrez fournir ce code d'invitation: $invite_code"
+#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
+#: ../../mod/photos.php:652 ../../mod/photos.php:674
+msgid "Profile Photos"
+msgstr "Photos du profil"
 
-#: ../../mod/invite.php:104
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Une fois inscrit, connectez-vous à la page de mon profil sur:"
+#: ../../include/attach.php:98 ../../include/attach.php:129
+#: ../../include/attach.php:185 ../../include/attach.php:200
+#: ../../include/attach.php:233 ../../include/attach.php:247
+#: ../../include/attach.php:268 ../../include/attach.php:463
+#: ../../include/attach.php:541 ../../include/chat.php:113
+#: ../../include/photos.php:15 ../../include/items.php:3492
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
+#: ../../mod/chat.php:87 ../../mod/chat.php:92
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
+#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
+#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
+msgid "Permission denied."
+msgstr "Permission refusée."
+
+#: ../../include/attach.php:180 ../../include/attach.php:228
+msgid "Item was not found."
+msgstr "Élément introuvable."
 
-#: ../../mod/ping.php:146
-msgid "{0} wants to be your friend"
-msgstr "{0} souhaite être votre ami(e)"
+#: ../../include/attach.php:281
+msgid "No source file."
+msgstr "Pas de fichier source."
 
-#: ../../mod/ping.php:151
-msgid "{0} sent you a message"
-msgstr "{0} vous a envoyé un message"
+#: ../../include/attach.php:298
+msgid "Cannot locate file to replace"
+msgstr "Impossible de trouver le fichier à remplacer."
 
-#: ../../mod/ping.php:156
-msgid "{0} requested registration"
-msgstr "{0} a demandé à s'inscrire"
+#: ../../include/attach.php:316
+msgid "Cannot locate file to revise/update"
+msgstr "Impossible de trouver le fichier à corriger/mettre-à-jour"
 
-#: ../../mod/ping.php:162
+#: ../../include/attach.php:327
 #, php-format
-msgid "{0} commented %s's post"
-msgstr "{0} a commenté une notice de %s"
+msgid "File exceeds size limit of %d"
+msgstr "Le fichier dépasse la taille limite de %d"
 
-#: ../../mod/ping.php:167
+#: ../../include/attach.php:339
 #, php-format
-msgid "{0} liked %s's post"
-msgstr "{0} a aimé une notice de %s"
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le stockage des pièces-jointes"
+
+#: ../../include/attach.php:423
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Envoi du fichier impossible. Limite système ou action avortée."
+
+#: ../../include/attach.php:435
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Le fichier stocké n'a pu être vérifié. Envoi impossible."
+
+#: ../../include/attach.php:479 ../../include/attach.php:496
+msgid "Path not available."
+msgstr "Chemin non disponible."
+
+#: ../../include/attach.php:546
+msgid "Empty pathname"
+msgstr "Chemin vide"
+
+#: ../../include/attach.php:564
+msgid "duplicate filename or path"
+msgstr "doublon de chemin ou de fichier"
+
+#: ../../include/attach.php:589
+msgid "Path not found."
+msgstr "Chemin introuvable."
+
+#: ../../include/attach.php:634
+msgid "mkdir failed."
+msgstr "mkdir a échoué."
+
+#: ../../include/attach.php:638
+msgid "database storage failed."
+msgstr "le stockage en BD a échoué"
+
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
+#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
+#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
+#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
+#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
+#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
+#: ../../include/bbcode.php:626
+msgid "Image/photo"
+msgstr "Image/photo"
+
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
+msgid "Encrypted content"
+msgstr "Contenu chiffré"
 
-#: ../../mod/ping.php:172
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR code"
+
+#: ../../include/bbcode.php:213
 #, php-format
-msgid "{0} disliked %s's post"
-msgstr "{0} n'a pas aimé une notice de %s"
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s a écrit le %2$s suivant %3$s"
+
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "article"
 
-#: ../../mod/ping.php:177
+#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
+msgid "$1 wrote:"
+msgstr "$1 a écrit :"
+
+#: ../../include/bookmarks.php:31
 #, php-format
-msgid "{0} is now friends with %s"
-msgstr "{0} est désormais ami(e) avec %s"
+msgid "%1$s's bookmarks"
+msgstr "Marque-pages de %1$s"
 
-#: ../../mod/ping.php:182
-msgid "{0} posted"
-msgstr "{0} a posté"
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr "canal"
 
-#: ../../mod/ping.php:187
+#: ../../include/conversation.php:161 ../../mod/like.php:134
 #, php-format
-msgid "{0} tagged %s's post with #%s"
-msgstr "{0} a taggué la notice de %s avec #%s"
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s aime %3$s de %2$s"
 
-#: ../../mod/contacts.php:62 ../../mod/contacts.php:133
-msgid "Could not access contact record."
-msgstr "Impossible d'accéder à l'enregistrement du contact."
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s déteste %3$s de %2$s"
 
-#: ../../mod/contacts.php:76
-msgid "Could not locate selected profile."
-msgstr "Impossible de localiser le profil séléctionné."
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s est désormais relié à %2$s"
 
-#: ../../mod/contacts.php:97
-msgid "Contact updated."
-msgstr "Contact mis-à-jour."
+#: ../../include/conversation.php:236
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s a tapoté %2$s"
 
-#: ../../mod/contacts.php:99 ../../mod/dfrn_request.php:409
-msgid "Failed to update contact record."
-msgstr "Échec de mise-à-jour du contact."
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s est actuellement %2$s"
 
-#: ../../mod/contacts.php:155
-msgid "Contact has been blocked"
-msgstr "Le contact a été bloqué"
+#: ../../include/conversation.php:631 ../../include/ItemObject.php:114
+msgid "Select"
+msgstr "Sélectionner"
 
-#: ../../mod/contacts.php:155
-msgid "Contact has been unblocked"
-msgstr "Le contact n'est plus bloqué"
+#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
+#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
+#: ../../mod/admin.php:745 ../../mod/connedit.php:359
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+msgid "Delete"
+msgstr "Supprimer"
 
-#: ../../mod/contacts.php:169
-msgid "Contact has been ignored"
-msgstr "Le contact a été ignoré"
+#: ../../include/conversation.php:642 ../../include/ItemObject.php:161
+msgid "Message is verified"
+msgstr "Message vérifié"
 
-#: ../../mod/contacts.php:169
-msgid "Contact has been unignored"
-msgstr "Le contact n'est plus ignoré"
+#: ../../include/conversation.php:662
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Voir le profil de %s @ %s"
 
-#: ../../mod/contacts.php:190
-msgid "stopped following"
-msgstr "retiré de la liste de suivi"
+#: ../../include/conversation.php:676
+msgid "Categories:"
+msgstr "Catégories :"
 
-#: ../../mod/contacts.php:211
-msgid "Contact has been removed."
-msgstr "Ce contact a été retiré."
+#: ../../include/conversation.php:677
+msgid "Filed under:"
+msgstr "Classé sous :"
 
-#: ../../mod/contacts.php:232
+#: ../../include/conversation.php:686 ../../include/ItemObject.php:226
 #, php-format
-msgid "You are mutual friends with %s"
-msgstr "Vous êtes ami (et réciproquement) avec %s"
+msgid " from %s"
+msgstr "de %s"
 
-#: ../../mod/contacts.php:236
+#: ../../include/conversation.php:689 ../../include/ItemObject.php:229
 #, php-format
-msgid "You are sharing with %s"
-msgstr "Vous partagez avec %s"
+msgid "last edited: %s"
+msgstr "dernière édition : %s"
 
-#: ../../mod/contacts.php:241
+#: ../../include/conversation.php:690 ../../include/ItemObject.php:230
 #, php-format
-msgid "%s is sharing with you"
-msgstr "%s partage avec vous"
+msgid "Expires: %s"
+msgstr "Expire : %s"
 
-#: ../../mod/contacts.php:258
-msgid "Private communications are not available for this contact."
-msgstr "Les communications privées ne sont pas disponibles pour ce contact."
+#: ../../include/conversation.php:705
+msgid "View in context"
+msgstr "Voir en contexte"
 
-#: ../../mod/contacts.php:261
-msgid "Never"
-msgstr "Jamais"
+#: ../../include/conversation.php:707 ../../include/conversation.php:1120
+#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
+#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
+#: ../../mod/photos.php:971
+msgid "Please wait"
+msgstr "Merci de patienter"
 
-#: ../../mod/contacts.php:265
-msgid "(Update was successful)"
-msgstr "(Mise à jour effectuée avec succès)"
+#: ../../include/conversation.php:834
+msgid "remove"
+msgstr "supprimer"
 
-#: ../../mod/contacts.php:265
-msgid "(Update was not successful)"
-msgstr "(Mise à jour échouée)"
+#: ../../include/conversation.php:838
+msgid "Loading..."
+msgstr "Chargement..."
 
-#: ../../mod/contacts.php:267
-msgid "Suggest friends"
-msgstr "Suggérer amitié/contact"
+#: ../../include/conversation.php:839
+msgid "Delete Selected Items"
+msgstr "Supprimer les éléments selectionnés"
 
-#: ../../mod/contacts.php:271
-#, php-format
-msgid "Network type: %s"
-msgstr "Type de réseau %s"
+#: ../../include/conversation.php:930
+msgid "View Source"
+msgstr "Voir source"
 
-#: ../../mod/contacts.php:274
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contact en commun"
-msgstr[1] "%d contacts en commun"
+#: ../../include/conversation.php:931
+msgid "Follow Thread"
+msgstr "Suivre discussion"
 
-#: ../../mod/contacts.php:279
-msgid "View all contacts"
-msgstr "Voir tous les contacts"
+#: ../../include/conversation.php:932
+msgid "View Status"
+msgstr "Voir état"
 
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:470
-msgid "Unblock"
-msgstr "Débloquer"
+#: ../../include/conversation.php:934
+msgid "View Photos"
+msgstr "Voir photos"
 
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:469
-msgid "Block"
-msgstr "Bloquer"
+#: ../../include/conversation.php:935
+msgid "Matrix Activity"
+msgstr "Activité de la matrice"
 
-#: ../../mod/contacts.php:289 ../../mod/contacts.php:332
-msgid "Unignore"
-msgstr "Ne plus ignorer"
+#: ../../include/conversation.php:936
+msgid "Edit Contact"
+msgstr "Éditer contact"
 
-#: ../../mod/contacts.php:289 ../../mod/contacts.php:332
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:143
-#: ../../mod/notifications.php:187
-msgid "Ignore"
-msgstr "Ignorer"
+#: ../../include/conversation.php:937
+msgid "Send PM"
+msgstr "Message privé"
 
-#: ../../mod/contacts.php:294
-msgid "Repair"
-msgstr "Réparer"
+#: ../../include/conversation.php:938
+msgid "Poke"
+msgstr "Tapoter"
 
-#: ../../mod/contacts.php:304
-msgid "Contact Editor"
-msgstr "Éditeur de contact"
+#: ../../include/conversation.php:1000
+#, php-format
+msgid "%s likes this."
+msgstr "%s aime ça."
 
-#: ../../mod/contacts.php:307
-msgid "Profile Visibility"
-msgstr "Visibilité du profil"
+#: ../../include/conversation.php:1000
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s déteste ça."
 
-#: ../../mod/contacts.php:308
+#: ../../include/conversation.php:1004
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-"Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous "
-"rend visite de manière sécurisée."
+msgid "%2$d people like this."
+msgid_plural "%2$d people like this."
+msgstr[0] ""
+msgstr[1] "%2$d personne(s) aime(nt) ça."
 
-#: ../../mod/contacts.php:309
-msgid "Contact Information / Notes"
-msgstr "Informations de contact / Notes"
+#: ../../include/conversation.php:1006
+#, php-format
+msgid "%2$d people don't like this."
+msgid_plural "%2$d people don't like this."
+msgstr[0] ""
+msgstr[1] "%2$d personne(s) déteste(nt) ça."
 
-#: ../../mod/contacts.php:310
-msgid "Edit contact notes"
-msgstr "Editer les notes des contacts"
+#: ../../include/conversation.php:1012
+msgid "and"
+msgstr "et"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:430
-#: ../../mod/viewconnections.php:61
+#: ../../include/conversation.php:1015
 #, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Visiter le profil de %s [%s]"
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ", et %d autre(s) personne(s)"
 
-#: ../../mod/contacts.php:316
-msgid "Block/Unblock contact"
-msgstr "Bloquer/débloquer ce contact"
+#: ../../include/conversation.php:1016
+#, php-format
+msgid "%s like this."
+msgstr "%s aime ça."
 
-#: ../../mod/contacts.php:317
-msgid "Ignore contact"
-msgstr "Ignorer ce contact"
+#: ../../include/conversation.php:1016
+#, php-format
+msgid "%s don't like this."
+msgstr "%s déteste ça."
 
-#: ../../mod/contacts.php:318
-msgid "Repair URL settings"
-msgstr "Réparer les réglages d'URL"
+#: ../../include/conversation.php:1066
+msgid "Visible to everybody"
+msgstr "Visible par tout le monde"
 
-#: ../../mod/contacts.php:319
-msgid "View conversations"
-msgstr "Voir les conversations"
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
+#: ../../mod/mail.php:269
+msgid "Please enter a link URL:"
+msgstr "Merci d'entrer l'URL d'un lien :"
 
-#: ../../mod/contacts.php:321
-msgid "Delete contact"
-msgstr "Effacer ce contact"
+#: ../../include/conversation.php:1068
+msgid "Please enter a video link/URL:"
+msgstr "Merci d'entrer l'URL d'une video :"
 
-#: ../../mod/contacts.php:325
-msgid "Last update:"
-msgstr "Dernière mise-à-jour :"
+#: ../../include/conversation.php:1069
+msgid "Please enter an audio link/URL:"
+msgstr "Merci d'entrer l'URL d'un contenu audio&nsbp;:"
 
-#: ../../mod/contacts.php:326
-msgid "Update public posts"
-msgstr "Met ses entrées publiques à jour: "
+#: ../../include/conversation.php:1070
+msgid "Tag term:"
+msgstr "Étiquette :"
 
-#: ../../mod/contacts.php:328 ../../mod/admin.php:701
-msgid "Update now"
-msgstr "Mettre à jour"
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
+msgid "Save to Folder:"
+msgstr "Classer dans Dossier :"
 
-#: ../../mod/contacts.php:335
-msgid "Currently blocked"
-msgstr "Actuellement bloqué"
+#: ../../include/conversation.php:1072
+msgid "Where are you right now?"
+msgstr "Où êtes-vous présentement?"
 
-#: ../../mod/contacts.php:336
-msgid "Currently ignored"
-msgstr "Actuellement ignoré"
+#: ../../include/conversation.php:1073 ../../mod/editpost.php:52
+#: ../../mod/mail.php:172 ../../mod/mail.php:270
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Expire YYYY-MM-DD HH:MM"
 
-#: ../../mod/contacts.php:364 ../../include/nav.php:130
-msgid "Contacts"
-msgstr "Contacts"
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
+#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+msgid "Preview"
+msgstr "Aperçu"
 
-#: ../../mod/contacts.php:366
-msgid "Show Blocked Connections"
-msgstr "Montrer les connexions bloquées"
+#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+msgid "Share"
+msgstr "Partager"
 
-#: ../../mod/contacts.php:366
-msgid "Hide Blocked Connections"
-msgstr "Cacher les connexion bloquées"
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
+msgid "Page link title"
+msgstr "Titre de la page liée"
 
-#: ../../mod/contacts.php:368
-msgid "Search your contacts"
-msgstr "Rechercher dans vos contacts"
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:104
+#: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:145 ../../mod/editblock.php:121
+msgid "Upload photo"
+msgstr "Téléverser photo"
 
-#: ../../mod/contacts.php:369 ../../mod/directory.php:65
-msgid "Finding: "
-msgstr "Trouvé: "
+#: ../../include/conversation.php:1102
+msgid "upload photo"
+msgstr "téléverser photo"
 
-#: ../../mod/contacts.php:370 ../../mod/directory.php:67
-#: ../../include/contact_widgets.php:34
-msgid "Find"
-msgstr "Trouver"
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:105
+#: ../../mod/mail.php:220 ../../mod/mail.php:333 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:146 ../../mod/editblock.php:122
+msgid "Attach file"
+msgstr "Attacher fichier"
 
-#: ../../mod/contacts.php:406
-msgid "Mutual Friendship"
-msgstr "Relation réciproque"
+#: ../../include/conversation.php:1104
+msgid "attach file"
+msgstr "attacher fichier"
 
-#: ../../mod/contacts.php:410
-msgid "is a fan of yours"
-msgstr "est un fan de vous"
+#: ../../include/conversation.php:1105 ../../mod/editpost.php:106
+#: ../../mod/mail.php:221 ../../mod/mail.php:334 ../../mod/editlayout.php:109
+#: ../../mod/editwebpage.php:147 ../../mod/editblock.php:123
+msgid "Insert web link"
+msgstr "Insérer lien web"
 
-#: ../../mod/contacts.php:414
-msgid "you are a fan of"
-msgstr "vous êtes un fan de"
+#: ../../include/conversation.php:1106
+msgid "web link"
+msgstr "lien web"
 
-#: ../../mod/contacts.php:431 ../../include/Contact.php:129
-#: ../../include/conversation.php:679
-msgid "Edit contact"
-msgstr "Éditer le contact"
+#: ../../include/conversation.php:1107
+msgid "Insert video link"
+msgstr "Insérer lien vidéo"
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr "Informations de confidentialité indisponibles."
+#: ../../include/conversation.php:1108
+msgid "video link"
+msgstr "lien vidéo"
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Visible par:"
+#: ../../include/conversation.php:1109
+msgid "Insert audio link"
+msgstr "Insérer lien audio"
 
-#: ../../mod/register.php:53
-msgid "An invitation is required."
-msgstr "Une invitation est requise."
+#: ../../include/conversation.php:1110
+msgid "audio link"
+msgstr "lien audio"
 
-#: ../../mod/register.php:58
-msgid "Invitation could not be verified."
-msgstr "L'invitation fournie n'a pu être validée."
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:110
+#: ../../mod/editlayout.php:113 ../../mod/editwebpage.php:151
+#: ../../mod/editblock.php:127
+msgid "Set your location"
+msgstr "Spécifier votre localisation"
 
-#: ../../mod/register.php:66
-msgid "Invalid OpenID url"
-msgstr "Adresse OpenID invalide"
+#: ../../include/conversation.php:1112
+msgid "set location"
+msgstr "spécifier localisation"
 
-#: ../../mod/register.php:81
-msgid "Please enter the required information."
-msgstr "Entrez les informations requises."
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:111
+#: ../../mod/editlayout.php:114 ../../mod/editwebpage.php:152
+#: ../../mod/editblock.php:128
+msgid "Clear browser location"
+msgstr "Nettoyer la localisation du navigateur"
 
-#: ../../mod/register.php:95
-msgid "Please use a shorter name."
-msgstr "Utilisez un nom plus court."
+#: ../../include/conversation.php:1114
+msgid "clear location"
+msgstr "nettoyer localisation"
 
-#: ../../mod/register.php:97
-msgid "Name too short."
-msgstr "Nom trop court."
+#: ../../include/conversation.php:1116 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:127 ../../mod/editwebpage.php:169
+#: ../../mod/editblock.php:142
+msgid "Set title"
+msgstr "Spécifier le titre"
 
-#: ../../mod/register.php:112
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Ceci ne semble pas être votre nom complet (Prénom Nom)."
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:126
+#: ../../mod/editlayout.php:130 ../../mod/editwebpage.php:171
+#: ../../mod/editblock.php:145
+msgid "Categories (comma-separated list)"
+msgstr "Catégories (séparées par des virgules)"
 
-#: ../../mod/register.php:117
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Votre domaine de courriel n'est pas autorisé sur ce site."
+#: ../../include/conversation.php:1121 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:116 ../../mod/editwebpage.php:154
+#: ../../mod/editblock.php:130
+msgid "Permission settings"
+msgstr "Permissions"
 
-#: ../../mod/register.php:120
-msgid "Not a valid email address."
-msgstr "Ceci n'est pas une adresse courriel valide."
+#: ../../include/conversation.php:1122
+msgid "permissions"
+msgstr "permissions"
 
-#: ../../mod/register.php:130
-msgid "Cannot use that email."
-msgstr "Impossible d'utiliser ce courriel."
+#: ../../include/conversation.php:1130 ../../mod/editpost.php:121
+#: ../../mod/editlayout.php:124 ../../mod/editwebpage.php:164
+#: ../../mod/editblock.php:139
+msgid "Public post"
+msgstr "Contenu public"
 
-#: ../../mod/register.php:136
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr ""
-"Votre \"pseudo\" peut seulement contenir les caractères \"a-z\", \"0-9\", "
-"\"-\", and \"_\", et doit commencer par une lettre."
+#: ../../include/conversation.php:1132 ../../mod/editpost.php:127
+#: ../../mod/editlayout.php:131 ../../mod/editwebpage.php:172
+#: ../../mod/editblock.php:146
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Exemple: robert@exemple.com, marie@exemple.com"
+
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:138
+#: ../../mod/mail.php:226 ../../mod/mail.php:339 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:156
+msgid "Set expiration date"
+msgstr "Définir la date d'expiration"
+
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
+msgid "Encrypt text"
+msgstr "Chiffrer le texte"
+
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
+msgid "OK"
+msgstr "Ok"
+
+#: ../../include/conversation.php:1150 ../../mod/settings.php:514
+#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../../mod/register.php:142 ../../mod/register.php:243
-msgid "Nickname is already registered. Please choose another."
-msgstr "Pseudo déjà utilisé. Merci d'en choisir un autre."
+#: ../../include/conversation.php:1381
+msgid "Commented Order"
+msgstr "Dans l'ordre des commentaires"
 
-#: ../../mod/register.php:161
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERREUR SÉRIEUSE: La génération des clés de sécurité a échoué."
+#: ../../include/conversation.php:1384
+msgid "Sort by Comment Date"
+msgstr "Trier par date de dernier commentaire"
 
-#: ../../mod/register.php:229
-msgid "An error occurred during registration. Please try again."
-msgstr "Une erreur est survenue lors de l'inscription. Merci de recommencer."
+#: ../../include/conversation.php:1387
+msgid "Posted Order"
+msgstr "Dans l'ordre des publications"
 
-#: ../../mod/register.php:265
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-"Une erreur est survenue lors de la création de votre profil par défaut. "
-"Merci de recommencer."
+#: ../../include/conversation.php:1390
+msgid "Sort by Post Date"
+msgstr "Trier par date de publication"
 
-#: ../../mod/register.php:377
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-"Inscription réussie. Vérifiez vos emails pour la suite des instructions."
+#: ../../include/conversation.php:1394
+msgid "Personal"
+msgstr "Personnel"
 
-#: ../../mod/register.php:381
-msgid "Failed to send email message. Here is the message that failed."
-msgstr "Impossible d'envoyer un email. Voici le message qui a échoué."
+#: ../../include/conversation.php:1397
+msgid "Posts that mention or involve you"
+msgstr "Publications qui vous mentionnent ou vous concernent d'une manière ou d'une autre"
 
-#: ../../mod/register.php:386
-msgid "Your registration can not be processed."
-msgstr "Votre inscription ne peut être traitée."
+#: ../../include/conversation.php:1400 ../../mod/menu.php:61
+#: ../../mod/connections.php:211
+msgid "New"
+msgstr "Nouveautés"
 
-#: ../../mod/register.php:423
-#, php-format
-msgid "Registration request at %s"
-msgstr "Demande d'inscription à %s"
+#: ../../include/conversation.php:1403
+msgid "Activity Stream - by date"
+msgstr "Flux d'activité - par date"
 
-#: ../../mod/register.php:432
-msgid "Your registration is pending approval by the site owner."
-msgstr "Votre inscription attend une validation du propriétaire du site."
+#: ../../include/conversation.php:1410
+msgid "Starred"
+msgstr "Mis en avant"
 
-#: ../../mod/register.php:481
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-"Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. "
-"Fournissez votre OpenID et cliquez \"S'inscrire\"."
+#: ../../include/conversation.php:1413
+msgid "Favourite Posts"
+msgstr "Publications préférées"
 
-#: ../../mod/register.php:482
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-"Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez"
-" le reste."
+#: ../../include/conversation.php:1420
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../mod/register.php:483
-msgid "Your OpenID (optional): "
-msgstr "Votre OpenID (facultatif): "
+#: ../../include/conversation.php:1423
+msgid "Posts flagged as SPAM"
+msgstr "Publications marquées comme indésirables"
 
-#: ../../mod/register.php:497
-msgid "Include your profile in member directory?"
-msgstr "Inclure votre profil dans l'annuaire des membres?"
+#: ../../include/conversation.php:1454
+msgid "Channel"
+msgstr "Canal"
 
-#: ../../mod/register.php:512
-msgid "Membership on this site is by invitation only."
-msgstr "L'inscription à ce site se fait uniquement sur invitation."
+#: ../../include/conversation.php:1457
+msgid "Status Messages and Posts"
+msgstr "Messages d'état et contributions"
 
-#: ../../mod/register.php:513
-msgid "Your invitation ID: "
-msgstr "Votre ID d'invitation: "
+#: ../../include/conversation.php:1466
+msgid "About"
+msgstr "À propos"
 
-#: ../../mod/register.php:516 ../../mod/admin.php:297
-msgid "Registration"
-msgstr "Inscription"
+#: ../../include/conversation.php:1469
+msgid "Profile Details"
+msgstr "Détails du profil"
 
-#: ../../mod/register.php:524
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr "Votre nom complet (p.ex. Michel Dupont): "
+#: ../../include/conversation.php:1478 ../../include/photos.php:302
+msgid "Photo Albums"
+msgstr "Albums photo"
 
-#: ../../mod/register.php:525
-msgid "Your Email Address: "
-msgstr "Votre adresse courriel: "
+#: ../../include/conversation.php:1487
+msgid "Files and Storage"
+msgstr "Fichiers et Stockage"
 
-#: ../../mod/register.php:526
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be "
-"'nickname@$sitename'."
+#: ../../include/conversation.php:1496 ../../include/conversation.php:1499
+msgid "Chatrooms"
+msgstr "Salons"
+
+#: ../../include/conversation.php:1509
+msgid "Events and Calendar"
+msgstr "Événements et agenda"
+
+#: ../../include/conversation.php:1517
+msgid "Saved Bookmarks"
+msgstr "Marque-pages sauvegardés"
+
+#: ../../include/conversation.php:1528
+msgid "Manage Webpages"
+msgstr "Gérer les pages web"
+
+#: ../../include/identity.php:29 ../../mod/item.php:1161
+msgid "Unable to obtain identity information from database"
+msgstr "Impossible d'obtenir les données d'identité depuis la base de données"
+
+#: ../../include/identity.php:62
+msgid "Empty name"
+msgstr "Nom vide"
+
+#: ../../include/identity.php:64
+msgid "Name too long"
+msgstr "Nom trop long"
+
+#: ../../include/identity.php:143
+msgid "No account identifier"
+msgstr "Pas d'identifiant de compte"
+
+#: ../../include/identity.php:153
+msgid "Nickname is required."
+msgstr "Un surnom est requis."
+
+#: ../../include/identity.php:167
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Le surnom contient des caractères interdits, ou est déjà pris sur ce site."
+
+#: ../../include/identity.php:226
+msgid "Unable to retrieve created identity"
+msgstr "Impossible de récupérer l'identité créée"
+
+#: ../../include/identity.php:285
+msgid "Default Profile"
+msgstr "Profil par défaut"
+
+#: ../../include/identity.php:477
+msgid "Requested channel is not available."
+msgstr "Canal demandé non-disponible."
+
+#: ../../include/identity.php:489
+msgid " Sorry, you don't have the permission to view this profile. "
+msgstr "Désolé, mais vous n'avez pas l'autorisation de voir ce profil."
+
+#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/achievements.php:8 ../../mod/blocks.php:10
+#: ../../mod/profile.php:16 ../../mod/filestorage.php:40
+msgid "Requested profile is not available."
+msgstr "Profil demandé inaccessible."
+
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
+msgid "Change profile photo"
+msgstr "Changer la photo du profil"
+
+#: ../../include/identity.php:648
+msgid "Profiles"
+msgstr "Profils"
+
+#: ../../include/identity.php:648
+msgid "Manage/edit profiles"
+msgstr "Gérer/éditer profils"
+
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
+msgid "Create New Profile"
+msgstr "Créer un nouveau profil"
+
+#: ../../include/identity.php:652
+msgid "Edit Profile"
+msgstr "Éditer profil"
+
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
+msgid "Profile Image"
+msgstr "Image du profil"
+
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
+msgid "visible to everybody"
+msgstr "visible par tous"
+
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
+msgid "Edit visibility"
+msgstr "Éditer la visibilité"
+
+#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../mod/directory.php:158
+msgid "Gender:"
+msgstr "Sexe :"
+
+#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../mod/directory.php:160
+msgid "Status:"
+msgstr "État :"
+
+#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../mod/directory.php:162
+msgid "Homepage:"
+msgstr "Site web :"
+
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
+msgstr "Connecté"
+
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:262
+msgid "g A l F d"
+msgstr "H:i l d F"
+
+#: ../../include/identity.php:753 ../../include/identity.php:833
+msgid "F d"
+msgstr "d F"
+
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:284
+msgid "[today]"
+msgstr "[aujourd'hui]"
+
+#: ../../include/identity.php:810
+msgid "Birthday Reminders"
+msgstr "Rappels d'anniversaires"
+
+#: ../../include/identity.php:811
+msgid "Birthdays this week:"
+msgstr "Anniversaires cette semaine :"
+
+#: ../../include/identity.php:866
+msgid "[No description]"
+msgstr "[Pas de description]"
+
+#: ../../include/identity.php:884
+msgid "Event Reminders"
+msgstr "Rappels d'événements"
+
+#: ../../include/identity.php:885
+msgid "Events this week:"
+msgstr "Événements cette semaine :"
+
+#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../mod/profperm.php:107
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../include/identity.php:906 ../../mod/settings.php:920
+msgid "Full Name:"
+msgstr "Nom complet :"
+
+#: ../../include/identity.php:913
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/identity.php:914
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/identity.php:921
+msgid "Birthday:"
+msgstr "Date de naissance :"
+
+#: ../../include/identity.php:925
+msgid "Age:"
+msgstr "Age :"
+
+#: ../../include/identity.php:934
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "depuis %1$d %2$s"
+
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
+msgid "Sexual Preference:"
+msgstr "Orientation sexuelle :"
+
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
+msgid "Hometown:"
+msgstr "Ville natale :"
+
+#: ../../include/identity.php:943
+msgid "Tags:"
+msgstr "Tags:"
+
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
+msgid "Political Views:"
+msgstr "Opinions politiques :"
+
+#: ../../include/identity.php:947
+msgid "Religion:"
+msgstr "Religion :"
+
+#: ../../include/identity.php:949 ../../mod/directory.php:164
+msgid "About:"
+msgstr "À propos :"
+
+#: ../../include/identity.php:951
+msgid "Hobbies/Interests:"
+msgstr "Occupations/Centres d'intérêt :"
+
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
+msgid "Likes:"
+msgstr "Aime :"
+
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
+msgid "Dislikes:"
+msgstr "N'aime pas :"
+
+#: ../../include/identity.php:958
+msgid "Contact information and Social Networks:"
+msgstr "Coordonnées et réseaux sociaux :"
+
+#: ../../include/identity.php:960
+msgid "My other channels:"
+msgstr "Mes autres canaux :"
+
+#: ../../include/identity.php:962
+msgid "Musical interests:"
+msgstr "Goûts musicaux :"
+
+#: ../../include/identity.php:964
+msgid "Books, literature:"
+msgstr "Lectures, goûts littéraires :"
+
+#: ../../include/identity.php:966
+msgid "Television:"
+msgstr "Télévision :"
+
+#: ../../include/identity.php:968
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cinéma/danse/culture/divertissement&nsbp;:"
+
+#: ../../include/identity.php:970
+msgid "Love/Romance:"
+msgstr "Vie sentimentale/amoureuse :"
+
+#: ../../include/identity.php:972
+msgid "Work/employment:"
+msgstr "Travail :"
+
+#: ../../include/identity.php:974
+msgid "School/education:"
+msgstr "Cursus :"
+
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+msgid "Private Message"
+msgstr "Message Privé"
+
+#: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
+#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/settings.php:575 ../../mod/editpost.php:103
+#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
+#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
+msgid "Edit"
+msgstr "Éditer"
+
+#: ../../include/ItemObject.php:118
+msgid "save to folder"
+msgstr "classer dans un dossier"
+
+#: ../../include/ItemObject.php:146
+msgid "add star"
+msgstr "mettre en avant"
+
+#: ../../include/ItemObject.php:147
+msgid "remove star"
+msgstr "ne plus mettre en avant"
+
+#: ../../include/ItemObject.php:148
+msgid "toggle star status"
+msgstr "(dé)marquer"
+
+#: ../../include/ItemObject.php:152
+msgid "starred"
+msgstr "mis en avant"
+
+#: ../../include/ItemObject.php:169
+msgid "add tag"
+msgstr "étiquetter"
+
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+msgid "I like this (toggle)"
+msgstr "J'aime (oui/non)"
+
+#: ../../include/ItemObject.php:184 ../../include/taxonomy.php:254
+msgid "like"
+msgstr "aime"
+
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+msgid "I don't like this (toggle)"
+msgstr "Je déteste (oui/non)"
+
+#: ../../include/ItemObject.php:185 ../../include/taxonomy.php:255
+msgid "dislike"
+msgstr "déteste"
+
+#: ../../include/ItemObject.php:187
+msgid "Share this"
+msgstr "Partager ça"
+
+#: ../../include/ItemObject.php:187
+msgid "share"
+msgstr "partage"
+
+#: ../../include/ItemObject.php:211 ../../include/ItemObject.php:212
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Voir le profil de %s - %s"
+
+#: ../../include/ItemObject.php:213
+msgid "to"
+msgstr "à"
+
+#: ../../include/ItemObject.php:214
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:215
+msgid "Wall-to-Wall"
+msgstr "Mur-mur"
+
+#: ../../include/ItemObject.php:216
+msgid "via Wall-To-Wall:"
+msgstr "par Mur-mur :"
+
+#: ../../include/ItemObject.php:249
+msgid "Bookmark Links"
+msgstr ""
+
+#: ../../include/ItemObject.php:279
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d commentaire"
+msgstr[1] "%d commentaires"
+
+#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
+#: ../../mod/photos.php:1074
+msgid "This is you"
+msgstr "C'est vous"
+
+#: ../../include/ItemObject.php:547 ../../mod/events.php:469
+#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
+#: ../../mod/settings.php:513 ../../mod/settings.php:625
+#: ../../mod/settings.php:653 ../../mod/settings.php:677
+#: ../../mod/settings.php:748 ../../mod/settings.php:912
+#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
+#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
+#: ../../mod/connedit.php:437 ../../mod/profiles.php:506
+#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
+#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
+#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
+#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/apw/php/config.php:231
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/blogga/php/config.php:67
+msgid "Submit"
+msgstr "Envoyer"
+
+#: ../../include/ItemObject.php:548
+msgid "Bold"
+msgstr "Gras"
+
+#: ../../include/ItemObject.php:549
+msgid "Italic"
+msgstr "Italique"
+
+#: ../../include/ItemObject.php:550
+msgid "Underline"
+msgstr "Souligné"
+
+#: ../../include/ItemObject.php:551
+msgid "Quote"
+msgstr "Citation"
+
+#: ../../include/ItemObject.php:552
+msgid "Code"
+msgstr "Code"
+
+#: ../../include/ItemObject.php:553
+msgid "Image"
+msgstr "Image"
+
+#: ../../include/ItemObject.php:554
+msgid "Link"
+msgstr "Lien/URL"
+
+#: ../../include/ItemObject.php:555
+msgid "Video"
+msgstr "Vidéo"
+
+#: ../../include/api.php:974
+msgid "Public Timeline"
+msgstr "Fil public"
+
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr "pleine taille"
+
+#: ../../include/notify.php:23
+msgid "created a new post"
+msgstr "a publié"
+
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
+msgstr "a commenté la publication de %s"
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Mâle"
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Femelle"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Actuellement mâle"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Actuellement femelle"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Surtout mâle"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Surtotu femelle"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgenre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Intersexuel"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transsexuel"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermaphrodite"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Rien de spécifique"
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Autre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Indécis"
+
+#: ../../include/profile_selectors.php:23
+msgid "Males"
+msgstr "Hommes"
+
+#: ../../include/profile_selectors.php:23
+msgid "Females"
+msgstr "Femmes"
+
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
+msgstr "Gay"
+
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
+msgstr "Lesbienne"
+
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
+msgstr "Sans préférence"
+
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
+msgstr "Bisexuel"
+
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
+msgstr "Autosexuel"
+
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
+msgstr "Abstinent"
+
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
+msgstr "Vierge"
+
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
+msgstr "Déviant"
+
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
+msgstr "Fétichiste"
+
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
+msgstr "Une floppée"
+
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr "Nonsexuel"
+
+#: ../../include/profile_selectors.php:42
+msgid "Single"
+msgstr "Célibataire"
+
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
+msgstr "Esseulé"
+
+#: ../../include/profile_selectors.php:42
+msgid "Available"
+msgstr "Disponible"
+
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr "Indisponible"
+
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
+msgstr "A un béguin"
+
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr "Amoureux transi"
+
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
+msgstr "Sort avec quelqu'un"
+
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr "Infidèle"
+
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr "Accro au sexe"
+
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr "Amis avec bénéfices"
+
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
+msgstr "Sans engagement"
+
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
+msgstr "Fiancé(e)"
+
+#: ../../include/profile_selectors.php:42
+msgid "Married"
+msgstr "Marrié(e)"
+
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr "Marié(e) dans ses rêves"
+
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
+msgstr "Partenaires"
+
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr "En cohabitation"
+
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
+msgstr "Conjoints de fait"
+
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
+msgstr "Heureux"
+
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
+msgstr "Pas en recherche"
+
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
+msgstr "Infidèle"
+
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr "Trahi(e)"
+
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
+msgstr "Séparé(e)"
+
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
+msgstr "Instable"
+
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
+msgstr "Divorcé(e)"
+
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr "Divorcé(e) dans ses rêves"
+
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
+msgstr "Veuf/veuve"
+
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr "Incertain"
+
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr "C'est compliqué"
+
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
+msgstr "S'en fiche"
+
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
+msgstr "Me demander"
+
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr "Il manque le nom du salon"
+
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr "Un salon de ce nom existe déjà"
+
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr "Identifiant de salon invalide."
+
+#: ../../include/chat.php:102
+msgid "Room not found."
+msgstr "Salon introuvable."
+
+#: ../../include/chat.php:123
+msgid "Room is full"
+msgstr "Le salon est plein"
+
+#: ../../include/taxonomy.php:210
+msgid "Tags"
+msgstr "Étiquettes"
+
+#: ../../include/taxonomy.php:227
+msgid "Keywords"
+msgstr "Mots-clefs"
+
+#: ../../include/taxonomy.php:252
+msgid "have"
+msgstr "ont"
+
+#: ../../include/taxonomy.php:252
+msgid "has"
+msgstr "a"
+
+#: ../../include/taxonomy.php:253
+msgid "want"
+msgstr "veulent"
+
+#: ../../include/taxonomy.php:253
+msgid "wants"
+msgstr "veut"
+
+#: ../../include/taxonomy.php:254
+msgid "likes"
+msgstr "aime"
+
+#: ../../include/taxonomy.php:255
+msgid "dislikes"
+msgstr "déteste"
+
+#: ../../include/auth.php:76
+msgid "Logged out."
+msgstr "Deconnecté."
+
+#: ../../include/auth.php:188
+msgid "Failed authentication"
+msgstr "Échec de l'authentification"
+
+#: ../../include/auth.php:203
+msgid "Login failed."
+msgstr "Échec de la connexion."
+
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr "Ce n'est pas une adresse de courriel valide"
+
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site"
+
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr "Votre adresse de courriel est déjà inscrite sur ce site."
+
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr "Une invitation est requise."
+
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr "Votre invitation n'a pas pu être vérifiée."
+
+#: ../../include/account.php:119
+msgid "Please enter the required information."
+msgstr "Merci d'entrer les informations requises."
+
+#: ../../include/account.php:187
+msgid "Failed to store account information."
+msgstr "Impossible de stocker les informations liées au compte."
+
+#: ../../include/account.php:273
+#, php-format
+msgid "Registration request at %s"
+msgstr "Demande d'inscription sur %s"
+
+#: ../../include/account.php:275 ../../include/account.php:302
+#: ../../include/account.php:359
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: ../../include/account.php:297
+msgid "your registration password"
+msgstr "votre mot de passe d'inscription"
+
+#: ../../include/account.php:300 ../../include/account.php:357
+#, php-format
+msgid "Registration details for %s"
+msgstr "Détails de l'inscription à %s"
+
+#: ../../include/account.php:366
+msgid "Account approved."
+msgstr "Compte approuvé."
+
+#: ../../include/account.php:400
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Inscription révoquée pour %s"
+
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr "Options de tri"
+
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr "Alphabétique"
+
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr "Alphabétique inversé"
+
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr "Anté-chronologique"
+
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
+msgstr "Activer la recherche sûre"
+
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
+msgstr "Désactiver la recherche sûre"
+
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
+msgstr "Mode sûr"
+
+#: ../../include/enotify.php:40
+msgid "Red Matrix Notification"
+msgstr "Notification Red Matrix"
+
+#: ../../include/enotify.php:41
+msgid "redmatrix"
+msgstr "redmatrix"
+
+#: ../../include/enotify.php:43
+msgid "Thank You,"
+msgstr "Merci,"
+
+#: ../../include/enotify.php:45
+#, php-format
+msgid "%s Administrator"
+msgstr "l'administrateur de %s"
+
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s "
+msgstr "%s "
+
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
+msgstr "[Red:Notification] Nouveau message reçu sur %s"
+
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, vous avez reçu un message privé sur %3$s, de la part de %2$s."
+
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s vous a envoyé %2$s."
+
+#: ../../include/enotify.php:87
+msgid "a private message"
+msgstr "un message privé"
+
+#: ../../include/enotify.php:88
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Merci de visiter %s pour voir et/ou répondre à vos messages privés."
+
+#: ../../include/enotify.php:142
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:150
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:159
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:170
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Red:Notification] Commentaire de %2$s sur conversation #%1$d"
+
+#: ../../include/enotify.php:171
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr ""
+
+#: ../../include/enotify.php:174 ../../include/enotify.php:189
+#: ../../include/enotify.php:215 ../../include/enotify.php:234
+#: ../../include/enotify.php:248
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Merci de visiter %s pour voir et/ou répondre sur cette conversation."
+
+#: ../../include/enotify.php:180
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
+msgstr "[Red:Notification] %s a publié sur votre profil"
+
+#: ../../include/enotify.php:182
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:208
+#, php-format
+msgid "[Red:Notify] %s tagged you"
+msgstr "[Red:Notification] %s vous a marqué"
+
+#: ../../include/enotify.php:209
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, vous avez été étiqueté sur %3$s par %2$s"
+
+#: ../../include/enotify.php:210
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr ""
+
+#: ../../include/enotify.php:223
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
+msgstr "[Red:Notification] %1$s vous a tapoté"
+
+#: ../../include/enotify.php:224
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, vous avez été tapoté/pointé/sollicité par %2$s sur %3$s"
+
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr ""
+
+#: ../../include/enotify.php:241
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
+msgstr "[Red:Notification] %s a marqué votre publication"
+
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:243
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
-"Choisissez un pseudo. Celui devra commencer par une lettre. L'adresse de "
-"votre profil en découlera sous la forme "
-"'<strong>pseudo@$sitename</strong>'."
 
-#: ../../mod/register.php:527
-msgid "Choose a nickname: "
-msgstr "Choisir un pseudo: "
+#: ../../include/enotify.php:255
+msgid "[Red:Notify] Introduction received"
+msgstr "[Red:Notification] Nouvelle introduction"
 
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
-msgstr "Publication réussie."
+#: ../../include/enotify.php:256
+#, php-format
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+msgstr ""
 
-#: ../../mod/allfriends.php:34
+#: ../../include/enotify.php:257
 #, php-format
-msgid "Friends of %s"
-msgstr "Amis de %s"
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+msgstr ""
 
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
-msgstr "Pas d'amis à afficher."
+#: ../../include/enotify.php:261 ../../include/enotify.php:280
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Vous pouvez visiter leur profil sur %s"
 
-#: ../../mod/help.php:30
-msgid "Help:"
-msgstr "Aide:"
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Merci de visiter %s avant d'approuver (ou non) son introduction."
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
-msgid "Help"
-msgstr "Aide"
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Friend suggestion received"
+msgstr "[Red:Notification] Nouvelle suggestion d'amitié"
+
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:272
+#, 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:278
+msgid "Name:"
+msgstr "Nom :"
+
+#: ../../include/enotify.php:279
+msgid "Photo:"
+msgstr "Photo :"
+
+#: ../../include/enotify.php:282
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Merci de visiter %s pour donner suite (ou non) à cette suggestion."
+
+#: ../../include/photos.php:89
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "L'image dépasse la taille limite de %lu octets"
+
+#: ../../include/photos.php:96
+msgid "Image file is empty."
+msgstr "L'image est vide."
+
+#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
+msgid "Unable to process image"
+msgstr "Impossible de traiter l'image"
+
+#: ../../include/photos.php:185
+msgid "Photo storage failed."
+msgstr "Le stockage de l'image a échoué."
+
+#: ../../include/photos.php:306 ../../mod/photos.php:690
+#: ../../mod/photos.php:1187
+msgid "Upload New Photos"
+msgstr "Ajouter des photos"
 
-#: ../../mod/install.php:34
-msgid "Could not create/connect to database."
-msgstr "Impossible de créer/atteindre la base de données."
+#: ../../include/reddav.php:1018
+msgid "Edit File properties"
+msgstr "Éditer les propriétés du fichier"
 
-#: ../../mod/install.php:39
-msgid "Connected to database."
-msgstr "Connecté à la base de données."
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitation disponible"
+msgstr[1] "%d invitations disponibles"
+
+#: ../../include/contact_widgets.php:20
+msgid "Find Channels"
+msgstr "Trouver des canaux"
+
+#: ../../include/contact_widgets.php:21
+msgid "Enter name or interest"
+msgstr "Saisir nom ou centre d'intérêt"
+
+#: ../../include/contact_widgets.php:22
+msgid "Connect/Follow"
+msgstr "Relier/Suivre"
+
+#: ../../include/contact_widgets.php:23
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples: Robert Morgenstein, Course à pieds"
+
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
+#: ../../mod/directory.php:211 ../../mod/connections.php:357
+msgid "Find"
+msgstr "Trouver"
+
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
+msgid "Channel Suggestions"
+msgstr "Canaux suggérés"
 
-#: ../../mod/install.php:75
-msgid "Proceed with Installation"
-msgstr "Commencer l'installation"
+#: ../../include/contact_widgets.php:27
+msgid "Random Profile"
+msgstr "Un profil au hasard"
 
-#: ../../mod/install.php:77
-msgid "Your Friendika site database has been installed."
-msgstr "La base de données de votre site Friendika a été installée."
+#: ../../include/contact_widgets.php:28
+msgid "Invite Friends"
+msgstr "Inviter des amis"
+
+#: ../../include/contact_widgets.php:120
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d relation en commun"
+msgstr[1] "%d relations en commun"
+
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Nouvelle page"
+
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
+msgstr "Cliquez ici pour mettre à jour."
+
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Cette action outrepasserait les limites prévues par votre forfait."
+
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
+msgstr "Cette action n'est pas possible avec la formule choisie."
 
-#: ../../mod/install.php:78
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
+msgstr "Ce canal est bloqué sur ce site."
+
+#: ../../include/follow.php:26
+msgid "Channel location missing."
+msgstr "Localisation du canal manquante."
+
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
+msgstr "Découverte du canal impossible. Le site est peut-être en dérangement ou mal configuré."
+
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
+msgstr "La réponse du canal distant n'a pas été comprise."
+
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
+msgstr "La réponse du canal distant était incomplète."
+
+#: ../../include/follow.php:129
+msgid "local account not found."
+msgstr "compte local introuvable."
+
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
+msgstr "Ne peut pas se connecter à vous."
+
+#: ../../include/security.php:280
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr ""
-"IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le"
-" 'poller'."
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert depuis trop longtemps (plus de 3 heures)."
+
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:64
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
+msgstr "Défaut"
+
+#: ../../include/oembed.php:157
+msgid "Embedded content"
+msgstr "Contenu imbriqué"
+
+#: ../../include/oembed.php:166
+msgid "Embedding disabled"
+msgstr "Imbrication désactivée"
+
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
+msgstr "Peut voir mon flux et mes publications \"publiques\""
+
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
+msgstr "Peut voir mon le canal \"public\" de mon profil"
+
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
+msgstr "Peut voir mes albums photos \"publics\""
+
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
+msgstr "Peut voir mes contacts \"publics\""
+
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
+msgstr "Peut voir mes fichiers \"publics\""
+
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
+msgstr "Peut voir mes pages \"publiques\""
+
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
+msgstr "Peut m'envoyer le flux et les publications de leur canal"
+
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Peut poster sur la page de mon canal (\"mur\")"
+
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
+msgstr "Peut commenter mes publications"
 
-#: ../../mod/install.php:79 ../../mod/install.php:89 ../../mod/install.php:207
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Référez-vous au fichier \"INSTALL.txt\"."
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
+msgstr "Peut m'envoyer des messages privés"
 
-#: ../../mod/install.php:81
-msgid "Proceed to registration"
-msgstr "Commencer l'inscription"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
+msgstr "Peut ajouter des photos à mes albums"
 
-#: ../../mod/install.php:87
-msgid "Database import failed."
-msgstr "Import de base échoué."
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Peut faire suivre à tous les contacts du mon canal via @truc"
 
-#: ../../mod/install.php:88
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avancé - utile seulement pour les canaux de type \"forum/groupe\""
+
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
+msgstr "Peut discuter avec moi (sous réserve de disponibilité)"
+
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
+msgstr "Peut écrire dans mon stockage \"public\" de fichiers"
+
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
+msgstr "Peut éditer mes pages \"publiques\""
+
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
+msgstr "Peut utiliser mes contributions \"publiques\" comme source de canaux dérivés"
+
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Plutôt avancé - très utile dans les communautés ouvertes"
+
+#: ../../include/permissions.php:32
+msgid "Can send me bookmarks"
+msgstr "Peut m'envoyer des marque-pages"
+
+#: ../../include/permissions.php:33
+msgid "Can administer my channel resources"
+msgstr "Peut administrer les ressources de mon canal"
+
+#: ../../include/permissions.php:33
 msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr ""
-"Vous pourriez avoir besoin d'importer le fichier \"database.sql\" "
-"manuellement au moyen de phpmyadmin ou de la commande mysql."
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Très avancé. Ne pas toucher, sauf si vous savez VRAIMENT ce que vous faites"
+
+#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../index.php:350
+msgid "Permission denied"
+msgstr "Accès refusé"
+
+#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
+msgid "Item not found."
+msgstr "Élément introuvable."
+
+#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
+msgstr "Collection introuvable."
+
+#: ../../include/items.php:3801
+msgid "Collection is empty."
+msgstr "Collection vide."
+
+#: ../../include/items.php:3808
+#, php-format
+msgid "Collection: %s"
+msgstr "Collection : %s"
+
+#: ../../include/items.php:3819
+#, php-format
+msgid "Connection: %s"
+msgstr "Relation : %s"
+
+#: ../../include/items.php:3822
+msgid "Connection not found."
+msgstr "Relation introuvable."
+
+#: ../../include/zot.php:545
+msgid "Invalid data packet"
+msgstr "Paquet de données invalide"
+
+#: ../../include/zot.php:555
+msgid "Unable to verify channel signature"
+msgstr "Impossible de vérifier la signature du canal"
+
+#: ../../include/zot.php:732
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Impossible de vérifier la signature de site pour %s"
+
+#: ../../mod/common.php:10
+msgid "No channel."
+msgstr "Pas de canal."
+
+#: ../../mod/common.php:39
+msgid "Common connections"
+msgstr "Relations communes"
+
+#: ../../mod/common.php:44
+msgid "No connections in common."
+msgstr "Pas de relations en commun."
+
+#: ../../mod/events.php:72
+msgid "Event title and start time are required."
+msgstr "Un titre et une date de début sont requises pour l'événement."
+
+#: ../../mod/events.php:287
+msgid "l, F j"
+msgstr "l j F"
+
+#: ../../mod/events.php:309
+msgid "Edit event"
+msgstr "Éditer événement"
+
+#: ../../mod/events.php:355
+msgid "Create New Event"
+msgstr "Créer événement"
+
+#: ../../mod/events.php:356
+msgid "Previous"
+msgstr "Précédent"
+
+#: ../../mod/events.php:357 ../../mod/setup.php:258
+msgid "Next"
+msgstr "Suivant"
+
+#: ../../mod/events.php:428
+msgid "hour:minute"
+msgstr "heure:minute"
+
+#: ../../mod/events.php:447
+msgid "Event details"
+msgstr "Détails de l'événement"
+
+#: ../../mod/events.php:448
+#, php-format
+msgid "Format is %s %s. Starting date and Title are required."
+msgstr "Le format est %s %s. Date de début et titre obligatoires."
 
-#: ../../mod/install.php:101
-msgid "Welcome to Friendika."
-msgstr "Bienvenue sur Friendika."
+#: ../../mod/events.php:450
+msgid "Event Starts:"
+msgstr "L'événement débute :"
+
+#: ../../mod/events.php:450 ../../mod/events.php:464
+msgid "Required"
+msgstr "Requis"
+
+#: ../../mod/events.php:453
+msgid "Finish date/time is not known or not relevant"
+msgstr "Date/heure de fin inconnue ou sans objet"
+
+#: ../../mod/events.php:455
+msgid "Event Finishes:"
+msgstr "L'événement termine :"
+
+#: ../../mod/events.php:458
+msgid "Adjust for viewer timezone"
+msgstr "Ajuster au fuseau horaire du visiteur"
+
+#: ../../mod/events.php:460
+msgid "Description:"
+msgstr "Description:"
+
+#: ../../mod/events.php:464
+msgid "Title:"
+msgstr "Titre:"
+
+#: ../../mod/events.php:466
+msgid "Share this event"
+msgstr "Partager cet événement"
+
+#: ../../mod/thing.php:94
+msgid "Thing updated"
+msgstr "Chose mise-à-jour"
+
+#: ../../mod/thing.php:153
+msgid "Object store: failed"
+msgstr "Stockage de l'objet : échec"
+
+#: ../../mod/thing.php:157
+msgid "Thing added"
+msgstr "Chose ajoutée"
+
+#: ../../mod/thing.php:175
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
+
+#: ../../mod/thing.php:228
+msgid "Show Thing"
+msgstr "Montrer chose"
+
+#: ../../mod/thing.php:235
+msgid "item not found."
+msgstr "élément introuvable."
+
+#: ../../mod/thing.php:263
+msgid "Edit Thing"
+msgstr "Éditer chose"
+
+#: ../../mod/thing.php:265 ../../mod/thing.php:311
+msgid "Select a profile"
+msgstr "Choisissez un profil"
+
+#: ../../mod/thing.php:267 ../../mod/thing.php:313
+msgid "Select a category of stuff. e.g. I ______ something"
+msgstr "Choisissez une catégorie de choses. p.ex. Je ______ quelque-chose"
+
+#: ../../mod/thing.php:270 ../../mod/thing.php:315
+msgid "Name of thing e.g. something"
+msgstr "Nom de la chose, p.ex. quelque-chose"
+
+#: ../../mod/thing.php:272 ../../mod/thing.php:316
+msgid "URL of thing (optional)"
+msgstr "URL de la chose (optionnel)"
+
+#: ../../mod/thing.php:274 ../../mod/thing.php:317
+msgid "URL for photo of thing (optional)"
+msgstr "URL de l'image de la chose (optionnel)"
+
+#: ../../mod/thing.php:309
+msgid "Add Thing to your Profile"
+msgstr "Ajouter la chose à votre profil"
+
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Limite du nombre total d'invitation dépassée."
+
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : adresse courriel invalide."
+
+#: ../../mod/invite.php:76
+msgid "Please join us on Red"
+msgstr "Rejoignez-nous sur Red"
+
+#: ../../mod/invite.php:87
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limite d'invitations dépassée. Merci de contacter l'administration de votre site."
+
+#: ../../mod/invite.php:92
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Échec dans la livraison du message."
+
+#: ../../mod/invite.php:96
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d message envoyé."
+msgstr[1] "%d messages envoyés."
+
+#: ../../mod/invite.php:115
+msgid "You have no more invitations available"
+msgstr "Vous ne disposez plus d'aucune invitation"
 
-#: ../../mod/install.php:124
-msgid "Friendika Social Network"
-msgstr "Réseau social Friendika"
+#: ../../mod/invite.php:141
+msgid "Send invitations"
+msgstr "Envoyer des invitations"
+
+#: ../../mod/invite.php:142
+msgid "Enter email addresses, one per line:"
+msgstr "Entrez les adresses de courriel, une par ligne :"
 
-#: ../../mod/install.php:125
-msgid "Installation"
-msgstr "Installation"
+#: ../../mod/invite.php:143 ../../mod/mail.php:216 ../../mod/mail.php:328
+msgid "Your message:"
+msgstr "Votre message :"
 
-#: ../../mod/install.php:126
+#: ../../mod/invite.php:144
 msgid ""
-"In order to install Friendika we need to know how to connect to your "
-"database."
-msgstr ""
-"Pour installer Friendika, nous avons besoin de contacter votre base de "
-"données."
+"You are cordially invited to join me and some other close friends on the Red"
+" Matrix - a revolutionary new decentralised communication and information "
+"tool."
+msgstr "Vous êtes cordialement invité à me rejoindre, ainsi que d'autres amis proches, sur la Matrice Red - un nouvel outil de communication acentré/décentralisé et révolutionnaire."
+
+#: ../../mod/invite.php:146
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Vous devrez fournir ce code d'invitation : $invite_code"
+
+#: ../../mod/invite.php:147
+msgid "Please visit my channel at"
+msgstr "Merci de me rendre visite sur"
 
-#: ../../mod/install.php:127
+#: ../../mod/invite.php:151
 msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-"Merci de vous tourner vers votre hébergeur et/ou administrateur pour toute "
-"question concernant ces réglages."
+"Once you have registered (on ANY Red Matrix site - they are all inter-"
+"connected), please connect with my Red Matrix channel address:"
+msgstr "Une fois inscrit (sur N'IMPORTE QUEL site Red Matrix - ils sont tous inter-connectés), merci de vous relier à l'adresse de mon canal :"
+
+#: ../../mod/invite.php:153
+msgid "Click the [Register] link on the following page to join."
+msgstr "Cliquez le lien [Inscription] sur la page suivante pour nous rejoindre."
 
-#: ../../mod/install.php:128
+#: ../../mod/invite.php:155
 msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-"La base de données que vous spécifierez doit exister. Si ce n'est pas encore"
-" le cas, merci de la créer avant de continuer."
+"For more information about the Red Matrix Project and why it has the "
+"potential to change the internet as we know it, please visit "
+"http://getzot.com"
+msgstr "Pour plus d'information sur le projet Red Matrix, et sa capacité à remodeler Internet, merci de visiter http://getzot.com"
+
+#: ../../mod/item.php:145
+msgid "Unable to locate original post."
+msgstr "Impossible de localiser la publication initiale."
+
+#: ../../mod/item.php:346
+msgid "Empty post discarded."
+msgstr "Publication vide défaussée."
+
+#: ../../mod/item.php:388
+msgid "Executable content type not permitted to this channel."
+msgstr "Les contenus de type 'exécutable' ne sont pas autorisés sur ce canal."
+
+#: ../../mod/item.php:819
+msgid "System error. Post not saved."
+msgstr "Erreur système. Publication non sauvegardée."
+
+#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+msgid "Wall Photos"
+msgstr "Photos du mur"
+
+#: ../../mod/item.php:1166
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Vous avez atteint votre limite de %1$.0f contributions \"racine\"."
+
+#: ../../mod/item.php:1172
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Vous avez atteint votre limite de %1$.0f pages web."
+
+#: ../../mod/menu.php:21
+msgid "Menu updated."
+msgstr "Menu mis à jour."
+
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
+msgstr "Impossible de mettre le menu à jour."
+
+#: ../../mod/menu.php:30
+msgid "Menu created."
+msgstr "Menu créé."
+
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
+msgstr "Impossible de créer le menu."
+
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
+msgstr "Gérer les menus"
+
+#: ../../mod/menu.php:60
+msgid "Drop"
+msgstr "Supprimer"
+
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
+msgstr "Créer un nouveau menu"
+
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
+msgstr "Supprimer ce menu"
+
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
+msgstr "Éditer le contenu du menu"
+
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
+msgstr "Éditer le menu"
+
+#: ../../mod/menu.php:80
+msgid "New Menu"
+msgstr "Nouveau menu"
+
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
+msgstr "Nom du menu"
+
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
+msgstr "Doit être unique, ne sera vu que par vous"
+
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
+msgstr "Titre du menu"
+
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
+msgstr "Titre du menu tel que vu par les visiteurs"
+
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
+msgstr "Autoriser les marque-pages"
+
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Le menu pourra être utilisé pour stocker des marque-pages"
+
+#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
+msgid "Create"
+msgstr "Créer"
+
+#: ../../mod/menu.php:92 ../../mod/mitem.php:14
+msgid "Menu not found."
+msgstr "Menu introuvable."
+
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
+msgstr "Menu supprimé."
+
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
+msgstr "Impossible de supprimer le menu."
+
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
+msgstr "Éditer le menu"
+
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
+msgstr "Ajouter/supprimer des entrées à ce menu"
+
+#: ../../mod/menu.php:114 ../../mod/mitem.php:186
+msgid "Modify"
+msgstr "Modifier"
+
+#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
+#: ../../mod/dirprofile.php:181
+msgid "Not found."
+msgstr "Introuvable."
+
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
+#: ../../mod/blocks.php:96
+msgid "View"
+msgstr "Vue"
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autoriser l'application à se connecter"
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Merci de retourner vers votre application, et d'y insérer ce Code de Sécurité :"
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Merci de vous connecter pour continuer."
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à publier en votre nom?"
+
+#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
+#: ../../mod/profiles.php:483
+msgid "Yes"
+msgstr "Oui"
+
+#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
+#: ../../mod/profiles.php:484
+msgid "No"
+msgstr "Non"
 
-#: ../../mod/install.php:129
-msgid "Database Server Name"
-msgstr "Serveur de base de données"
+#: ../../mod/apps.php:8
+msgid "No installed applications."
+msgstr "Aucune application installée."
 
-#: ../../mod/install.php:130
-msgid "Database Login Name"
-msgstr "Nom d'utilisateur de la base"
+#: ../../mod/apps.php:13
+msgid "Applications"
+msgstr "Applications"
 
-#: ../../mod/install.php:131
-msgid "Database Login Password"
-msgstr "Mot de passe de la base"
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
+msgid "Edit post"
+msgstr "Éditer la contribution"
 
-#: ../../mod/install.php:132
-msgid "Database Name"
-msgstr "Nom de la base"
+#: ../../mod/cloud.php:112
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgstr "Red Matrix - Pour les invités: Username={votre courriel}, MDP=+++"
 
-#: ../../mod/install.php:133
-msgid "Please select a default timezone for your website"
-msgstr "Sélectionner un fuseau horaire par défaut pour votre site"
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
+msgstr "Marque-page ajouté"
 
-#: ../../mod/install.php:134
-msgid ""
-"Site administrator email address. Your account email address must match this"
-" in order to use the web admin panel."
-msgstr ""
-"Adresse courriel de l'administrateur du site. L'adresse courriel de votre "
-"compte doit correspondre si vous voulez utiliser l'administration web."
+#: ../../mod/bookmarks.php:53
+msgid "My Bookmarks"
+msgstr "Mes marque-pages"
 
-#: ../../mod/install.php:153
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-"Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH "
-"du serveur web."
+#: ../../mod/bookmarks.php:64
+msgid "My Connections Bookmarks"
+msgstr "Marque-pages de mes relations"
 
-#: ../../mod/install.php:154
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
-msgstr ""
-"Ceci est requis. Merci d'ajuster la configuration dans le fichier "
-".htconfig.php en conséquence."
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "Le nom est requis"
 
-#: ../../mod/install.php:161
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-"La version \"ligne de commande\" de PHP de votre système n'a pas "
-"\"register_argc_argv\" d'activé."
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "Clef et secret sont requis"
 
-#: ../../mod/install.php:162
-msgid "This is required for message delivery to work."
-msgstr "Ceci est requis pour que la livraison des messages fonctionne."
+#: ../../mod/settings.php:79 ../../mod/settings.php:539
+msgid "Update"
+msgstr "Mise-à-jour"
 
-#: ../../mod/install.php:184
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-"Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de "
-"générer des clés de chiffrement"
+#: ../../mod/settings.php:192
+msgid "Passwords do not match. Password unchanged."
+msgstr "Les deux saisies du mot de passe ne correspondent pas. Il n'a donc pas été changé."
 
-#: ../../mod/install.php:185
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr ""
-"Si vous utilisez Windows, merci de vous réferer à "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
+#: ../../mod/settings.php:196
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Le mot de passe ne peut pas être vide. Il n'a donc pas été changé."
 
-#: ../../mod/install.php:194
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-"Erreur: Le module \"rewrite\" du serveur web Apache est requis mais pas "
-"installé."
+#: ../../mod/settings.php:209
+msgid "Password changed."
+msgstr "Le mot de passe a été changé."
 
-#: ../../mod/install.php:196
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Erreur: Le module PHP \"libCURL\" est requis mais pas installé."
+#: ../../mod/settings.php:211
+msgid "Password update failed. Please try again."
+msgstr "La mise-à-jour du mot de passe a échoué. Merci de recommencer."
 
-#: ../../mod/install.php:198
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-"Erreur: Le module PHP \"GD\" disposant du support JPEG est requis mais pas "
-"installé."
+#: ../../mod/settings.php:225
+msgid "Not valid email."
+msgstr "Adresse de courriel non-valide."
 
-#: ../../mod/install.php:200
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Erreur: Le module PHP \"openssl\" est requis mais pas installé."
+#: ../../mod/settings.php:228
+msgid "Protected email address. Cannot change to that email."
+msgstr "Adresse de courriel protégée. Impossible de l'utiliser."
 
-#: ../../mod/install.php:202
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Erreur: Le module PHP \"mysqli\" est requis mais pas installé."
+#: ../../mod/settings.php:237
+msgid "System failure storing new email. Please try again."
+msgstr "Défaillance système lors du stockage de la nouvelle adresse de courriel. Merci de ré-essayer."
 
-#: ../../mod/install.php:204
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Erreur: le module PHP mb_string est requis mais pas installé."
+#: ../../mod/settings.php:441
+msgid "Settings updated."
+msgstr "Réglages sauvegardés."
 
-#: ../../mod/install.php:216
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr ""
-"L'installeur web doit être en mesure de créer un fichier \".htconfig.php\" à"
-" la racine de votre serveur web, mais il en est incapable."
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:574
+msgid "Add application"
+msgstr "Ajouter une application"
 
-#: ../../mod/install.php:217
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-"Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut "
-"ne pas être capable d'écrire dans votre répertoire - alors que vous-même le "
-"pouvez."
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+msgid "Name"
+msgstr "Nom"
 
-#: ../../mod/install.php:218
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
-msgstr ""
-"Merci de vérifier - avec la documentation ou le support de votre hébergement"
-" - que la situation peut être corrigée."
+#: ../../mod/settings.php:515
+msgid "Name of application"
+msgstr "Nom de l'application"
 
-#: ../../mod/install.php:219
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the"
-" file \"INSTALL.txt\" for instructions."
-msgstr ""
-"Dans le cas contraire, vous pouvez pratiquer une installation manuelle. "
-"Référez-vous au fichier \"INSTALL.txt\" pour les instructions."
+#: ../../mod/settings.php:516 ../../mod/settings.php:542
+msgid "Consumer Key"
+msgstr "Clef de consommateur"
 
-#: ../../mod/install.php:228
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-"Le fichier de configuration de la base (\".htconfig.php\") ne peut être "
-"créé. Merci d'utiliser le texte ci-joint pour créer ce fichier à la racine "
-"de votre hébergement."
+#: ../../mod/settings.php:516 ../../mod/settings.php:517
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères."
 
-#: ../../mod/install.php:243
-msgid "Errors encountered creating database tables."
-msgstr "Des erreurs ont été signalées lors de la création des tables."
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+msgid "Consumer Secret"
+msgstr "Secret de consommateur"
 
-#: ../../mod/network.php:148
-msgid "Commented Order"
-msgstr "Dans l'ordre des commentaires"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Redirect"
+msgstr "Redirection"
 
-#: ../../mod/network.php:153
-msgid "Posted Order"
-msgstr "Dans l'ordre des notices"
+#: ../../mod/settings.php:518
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI de redirection - laissez blanc, sauf si l'application a demandé autrement"
 
-#: ../../mod/network.php:159
-msgid "New"
-msgstr "Nouveau"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Icon url"
+msgstr "URL de l'icône"
 
-#: ../../mod/network.php:164
-msgid "Starred"
-msgstr "Mis en avant"
+#: ../../mod/settings.php:519
+msgid "Optional"
+msgstr "Facultatif"
 
-#: ../../mod/network.php:169
-msgid "Bookmarks"
-msgstr "Marqué"
+#: ../../mod/settings.php:530
+msgid "You can't edit this application."
+msgstr "Vous ne pouvez pas éditer cette application."
 
-#: ../../mod/network.php:216
-#, php-format
-msgid "Warning: This group contains %s member from an insecure network."
-msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] "Attention: Ce groupe contient %s membre d'un réseau non-sûr."
-msgstr[1] "Attention: Ce groupe contient %s membres d'un réseau non-sûr."
-
-#: ../../mod/network.php:219
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr ""
-"Les messages privés envoyés à ce groupe s'exposent à une diffusion "
-"incontrôlée."
+#: ../../mod/settings.php:573
+msgid "Connected Apps"
+msgstr "Applications connectées"
 
-#: ../../mod/network.php:292
-msgid "No such group"
-msgstr "Groupe inexistant"
+#: ../../mod/settings.php:577
+msgid "Client key starts with"
+msgstr "La clef cliente commence par"
 
-#: ../../mod/network.php:303
-msgid "Group is empty"
-msgstr "Groupe vide"
+#: ../../mod/settings.php:578
+msgid "No name"
+msgstr "Sans nom"
 
-#: ../../mod/network.php:308
-msgid "Group: "
-msgstr "Groupe: "
+#: ../../mod/settings.php:579
+msgid "Remove authorization"
+msgstr "Révoquer l'autorisation"
 
-#: ../../mod/network.php:318
-msgid "Contact: "
-msgstr "Contact: "
+#: ../../mod/settings.php:590
+msgid "No feature settings configured"
+msgstr "Pas de fonctionnalité à configurer"
 
-#: ../../mod/network.php:320
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr ""
-"Les messages privés envoyés à ce contact s'exposent à une diffusion "
-"incontrôlée."
+#: ../../mod/settings.php:598
+msgid "Feature Settings"
+msgstr "Fonctionnalités"
 
-#: ../../mod/network.php:325
-msgid "Invalid contact."
-msgstr "Contact invalide."
+#: ../../mod/settings.php:621
+msgid "Account Settings"
+msgstr "Compte"
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
-msgstr "Identifiant de profil invalide."
+#: ../../mod/settings.php:622
+msgid "Password Settings"
+msgstr "Mot de passe"
 
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
-msgstr "Éditer la visibilité du profil"
+#: ../../mod/settings.php:623
+msgid "New Password:"
+msgstr "Nouveau mot de passe :"
 
-#: ../../mod/profperm.php:105 ../../mod/group.php:164
-msgid "Click on a contact to add or remove."
-msgstr "Cliquez sur un contact pour l'ajouter ou le supprimer."
+#: ../../mod/settings.php:624
+msgid "Confirm:"
+msgstr "Confirmation :"
 
-#: ../../mod/profperm.php:114
-msgid "Visible To"
-msgstr "Visible par"
+#: ../../mod/settings.php:624
+msgid "Leave password fields blank unless changing"
+msgstr "Laissez les mots de passe vides si vous ne voulez pas les modifier"
 
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr "Tous les contacts (ayant un accès sécurisé)"
+#: ../../mod/settings.php:626 ../../mod/settings.php:921
+msgid "Email Address:"
+msgstr "Adresse de courriel :"
 
-#: ../../mod/events.php:61
-msgid "Event description and start time are required."
-msgstr "Une description et une heure de début sont requises."
+#: ../../mod/settings.php:627
+msgid "Remove Account"
+msgstr "Supprimer le compte"
 
-#: ../../mod/events.php:207
-msgid "Create New Event"
-msgstr "Créer un nouvel événement"
+#: ../../mod/settings.php:628
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Attention : cette action est permanente et irréversible."
 
-#: ../../mod/events.php:210
-msgid "Previous"
-msgstr "Précédent"
+#: ../../mod/settings.php:644
+msgid "Off"
+msgstr "Inactif"
 
-#: ../../mod/events.php:213
-msgid "Next"
-msgstr "Suivant"
+#: ../../mod/settings.php:644
+msgid "On"
+msgstr "Actif"
 
-#: ../../mod/events.php:220
-msgid "l, F j"
-msgstr "l, F j"
+#: ../../mod/settings.php:651
+msgid "Additional Features"
+msgstr "Fonctionnalités additionnelles"
 
-#: ../../mod/events.php:232
-msgid "Edit event"
-msgstr "Editer l'événement"
+#: ../../mod/settings.php:676
+msgid "Connector Settings"
+msgstr "Connecteurs"
 
-#: ../../mod/events.php:234 ../../include/text.php:857
-msgid "link to source"
-msgstr "lien original"
+#: ../../mod/settings.php:706 ../../mod/admin.php:379
+msgid "No special theme for mobile devices"
+msgstr "Pas de thème spécifique aux périphériques mobiles"
 
-#: ../../mod/events.php:302
-msgid "hour:minute"
-msgstr "heures:minutes"
+#: ../../mod/settings.php:746
+msgid "Display Settings"
+msgstr "Affichage"
 
-#: ../../mod/events.php:311
-msgid "Event details"
-msgstr "Détails de l'événement"
+#: ../../mod/settings.php:752
+msgid "Display Theme:"
+msgstr "Thème :"
 
-#: ../../mod/events.php:312
-#, php-format
-msgid "Format is %s %s. Starting date and Description are required."
-msgstr ""
-"Le format est %s %s. Une date de début et une description sont requises."
+#: ../../mod/settings.php:753
+msgid "Mobile Theme:"
+msgstr "Thème mobile :"
 
-#: ../../mod/events.php:313
-msgid "Event Starts:"
-msgstr "Début de l'événement:"
+#: ../../mod/settings.php:754
+msgid "Update browser every xx seconds"
+msgstr "Rafraîchir le navigateur toutes les xx secondes"
 
-#: ../../mod/events.php:316
-msgid "Finish date/time is not known or not relevant"
-msgstr "Date/heure de fin inconnue ou sans objet"
+#: ../../mod/settings.php:754
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimum 10 secondes, pas de maximum"
 
-#: ../../mod/events.php:318
-msgid "Event Finishes:"
-msgstr "Fin de l'événement:"
+#: ../../mod/settings.php:755
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Nombre maximal de conversations pouvant être chargées en même temps :"
 
-#: ../../mod/events.php:321
-msgid "Adjust for viewer timezone"
-msgstr "Ajuster à la zone horaire du visiteur"
+#: ../../mod/settings.php:755
+msgid "Maximum of 100 items"
+msgstr "100 éléments au maximum"
 
-#: ../../mod/events.php:323
-msgid "Description:"
-msgstr "Description:"
+#: ../../mod/settings.php:756
+msgid "Don't show emoticons"
+msgstr "Ne pas montrer les frimousses/émoticones"
 
-#: ../../mod/events.php:327
-msgid "Share this event"
-msgstr "Partager cet événement"
+#: ../../mod/settings.php:792
+msgid "Nobody except yourself"
+msgstr "Personne sauf vous"
 
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Identifiant de demande invalide."
+#: ../../mod/settings.php:793
+msgid "Only those you specifically allow"
+msgstr "Seulement ceux que vous autorisez spécifiquement"
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:144
-#: ../../mod/notifications.php:188
-msgid "Discard"
-msgstr "Défausser"
+#: ../../mod/settings.php:794
+msgid "Anybody in your address book"
+msgstr "Tous vos contacts"
 
-#: ../../mod/notifications.php:71 ../../include/nav.php:109
-msgid "Network"
-msgstr "Réseau"
+#: ../../mod/settings.php:795
+msgid "Anybody on this website"
+msgstr "Tous les utilisateurs du site"
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:73
-#: ../../include/nav.php:111
-msgid "Home"
-msgstr "Accueil"
+#: ../../mod/settings.php:796
+msgid "Anybody in this network"
+msgstr "Tous les utilisateurs du réseau"
 
-#: ../../mod/notifications.php:81 ../../include/nav.php:117
-msgid "Introductions"
-msgstr "Introductions"
+#: ../../mod/settings.php:797
+msgid "Anybody on the internet"
+msgstr "Tout les utilisateurs d'Internet"
 
-#: ../../mod/notifications.php:86 ../../mod/message.php:72
-#: ../../include/nav.php:122
-msgid "Messages"
-msgstr "Messages"
+#: ../../mod/settings.php:874
+msgid "Publish your default profile in the network directory"
+msgstr "Publier votre profil par défaut dans l'annuaire du réseau"
 
-#: ../../mod/notifications.php:105
-msgid "Show Ignored Requests"
-msgstr "Voir les demandes ignorées"
+#: ../../mod/settings.php:879
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Nous autoriser à vous suggérer comme relation potentielle aux nouveaux arrivants?"
 
-#: ../../mod/notifications.php:105
-msgid "Hide Ignored Requests"
-msgstr "Cacher les demandes ignorées"
+#: ../../mod/settings.php:883 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "ou"
 
-#: ../../mod/notifications.php:131 ../../mod/notifications.php:174
-msgid "Notification type: "
-msgstr "Type de notification: "
+#: ../../mod/settings.php:888
+msgid "Your channel address is"
+msgstr "Votre canal a pour adresse"
 
-#: ../../mod/notifications.php:132
-msgid "Friend Suggestion"
-msgstr "Suggestion d'amitié/contact"
+#: ../../mod/settings.php:910
+msgid "Channel Settings"
+msgstr "Canal"
 
-#: ../../mod/notifications.php:134
-#, php-format
-msgid "suggested by %s"
-msgstr "suggéré(e) par %s"
+#: ../../mod/settings.php:919
+msgid "Basic Settings"
+msgstr "Basique"
 
-#: ../../mod/notifications.php:140 ../../mod/notifications.php:185
-#: ../../mod/admin.php:466
-msgid "Approve"
-msgstr "Approuver"
+#: ../../mod/settings.php:922
+msgid "Your Timezone:"
+msgstr "Zone de temps :"
 
-#: ../../mod/notifications.php:160
-msgid "Claims to be known to you: "
-msgstr "Prétend que vous le connaissez: "
+#: ../../mod/settings.php:923
+msgid "Default Post Location:"
+msgstr "Localisation par défaut :"
 
-#: ../../mod/notifications.php:160
-msgid "yes"
-msgstr "oui"
+#: ../../mod/settings.php:924
+msgid "Use Browser Location:"
+msgstr "Utiliser la localisation fournie par le navigateur :"
 
-#: ../../mod/notifications.php:160
-msgid "no"
-msgstr "non"
+#: ../../mod/settings.php:926
+msgid "Adult Content"
+msgstr "Contenu \"adulte\""
 
-#: ../../mod/notifications.php:167
-msgid "Approve as: "
-msgstr "Approuver en tant que: "
+#: ../../mod/settings.php:926
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Ce canal publie plus ou moins fréquemment du contenu pour adultes. (Merci d'indiquer tout contenu pour adulte ou potentiellement choquant avec le tag #NSFW - Not Safe For Work)"
 
-#: ../../mod/notifications.php:168
-msgid "Friend"
-msgstr "Ami"
+#: ../../mod/settings.php:928
+msgid "Security and Privacy Settings"
+msgstr "Sécurité et vie privée"
 
-#: ../../mod/notifications.php:169
-msgid "Sharer"
-msgstr "Initiateur du partage"
+#: ../../mod/settings.php:930
+msgid "Hide my online presence"
+msgstr "Cacher ma présence en ligne"
 
-#: ../../mod/notifications.php:169
-msgid "Fan/Admirer"
-msgstr "Fan/Admirateur"
+#: ../../mod/settings.php:930
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Cacher votre statut (en ligne/hors ligne) sur votre profil"
 
-#: ../../mod/notifications.php:175
-msgid "Friend/Connect Request"
-msgstr "Demande de connexion/relation"
+#: ../../mod/settings.php:932
+msgid "Simple Privacy Settings:"
+msgstr "Réglages simples :"
 
-#: ../../mod/notifications.php:175
-msgid "New Follower"
-msgstr "Nouvel abonné"
+#: ../../mod/settings.php:933
+msgid ""
+"Very Public - extremely permissive (should be used with caution)"
+msgstr "Très public - extrèmement permissif (à n'utiliser qu'en connaissance de cause)"
 
-#: ../../mod/notifications.php:194
-msgid "No notifications."
-msgstr "Pas de notification."
+#: ../../mod/settings.php:934
+msgid ""
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
+msgstr "Classique - public par défaut, privé en cas de besoin (comparable dans le principe aux réseaux sociaux centralisés, avec un mode privé plus efficace)"
 
-#: ../../mod/notifications.php:197 ../../mod/notifications.php:283
-#: ../../mod/notifications.php:359 ../../include/nav.php:118
-msgid "Notifications"
-msgstr "Notifications"
+#: ../../mod/settings.php:935
+msgid "Private - default private, never open or public"
+msgstr "Privé - privé par défaut, jamais ouvert ni public"
 
-#: ../../mod/notifications.php:234 ../../mod/notifications.php:316
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s a aimé la notice de %s"
+#: ../../mod/settings.php:936
+msgid "Blocked - default blocked to/from everybody"
+msgstr "Bloqué - par défaut, bloqué de/vers tout le monde"
 
-#: ../../mod/notifications.php:243 ../../mod/notifications.php:325
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s n'a pas aimé la notice de %s"
+#: ../../mod/settings.php:939
+msgid "Advanced Privacy Settings"
+msgstr "Réglages avancés"
 
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:339
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s est désormais ami(e) avec %s"
+#: ../../mod/settings.php:941
+msgid "Maximum Friend Requests/Day:"
+msgstr "Nombre maximum de mises en relation par jour :"
 
-#: ../../mod/notifications.php:264
-#, php-format
-msgid "%s created a new post"
-msgstr "%s a publié une notice"
+#: ../../mod/settings.php:941
+msgid "May reduce spam activity"
+msgstr "Contribue à réduire l'impact du spam"
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:348
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s a commenté une notice de %s"
+#: ../../mod/settings.php:942
+msgid "Default Post Permissions"
+msgstr "Permissions par défaut des publications"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:355
-msgid "Nothing new!"
-msgstr "Rien de neuf!"
+#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+msgid "(click to open/close)"
+msgstr "(cliquer pour ouvrir/fermer)"
 
-#: ../../mod/crepair.php:100
-msgid "Contact settings applied."
-msgstr "Réglages du contact appliqués."
+#: ../../mod/settings.php:954
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Nombre maximum de messages privés émanant d'inconnus, par jour :"
 
-#: ../../mod/crepair.php:102
-msgid "Contact update failed."
-msgstr "Impossible d'appliquer les réglages."
+#: ../../mod/settings.php:954
+msgid "Useful to reduce spamming"
+msgstr "Utile pour réduire le spam"
 
-#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
-msgstr "Contact introuvable."
+#: ../../mod/settings.php:957
+msgid "Notification Settings"
+msgstr "Notifications"
 
-#: ../../mod/crepair.php:133
-msgid "Repair Contact Settings"
-msgstr "Réglages du réparateur de contacts"
+#: ../../mod/settings.php:958
+msgid "By default post a status message when:"
+msgstr "Par défaut, publier un statut quand:"
 
-#: ../../mod/crepair.php:135
-msgid ""
-"WARNING: This is highly advanced and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr ""
-"ATTENTION: Manipulation réservée aux experts, toute "
-"information incorrecte pourrait empêcher la communication avec ce contact."
+#: ../../mod/settings.php:959
+msgid "accepting a friend request"
+msgstr "acceptez une mise en relation"
 
-#: ../../mod/crepair.php:136
-msgid ""
-"Please use your browser 'Back' button now if you are "
-"uncertain what to do on this page."
-msgstr "une photo"
+#: ../../mod/settings.php:960
+msgid "joining a forum/community"
+msgstr "joignez un forum ou à une communauté"
 
-#: ../../mod/crepair.php:145
-msgid "Account Nickname"
-msgstr "Pseudo du compte"
+#: ../../mod/settings.php:961
+msgid "making an interesting profile change"
+msgstr "faites une modification intéressante de votre profil"
 
-#: ../../mod/crepair.php:146
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@NomDuTag - prend le pas sur Nom/Pseudo"
+#: ../../mod/settings.php:962
+msgid "Send a notification email when:"
+msgstr "Envoyer un courriel de notification quand :"
 
-#: ../../mod/crepair.php:147
-msgid "Account URL"
-msgstr "URL du compte"
+#: ../../mod/settings.php:963
+msgid "You receive an introduction"
+msgstr "Vous recevez une introduction"
 
-#: ../../mod/crepair.php:148
-msgid "Friend Request URL"
-msgstr "Echec du téléversement de l'image."
+#: ../../mod/settings.php:964
+msgid "Your introductions are confirmed"
+msgstr "Vos introductions sont acceptées/confirmées"
 
-#: ../../mod/crepair.php:149
-msgid "Friend Confirm URL"
-msgstr "Accès public refusé."
+#: ../../mod/settings.php:965
+msgid "Someone writes on your profile wall"
+msgstr "Quelqu'un écrit sur votre mur"
 
-#: ../../mod/crepair.php:150
-msgid "Notification Endpoint URL"
-msgstr "Aucune photo sélectionnée"
+#: ../../mod/settings.php:966
+msgid "Someone writes a followup comment"
+msgstr "Quelqu'un commente sur vos publications"
 
-#: ../../mod/crepair.php:151
-msgid "Poll/Feed URL"
-msgstr "Téléverser des photos"
+#: ../../mod/settings.php:967
+msgid "You receive a private message"
+msgstr "Vous recevez un Message Privé"
 
-#: ../../mod/crepair.php:152
-msgid "New photo from this URL"
-msgstr "Nouvelle photo depuis cette URL"
+#: ../../mod/settings.php:968
+msgid "You receive a friend suggestion"
+msgstr "Vous recevez une suggestion d'amitié/relation"
 
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
-msgstr "Cette introduction a déjà été acceptée."
+#: ../../mod/settings.php:969
+msgid "You are tagged in a post"
+msgstr "Vous êtes étiqueté dans une publication"
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:351
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-"L'emplacement du profil est invalide ou ne contient pas de profil valide."
+#: ../../mod/settings.php:970
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Vous êtes tapoté/pointé/etc. dans une publication"
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:356
-msgid "Warning: profile location has no identifiable owner name."
-msgstr "Attention: l'emplacement du profil n'a pas de nom identifiable."
+#: ../../mod/settings.php:973
+msgid "Advanced Account/Page Type Settings"
+msgstr "Type de page/Compte (avancé)"
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:358
-msgid "Warning: profile location has no profile photo."
-msgstr "Attention: l'emplacement du profil n'a pas de photo de profil."
+#: ../../mod/settings.php:974
+msgid "Change the behaviour of this account for special situations"
+msgstr "Modifie le comportement de ce compte pour certains cas particuliers"
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:361
+#: ../../mod/subthread.php:105
 #, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] "%d paramètre requis n'a pas été trouvé à l'endroit indiqué"
-msgstr[1] "%d paramètres requis n'ont pas été trouvés à l'endroit indiqué"
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s suit %3$s de %2$s"
 
-#: ../../mod/dfrn_request.php:167
-msgid "Introduction complete."
-msgstr "Phase de présentation achevée."
+#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
+#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
+#: ../../mod/update_community.php:18
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contenu embarqué - rechargez la page pour le voir]"
 
-#: ../../mod/dfrn_request.php:191
-msgid "Unrecoverable protocol error."
-msgstr "Erreur de protocole non-récupérable."
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:35
+msgid "Channel not found."
+msgstr "Canal introuvable."
 
-#: ../../mod/dfrn_request.php:219
-msgid "Profile unavailable."
-msgstr "Profil indisponible."
+#: ../../mod/chanview.php:93
+msgid "toggle full screen mode"
+msgstr "(dés)activer le mode plein-écran"
 
-#: ../../mod/dfrn_request.php:244
+#: ../../mod/tagger.php:98
 #, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s a reçu trop de demande d'introduction aujourd'hui."
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s a étiqueté le %3$s de %2$s par %4$s"
 
-#: ../../mod/dfrn_request.php:245
-msgid "Spam protection measures have been invoked."
-msgstr "Des mesures de protection contre le spam ont été déclenchées."
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Vous devez vous connecter pour voir cette page."
 
-#: ../../mod/dfrn_request.php:246
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "Les relations sont encouragées à attendre 24 heures pour recommencer."
+#: ../../mod/chat.php:120
+msgid "Leave Room"
+msgstr "Quitter le salon"
 
-#: ../../mod/dfrn_request.php:276
-msgid "Invalid locator"
-msgstr "Localisateur invalide"
+#: ../../mod/chat.php:121
+msgid "I am away right now"
+msgstr "Je suis momentanément absent"
 
-#: ../../mod/dfrn_request.php:296
-msgid "Unable to resolve your name at the provided location."
-msgstr "Impossible de résoudre votre nom à l'emplacement fourni."
+#: ../../mod/chat.php:122
+msgid "I am online"
+msgstr "Je suis en ligne"
 
-#: ../../mod/dfrn_request.php:309
-msgid "You have already introduced yourself here."
-msgstr "Vous vous êtes déjà présenté ici."
+#: ../../mod/chat.php:146 ../../mod/chat.php:166
+msgid "New Chatroom"
+msgstr "Nouveau salon"
 
-#: ../../mod/dfrn_request.php:313
+#: ../../mod/chat.php:147
+msgid "Chatroom Name"
+msgstr "Nom du salon"
+
+#: ../../mod/chat.php:162
 #, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Il semblerait que vous soyez déjà ami avec %s."
+msgid "%1$s's Chatrooms"
+msgstr "Salons de %1$s"
+
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
+#: ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:442
+msgid "Public access denied."
+msgstr "Accès public refusé."
 
-#: ../../mod/dfrn_request.php:334
-msgid "Invalid profile URL."
-msgstr "URL de profil invalide."
+#: ../../mod/viewconnections.php:43
+msgid "No connections."
+msgstr "Pas de relations."
 
-#: ../../mod/dfrn_request.php:430
-msgid "Your introduction has been sent."
-msgstr "Votre présentation a été envoyée."
+#: ../../mod/viewconnections.php:55
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Visiter le profil de %s [%s]"
 
-#: ../../mod/dfrn_request.php:483
-msgid "Please login to confirm introduction."
-msgstr "Connectez-vous pour confirmer l'introduction."
+#: ../../mod/viewconnections.php:70
+msgid "View Connnections"
+msgstr "Voir les relations"
 
-#: ../../mod/dfrn_request.php:497
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"this profile."
-msgstr ""
-"Identité incorrecte actuellement connectée. Merci de vous connecter à "
-"ce profil."
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Étiquette retirée"
 
-#: ../../mod/dfrn_request.php:509
-#, php-format
-msgid "Welcome home %s."
-msgstr "Bienvenue chez vous, %s."
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Retirer une étiquette à l'élément"
 
-#: ../../mod/dfrn_request.php:510
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Merci de confirmer votre demande d'introduction auprès de %s."
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Étiquette à retirer :"
+
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
+msgid "Remove"
+msgstr "Retirer"
 
-#: ../../mod/dfrn_request.php:511
-msgid "Confirm"
-msgstr "Confirmer"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
+msgstr "Continuer"
 
-#: ../../mod/dfrn_request.php:544 ../../include/items.php:2431
-msgid "[Name Withheld]"
-msgstr "[Nom non-publié]"
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
+msgstr "Configuration du canal Premium"
 
-#: ../../mod/dfrn_request.php:551
-msgid "Introduction received at "
-msgstr "Introduction reçue sur "
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
+msgstr "Activer les restrictions liées au canal premium"
 
-#: ../../mod/dfrn_request.php:635
-#, php-format
+#: ../../mod/connect.php:87
 msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr ""
-"Membres de Diaspora : N'utilisez pas ce formulaire. Entrez plutôt \"%s\" "
-"dans votre barre de recherche Diaspora."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Merci de saisir les restrictions et/ou conditions - reçu Paypal, transaction Bitcoin, ligne de conduite, ..."
 
-#: ../../mod/dfrn_request.php:638
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
 msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
-msgstr ""
-"Saisissez votre \"Adresse d'identité\" de l'un des réseaux sociaux suivants:"
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Avant d'autoriser la mise en relation, ce canal attire votre attention sur les conditions suivantes :"
 
-#: ../../mod/dfrn_request.php:641
-msgid "Friend/Connection Request"
-msgstr "Requête de relation/amitié"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Les relations potentielles verront ce qui suit avant de pouvoir continuer :"
 
-#: ../../mod/dfrn_request.php:642
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
 msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr ""
-"Exemples : jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "En continuant, je certifie que je me suis acquitté de toutes les instructions indiquées sur cette page."
 
-#: ../../mod/dfrn_request.php:643
-msgid "Please answer the following:"
-msgstr "Merci de répondre à ce qui suit:"
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Aucune instruction spécifique n'a été établie par le propriétaire du canal.)"
 
-#: ../../mod/dfrn_request.php:644
-#, php-format
-msgid "Does %s know you?"
-msgstr "Est-ce que %s vous connaît?"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
+msgstr "Canal Premium ou restreint"
 
-#: ../../mod/dfrn_request.php:647
-msgid "Add a personal note:"
-msgstr "Ajouter une note personnelle:"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Aucun délégué potentiel n'a été trouvé pour cette page."
 
-#: ../../mod/dfrn_request.php:649 ../../include/contact_selectors.php:78
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Gestion des délégués de la page"
 
-#: ../../mod/dfrn_request.php:650
-msgid "StatusNet/Federated Social Web"
-msgstr "StatusNet/Federated Social Web"
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Les délégués sont capables de gérer tous les aspects de ce compte ou de cette page, à l'exception des réglages basiques du compte. Merci de ne déléguer votre compte personnel qu'à quelqu'un en qui vous avez une confiance aveugle."
 
-#: ../../mod/dfrn_request.php:652
-msgid "- please share from your own site as noted above"
-msgstr "- partagez depuis votre propre site comme indiqué ci-dessus"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Actuels gestionnaires de pages"
 
-#: ../../mod/dfrn_request.php:653
-msgid "Your Identity Address:"
-msgstr "Votre adresse d'identité:"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Actuels délégués"
 
-#: ../../mod/dfrn_request.php:654
-msgid "Submit Request"
-msgstr "Envoyer la requête"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Délégués potentiels"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Autoriser l'application à se connecter"
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Ajouter"
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Retournez à votre application et saisissez ce Code de Sécurité : "
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Aucune entrée."
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Merci de vous connecter pour continuer."
+#: ../../mod/chatsvc.php:102
+msgid "Away"
+msgstr "Absent"
 
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr ""
-"Voulez-vous autoriser cette application à accéder à vos notices et contacts,"
-" et/ou à créer des notices à votre place?"
-
-#: ../../mod/tagger.php:70 ../../mod/like.php:127
-#: ../../addon/facebook/facebook.php:1024
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../include/conversation.php:26 ../../include/conversation.php:35
-#: ../../include/diaspora.php:1211
-msgid "status"
-msgstr "le statut"
+#: ../../mod/chatsvc.php:106
+msgid "Online"
+msgstr "En ligne"
 
-#: ../../mod/tagger.php:103
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s a taggué %3$s de %2$s avec %4$s"
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Élément indisponible."
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1028
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../include/conversation.php:43 ../../include/diaspora.php:1227
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s aime %3$s de %2$s"
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr "Entrée de menu mis-à-jour."
 
-#: ../../mod/like.php:146 ../../include/conversation.php:46
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s n'aime pas %3$s de %2$s"
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr "Impossible de mettre l'entrée de menu à jour."
 
-#: ../../mod/lostpass.php:16
-msgid "No valid account found."
-msgstr "Impossible de trouver un compte valide."
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr "Entrée de menu ajouté."
 
-#: ../../mod/lostpass.php:31
-msgid "Password reset request issued. Check your email."
-msgstr "Réinitialisation du mot de passe en cours. Vérifiez votre courriel."
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr "Impossible d'ajouter l'entrée de menu."
 
-#: ../../mod/lostpass.php:42
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Requête de réinitialisation de mot de passe à %s"
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr "Gérer les entrées de menu"
 
-#: ../../mod/lostpass.php:64
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-"Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utilisée par"
-" le passé.) La réinitialisation a échoué."
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr "Éditer le menu"
 
-#: ../../mod/lostpass.php:83
-msgid "Your password has been reset as requested."
-msgstr "Votre mot de passe a bien été réinitialisé."
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr "Éditer l'entrée"
 
-#: ../../mod/lostpass.php:84
-msgid "Your new password is"
-msgstr "Votre nouveau mot de passe est "
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr "Supprimer l'entrée"
 
-#: ../../mod/lostpass.php:85
-msgid "Save or copy your new password - and then"
-msgstr "Sauvez ou copiez ce nouveau mot de passe - puis"
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr "Nouvelle entrée"
 
-#: ../../mod/lostpass.php:86
-msgid "click here to login"
-msgstr "cliquez ici pour vous connecter"
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr "Éditer ce bloc de menu"
+
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr "Ajouter une entrée au menu"
+
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr "Supprimer cet entrée du menu"
+
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr "Éditer cette entrée du menu"
 
-#: ../../mod/lostpass.php:87
-msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
-msgstr ""
-"Votre mot de passe peut être changé depuis la page "
-"<em>Réglages</em>, une fois que vous serez connecté."
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr "Nouvelle entrée de menu"
 
-#: ../../mod/lostpass.php:118
-msgid "Forgot your Password?"
-msgstr "Mot de passe oublié?"
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr "Permissions de l'entrée de menu"
 
-#: ../../mod/lostpass.php:119
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-"Entrez votre adresse de courriel et validez pour réinitialiser votre mot de "
-"passe. Vous recevrez la suite des instructions par courriel."
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr "Texte du lien"
 
-#: ../../mod/lostpass.php:120
-msgid "Nickname or Email: "
-msgstr "Pseudo ou Courriel: "
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr "URL du lien"
 
-#: ../../mod/lostpass.php:121
-msgid "Reset"
-msgstr "Réinitialiser"
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr "Utiliser l'authentification automagique de Red, si possible"
 
-#: ../../mod/friendica.php:43
-msgid "This is Friendica, version"
-msgstr "Motorisé par Friendica version"
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr "Ouvrir le lien dans une nouvelle fenêtre"
 
-#: ../../mod/friendica.php:44
-msgid "running at web location"
-msgstr "hébergé sur"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr "Ordre dans la liste"
 
-#: ../../mod/friendica.php:46
-msgid ""
-"Please visit Project.Friendika.com to learn "
-"more about the Friendica project."
-msgstr ""
-"Pour en savoir plus, vous pouvez nous rendre visite sur <a "
-"href=\"http://project.friendica.com\">Project.Friendica.com</a>"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Les nombres les plus élevés seront descendus au bas de la liste"
 
-#: ../../mod/friendica.php:48
-msgid "Bug reports and issues: please visit"
-msgstr "Pour les rapports de bugs: rendez vous sur"
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr "Entrée de menu introuvable."
 
-#: ../../mod/friendica.php:49
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr ""
-"Suggestions, remerciements, donations, etc. - écrivez à \"Info\" arob. "
-"Friendica - point com"
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr "Entrée de menu supprimée."
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
-msgstr "Extensions/greffons/applications installées"
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr "Impossible de supprimer l'entrée de menu."
 
-#: ../../mod/friendica.php:62
-msgid "No installed plugins/addons/apps"
-msgstr "Aucune extension/greffon/application installée"
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr "Éditer l'entrée de menu"
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
-msgstr "Supprimer mon compte"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Collection créée."
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr ""
-"Ceci supprimera totalement votre compte. Cette opération est irréversible."
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Impossible de créer la collection."
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
-msgstr "Merci de saisir votre mot de passe pour vérification:"
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Collection mise-à-jour."
 
-#: ../../mod/apps.php:4
-msgid "Applications"
-msgstr "Applications"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Créez une collection de canaux."
 
-#: ../../mod/apps.php:7
-msgid "No installed applications."
-msgstr "Pas d'application installée."
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
+msgstr "Nom de la collection :"
 
-#: ../../mod/notes.php:63 ../../include/text.php:628
-msgid "Save"
-msgstr "Sauver"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
+msgstr "Les membres sont visibles par les autres canaux"
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Suggestion d'amitié/contact envoyée."
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Collection supprimée."
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Suggérer des amis/contacts"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Impossible de supprimer la collection."
 
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Suggérer un ami/contact pour %s"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
+msgstr "Éditeur de collection"
+
+#: ../../mod/group.php:196
+msgid "Members"
+msgstr "Membres"
 
-#: ../../mod/viewsrc.php:7
-msgid "Access denied."
-msgstr "Accès refusé."
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
+msgstr "Tous canaux connectés"
 
-#: ../../mod/directory.php:49
-msgid "Global Directory"
-msgstr "Annuaire global"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
+msgstr "Cliquer sur un canal pour ajouter ou supprimer"
 
-#: ../../mod/directory.php:55
-msgid "Normal site view"
-msgstr "Vue normale"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Identifiant de profil invalide."
 
-#: ../../mod/directory.php:57
-msgid "Admin - View all site entries"
-msgstr "Admin - voir toutes les entrées"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Éditeur de visibilité de profil"
 
-#: ../../mod/directory.php:63
-msgid "Find on this site"
-msgstr "Trouver sur ce site"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Cliquez sur un contact pour l'ajouter ou le retirer."
 
-#: ../../mod/directory.php:66
-msgid "Site Directory"
-msgstr "Annuaire local"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Visible par"
 
-#: ../../mod/directory.php:125
-msgid "Gender: "
-msgstr "Genre: "
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Toutes les relations"
 
-#: ../../mod/directory.php:151
-msgid "No entries (some entries may be hidden)."
-msgstr "Aucune entrée (certaines peuvent être cachées)."
+#: ../../mod/admin.php:48
+msgid "Theme settings updated."
+msgstr "Réglages du thème sauvegardés."
 
-#: ../../mod/admin.php:59 ../../mod/admin.php:295
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
 msgid "Site"
 msgstr "Site"
 
-#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
 msgid "Plugins"
 msgstr "Extensions"
 
-#: ../../mod/admin.php:76 ../../mod/admin.php:651
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
+msgid "Themes"
+msgstr "Thèmes"
+
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
+msgid "Server"
+msgstr "Serveur"
+
+#: ../../mod/admin.php:93
+msgid "DB updates"
+msgstr "MàJ BD"
+
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
 msgid "Logs"
 msgstr "Journaux"
 
-#: ../../mod/admin.php:81
+#: ../../mod/admin.php:113
+msgid "Plugin Features"
+msgstr "Fonctionnalités liées aux extensions"
+
+#: ../../mod/admin.php:115
 msgid "User registrations waiting for confirmation"
-msgstr "Inscriptions en attente de confirmation"
+msgstr "Inscriptions en attente"
 
-#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459
-#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650
+#: ../../mod/admin.php:189
+msgid "Message queues"
+msgstr "File des messages"
+
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../mod/admin.php:145
+#: ../../mod/admin.php:195
 msgid "Summary"
 msgstr "Résumé"
 
-#: ../../mod/admin.php:146
+#: ../../mod/admin.php:197
 msgid "Registered users"
 msgstr "Utilisateurs inscrits"
 
-#: ../../mod/admin.php:148
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
 msgid "Pending registrations"
 msgstr "Inscriptions en attente"
 
-#: ../../mod/admin.php:149
+#: ../../mod/admin.php:200
 msgid "Version"
-msgstr "Versio"
+msgstr "Version"
 
-#: ../../mod/admin.php:151
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
 msgid "Active plugins"
-msgstr "Extensions activés"
+msgstr "Extensions actives"
 
-#: ../../mod/admin.php:243
+#: ../../mod/admin.php:350
 msgid "Site settings updated."
-msgstr "Réglages du site mis-à-jour."
+msgstr "Réglages du site sauvegardés."
+
+#: ../../mod/admin.php:381
+msgid "No special theme for accessibility"
+msgstr "Pas de thème spécifique pour l'accessibilité"
 
-#: ../../mod/admin.php:287
+#: ../../mod/admin.php:409
 msgid "Closed"
 msgstr "Fermé"
 
-#: ../../mod/admin.php:288
+#: ../../mod/admin.php:410
 msgid "Requires approval"
-msgstr "Demande une apptrobation"
+msgstr "Après approbation"
 
-#: ../../mod/admin.php:289
+#: ../../mod/admin.php:411
 msgid "Open"
 msgstr "Ouvert"
 
-#: ../../mod/admin.php:298
+#: ../../mod/admin.php:416
+msgid "Private"
+msgstr "Privé"
+
+#: ../../mod/admin.php:417
+msgid "Paid Access"
+msgstr "Accès payant"
+
+#: ../../mod/admin.php:418
+msgid "Free Access"
+msgstr "Accès gratuit"
+
+#: ../../mod/admin.php:419
+msgid "Tiered Access"
+msgstr "Accès par paliers"
+
+#: ../../mod/admin.php:432 ../../mod/register.php:189
+msgid "Registration"
+msgstr "Inscription"
+
+#: ../../mod/admin.php:433
 msgid "File upload"
-msgstr "Téléversement de fichier"
+msgstr "Envoi de fichier"
 
-#: ../../mod/admin.php:299
+#: ../../mod/admin.php:434
 msgid "Policies"
-msgstr "Politiques"
+msgstr "Stratégies"
 
-#: ../../mod/admin.php:300
+#: ../../mod/admin.php:435
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477
+#: ../../mod/admin.php:439
 msgid "Site name"
 msgstr "Nom du site"
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:440
 msgid "Banner/Logo"
-msgstr "Bannière/Logo"
+msgstr "Bannière/logo"
+
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr "Information sur l'administration"
 
-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Coordonnées de l'administration du site. Affichée sur la page 'siteinfo'. Vous pouvez utiliser du BBCode ici"
+
+#: ../../mod/admin.php:442
 msgid "System language"
 msgstr "Langue du système"
 
-#: ../../mod/admin.php:307
+#: ../../mod/admin.php:443
 msgid "System theme"
 msgstr "Thème du système"
 
-#: ../../mod/admin.php:309
+#: ../../mod/admin.php:443
+msgid ""
+"Default system theme - may be over-ridden by user profiles - change theme settings"
+msgstr "Thème par défaut - il peut être changé pour chaque profil utilisateur - modifier le thème"
+
+#: ../../mod/admin.php:444
+msgid "Mobile system theme"
+msgstr "Thème système pour mobile"
+
+#: ../../mod/admin.php:444
+msgid "Theme for mobile devices"
+msgstr "Thème dédié aux périphériques mobiles"
+
+#: ../../mod/admin.php:445
+msgid "Accessibility system theme"
+msgstr "Thème système pour l'accessibilité"
+
+#: ../../mod/admin.php:445
+msgid "Accessibility theme"
+msgstr "Thème pour l'accessibilité"
+
+#: ../../mod/admin.php:446
+msgid "Channel to use for this website's static pages"
+msgstr "Canal à utiliser pour les pages statiques de ce site"
+
+#: ../../mod/admin.php:446
+msgid "Site Channel"
+msgstr "Canal du site"
+
+#: ../../mod/admin.php:448
 msgid "Maximum image size"
 msgstr "Taille maximale des images"
 
-#: ../../mod/admin.php:311
+#: ../../mod/admin.php:448
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Taille maximum, en octets, des images envoyées. Par défaut 0, soit sans limite."
+
+#: ../../mod/admin.php:449
 msgid "Register policy"
 msgstr "Politique d'inscription"
 
-#: ../../mod/admin.php:312
+#: ../../mod/admin.php:450
+msgid "Access policy"
+msgstr "Politique d'accès"
+
+#: ../../mod/admin.php:451
 msgid "Register text"
 msgstr "Texte d'inscription"
 
-#: ../../mod/admin.php:313
+#: ../../mod/admin.php:451
+msgid "Will be displayed prominently on the registration page."
+msgstr "Sera affiché de manière bien visible sur le formulaire d'inscription."
+
+#: ../../mod/admin.php:452
 msgid "Accounts abandoned after x days"
 msgstr "Les comptes sont abandonnés après x jours"
 
-#: ../../mod/admin.php:313
+#: ../../mod/admin.php:452
 msgid ""
-"Will not waste system resources polling external sites for abandoned "
+"Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
-msgstr ""
-"Pour ne pas gaspiller les ressources système, on cesse d'interroger les "
-"sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette "
-"fonction."
+msgstr "Pour éviter de gaspiller les ressources du système en essayer de mettre à jour des comptes abandonnés. Mettez 0 pour ne pas avoir de limite de temps."
 
-#: ../../mod/admin.php:314
+#: ../../mod/admin.php:453
 msgid "Allowed friend domains"
-msgstr "Domaines autorisés"
+msgstr "Domaines amicaux"
+
+#: ../../mod/admin.php:453
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Liste de noms de domaines - séparés par des virgules - pour lesquels ce site acceptera les demandes d'amitié ou de mise en relation. Les caractères génériques (*) sont acceptés. Laissez vide pour accepter tous les domaines."
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:454
 msgid "Allowed email domains"
-msgstr "Domaines courriel autorisés"
+msgstr "Domaines de courriels amicaux"
+
+#: ../../mod/admin.php:454
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Liste de noms de domaines - séparés par des virgules - dont les adresses de courriel seront autorisées lors de l'inscription à ce site. Les caractères génériques (*) sont acceptés. Laissez vide pour accepter tous les domaines."
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:455
 msgid "Block public"
-msgstr "Interdire la publication globale"
+msgstr "Bloquer public"
+
+#: ../../mod/admin.php:455
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Cocher pour interdire tout accès public, y compris aux pages marquées comme publiques, aux visiteurs anonymes."
 
-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:456
 msgid "Force publish"
-msgstr "Forcer la publication globale"
+msgstr "Forcer publication"
 
-#: ../../mod/admin.php:318
-msgid "Global directory update URL"
-msgstr "URL de mise-à-jour de l'annuaire global"
+#: ../../mod/admin.php:456
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Cocher pour forcer la publication de tous les profils du site dans l'annuaire."
 
-#: ../../mod/admin.php:320
-msgid "Block multiple registrations"
-msgstr "Interdire les inscriptions multiples"
+#: ../../mod/admin.php:457
+msgid "No login on Homepage"
+msgstr "Pas de connexion depuis la page d'accueil"
 
-#: ../../mod/admin.php:321
-msgid "OpenID support"
-msgstr "Support OpenID"
+#: ../../mod/admin.php:457
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
+msgstr ""
 
-#: ../../mod/admin.php:322
-msgid "Gravatar support"
-msgstr "Support Gravatar"
+#: ../../mod/admin.php:459
+msgid "Proxy user"
+msgstr "Utilisateurs du proxy"
 
-#: ../../mod/admin.php:323
-msgid "Fullname check"
-msgstr "Vérification du \"Prénom Nom\""
+#: ../../mod/admin.php:460
+msgid "Proxy URL"
+msgstr "URL du proxy"
 
-#: ../../mod/admin.php:324
-msgid "UTF-8 Regular expressions"
-msgstr "Regex UTF-8"
+#: ../../mod/admin.php:461
+msgid "Network timeout"
+msgstr "Délai maximal du réseau"
 
-#: ../../mod/admin.php:325
-msgid "Show Community Page"
-msgstr "Montrer la \"Place publique\""
+#: ../../mod/admin.php:461
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "En secondes. Mettre à 0 pour ne pas avoir de délai maximal (pas recommandé)."
 
-#: ../../mod/admin.php:326
-msgid "Enable OStatus support"
-msgstr "Activer le support d'OStatus"
+#: ../../mod/admin.php:462
+msgid "Delivery interval"
+msgstr "Intervalle de distribution"
 
-#: ../../mod/admin.php:327
-msgid "Enable Diaspora support"
-msgstr "Activer le support de Diaspora"
+#: ../../mod/admin.php:462
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr "Temporise le processus de distribution de tant de secondes pour réduire la charge sur le système. Valeurs recommandées : 4-5 pour les serveurs mutualisés, 2-3 pour les VPS. 0-1 pour les gros serveurs dédiés."
 
-#: ../../mod/admin.php:328
-msgid "Only allow Friendika contacts"
-msgstr "N'autoriser que les contacts Friendica"
+#: ../../mod/admin.php:463
+msgid "Poll interval"
+msgstr "Intervalle de scrutation"
 
-#: ../../mod/admin.php:329
-msgid "Verify SSL"
-msgstr "Vérifier SSL"
+#: ../../mod/admin.php:463
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Temporise le processus de scrutation en tâche de fond de tant de secondes, pour réduire la charge. Si 0, utilise l'intervalle de distribution."
 
-#: ../../mod/admin.php:330
-msgid "Proxy user"
-msgstr "Utilisateur du proxy"
+#: ../../mod/admin.php:464
+msgid "Maximum Load Average"
+msgstr "Charge moyenne maximale"
 
-#: ../../mod/admin.php:331
-msgid "Proxy URL"
-msgstr "URL du proxy"
+#: ../../mod/admin.php:464
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Charge système maximale au-delà de laquelle distribution et scrutation sont mis en pause - par défaut 50."
 
-#: ../../mod/admin.php:332
-msgid "Network timeout"
-msgstr "Dépassement du délai d'attente du réseau"
+#: ../../mod/admin.php:520
+msgid "No server found"
+msgstr "Serveur introuvable"
+
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
+msgid "ID"
+msgstr "ID"
+
+#: ../../mod/admin.php:527
+msgid "for channel"
+msgstr "pour le canal"
+
+#: ../../mod/admin.php:527
+msgid "on server"
+msgstr "sur le serveur"
+
+#: ../../mod/admin.php:527
+msgid "Status"
+msgstr "État"
+
+#: ../../mod/admin.php:548
+msgid "Update has been marked successful"
+msgstr "La mise à jour a été marquée comme réussie"
+
+#: ../../mod/admin.php:558
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr "L'éxecution de %s a échoué. Merci de vérifier les journaux du système."
+
+#: ../../mod/admin.php:561
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "La mise à jour %s a été appliquée avec succès."
+
+#: ../../mod/admin.php:565
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "La mise à jour %s n'a pas retourné d'information. Impossible de savoir si elle a réussi ou non."
+
+#: ../../mod/admin.php:568
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "La fonction de mise à jour %s est introuvable."
+
+#: ../../mod/admin.php:583
+msgid "No failed updates."
+msgstr "Aucune mise à jour défaillante."
 
-#: ../../mod/admin.php:353
+#: ../../mod/admin.php:587
+msgid "Failed Updates"
+msgstr "Mises à jour défaillantes"
+
+#: ../../mod/admin.php:589
+msgid "Mark success (if update was manually applied)"
+msgstr "Marquer comme réussie (si la mise à jour a été réalisée manuellement)"
+
+#: ../../mod/admin.php:590
+msgid "Attempt to execute this update step automatically"
+msgstr "Tenter de réaliser cette étape de mise à jour automatiquement"
+
+#: ../../mod/admin.php:616
 #, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s utilisateur bloqué"
-msgstr[1] "%s utilisateurs (dé)bloqués"
+msgstr[0] "%s utilisateur bloqué/débloqué"
+msgstr[1] "%s utilisateurs bloqués/débloqués"
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:623
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s utilisateur supprimé"
 msgstr[1] "%s utilisateurs supprimés"
 
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:654
+msgid "Account not found"
+msgstr "Compte introuvable"
+
+#: ../../mod/admin.php:665
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Utilisateur '%s' supprimé"
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:674
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Utilisateur '%s' débloqué"
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:674
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Utilisateur '%s' bloqué"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:739
 msgid "select all"
 msgstr "tout sélectionner"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:740
 msgid "User registrations waiting for confirm"
-msgstr "Inscriptions d'utilisateurs en attente de confirmation"
+msgstr "Inscriptions en attente d'approbation"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:741
 msgid "Request date"
 msgstr "Date de la demande"
 
-#: ../../mod/admin.php:464 ../../mod/admin.php:473
-#: ../../include/contact_selectors.php:78
-msgid "Email"
-msgstr "Courriel"
-
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:742
 msgid "No registrations."
 msgstr "Pas d'inscriptions."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:743
+msgid "Approve"
+msgstr "Approuver"
+
+#: ../../mod/admin.php:744
 msgid "Deny"
-msgstr "Rejetter"
+msgstr "Refuser"
+
+#: ../../mod/admin.php:746 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
+msgstr "Bloquer"
+
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
+msgstr "Débloquer"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:750
 msgid "Register date"
 msgstr "Date d'inscription"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:750
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: ../../mod/admin.php:473
-msgid "Last item"
-msgstr "Dernier élément"
+#: ../../mod/admin.php:750
+msgid "Expires"
+msgstr "Expire"
 
-#: ../../mod/admin.php:473
-msgid "Account"
-msgstr "Compte"
+#: ../../mod/admin.php:750
+msgid "Service Class"
+msgstr "Classe de service"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:752
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-"Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont "
-"posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?"
+msgstr "Les utilisateurs sélectionnés seront supprimés!\\n\\nTout ce que ces utilisateurs ont publié sur ce site sera détruit de manière définitive!\\n\\nÊtes-vous certain?"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:753
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-"L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site "
-"sera définitivement perdu!\\n\\nÊtes-vous certain?"
+msgstr "L'utilisateur {0} sera supprimé!\\n\\nTout ce que cet utilisateur a publié sur ce site sera détruit de manière définitive!\\n\\nÊtes-vous certain?"
 
-#: ../../mod/admin.php:512
+#: ../../mod/admin.php:794
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extension %s désactivée."
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:798
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extension %s activée."
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
 msgid "Enable"
 msgstr "Activer"
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
 msgid "Toggle"
-msgstr "Activer/Désactiver"
+msgstr "(Dés)activer"
 
-#: ../../mod/admin.php:551 ../../include/nav.php:128
-msgid "Settings"
-msgstr "Réglages"
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
+msgid "Author: "
+msgstr "Auteur :"
+
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
+msgid "Maintainer: "
+msgstr "Maintenu par :"
+
+#: ../../mod/admin.php:974
+msgid "No themes found."
+msgstr "Aucun thème trouvé."
+
+#: ../../mod/admin.php:1033
+msgid "Screenshot"
+msgstr "Aperçu"
 
-#: ../../mod/admin.php:613
+#: ../../mod/admin.php:1081
+msgid "[Experimental]"
+msgstr "[Expérimental]"
+
+#: ../../mod/admin.php:1082
+msgid "[Unsupported]"
+msgstr "[Non-supporté]"
+
+#: ../../mod/admin.php:1109
 msgid "Log settings updated."
-msgstr "Réglages des journaux mis-à-jour."
+msgstr "Réglages du journal sauvegardés."
 
-#: ../../mod/admin.php:653
+#: ../../mod/admin.php:1165
 msgid "Clear"
-msgstr "Effacer"
+msgstr "Vider"
+
+#: ../../mod/admin.php:1171
+msgid "Debugging"
+msgstr "Débogage"
+
+#: ../../mod/admin.php:1172
+msgid "Log file"
+msgstr "Fichier du journal"
+
+#: ../../mod/admin.php:1172
+msgid ""
+"Must be writable by web server. Relative to your Red top-level directory."
+msgstr "Doit être accessible en écriture par le serveur web. Chemin relatif à la racine de Red."
+
+#: ../../mod/admin.php:1173
+msgid "Log level"
+msgstr "Niveau de journalisation"
+
+#: ../../mod/filer.php:35
+msgid "- select -"
+msgstr "- choisir -"
+
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenue sur %s"
+
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
+msgstr "Élément introuvable"
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Élément non-éditable"
+
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr "Supprimer l'élément?"
+
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
+msgstr "Insérer une vidéo YouTube"
+
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Insérer une vidéo Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Insérer un son Vorbis [.ogg]"
+
+#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
+msgstr "Age :"
+
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
+msgid "Gender: "
+msgstr "Sexe/genre :"
+
+#: ../../mod/directory.php:207
+msgid "Finding:"
+msgstr "Recherche :"
+
+#: ../../mod/directory.php:215
+msgid "next page"
+msgstr "page suiv."
+
+#: ../../mod/directory.php:215
+msgid "previous page"
+msgstr "page préc."
+
+#: ../../mod/directory.php:222
+msgid "No entries (some entries may be hidden)."
+msgstr "Pas d'entrées (certaines peuvent être cachées)."
+
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
+msgstr "Impossible d'accéder aux détails du contact."
+
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
+msgstr "Impossible de localiser le profil sélectionné."
+
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
+msgstr "Connexion mise à jour."
+
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
+msgstr "Impossible de mettre à jour les détails de la relation."
+
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
+msgstr "Impossible d'accéder aux détails du carnet d'adresses."
+
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Actualisation impossible - le canal est momentanément indisponible."
+
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
+msgstr "Le canal n'est plus bloqué"
+
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
+msgstr "Le canal est bloqué"
+
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
+msgstr "Impossible de régler les paramètres du carnet d'adresses."
+
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
+msgstr "Le canal n'est plus ignoré"
+
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
+msgstr "Le canal est ignoré"
+
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
+msgstr "Le canal n'est plus archivé"
+
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
+msgstr "Le canal est archivé"
+
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
+msgstr "Le canal n'est plus caché"
+
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
+msgstr "Le canal est caché"
+
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
+msgstr "Le canal est approuvé"
+
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
+msgstr "Le canal n'est plus approuvé"
+
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
+msgstr "Le canal a été supprimé"
+
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
+msgstr "Voir le profil de %s"
+
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
+msgstr "Actualiser les permissions"
+
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
+msgstr "Récupérer les permissions les plus récentes"
+
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
+msgstr "Activité récente"
+
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
+msgstr "Voir les contributions et commentaires récentes"
+
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
+msgstr "Bloquer ou Débloquer cette relation"
+
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
+msgstr "Ne plus ignorer"
+
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
+msgstr "Ignorer ou ne plus ignorer cette relation"
+
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
+msgstr "Ne plus archiver"
+
+#: ../../mod/connedit.php:346
+msgid "Archive"
+msgstr "Archiver"
+
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
+msgstr "Archiver ou ne plus archiver cette relation"
+
+#: ../../mod/connedit.php:352
+msgid "Unhide"
+msgstr "Ne plus cacher"
+
+#: ../../mod/connedit.php:352
+msgid "Hide"
+msgstr "Cacher"
+
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
+msgstr "Cacher ou ne plus cacher cette relation"
+
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
+msgstr "Supprimer cette relation"
+
+#: ../../mod/connedit.php:395
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
+msgstr "Approuver cette relation"
+
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
+msgstr "Accepter la relation pour permettre la communication"
+
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
+msgstr "Permissions automatiques"
+
+#: ../../mod/connedit.php:421
+#, php-format
+msgid "Connections: settings for %s"
+msgstr "Relations : réglages pour %s"
+
+#: ../../mod/connedit.php:425
+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 "Pour chaque introduction reçue, toutes les permissions définies ici seront appliquées aux nouvelles relations automatiquement, et l'introduction sera approuvée. Laissez cette page telle quelle si vous ne souhaitez pas utiliser ce mécanisme."
+
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
+msgstr "Faites glisser pour ajuster le niveau de la relation"
+
+#: ../../mod/connedit.php:433
+msgid "inherited"
+msgstr "par héritage"
+
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
+msgstr "Cette relation n'a aucune permission spécifique!"
+
+#: ../../mod/connedit.php:436
+msgid ""
+"This may be appropriate based on your privacy "
+"settings, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Ceci devrait correspondre à vos réglages de vie privée, mais vous pouvez toujours contrôler les \"Permissions avancées\"."
+
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
+msgstr "Visibilité du profil"
+
+#: ../../mod/connedit.php:439
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Merci de choisir le profil que vous souhaitez montrer quand %s visite votre profil de manière authentifiée."
+
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
+msgstr "Notes / Information de contact"
+
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
+msgstr "Éditer les notes du contact"
+
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
+msgstr "Ses réglages"
+
+#: ../../mod/connedit.php:444
+msgid "My Settings"
+msgstr "Mes réglages"
+
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
+msgstr "Membres de forum"
+
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
+msgstr "Boîte à savon"
+
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
+msgstr "Partage complet (fonctionnement habituel des réseaux sociaux)"
+
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
+msgstr "Partage modéré"
+
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
+msgstr "Suivi uniquement"
+
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
+msgstr "Permissions spécifiques"
+
+#: ../../mod/connedit.php:452
+msgid ""
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
+"individual settings. Changing those inherited settings on this page will "
+"have no effect."
+msgstr "Certaines permissions peuvent être héritées de vos réglages de vie privée, lesquels sont prioritaires sur les réglages spécifiques. Changer ces permissions héritées sur la présente page n'aura aucun effet."
 
-#: ../../mod/admin.php:659
-msgid "Debugging"
-msgstr "Déboguage"
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
+msgstr "Permissions avancées"
 
-#: ../../mod/admin.php:660
-msgid "Log file"
-msgstr "Fichier de journaux"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
+msgstr "Permissions simples (en choisir une, puis valider)"
 
-#: ../../mod/admin.php:660
-msgid "Must be writable by web server. Relative to your Friendika index.php."
-msgstr ""
-"Doit être accessible en écriture pour le serveur web. Le chemin est relative"
-" à l'index.php de Friendica."
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "Visiter le profil de %s - %s"
 
-#: ../../mod/admin.php:661
-msgid "Log level"
-msgstr "Niveau de journalisaton"
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
+msgstr "Bloquer/Débloquer le contact"
 
-#: ../../mod/admin.php:702
-msgid "Close"
-msgstr "Fermer"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
+msgstr "Ignorer le contact"
 
-#: ../../mod/admin.php:708
-msgid "FTP Host"
-msgstr "Hôte FTP"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
+msgstr "Réparer les réglages d'URL"
 
-#: ../../mod/admin.php:709
-msgid "FTP Path"
-msgstr "Chemin FTP"
+#: ../../mod/connedit.php:462
+msgid "View conversations"
+msgstr "Voir les conversations"
 
-#: ../../mod/admin.php:710
-msgid "FTP User"
-msgstr "Utilisateur FTP"
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
+msgstr "Supprimer le contact"
 
-#: ../../mod/admin.php:711
-msgid "FTP Password"
-msgstr "Mot de passe FTP"
+#: ../../mod/connedit.php:467
+msgid "Last update:"
+msgstr "Dernière mise-à-jour :"
 
-#: ../../mod/item.php:84
-msgid "Unable to locate original post."
-msgstr "Impossible de localiser l'article original."
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
+msgstr "Mettre à jour les publications"
 
-#: ../../mod/item.php:199
-msgid "Empty post discarded."
-msgstr "Article vide défaussé."
+#: ../../mod/connedit.php:471
+msgid "Update now"
+msgstr "Mettre à jour maintenant"
 
-#: ../../mod/item.php:675 ../../mod/item.php:720 ../../mod/item.php:764
-#: ../../mod/item.php:807 ../../include/items.php:1769
-#: ../../include/items.php:2068 ../../include/items.php:2115
-#: ../../include/items.php:2227 ../../include/items.php:2273
-msgid "noreply"
-msgstr "noreply"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
+msgstr "Actuellement bloqué"
 
-#: ../../mod/item.php:719 ../../mod/item.php:806 ../../include/items.php:2272
-msgid "Administrator@"
-msgstr "Administrator@"
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
+msgstr "Actuellement ignoré"
 
-#: ../../mod/item.php:722 ../../include/items.php:2117
-#: ../../include/items.php:2275
-#, php-format
-msgid "%s commented on an item at %s"
-msgstr "%s a commenté un élément à %s"
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
+msgstr "Actuellement archivé"
 
-#: ../../mod/item.php:809
-#, php-format
-msgid "%s posted to your profile wall at %s"
-msgstr "%s a posté sur votre mur à %s"
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
+msgstr "Actuellement en attente"
 
-#: ../../mod/item.php:843
-msgid "System error. Post not saved."
-msgstr "Erreur système. Publication non sauvée."
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
+msgstr "Dissimuler ce contact aux autres"
 
-#: ../../mod/item.php:868
-#, php-format
+#: ../../mod/connedit.php:481
 msgid ""
-"This message was sent to you by %s, a member of the Friendika social "
-"network."
-msgstr ""
-"Ce message vous a été envoyé par %s, un membre du réseau social Friendica."
+"Replies/likes to your public posts may still be visible"
+msgstr "Les réponses et autres réactions à vos contributions publiques pourraient être toujours visibles"
 
-#: ../../mod/item.php:870
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Vous pouvez leur rendre visite sur %s"
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
+msgstr "Aide à la mise en page"
 
-#: ../../mod/item.php:871
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-"Merci de contacter l'émeteur en répondant à cette publication si vous ne "
-"souhaitez pas recevoir ces messages."
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
+msgstr "Aide avec cette fonctionnalité"
 
-#: ../../mod/item.php:873
-#, php-format
-msgid "%s posted an update."
-msgstr "%s a publié une mise à jour."
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
+msgstr "Nom de la mise-en-page"
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Étiquette enlevée"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
+msgstr "Aide :"
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Enlever l'étiquette de l'élément"
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
+msgstr "Introuvable"
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Choisir une étiquette à enlever: "
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
+msgstr "Page introuvable."
 
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr "Utiliser comme photo de profil"
+#: ../../mod/rmagic.php:56
+msgid "Remote Authentication"
+msgstr "Authentification distante"
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
-msgstr "Pas de destinataire sélectionné."
+#: ../../mod/rmagic.php:57
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Entrez l'adresse de votre canal (p.ex. moncanal@monsite.com)"
 
-#: ../../mod/message.php:26
-msgid "Unable to locate contact information."
-msgstr "Impossible de localiser les informations du contact."
+#: ../../mod/rmagic.php:58
+msgid "Authenticate"
+msgstr "Authentifier"
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr "Impossible d'envoyer le message."
+#: ../../mod/page.php:35
+msgid "Invalid item."
+msgstr "Élément invalide."
 
-#: ../../mod/message.php:31
-msgid "Message sent."
-msgstr "Message envoyé."
+#: ../../mod/network.php:79
+msgid "No such group"
+msgstr "Rien de tel comme groupe"
 
-#: ../../mod/message.php:51
-msgid "Inbox"
-msgstr "Messages entrants"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
+msgstr "Résultats de recherche pour :"
 
-#: ../../mod/message.php:56
-msgid "Outbox"
-msgstr "Messages sortants"
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "Collection vide"
 
-#: ../../mod/message.php:61
-msgid "New Message"
-msgstr "Nouveau message"
+#: ../../mod/network.php:180
+msgid "Collection: "
+msgstr "Collection :"
 
-#: ../../mod/message.php:87
-msgid "Message deleted."
-msgstr "Message supprimé."
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr "Relation :"
 
-#: ../../mod/message.php:103
-msgid "Conversation removed."
-msgstr "Conversation supprimée."
+#: ../../mod/network.php:196
+msgid "Invalid connection."
+msgstr "Relation invalide."
 
-#: ../../mod/message.php:119 ../../include/conversation.php:767
-msgid "Please enter a link URL:"
-msgstr "Entrez un lien web:"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
+msgid "Profile not found."
+msgstr "Profil introuvable."
 
-#: ../../mod/message.php:127
-msgid "Send Private Message"
-msgstr "Envoyer un message privé"
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "Profil supprimé."
 
-#: ../../mod/message.php:128 ../../mod/message.php:261
-msgid "To:"
-msgstr "À:"
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Profil-"
 
-#: ../../mod/message.php:129 ../../mod/message.php:262
-msgid "Subject:"
-msgstr "Sujet:"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "Nouveau profil créé."
 
-#: ../../mod/message.php:170
-msgid "No messages."
-msgstr "Aucun message."
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
+msgstr "Profil impossible à cloner."
 
-#: ../../mod/message.php:183
-msgid "Delete conversation"
-msgstr "Effacer conversation"
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
+msgstr "Le nom du profil est requis."
 
-#: ../../mod/message.php:186
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
+#: ../../mod/profiles.php:294
+msgid "Marital Status"
+msgstr "Statut marital"
 
-#: ../../mod/message.php:213
-msgid "Message not available."
-msgstr "Message indisponible."
+#: ../../mod/profiles.php:298
+msgid "Romantic Partner"
+msgstr "Partenaire"
 
-#: ../../mod/message.php:250
-msgid "Delete message"
-msgstr "Effacer message"
+#: ../../mod/profiles.php:302
+msgid "Likes"
+msgstr "Aime"
 
-#: ../../mod/message.php:260
-msgid "Send Reply"
-msgstr "Répondre"
+#: ../../mod/profiles.php:306
+msgid "Dislikes"
+msgstr "Déteste"
 
-#: ../../mod/dfrn_confirm.php:234
-msgid "Response from remote site was not understood."
-msgstr "Réponse du site distant incomprise."
+#: ../../mod/profiles.php:310
+msgid "Work/Employment"
+msgstr "Travail/Occupation"
 
-#: ../../mod/dfrn_confirm.php:243
-msgid "Unexpected response from remote site: "
-msgstr "Réponse inattendue du site distant: "
+#: ../../mod/profiles.php:313
+msgid "Religion"
+msgstr "Religion/Croyance"
 
-#: ../../mod/dfrn_confirm.php:251
-msgid "Confirmation completed successfully."
-msgstr "Confirmation achevée avec succès."
+#: ../../mod/profiles.php:317
+msgid "Political Views"
+msgstr "Opinions politiques"
 
-#: ../../mod/dfrn_confirm.php:253 ../../mod/dfrn_confirm.php:267
-#: ../../mod/dfrn_confirm.php:274
-msgid "Remote site reported: "
-msgstr "Alerte du site distant: "
+#: ../../mod/profiles.php:321
+msgid "Gender"
+msgstr "Sexe/Genre"
 
-#: ../../mod/dfrn_confirm.php:265
-msgid "Temporary failure. Please wait and try again."
-msgstr "Échec temporaire. Merci de recommencer ultérieurement."
+#: ../../mod/profiles.php:325
+msgid "Sexual Preference"
+msgstr "Préférence sexuelle"
 
-#: ../../mod/dfrn_confirm.php:272
-msgid "Introduction failed or was revoked."
-msgstr "Introduction échouée ou annulée."
+#: ../../mod/profiles.php:329
+msgid "Homepage"
+msgstr "Site Internet"
 
-#: ../../mod/dfrn_confirm.php:409
-msgid "Unable to set contact photo."
-msgstr "Impossible de définir la photo du contact."
+#: ../../mod/profiles.php:333
+msgid "Interests"
+msgstr "Centres d'intérêt"
 
-#: ../../mod/dfrn_confirm.php:459 ../../include/conversation.php:79
-#: ../../include/diaspora.php:477
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s est désormais lié à %2$s"
+#: ../../mod/profiles.php:337
+msgid "Address"
+msgstr "Adresse"
 
-#: ../../mod/dfrn_confirm.php:530
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Pas d'utilisateur trouvé pour '%s' "
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
+msgid "Location"
+msgstr "Localisation"
 
-#: ../../mod/dfrn_confirm.php:540
-msgid "Our site encryption key is apparently messed up."
-msgstr "Notre clé de chiffrement de site est apparemment corrompue."
+#: ../../mod/profiles.php:427
+msgid "Profile updated."
+msgstr "Profil mis à jour."
 
-#: ../../mod/dfrn_confirm.php:551
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "URL de site absente ou indéchiffrable."
+#: ../../mod/profiles.php:482
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Cacher vos contacts/relations aux visiteurs de ce profil?"
 
-#: ../../mod/dfrn_confirm.php:572
-msgid "Contact record was not found for you on our site."
-msgstr "Pas d'entrée pour ce contact sur notre site."
+#: ../../mod/profiles.php:505
+msgid "Edit Profile Details"
+msgstr "Éditer les détails du profil"
 
-#: ../../mod/dfrn_confirm.php:586
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr ""
-"La clé publique du site ne se trouve pas dans l'enregistrement du contact "
-"pour l'URL %s."
+#: ../../mod/profiles.php:507
+msgid "View this profile"
+msgstr "Voir le profil"
 
-#: ../../mod/dfrn_confirm.php:606
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr ""
-"L'identifiant fourni par votre système fait doublon sur le notre. Cela peut "
-"fonctionner si vous réessayez."
+#: ../../mod/profiles.php:508
+msgid "Change Profile Photo"
+msgstr "Changer la photo du profil"
 
-#: ../../mod/dfrn_confirm.php:617
-msgid "Unable to set your contact credentials on our system."
-msgstr "Impossible de vous définir des permissions sur notre système."
+#: ../../mod/profiles.php:509
+msgid "Create a new profile using these settings"
+msgstr "Créer un nouveau profil avec ces réglages"
 
-#: ../../mod/dfrn_confirm.php:671
-msgid "Unable to update your contact profile details on our system"
-msgstr ""
-"Impossible de mettre les détails de votre profil à jour sur notre système"
+#: ../../mod/profiles.php:510
+msgid "Clone this profile"
+msgstr "Cloner le profil"
 
-#: ../../mod/dfrn_confirm.php:701
-#, php-format
-msgid "Connection accepted at %s"
-msgstr "Connexion acceptée avec %s"
+#: ../../mod/profiles.php:511
+msgid "Delete this profile"
+msgstr "Supprimer le profil"
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122
-#: ../../include/auth.php:147 ../../include/auth.php:201
-msgid "Login failed."
-msgstr "Échec de connexion."
+#: ../../mod/profiles.php:512
+msgid "Profile Name:"
+msgstr "Nom du profil :"
 
-#: ../../mod/openid.php:79 ../../include/auth.php:217
-msgid "Welcome "
-msgstr "Bienvenue "
+#: ../../mod/profiles.php:513
+msgid "Your Full Name:"
+msgstr "Votre nom complet :"
 
-#: ../../mod/openid.php:80 ../../include/auth.php:218
-msgid "Please upload a profile photo."
-msgstr "Merci d'illustrer votre profil d'une image."
+#: ../../mod/profiles.php:514
+msgid "Title/Description:"
+msgstr "Titre/description :"
 
-#: ../../mod/openid.php:83 ../../include/auth.php:221
-msgid "Welcome back "
-msgstr "Bienvenue à nouveau, "
+#: ../../mod/profiles.php:515
+msgid "Your Gender:"
+msgstr "Sexe/Genre :"
 
-#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
+#: ../../mod/profiles.php:516
 #, php-format
-msgid "%s welcomes %s"
-msgstr "%s accueille %s"
+msgid "Birthday (%s):"
+msgstr "Date de naissance (%s) :"
 
-#: ../../mod/viewconnections.php:25 ../../include/text.php:567
-msgid "View Contacts"
-msgstr "Voir les contacts"
+#: ../../mod/profiles.php:517
+msgid "Street Address:"
+msgstr "Adresse postale :"
 
-#: ../../mod/viewconnections.php:40
-msgid "No contacts."
-msgstr "Aucun contact."
+#: ../../mod/profiles.php:518
+msgid "Locality/City:"
+msgstr "Ville/Localité :"
 
-#: ../../mod/group.php:27
-msgid "Group created."
-msgstr "Groupe créé."
+#: ../../mod/profiles.php:519
+msgid "Postal/Zip Code:"
+msgstr "Code postal :"
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
-msgstr "Impossible de créer le groupe."
+#: ../../mod/profiles.php:520
+msgid "Country:"
+msgstr "Pays :"
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
-msgstr "Groupe introuvable."
+#: ../../mod/profiles.php:521
+msgid "Region/State:"
+msgstr "Région/Province/État :"
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
-msgstr "Groupe renommé."
+#: ../../mod/profiles.php:522
+msgid "♥ Marital Status:"
+msgstr "♥Statut marital :"
 
-#: ../../mod/group.php:82
-msgid "Create a group of contacts/friends."
-msgstr "Créez un groupe de contacts/amis."
+#: ../../mod/profiles.php:523
+msgid "Who: (if applicable)"
+msgstr "Avec : (si pertinent)"
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
-msgid "Group Name: "
-msgstr "Nom du groupe: "
+#: ../../mod/profiles.php:524
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemples : cathy123, Cathy Williams, cathy@exemple.com"
 
-#: ../../mod/group.php:98
-msgid "Group removed."
-msgstr "Groupe enlevé."
+#: ../../mod/profiles.php:525
+msgid "Since [date]:"
+msgstr "Depuis [date] :"
 
-#: ../../mod/group.php:100
-msgid "Unable to remove group."
-msgstr "Impossible d'enlever le groupe."
+#: ../../mod/profiles.php:527
+msgid "Homepage URL:"
+msgstr "URL de mon site Internet :"
 
-#: ../../mod/group.php:165
-msgid "Group Editor"
-msgstr "Éditeur de groupe"
+#: ../../mod/profiles.php:530
+msgid "Religious Views:"
+msgstr "Opinions religieuses :"
 
-#: ../../mod/group.php:179
-msgid "Members"
-msgstr "Membres"
+#: ../../mod/profiles.php:531
+msgid "Keywords:"
+msgstr "Mots-clefs :"
 
-#: ../../mod/group.php:194
-msgid "All Contacts"
-msgstr "Tout les contacts"
+#: ../../mod/profiles.php:534
+msgid "Example: fishing photography software"
+msgstr "Exemple : escrime photographie modélisme"
 
-#: ../../mod/attach.php:8
-msgid "Item not available."
-msgstr "Elément non disponible."
+#: ../../mod/profiles.php:535
+msgid "Used in directory listings"
+msgstr "Utilisé pour le référencement dans l'annuaire"
 
-#: ../../mod/attach.php:20
-msgid "Item was not found."
-msgstr "Element introuvable."
+#: ../../mod/profiles.php:536
+msgid "Tell us about yourself..."
+msgstr "Parlez nous de vous..."
 
-#: ../../mod/common.php:34
-msgid "Common Friends"
-msgstr "Amis communs"
+#: ../../mod/profiles.php:537
+msgid "Hobbies/Interests"
+msgstr "Loisirs/Centres d'intêret"
 
-#: ../../mod/common.php:42
-msgid "No friends in common."
-msgstr "Pas d'amis communs"
+#: ../../mod/profiles.php:538
+msgid "Contact information and Social Networks"
+msgstr "Coordonnées et réseaux sociaux"
 
-#: ../../mod/match.php:10
-msgid "Profile Match"
-msgstr "Correpondance de profils"
+#: ../../mod/profiles.php:539
+msgid "My other channels"
+msgstr "Mes autres canaux"
 
-#: ../../mod/match.php:18
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-"Aucun mot-clé en correspondance. Merci d'ajouter des mots-clés à votre "
-"profil par défaut."
+#: ../../mod/profiles.php:540
+msgid "Musical interests"
+msgstr "Goûts musicaux"
 
-#: ../../mod/community.php:21
-msgid "Not available."
-msgstr "Indisponible."
+#: ../../mod/profiles.php:541
+msgid "Books, literature"
+msgstr "Littérature"
 
-#: ../../mod/community.php:30 ../../include/nav.php:97
-msgid "Community"
-msgstr "Communauté"
+#: ../../mod/profiles.php:542
+msgid "Television"
+msgstr "Télévision"
+
+#: ../../mod/profiles.php:543
+msgid "Film/dance/culture/entertainment"
+msgstr "Cinéma/Danse/Culture/Divertissement"
+
+#: ../../mod/profiles.php:544
+msgid "Love/romance"
+msgstr "Amour/Romance"
+
+#: ../../mod/profiles.php:545
+msgid "Work/employment"
+msgstr "Travail/Occupation"
+
+#: ../../mod/profiles.php:546
+msgid "School/education"
+msgstr "Études"
 
-#: ../../mod/community.php:87
+#: ../../mod/profiles.php:551
 msgid ""
-"Shared content is covered by the Creative Commons "
-"Attribution 3.0 license."
-msgstr ""
-"Le contenu est partagé suivant les termes de la licence Creative Commons "
-"Attribution 3.0."
+"This is your public profile.
                                      It may "
+"be visible to anybody using the internet."
+msgstr "Ceci est votre profil public.
                                      Il pourrait être visible par tout utilisateur - fut-il anonyme - d'Internet."
 
-#: ../../addon/tumblr/tumblr.php:35
-msgid "Post to Tumblr"
-msgstr "Publier sur Tumblr"
+#: ../../mod/profiles.php:600
+msgid "Edit/Manage Profiles"
+msgstr "Éditer/gérer les profils"
 
-#: ../../addon/tumblr/tumblr.php:66
-msgid "Tumblr Post Settings"
-msgstr "Réglages de Tumblr"
+#: ../../mod/profiles.php:601
+msgid "Add profile things"
+msgstr "Ajouter des choses de profil"
 
-#: ../../addon/tumblr/tumblr.php:68
-msgid "Enable Tumblr Post Plugin"
-msgstr "Activer l'extension Tumblr"
+#: ../../mod/profiles.php:602
+msgid "Include desirable objects in your profile"
+msgstr "Incluez des objets souhaitables dans votre profil"
 
-#: ../../addon/tumblr/tumblr.php:73
-msgid "Tumblr login"
-msgstr "Login Tumblr"
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Canal ajouté."
 
-#: ../../addon/tumblr/tumblr.php:78
-msgid "Tumblr password"
-msgstr "Mot de passe Tumblr"
+#: ../../mod/post.php:226
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Authentification distante bloquée. Vous êtes connecté sur ce site localement. Merci de vous en déconnecter et de recommencer."
 
-#: ../../addon/tumblr/tumblr.php:83
-msgid "Post to Tumblr by default"
-msgstr "Publier sur Tumblr par défaut"
+#: ../../mod/post.php:256
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Bienvenue %s. L'authentification distante a fonctionné."
 
-#: ../../addon/tumblr/tumblr.php:174 ../../addon/wppost/wppost.php:171
-msgid "Post from Friendica"
-msgstr "Publier depuis Friendica"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Ce site n'est pas un serveur d'annuaire"
 
-#: ../../addon/twitter/twitter.php:78
-msgid "Post to Twitter"
-msgstr "Poster sur Twitter"
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Impossible de créer la source. Aucun canal selectionné."
 
-#: ../../addon/twitter/twitter.php:123
-msgid "Twitter settings updated."
-msgstr "Réglages de Twitter mis-à-jour."
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Source créée."
 
-#: ../../addon/twitter/twitter.php:145
-msgid "Twitter Posting Settings"
-msgstr "Réglages du connecteur Twitter"
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Source mise à jour."
 
-#: ../../addon/twitter/twitter.php:152
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../mod/sources.php:82
+msgid "*"
 msgstr ""
-"Pas de paire de clés pour Twitter. Merci de contacter l'administrateur du "
-"site."
 
-#: ../../addon/twitter/twitter.php:171
-msgid ""
-"At this Friendika instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input"
-" box below and submit the form. Only your public posts will"
-" be posted to Twitter."
-msgstr ""
-"Sur cette instance de Friendika, le connecteur Twitter a été activé, mais "
-"vous n'avez pas encore connecté votre compte à Twitter. Pour ce faire, "
-"cliquez sur le bouton ci-dessous pour obtenir un PIN de Twitter, que vous "
-"aurez à coller dans la boîte ci-dessous. Ensuite, validez le formulaire. "
-"Seuls vos articles <strong>publics</strong> seront postés sur "
-"Twitter."
-
-#: ../../addon/twitter/twitter.php:172
-msgid "Log in with Twitter"
-msgstr "Se connecter à Twitter"
-
-#: ../../addon/twitter/twitter.php:174
-msgid "Copy the PIN from Twitter here"
-msgstr "Copier le PIN de Twitter ici"
-
-#: ../../addon/twitter/twitter.php:188 ../../addon/statusnet/statusnet.php:337
-msgid "Currently connected to: "
-msgstr "Actuellement connecté à: "
-
-#: ../../addon/twitter/twitter.php:189
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Gérer les sources distantes du contenu de votre canal."
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Nouvelle source"
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
 msgid ""
-"If enabled all your public postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for"
-" every posting separately in the posting options when writing the entry."
-msgstr ""
-"En cas d'activation, toutes vos notices publiques seront "
-"transmises au compte Twitter associé. Vous pourrez choisir de le faire par "
-"défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction."
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importer tout ou partie du contenu du canal suivant dans le canal en cours, et le distribuer en concordance avec les réglages de votre canal."
 
-#: ../../addon/twitter/twitter.php:191
-msgid "Allow posting to Twitter"
-msgstr "Autoriser la publication sur Twitter"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "N'importer le contenu que s'ils contient ces mots (un par ligne)"
 
-#: ../../addon/twitter/twitter.php:194
-msgid "Send public postings to Twitter by default"
-msgstr "Envoyer les éléments publics sur Twitter par défaut"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Laissez en blanc pour importer tout le contenu public"
 
-#: ../../addon/twitter/twitter.php:199 ../../addon/statusnet/statusnet.php:348
-msgid "Clear OAuth configuration"
-msgstr "Effacer la configuration OAuth"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
+msgstr "Nom du canal"
 
-#: ../../addon/twitter/twitter.php:301
-msgid "Consumer key"
-msgstr "Clé utilisateur"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Source introuvable."
 
-#: ../../addon/twitter/twitter.php:302
-msgid "Consumer secret"
-msgstr "Secret utilisateur"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Éditer source"
 
-#: ../../addon/statusnet/statusnet.php:141
-msgid "Post to StatusNet"
-msgstr "Poster sur StatusNet"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Supprimer source"
 
-#: ../../addon/statusnet/statusnet.php:183
-msgid ""
-"Please contact your site administrator.
                                      The provided API URL is not "
-"valid."
-msgstr ""
-"Merci de contacter l'administrateur du site.
                                      L'URL d'API fournie est "
-"invalide."
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Source supprimée"
+
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Impossible de supprimer la source."
+
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
+msgstr "Les informations de vie privée à distance ne sont pas disponibles."
 
-#: ../../addon/statusnet/statusnet.php:211
-msgid "We could not contact the StatusNet API with the Path you entered."
-msgstr "Nous n'avons pas pu contacter l'API StatusNet avec le chemin saisi."
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Visible par :"
 
-#: ../../addon/statusnet/statusnet.php:238
-msgid "StatusNet settings updated."
-msgstr "Réglages StatusNet mis-à-jour."
+#: ../../mod/magic.php:70
+msgid "Hub not found."
+msgstr "Instance introuvable."
 
-#: ../../addon/statusnet/statusnet.php:261
-msgid "StatusNet Posting Settings"
-msgstr "Réglages du connecteur StatusNet"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
+msgstr "Serveur Red Matrix - Configuration"
 
-#: ../../addon/statusnet/statusnet.php:275
-msgid "Globally Available StatusNet OAuthKeys"
-msgstr "Clés OAuth StatusNet universelles"
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
+msgstr "Impossible de se connecter à la base de données."
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../mod/setup.php:171
 msgid ""
-"There are preconfigured OAuth key pairs for some StatusNet servers "
-"available. If you are useing one of them, please use these credentials. If "
-"not feel free to connect to any other StatusNet instance (see below)."
-msgstr ""
-"Ce sont des paires de clés OAuth préconfigurées pour certains serveurs "
-"StatusNet courants. Si vous utilisez l'un d'entre eux, merci de vous servir "
-"de ces clés. Autrement, vous pouvez vous connecter à n'importer quelle autre"
-" instance de StatusNet (voir ci-dessous)."
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Impossible de se connecter au site par l'URL indiquée. Problème potentiel de certificat SSL/TLS ou de DNS."
 
-#: ../../addon/statusnet/statusnet.php:284
-msgid "Provide your own OAuth Credentials"
-msgstr "Fournissez vos propres paramètres OAuth"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
+msgstr "Impossible de créer la table."
 
-#: ../../addon/statusnet/statusnet.php:285
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendika Account as"
-" an desktop client on your StatusNet account, copy the consumer key pair "
-"here and enter the API base root.
                                      Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Friendika installation at your favorited StatusNet installation."
-msgstr ""
-"Aucune paire de clé n'a été trouvée pour StatusNet. Inscrivez votre compte "
-"Friendika comme client bureautique sur votre compte StatusNet, puis copiez "
-"la paire de clés d'utilisateur ici et renseignez le chemin de base de "
-"l'API.<br />Avant d'enregistrer votre propre paire de clés OAuth, "
-"merci de vérifier auprès de l'administrateur qu'il en existe pas déjà une "
-"pour votre fournisseur StatusNet."
-
-#: ../../addon/statusnet/statusnet.php:287
-msgid "OAuth Consumer Key"
-msgstr "Clé de consommateur OAuth"
-
-#: ../../addon/statusnet/statusnet.php:290
-msgid "OAuth Consumer Secret"
-msgstr "Secret d'utilisateur OAuth"
-
-#: ../../addon/statusnet/statusnet.php:293
-msgid "Base API Path (remember the trailing /)"
-msgstr "Chemin de base de l'API (n'oubliez pas le / final)"
-
-#: ../../addon/statusnet/statusnet.php:314
-msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below"
-" and submit the form. Only your public posts will be posted"
-" to StatusNet."
-msgstr ""
-"Pour vous connecter à votre compte StatusNet, cliquez sur le bouton ci-"
-"dessous pour obtenir un code de sécurité de StatusNet, que vous aurez à "
-"coller dans la boîte ci-dessous. Ensuite, validez le formulaire. Seuls vos "
-"articles <strong>publics</strong> seront postés sur StatusNet."
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
+msgstr "La base de données de votre site a été installée."
 
-#: ../../addon/statusnet/statusnet.php:315
-msgid "Log in with StatusNet"
-msgstr "Se connecter à StatusNet"
+#: ../../mod/setup.php:187
+msgid ""
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
+msgstr "Vous pourriez avoir besoin d'importer le fichier \"install/database.sql\" manuellement via phpmyadmin ou mysql."
 
-#: ../../addon/statusnet/statusnet.php:317
-msgid "Copy the security code from StatusNet here"
-msgstr "Coller le code de sécurité de StatusNet ici"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Merci de consulter le fichier \"install/INSTALL.txt\"."
 
-#: ../../addon/statusnet/statusnet.php:323
-msgid "Cancel Connection Process"
-msgstr "Annuler le processus de connexion"
+#: ../../mod/setup.php:254
+msgid "System check"
+msgstr "Vérification du système"
 
-#: ../../addon/statusnet/statusnet.php:325
-msgid "Current StatusNet API is"
-msgstr "L'API StatusNet courante est"
+#: ../../mod/setup.php:259
+msgid "Check again"
+msgstr "Re-vérifier"
 
-#: ../../addon/statusnet/statusnet.php:326
-msgid "Cancel StatusNet Connection"
-msgstr "Annuler la connexion à StatusNet"
+#: ../../mod/setup.php:281
+msgid "Database connection"
+msgstr "Connexion à la base de données"
 
-#: ../../addon/statusnet/statusnet.php:338
+#: ../../mod/setup.php:282
 msgid ""
-"If enabled all your public postings can be posted to the "
-"associated StatusNet account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr ""
-"En cas d'activation, toutes vos notices publiques seront "
-"transmises au compte StatusNet associé. Vous pourrez choisir de le faire par"
-" défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction."
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
+msgstr "Pour installer Red Matrix, nous avons besoin de savoir comment contacter votre base de données."
 
-#: ../../addon/statusnet/statusnet.php:340
-msgid "Allow posting to StatusNet"
-msgstr "Autoriser la publication sur StatusNet"
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Merci de contacter votre prestataire d'hébergement ou votre administration système si vous avez des doutes à propos de ces paramètres."
 
-#: ../../addon/statusnet/statusnet.php:343
-msgid "Send public postings to StatusNet by default"
-msgstr "Par défaut, envoyer les notices publiques à StatusNet"
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de données que vous allez spécifier doit exister. Si ce n'est pas déjà le cas, merci de la créer avant de continuer."
 
-#: ../../addon/statusnet/statusnet.php:478
-msgid "API URL"
-msgstr "URL de l'API"
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
+msgstr "Nom du serveur de BD"
 
-#: ../../addon/oembed/oembed.php:30
-msgid "OEmbed settings updated"
-msgstr "Réglage OEmbed mis-à-jour"
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
+msgstr "Par défaut, localhost"
 
-#: ../../addon/oembed/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
-msgstr "Utiliser OEmbed pour les vidéos Youtube"
+#: ../../mod/setup.php:289
+msgid "Database Port"
+msgstr "Port du serveur"
 
-#: ../../addon/oembed/oembed.php:71
-msgid "URL to embed:"
-msgstr "URL à incorporer:"
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
+msgstr "Numéro TCP du port - utilisez 0 pour la valeur par défaut"
 
-#: ../../addon/tictac/tictac.php:20
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Morpion en trois dimensions"
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
+msgstr "Identifiant de connexion à la BD"
 
-#: ../../addon/tictac/tictac.php:53
-msgid "3D Tic-Tac-Toe"
-msgstr "Morpion 3D"
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
+msgstr "Mot de passe de connexion à la BD"
 
-#: ../../addon/tictac/tictac.php:58
-msgid "New game"
-msgstr "Nouvelle partie"
+#: ../../mod/setup.php:292
+msgid "Database Name"
+msgstr "Nom de la base de données"
 
-#: ../../addon/tictac/tictac.php:59
-msgid "New game with handicap"
-msgstr "Nouvelle partie avec handicap"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
+msgstr "Adresse de courriel de l'administrateur du site"
 
-#: ../../addon/tictac/tictac.php:60
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
 msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr ""
-"Le morpion 3D, c'est comme la version traditionnelle. Sauf qu'on joue sur "
-"plusieurs étages en même temps."
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Votre compte devra utiliser la même adresse de courriel pour pouvoir utiliser l'administration web."
 
-#: ../../addon/tictac/tictac.php:61
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr ""
-"Dans le cas qui nous concerne, il y a trois étages. Vous gagnez en alignant "
-"trois coups dans n'importe quel étage, ainsi que verticalement ou en "
-"diagonale entre les étages."
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
+msgstr "URL du site"
 
-#: ../../addon/tictac/tictac.php:63
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr ""
-"Le handicap interdit la position centrale de l'étage du milieu, parce que le"
-" joueur qui prend cette case obtient souvent un avantage."
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
+msgstr "Merci d'utiliser SSL/TLS (https) autant que possible."
 
-#: ../../addon/tictac/tictac.php:182
-msgid "You go first..."
-msgstr "À vous de jouer..."
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
+msgstr "Merci de choisir une zone de temps (fuseau horaire) pour votre site"
 
-#: ../../addon/tictac/tictac.php:187
-msgid "I'm going first this time..."
-msgstr "Je commence..."
+#: ../../mod/setup.php:325
+msgid "Site settings"
+msgstr "Réglages du site"
 
-#: ../../addon/tictac/tictac.php:193
-msgid "You won!"
-msgstr "Vous avez gagné!"
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Impossible de trouver une version CLI de PHP dans le PATH du serveur web."
 
-#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
-msgid "\"Cat\" game!"
-msgstr "Match nul!"
+#: ../../mod/setup.php:385
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "En l'absence de version CLI de PHP sur votre serveur, vous ne pourrez pas utiliser la mise-à-jour en arrière-plan via cron."
 
-#: ../../addon/tictac/tictac.php:222
-msgid "I won!"
-msgstr "J'ai gagné!"
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
+msgstr "Chemin vers l'éxecutable PHP"
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:56
-#, php-format
+#: ../../mod/setup.php:389
 msgid ""
-"Allow to use your friendika id (%s) to connecto to external unhosted-enabled"
-" storage (like ownCloud)"
-msgstr ""
-"Autoriser votre identifiant friendica (%s) à se connecter à un stockage "
-"compatible unhosted (ownCloud, par exemple)"
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Entrez le chemin complet vers l'exécutable php. Vous pouvez continuer l'installation sans."
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:57
-msgid "Unhosted DAV storage url"
-msgstr "URL de stockage DAV d'Unhosted"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
+msgstr "PHP en ligne de commande (CLI)"
 
-#: ../../addon/impressum/impressum.php:25
-msgid "Impressum"
-msgstr "Impressum"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La version CLI de PHP sur votre système n'a pas l'option \"register_argc_argv\" activée."
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
-msgid "Site Owner"
-msgstr "Propriétaire du site"
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
+msgstr "Elle est nécessaire pour la livraison de messages."
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
-msgid "Email Address"
-msgstr "Adresse courriel"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
-msgid "Postal Address"
-msgstr "Adresse postale"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Erreur : la fonction \"openssl_pkey_new\" de ce système n'est pas capable de générer des clefs de chiffrement"
 
-#: ../../addon/impressum/impressum.php:49
+#: ../../mod/setup.php:428
 msgid ""
-"The impressum addon needs to be configured!
                                      Please add at least the "
-"owner variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr ""
-"L'extension \"Impressum\" (ou ours) n'est pas configuré!
                                      Merci"
-" d'ajouter au moins la variable owner à votre fichier de "
-"configuration. Pour les autres variables, reportez-vous au fichier README "
-"accompagnant l'extension."
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si vous êtes sur un serveur Windows, merci de consulter \"http://www.php.net/manual/fr/openssl.installation.php\"."
 
-#: ../../addon/impressum/impressum.php:71
-msgid "Site Owners Profile"
-msgstr "Profil des propriétaires du site"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
+msgstr "Générer les clefs de chiffrement"
 
-#: ../../addon/impressum/impressum.php:73
-msgid "Notes"
-msgstr "Notes"
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
+msgstr "module PHP libCurl"
 
-#: ../../addon/facebook/facebook.php:337
-msgid "Facebook disabled"
-msgstr "Connecteur Facebook désactivé"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
+msgstr "module PHP GD graphics"
 
-#: ../../addon/facebook/facebook.php:342
-msgid "Updating contacts"
-msgstr "Mise-à-jour des contacts"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
+msgstr "module PHP OpenSSL"
 
-#: ../../addon/facebook/facebook.php:351
-msgid "Facebook API key is missing."
-msgstr "Clé d'API Facebook manquante."
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
+msgstr "module PHP mysqli"
 
-#: ../../addon/facebook/facebook.php:358
-msgid "Facebook Connect"
-msgstr "Connecteur Facebook"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
+msgstr "module PHP mb_string"
 
-#: ../../addon/facebook/facebook.php:364
-msgid "Install Facebook connector for this account."
-msgstr "Installer le connecteur Facebook sur ce compte."
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
+msgstr "module PHP mcrypt"
 
-#: ../../addon/facebook/facebook.php:371
-msgid "Remove Facebook connector"
-msgstr "Désinstaller le connecteur Facebook"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
+msgstr "module Apache mod_rewrite"
 
-#: ../../addon/facebook/facebook.php:376
+#: ../../mod/setup.php:447
 msgid ""
-"Re-authenticate [This is necessary whenever your Facebook password is "
-"changed.]"
-msgstr ""
-"Se ré-authentifier [nécessaire chaque fois que vous changez votre mot de "
-"passe Facebook.]"
-
-#: ../../addon/facebook/facebook.php:383
-msgid "Post to Facebook by default"
-msgstr "Poster sur Facebook par défaut"
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Erreur : le module mod-rewrite du serveur web Apache est requis, mais pas installé."
 
-#: ../../addon/facebook/facebook.php:387
-msgid "Link all your Facebook friends and conversations on this website"
-msgstr "Lier tous vos amis et conversations Facebook sur ce site"
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../addon/facebook/facebook.php:389
+#: ../../mod/setup.php:453
 msgid ""
-"Facebook conversations consist of your profile wall and your friend"
-" stream."
-msgstr ""
-"Les conversations Facebook se composent du mur du profil et des "
-"flux de vos amis."
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Erreur : proc_open est requis, mais soit n'est pas installé, soit est désactivé dans le php.ini"
 
-#: ../../addon/facebook/facebook.php:390
-msgid "On this website, your Facebook friend stream is only visible to you."
-msgstr ""
-"Sur ce site, les flux de vos amis Facebook ne sont visibles que par vous."
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Erreur : le module libCURL de PHP est requis, mais pas installé."
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../mod/setup.php:465
 msgid ""
-"The following settings determine the privacy of your Facebook profile wall "
-"on this website."
-msgstr ""
-"Les réglages suivants déterminent le niveau de vie privée de votre mur "
-"Facebook depuis ce site."
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Erreur : le module GD de PHP (avec support JPEG) est requis, mais pas installé."
+
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Erreur : le module openssl de PHP est requis, mais pas installé."
+
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Erreur : le module mysqli de PHP est requis, mais pas installé."
 
-#: ../../addon/facebook/facebook.php:395
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Erreur : le module mb_string de PHP est requis, mais pas installé."
+
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Erreur : le module mcrypt de PHP est requis, mais pas installé."
+
+#: ../../mod/setup.php:497
 msgid ""
-"On this website your Facebook profile wall conversations will only be "
-"visible to you"
-msgstr ""
-"Sur ce site, les conversations de votre mur Facebook ne sont visibles que "
-"par vous."
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais en est incapable."
 
-#: ../../addon/facebook/facebook.php:400
-msgid "Do not import your Facebook profile wall conversations"
-msgstr "Ne pas importer les conversations de votre mur Facebook."
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "C'est généralement lié à un problème de droits, à cause duquel le serveur web est interdit d'écriture dans le répertoire concerné - alors que votre propre utilisateur a le droit."
 
-#: ../../addon/facebook/facebook.php:402
+#: ../../mod/setup.php:499
 msgid ""
-"If you choose to link conversations and leave both of these boxes unchecked,"
-" your Facebook profile wall will be merged with your profile wall on this "
-"website and your privacy settings on this website will be used to determine "
-"who may see the conversations."
-msgstr ""
-"Si vous choisissez de lier les conversations et de laisser ces deux cases "
-"non-cochées, votre mur Facebook sera fusionné avec votre mur de profil (sur "
-"ce site). Vos réglages (locaux) de vie privée serviront à en déterminer la "
-"visibilité."
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Au terme de cette procédure, nous vous transmettrons un texte à sauvegarder dans un fichier nommé .htconfig.php, à la racine de votre installation de Red."
 
-#: ../../addon/facebook/facebook.php:469
-#: ../../include/contact_selectors.php:78
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Autrement, vous pouvez contourner toute cette procédure et réaliser l'installation manuellement. Merci de consulter le fichier \"install/INSTALL.txt\" pour les instructions détaillées."
 
-#: ../../addon/facebook/facebook.php:470
-msgid "Facebook Connector Settings"
-msgstr "Réglages du connecteur Facebook"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
+msgstr "Le fichier .htconfig.php est accessible en écriture"
 
-#: ../../addon/facebook/facebook.php:484
-msgid "Post to Facebook"
-msgstr "Poster sur Facebook"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red utilise le moteur de template Smarty3 pour mettre son contenu en forme. Smarty3 compile ses templates vers du PHP natif pour accélérer le rendu."
 
-#: ../../addon/facebook/facebook.php:561
+#: ../../mod/setup.php:514
 msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
-msgstr ""
-"Publication sur Facebook annulée pour cause de conflit de permissions inter-"
-"réseaux."
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
+msgstr "Pour stocker ces templates compilées, le serveur web nécessite de pouvoir écrire dans le répertoire view/tpl/smarty3/."
 
-#: ../../addon/facebook/facebook.php:624
-msgid "Image: "
-msgstr "Image: "
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Merci de vous assurer que l'utilisateur sous lequel le serveur web tourne (le plus souvent, www-data) a bien l'autorisation d'écrire dans ce répertoire."
 
-#: ../../addon/facebook/facebook.php:700
-msgid "View on Friendika"
-msgstr "Voir sur Friendica"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Note : pour renforcer la sécurité, vous pouvez décider de ne donner l'accès en écrire qu'au répertoire view/tpl/smarty3 - et pas aux fichiers de templates (.tpl) qu'il contient."
 
-#: ../../addon/facebook/facebook.php:724
-msgid "Facebook post failed. Queued for retry."
-msgstr "Publication sur Facebook échouée. En attente pour re-tentative."
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
+msgstr "view/tpl/smarty3 est accessible en écriture"
 
-#: ../../addon/widgets/widgets.php:55
-msgid "Generate new key"
-msgstr "Générer une nouvelle clé"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red utilise le répertoire 'store' - situé à la racine de Red - pour sauvegarder les fichiers envoyés. Le serveur web aura donc besoin de pouvoir y écrire."
 
-#: ../../addon/widgets/widgets.php:58
-msgid "Widgets key"
-msgstr "Clé des widgets"
+#: ../../mod/setup.php:536
+msgid "store is writable"
+msgstr "'store' est accessible en écriture"
 
-#: ../../addon/widgets/widgets.php:60
-msgid "Widgets available"
-msgstr "Widgets disponibles"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
+msgstr "Validation du certificat SSL/TLS"
 
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendika!"
-msgstr "Se connecter à Friendica!"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Le certificat SSL/TLS n'a pas pu être validé. Merci de le corriger, ou de désactiver l'accès https à ce site."
 
-#: ../../addon/widgets/widget_like.php:58
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] "%d personne aime ça"
-msgstr[1] "%d personnes aiment ça"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "La réécriture d'URL définie dans le .htaccess ne fonctionne pas. Merci de vérifier la configuration de votre serveur web."
 
-#: ../../addon/widgets/widget_like.php:61
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] "%d personne n'aime pas ça"
-msgstr[1] "%d personnes n'aiment pas ça"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
+msgstr "La réécriture d'URL fonctionne"
 
-#: ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
-msgstr "Signaler un bug"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Le fichier de configuration de la base de données - \".htconfig.php\" - ne peut être écrit. Merci de copier le texte généré dans un fichier à ce nom, à la racine de votre serveur web."
 
-#: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
-msgstr "Réglages de \"Not Safe For Work\""
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
+msgstr "Erreurs rencontrées pendant la création de tables de BD."
 
-#: ../../addon/nsfw/nsfw.php:49
-msgid "Comma separated words to treat as NSFW"
-msgstr "Liste de mots à considérer comme NSFW. Séparés par des virgules."
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
+msgstr "
                                      Et maintenant
                                      "
 
-#: ../../addon/nsfw/nsfw.php:66
-msgid "NSFW Settings saved."
-msgstr "Réglages NSFW sauvegardés."
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANT : Vous devez créer [manuellement] une tâche planifiée pour les mises-à-jour."
 
-#: ../../addon/nsfw/nsfw.php:102
+#: ../../mod/siteinfo.php:57
 #, php-format
-msgid "%s - Click to open/close"
-msgstr "%s - cliquer pour ouvrir/fermer"
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Extensions/applications installées :"
 
-#: ../../addon/communityhome/communityhome.php:29
-msgid "OpenID"
-msgstr "OpenID"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Aucune extension/application installée"
 
-#: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
-msgstr "Derniers utilisateurs"
+#: ../../mod/siteinfo.php:109
+msgid "Red"
+msgstr "Red"
 
-#: ../../addon/communityhome/communityhome.php:81
-msgid "Most active users"
-msgstr "Utilisateurs les plus actifs"
+#: ../../mod/siteinfo.php:110
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Ceci est une instance - un hub - de la Matrice Red - un réseau global et coopératif de sites web qui respectent la vie privée de manière décentralisée/acentrée."
 
-#: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
-msgstr "Dernières photos"
+#: ../../mod/siteinfo.php:113
+msgid "Running at web location"
+msgstr "En train de tourner chez"
 
-#: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
-msgstr "Dernièrement aimé"
+#: ../../mod/siteinfo.php:114
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Merci de visiter GetZot.com pour en apprendre davantage sur la Matrice Red."
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../include/conversation.php:23
-msgid "event"
-msgstr "évènement"
+#: ../../mod/siteinfo.php:115
+msgid "Bug reports and issues: please visit"
+msgstr "Pour remonter bogues et problèmes, merci de visiter"
 
-#: ../../addon/membersince/membersince.php:17
-#, php-format
-msgid " - Member since: %s"
-msgstr " - Membre depuis: %s"
+#: ../../mod/siteinfo.php:118
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com"
 
-#: ../../addon/randplace/randplace.php:170
-msgid "Randplace Settings"
-msgstr "Réglages de Randplace"
+#: ../../mod/siteinfo.php:120
+msgid "Site Administrators"
+msgstr "Administrateurs du site"
 
-#: ../../addon/randplace/randplace.php:172
-msgid "Enable Randplace Plugin"
-msgstr "Activer l'extension Randplace"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr "Ajouter un canal"
 
-#: ../../addon/piwik/piwik.php:70
+#: ../../mod/new_channel.php:108
 msgid ""
-"This website is tracked using the Piwik "
-"analytics tool."
-msgstr ""
-"Ce site collecte ses statistiques grâce à Piwik."
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Un canal est une collection de pages web reliées entre elles, sous votre contrôle. Il peut contenir des profils de réseau social, des blogs, des groupes de conversation, des forums, des pages de célébrités, et bien plus encore. Vous pouvez créer autant de canaux que votre fournisseur vous y autorise."
 
-#: ../../addon/piwik/piwik.php:73
-#, php-format
-msgid ""
-"If you do not want that your visits are logged this way you can"
-" set a cookie to prevent Piwik from tracking further visits of the site "
-"(opt-out)."
-msgstr ""
-"Si vous ne voulez pas que vos visites soient collectées par ce biais, vous "
-"pouvez activer un cookie qui empêchera Piwik de tenir compte de"
-" vos visites ultérieures (opt-out)."
+#: ../../mod/new_channel.php:111
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Exemples : \"Bob Jameson\", \"Lisa et ses chevaux sauvages\", \"Football\", \"Groupe des amateurs de tir à l'arc\""
 
-#: ../../addon/piwik/piwik.php:82
-msgid "Piwik Base URL"
-msgstr "URL de base de Piwik"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr "Choisissez un nom court"
 
-#: ../../addon/piwik/piwik.php:83
-msgid "Site ID"
-msgstr "ID du site"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Ce nom court sera utilisé pour créer une adresse de canal, facile à retenir - un peu comme une adresse de courriel - que vous pourrez partager avec d'autres."
 
-#: ../../addon/piwik/piwik.php:84
-msgid "Show opt-out cookie link?"
-msgstr "Montrer le lien d'opt-out?"
+#: ../../mod/new_channel.php:114
+msgid "Or import an existing channel from another location"
+msgstr "Ou importez un canal existant à un autre endroit"
 
-#: ../../addon/js_upload/js_upload.php:43
-msgid "Upload a file"
-msgstr "Téléverser un fichier"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Aucun compte valide trouvé."
 
-#: ../../addon/js_upload/js_upload.php:44
-msgid "Drop files here to upload"
-msgstr "Déposer des fichiers ici pour les téléverser"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Réinitialisation du mot de passe demandée. Vérifiez vos courriels."
 
-#: ../../addon/js_upload/js_upload.php:46
-msgid "Failed"
-msgstr "Échec"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Membre du site (%s)"
 
-#: ../../addon/js_upload/js_upload.php:294
-msgid "No files were uploaded."
-msgstr "Aucun fichier n'a été téléversé."
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Demande de réinitialisation de mot de passe sur %s"
 
-#: ../../addon/js_upload/js_upload.php:300
-msgid "Uploaded file is empty"
-msgstr "Le fichier téléversé est vide"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué."
 
-#: ../../addon/js_upload/js_upload.php:323
-msgid "File has an invalid extension, it should be one of "
-msgstr "Le fichier a une extension invalide, elle devrait être parmi "
+#: ../../mod/lostpass.php:85 ../../boot.php:1434
+msgid "Password Reset"
+msgstr "Réinitialiser le mot de passe"
 
-#: ../../addon/js_upload/js_upload.php:334
-msgid "Upload was cancelled, or server error encountered"
-msgstr "Téléversement annulé, ou erreur de serveur"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
+msgstr "Votre mot de passe a bien été réinitialisé."
 
-#: ../../addon/wppost/wppost.php:41
-msgid "Post to Wordpress"
-msgstr "Poster sur WordPress"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
+msgstr "Votre nouveau mot de passe est"
 
-#: ../../addon/wppost/wppost.php:73
-msgid "WordPress Post Settings"
-msgstr "Réglages WordPress"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
+msgstr "Sauvez-le ou copiez-le, puis"
 
-#: ../../addon/wppost/wppost.php:75
-msgid "Enable WordPress Post Plugin"
-msgstr "Activer l'extension WordPress"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
+msgstr "cliquez ici pour vous connecter"
 
-#: ../../addon/wppost/wppost.php:80
-msgid "WordPress username"
-msgstr "Utilisateur WordPress"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
+msgstr "Votre mot de passe peut être changé depuis la page des Réglages une fois connecté."
 
-#: ../../addon/wppost/wppost.php:85
-msgid "WordPress password"
-msgstr "Mot de passe WordPress"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Votre mot de passe de %s a été changé"
 
-#: ../../addon/wppost/wppost.php:90
-msgid "WordPress API URL"
-msgstr "URL de l'API WordPress"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Mot de passe oublié?"
 
-#: ../../addon/wppost/wppost.php:95
-msgid "Post to WordPress by default"
-msgstr "Publier sur WordPress par défaut"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Saisissez votre adresse de courriel, et validez, pour réinitialiser votre mot de passe. Vérifiez ensuite votre boîte à lettres pour la suite des instructions."
 
-#: ../../include/notifier.php:616 ../../include/delivery.php:415
-msgid "(no subject)"
-msgstr "(sans titre)"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr "Adresse de courriel"
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
-msgstr "Inconnu | Non-classé"
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Réinitialiser"
 
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
-msgstr "Bloquer immédiatement"
+#: ../../mod/import.php:36
+msgid "Nothing to import."
+msgstr "Rien à importer."
 
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
-msgstr "Douteux, spammeur, accro à l'auto-promotion"
+#: ../../mod/import.php:58
+msgid "Unable to download data from old server"
+msgstr "Impossible de récupérer les données de l'ancien serveur"
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
-msgstr "Connu de moi, mais sans opinion"
+#: ../../mod/import.php:64
+msgid "Imported file is empty."
+msgstr "Le fichier importé est vide."
 
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
-msgstr "OK, probablement inoffensif"
+#: ../../mod/import.php:88
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Impossible de créer un doublon d'un identifiant de canal. L'import a échoué."
 
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
-msgstr "Réputé, a toute ma confiance"
+#: ../../mod/import.php:106
+msgid "Channel clone failed. Import failed."
+msgstr "Le clonage du canal a échoué. L'import a échoué."
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Fréquemment"
+#: ../../mod/import.php:116
+msgid "Cloned channel not found. Import failed."
+msgstr "Le canal cloné n'a pas été trouvé. L'import a échoué."
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Toutes les heures"
+#: ../../mod/import.php:358
+msgid "Import completed."
+msgstr "L'import est terminé."
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Deux fois par jour"
+#: ../../mod/import.php:371
+msgid "You must be logged in to use this feature."
+msgstr "Vous devez vous connecter pour utiliser cette fonctionnalité."
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Chaque jour"
+#: ../../mod/import.php:376
+msgid "Import Channel"
+msgstr "Importation de canal"
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Chaque semaine"
+#: ../../mod/import.php:377
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file. Only identity and connections/relationships will "
+"be imported. Importation of content is not yet available."
+msgstr "Utilisez ce formulaire pour importer un canal existant sur un serveur différent. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export. Seules les données d'identité et de relations seront importées. L'importation des contenus n'est pas encore disponible."
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Chaque mois"
+#: ../../mod/import.php:378
+msgid "File to Upload"
+msgstr "Fichier à envoyer"
 
-#: ../../include/contact_selectors.php:78
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../mod/import.php:379
+msgid "Or provide the old server/hub details"
+msgstr "Ou fournissez les détails de l'ancien serveur"
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../mod/import.php:380
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Votre ancienne identité (zyx@exemple.com)"
 
-#: ../../include/contact_selectors.php:78
-msgid "Zot!"
-msgstr "Zot!"
+#: ../../mod/import.php:381
+msgid "Your old login email address"
+msgstr "Votre ancienne adresse de courriel"
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
-msgstr "Masculin"
+#: ../../mod/import.php:382
+msgid "Your old login password"
+msgstr "Votre ancien mot de passe"
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
-msgstr "Féminin"
+#: ../../mod/import.php:383
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Quelle que soit l'option choisie, merci de décider si cette nouvelle adresse sera la primaire, ou si votre ancienne adresse continuera à jouer ce rôle. Vous pourrez publier depuis l'adresse de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media."
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Actuellement masculin"
+#: ../../mod/import.php:384
+msgid "Make this hub my primary location"
+msgstr "Faire de cette adresse ma principale"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Actuellement féminin"
+#: ../../mod/manage.php:63
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Vous avez créé %1$.0f des %2$.0f canaux autorisés."
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Principalement masculin"
+#: ../../mod/manage.php:71
+msgid "Create a new channel"
+msgstr "Créer un nouveau canal"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Principalement féminin"
+#: ../../mod/manage.php:76
+msgid "Channel Manager"
+msgstr "Gestionnaire du canal"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgenre"
+#: ../../mod/manage.php:77
+msgid "Current Channel"
+msgstr "Canal actif"
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Inter-sexe"
+#: ../../mod/manage.php:79
+msgid "Attach to one of your channels by selecting it."
+msgstr "Branchez-vous à l'un de vos canaux en le selectionnant."
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transsexuel"
+#: ../../mod/manage.php:80
+msgid "Default Channel"
+msgstr "Canal par défaut"
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermaphrodite"
+#: ../../mod/manage.php:81
+msgid "Make Default"
+msgstr "Définir comme défaut"
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutre"
+#: ../../mod/vote.php:97
+msgid "Total votes"
+msgstr "Suffrages exprimés"
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Non-spécifique"
+#: ../../mod/vote.php:98
+msgid "Average Rating"
+msgstr "Note moyenne"
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
-msgstr "Autre"
+#: ../../mod/match.php:16
+msgid "Profile Match"
+msgstr "Profils similaires"
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Indécis"
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Aucun mot-clef à comparer. Merci d'ajouter des mots-clefs à votre profil par défaut."
 
-#: ../../include/profile_selectors.php:19
-msgid "Males"
-msgstr "Hommes"
+#: ../../mod/match.php:61
+msgid "is interested in:"
+msgstr "s'intéresse à :"
 
-#: ../../include/profile_selectors.php:19
-msgid "Females"
-msgstr "Femmes"
+#: ../../mod/match.php:69
+msgid "No matches"
+msgstr "Pas de correspondance"
 
-#: ../../include/profile_selectors.php:19
-msgid "Gay"
-msgstr "Gay"
+#: ../../mod/zfinger.php:23
+msgid "invalid target signature"
+msgstr "signature de la cible invalide"
 
-#: ../../include/profile_selectors.php:19
-msgid "Lesbian"
-msgstr "Lesbienne"
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Impossible de localiser le destinataire."
 
-#: ../../include/profile_selectors.php:19
-msgid "No Preference"
-msgstr "Sans préférence"
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Impossible de communiquer avec le canal demandé."
 
-#: ../../include/profile_selectors.php:19
-msgid "Bisexual"
-msgstr "Bisexuel"
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "Impossible de vérifier le canal demandé."
 
-#: ../../include/profile_selectors.php:19
-msgid "Autosexual"
-msgstr "Auto-sexuel"
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Le canal choisi a des restrictions quant aux messages privés. L'envoi a échoué."
 
-#: ../../include/profile_selectors.php:19
-msgid "Abstinent"
-msgstr "Abstinent"
+#: ../../mod/mail.php:121 ../../mod/message.php:31
+msgid "Messages"
+msgstr "Messages"
 
-#: ../../include/profile_selectors.php:19
-msgid "Virgin"
-msgstr "Vierge"
+#: ../../mod/mail.php:132
+msgid "Message deleted."
+msgstr "Message supprimé."
 
-#: ../../include/profile_selectors.php:19
-msgid "Deviant"
-msgstr "Déviant"
+#: ../../mod/mail.php:149
+msgid "Message recalled."
+msgstr "Message annulé/rappelé."
 
-#: ../../include/profile_selectors.php:19
-msgid "Fetish"
-msgstr "Fétichiste"
+#: ../../mod/mail.php:206
+msgid "Send Private Message"
+msgstr "Envoyer un Message Privé"
 
-#: ../../include/profile_selectors.php:19
-msgid "Oodles"
-msgstr "Oodles"
+#: ../../mod/mail.php:207 ../../mod/mail.php:323
+msgid "To:"
+msgstr "À :"
 
-#: ../../include/profile_selectors.php:19
-msgid "Nonsexual"
-msgstr "Non-sexuel"
+#: ../../mod/mail.php:212 ../../mod/mail.php:325
+msgid "Subject:"
+msgstr "Sujet :"
 
-#: ../../include/profile_selectors.php:33
-msgid "Single"
-msgstr "Célibataire"
+#: ../../mod/mail.php:249
+msgid "Message not found."
+msgstr "Message introuvable."
 
-#: ../../include/profile_selectors.php:33
-msgid "Lonely"
-msgstr "Esseulé"
+#: ../../mod/mail.php:292 ../../mod/message.php:72
+msgid "Delete message"
+msgstr "Supprimer message"
 
-#: ../../include/profile_selectors.php:33
-msgid "Available"
-msgstr "Disponible"
+#: ../../mod/mail.php:293
+msgid "Recall message"
+msgstr "Rappeler/annuler le message"
 
-#: ../../include/profile_selectors.php:33
-msgid "Unavailable"
-msgstr "Indisponible"
+#: ../../mod/mail.php:295
+msgid "Message has been recalled."
+msgstr "Le message a été rappelé."
 
-#: ../../include/profile_selectors.php:33
-msgid "Dating"
-msgstr "Dans une relation"
+#: ../../mod/mail.php:312
+msgid "Private Conversation"
+msgstr "Conversation privée"
 
-#: ../../include/profile_selectors.php:33
-msgid "Unfaithful"
-msgstr "Infidèle"
+#: ../../mod/mail.php:316
+msgid "Delete conversation"
+msgstr "Supprimer conversation"
 
-#: ../../include/profile_selectors.php:33
-msgid "Sex Addict"
-msgstr "Accro au sexe"
+#: ../../mod/mail.php:318
+msgid ""
+"No secure communications available. You may be able to "
+"respond from the sender's profile page."
+msgstr "Aucune communication sécurisée n'est possible en l'état. Vous pourrez peut-être répondre depuis la page de profil de l'émetteur."
 
-#: ../../include/profile_selectors.php:33
-msgid "Friends"
-msgstr "Amis"
+#: ../../mod/mail.php:322
+msgid "Send Reply"
+msgstr "Envoyer une réponse"
 
-#: ../../include/profile_selectors.php:33
-msgid "Friends/Benefits"
-msgstr "Amis par intérêt"
+#: ../../mod/editlayout.php:72
+msgid "Edit Layout"
+msgstr "Éditer mise-en-page"
 
-#: ../../include/profile_selectors.php:33
-msgid "Casual"
-msgstr "Casual"
+#: ../../mod/editlayout.php:82
+msgid "Delete layout?"
+msgstr "Supprimer la mise-en-page?"
 
-#: ../../include/profile_selectors.php:33
-msgid "Engaged"
-msgstr "Fiancé"
+#: ../../mod/editlayout.php:147
+msgid "Delete Layout"
+msgstr "Supprimer mise-en-page"
 
-#: ../../include/profile_selectors.php:33
-msgid "Married"
-msgstr "Marié"
+#: ../../mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
+msgstr "L'image a été téléversée, mais le recadrage a échoué."
 
-#: ../../include/profile_selectors.php:33
-msgid "Partners"
-msgstr "Partenaire"
+#: ../../mod/profile_photo.php:97
+msgid "Image resize failed."
+msgstr "Le retaillage de l'image a échoué."
 
-#: ../../include/profile_selectors.php:33
-msgid "Cohabiting"
-msgstr "En cohabitation"
+#: ../../mod/profile_photo.php:141
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Shirt-rechargez votre page, ou videz le cache du navigateur si la photo ne s'affiche pas immédiatement."
 
-#: ../../include/profile_selectors.php:33
-msgid "Happy"
-msgstr "Heureux"
+#: ../../mod/profile_photo.php:163
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "L'image dépasse la taille limite de %d"
 
-#: ../../include/profile_selectors.php:33
-msgid "Not Looking"
-msgstr "Sans recherche"
+#: ../../mod/profile_photo.php:172
+msgid "Unable to process image."
+msgstr "Impossible de traîter l'image."
 
-#: ../../include/profile_selectors.php:33
-msgid "Swinger"
-msgstr "Échangiste"
+#: ../../mod/profile_photo.php:214 ../../mod/profile_photo.php:262
+msgid "Photo not available."
+msgstr "Photo inaccessible."
 
-#: ../../include/profile_selectors.php:33
-msgid "Betrayed"
-msgstr "Trahi(e)"
+#: ../../mod/profile_photo.php:281
+msgid "Upload File:"
+msgstr "Fichier :"
 
-#: ../../include/profile_selectors.php:33
-msgid "Separated"
-msgstr "Séparé"
+#: ../../mod/profile_photo.php:282
+msgid "Select a profile:"
+msgstr "Choisir un profil :"
 
-#: ../../include/profile_selectors.php:33
-msgid "Unstable"
-msgstr "Instable"
+#: ../../mod/profile_photo.php:283
+msgid "Upload Profile Photo"
+msgstr "Téléverser une photo de profil"
 
-#: ../../include/profile_selectors.php:33
-msgid "Divorced"
-msgstr "Divorcé"
+#: ../../mod/profile_photo.php:284
+msgid "Upload"
+msgstr "Envoyer"
 
-#: ../../include/profile_selectors.php:33
-msgid "Widowed"
-msgstr "Veuf/Veuve"
+#: ../../mod/profile_photo.php:288
+msgid "skip this step"
+msgstr "passer cette étape"
 
-#: ../../include/profile_selectors.php:33
-msgid "Uncertain"
-msgstr "Incertain"
+#: ../../mod/profile_photo.php:288
+msgid "select a photo from your photo albums"
+msgstr "choisir une photo dans vos albums"
 
-#: ../../include/profile_selectors.php:33
-msgid "Complicated"
-msgstr "Compliqué"
+#: ../../mod/profile_photo.php:302
+msgid "Crop Image"
+msgstr "Recadrer l'image"
 
-#: ../../include/profile_selectors.php:33
-msgid "Don't care"
-msgstr "S'en désintéresse"
+#: ../../mod/profile_photo.php:303
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Merci d'ajuter le cadre pour une visualisation optimale."
 
-#: ../../include/profile_selectors.php:33
-msgid "Ask me"
-msgstr "Me demander"
+#: ../../mod/profile_photo.php:305
+msgid "Done Editing"
+msgstr "J'ai terminé"
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:233
-msgid "Starts:"
-msgstr "Débute:"
+#: ../../mod/profile_photo.php:340
+msgid "Image uploaded successfully."
+msgstr "Image téléversée avec succès."
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:241
-msgid "Finishes:"
-msgstr "Finit:"
+#: ../../mod/profile_photo.php:342
+msgid "Image upload failed."
+msgstr "Le téléversement a échoué."
 
-#: ../../include/acl_selectors.php:279
-msgid "Visible to everybody"
-msgstr "Visible par tout le monde"
+#: ../../mod/profile_photo.php:351
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "La réduction de taille [%s] a échoué."
 
-#: ../../include/acl_selectors.php:280
-msgid "show"
-msgstr "montrer"
+#: ../../mod/connections.php:191 ../../mod/connections.php:263
+msgid "Blocked"
+msgstr "Bloqué"
 
-#: ../../include/acl_selectors.php:281
-msgid "don't show"
-msgstr "ne pas montrer"
+#: ../../mod/connections.php:196 ../../mod/connections.php:270
+msgid "Ignored"
+msgstr "Ignoré"
 
-#: ../../include/auth.php:27
-msgid "Logged out."
-msgstr "Déconnecté."
+#: ../../mod/connections.php:201 ../../mod/connections.php:284
+msgid "Hidden"
+msgstr "Caché"
 
-#: ../../include/bbcode.php:147
-msgid "Image/photo"
-msgstr "Image/photo"
+#: ../../mod/connections.php:206 ../../mod/connections.php:277
+msgid "Archived"
+msgstr "Archivé"
 
-#: ../../include/poller.php:457
-msgid "From: "
-msgstr "De: "
+#: ../../mod/connections.php:217
+msgid "All"
+msgstr "Tout"
 
-#: ../../include/Contact.php:125 ../../include/conversation.php:675
-msgid "View status"
-msgstr "Voir le statut"
+#: ../../mod/connections.php:241
+msgid "Suggest new connections"
+msgstr "Suggérer de nouvelles relations"
 
-#: ../../include/Contact.php:126 ../../include/conversation.php:676
-msgid "View profile"
-msgstr "Voir le profil"
+#: ../../mod/connections.php:247
+msgid "Show pending (new) connections"
+msgstr "Voir les (nouvelles) relations en attente"
 
-#: ../../include/Contact.php:127 ../../include/conversation.php:677
-msgid "View photos"
-msgstr "Voir les photos"
+#: ../../mod/connections.php:253
+msgid "Show all connections"
+msgstr "Voir toutes les relations"
 
-#: ../../include/Contact.php:128 ../../include/Contact.php:141
-#: ../../include/conversation.php:678
-msgid "View recent"
-msgstr "Voir nouveautés"
+#: ../../mod/connections.php:256
+msgid "Unblocked"
+msgstr "Non bloquées"
 
-#: ../../include/Contact.php:130 ../../include/Contact.php:141
-#: ../../include/conversation.php:680
-msgid "Send PM"
-msgstr "Envoyer message privé"
+#: ../../mod/connections.php:259
+msgid "Only show unblocked connections"
+msgstr "Ne montrer que les relations non-bloquées"
 
-#: ../../include/datetime.php:44 ../../include/datetime.php:46
-msgid "Miscellaneous"
-msgstr "Divers"
+#: ../../mod/connections.php:266
+msgid "Only show blocked connections"
+msgstr "Ne montrer que les relations bloquées"
 
-#: ../../include/datetime.php:105 ../../include/datetime.php:237
-msgid "year"
-msgstr "an"
+#: ../../mod/connections.php:273
+msgid "Only show ignored connections"
+msgstr "Ne montrer que les relations ignorées"
 
-#: ../../include/datetime.php:110 ../../include/datetime.php:238
-msgid "month"
-msgstr "mois"
+#: ../../mod/connections.php:280
+msgid "Only show archived connections"
+msgstr "Ne montrer que les relations archivées"
 
-#: ../../include/datetime.php:115 ../../include/datetime.php:240
-msgid "day"
-msgstr "jour"
+#: ../../mod/connections.php:287
+msgid "Only show hidden connections"
+msgstr "Ne montrer que les relations cachées"
 
-#: ../../include/datetime.php:228
-msgid "never"
-msgstr "jamais"
+#: ../../mod/connections.php:331
+#, php-format
+msgid "%1$s [%2$s]"
+msgstr ""
 
-#: ../../include/datetime.php:234
-msgid "less than a second ago"
-msgstr "il y a moins d'une seconde"
+#: ../../mod/connections.php:332
+msgid "Edit contact"
+msgstr "Éditer contact"
 
-#: ../../include/datetime.php:237
-msgid "years"
-msgstr "ans"
+#: ../../mod/connections.php:355
+msgid "Search your connections"
+msgstr "Chercher parmi vos relations"
 
-#: ../../include/datetime.php:238
-msgid "months"
-msgstr "mois"
+#: ../../mod/connections.php:356
+msgid "Finding: "
+msgstr "Recherche :"
 
-#: ../../include/datetime.php:239
-msgid "week"
-msgstr "semaine"
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Identifiant de requête invalide."
 
-#: ../../include/datetime.php:239
-msgid "weeks"
-msgstr "semaines"
+#: ../../mod/notifications.php:35
+msgid "Discard"
+msgstr "Défausser"
 
-#: ../../include/datetime.php:240
-msgid "days"
-msgstr "jours"
+#: ../../mod/notifications.php:93 ../../mod/notify.php:54
+msgid "No more system notifications."
+msgstr "Pas d'autre notification du système."
 
-#: ../../include/datetime.php:241
-msgid "hour"
-msgstr "heure"
+#: ../../mod/notifications.php:97 ../../mod/notify.php:58
+msgid "System Notifications"
+msgstr "Notifications du système"
 
-#: ../../include/datetime.php:241
-msgid "hours"
-msgstr "heures"
+#: ../../mod/blocks.php:65
+msgid "Block Name"
+msgstr "Nom du bloc"
 
-#: ../../include/datetime.php:242
-msgid "minute"
-msgstr "minute"
+#: ../../mod/oexchange.php:23
+msgid "Unable to find your hub."
+msgstr "Impossible de trouver votre instance."
 
-#: ../../include/datetime.php:242
-msgid "minutes"
-msgstr "minutes"
+#: ../../mod/oexchange.php:37
+msgid "Post successful."
+msgstr "Contribution effectuée."
 
-#: ../../include/datetime.php:243
-msgid "second"
-msgstr "seconde"
+#: ../../mod/editwebpage.php:106
+msgid "Edit Webpage"
+msgstr "Éditer page web"
 
-#: ../../include/datetime.php:243
-msgid "seconds"
-msgstr "secondes"
+#: ../../mod/editwebpage.php:116
+msgid "Delete webpage?"
+msgstr "Supprimer la page web?"
 
-#: ../../include/datetime.php:250
-msgid " ago"
-msgstr " auparavant"
+#: ../../mod/editwebpage.php:189
+msgid "Delete Webpage"
+msgstr "Supprimer page web"
 
-#: ../../include/datetime.php:421 ../../include/profile_advanced.php:30
-#: ../../include/items.php:1215
-msgid "Birthday:"
-msgstr "Anniversaire:"
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+msgid "Access to this profile has been restricted."
+msgstr "L'accès à ce profil a été restreint."
 
-#: ../../include/profile_advanced.php:22
-msgid "j F, Y"
-msgstr "j F, Y"
+#: ../../mod/poke.php:159
+msgid "Poke/Prod"
+msgstr "Tapoter/Solliciter"
 
-#: ../../include/profile_advanced.php:23
-msgid "j F"
-msgstr "j F"
+#: ../../mod/poke.php:160
+msgid "poke, prod or do other things to somebody"
+msgstr "Tapoter, pointer, et autres choses à faire à quelqu'un"
 
-#: ../../include/profile_advanced.php:34
-msgid "Age:"
-msgstr "Age:"
+#: ../../mod/poke.php:161
+msgid "Recipient"
+msgstr "Destinataire"
 
-#: ../../include/profile_advanced.php:49
-msgid "Religion:"
-msgstr "Religion:"
+#: ../../mod/poke.php:162
+msgid "Choose what you wish to do to recipient"
+msgstr "Choisir quoi lui faire"
 
-#: ../../include/profile_advanced.php:51
-msgid "About:"
-msgstr "À propos:"
+#: ../../mod/poke.php:165
+msgid "Make this post private"
+msgstr "Rendre cette contribution privée"
 
-#: ../../include/profile_advanced.php:53
-msgid "Hobbies/Interests:"
-msgstr "Passe-temps/Centres d'intérêt:"
+#: ../../mod/channel.php:85
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permissions insuffisantes. Demande redirigée à la page du profil."
 
-#: ../../include/profile_advanced.php:55
-msgid "Contact information and Social Networks:"
-msgstr "Coordonées/Réseaux sociaux:"
+#: ../../mod/community.php:23
+msgid "Not available."
+msgstr "Indisponible."
 
-#: ../../include/profile_advanced.php:57
-msgid "Musical interests:"
-msgstr "Goûts musicaux:"
+#: ../../mod/community.php:32
+msgid "Community"
+msgstr "Communauté"
 
-#: ../../include/profile_advanced.php:59
-msgid "Books, literature:"
-msgstr "Lectures:"
+#: ../../mod/community.php:63 ../../mod/community.php:88
+msgid "No results."
+msgstr "Aucun résultat."
 
-#: ../../include/profile_advanced.php:61
-msgid "Television:"
-msgstr "Télévision:"
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Contact introuvable."
 
-#: ../../include/profile_advanced.php:63
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cinéma/Danse/Culture/Divertissement:"
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Suggestion d'amitié/relation envoyée."
 
-#: ../../include/profile_advanced.php:65
-msgid "Love/Romance:"
-msgstr "Amour/Romance:"
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Suggérer une relation"
 
-#: ../../include/profile_advanced.php:67
-msgid "Work/employment:"
-msgstr "Activité professionnelle/Occupation:"
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Suggérer une relation à %s"
 
-#: ../../include/profile_advanced.php:69
-msgid "School/education:"
-msgstr "Études/Formation:"
+#: ../../mod/editblock.php:86
+msgid "Edit Block"
+msgstr "Éditer bloc"
 
-#: ../../include/text.php:232
-msgid "prev"
-msgstr "précédent"
+#: ../../mod/editblock.php:96
+msgid "Delete block?"
+msgstr "Supprimer le bloc?"
 
-#: ../../include/text.php:234
-msgid "first"
-msgstr "premier"
+#: ../../mod/editblock.php:163
+msgid "Delete Block"
+msgstr "Supprimer bloc"
 
-#: ../../include/text.php:263
-msgid "last"
-msgstr "dernier"
+#: ../../mod/dirprofile.php:114
+msgid "Status: "
+msgstr "État :"
 
-#: ../../include/text.php:266
-msgid "next"
-msgstr "suivant"
+#: ../../mod/dirprofile.php:115
+msgid "Sexual Preference: "
+msgstr "Orientation sexuelle :"
 
-#: ../../include/text.php:546
-msgid "No contacts"
-msgstr "Aucun contact"
+#: ../../mod/dirprofile.php:117
+msgid "Homepage: "
+msgstr "Site web :"
 
-#: ../../include/text.php:555
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
+#: ../../mod/dirprofile.php:118
+msgid "Hometown: "
+msgstr "Ville natale :"
 
-#: ../../include/text.php:626 ../../include/nav.php:87
-msgid "Search"
-msgstr "Recherche"
+#: ../../mod/dirprofile.php:120
+msgid "About: "
+msgstr "À propos :"
 
-#: ../../include/text.php:709
-msgid "Monday"
-msgstr "Lundi"
+#: ../../mod/dirprofile.php:168
+msgid "Keywords: "
+msgstr "Mots-clefs :"
 
-#: ../../include/text.php:709
-msgid "Tuesday"
-msgstr "Mardi"
+#: ../../mod/filestorage.php:68
+msgid "Permission Denied."
+msgstr "Permission refusée."
 
-#: ../../include/text.php:709
-msgid "Wednesday"
-msgstr "Mercredi"
+#: ../../mod/filestorage.php:85
+msgid "File not found."
+msgstr "Fichier introuvable."
 
-#: ../../include/text.php:709
-msgid "Thursday"
-msgstr "Jeudi"
+#: ../../mod/filestorage.php:119
+msgid "Edit file permissions"
+msgstr "Éditer les permissions du fichier"
 
-#: ../../include/text.php:709
-msgid "Friday"
-msgstr "Vendredi"
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
+#: ../../mod/photos.php:946
+msgid "Permissions"
+msgstr "Permissions"
 
-#: ../../include/text.php:709
-msgid "Saturday"
-msgstr "Samedi"
+#: ../../mod/filestorage.php:126
+msgid "Include all files and sub folders"
+msgstr "Inclure tous fichiers et sous-répertoires"
 
-#: ../../include/text.php:709
-msgid "Sunday"
-msgstr "Dimanche"
+#: ../../mod/filestorage.php:127
+msgid "Return to file list"
+msgstr "Retourner à la liste des fichiers"
 
-#: ../../include/text.php:713
-msgid "January"
-msgstr "Janvier"
+#: ../../mod/filestorage.php:129
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Copiez/collez ce code pour joindre le fichier à une publication"
 
-#: ../../include/text.php:713
-msgid "February"
-msgstr "Février"
+#: ../../mod/filestorage.php:130
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Copiez/collez cette URL pour lier le fichier depuis une page web"
 
-#: ../../include/text.php:713
-msgid "March"
-msgstr "Mars"
+#: ../../mod/filestorage.php:167
+msgid "Download"
+msgstr "Télécharger"
 
-#: ../../include/text.php:713
-msgid "April"
-msgstr "Avril"
+#: ../../mod/filestorage.php:173
+msgid "Used: "
+msgstr "Utilisé :"
 
-#: ../../include/text.php:713
-msgid "May"
-msgstr "Mai"
+#: ../../mod/filestorage.php:174
+msgid "[directory]"
+msgstr "[répertoire]"
 
-#: ../../include/text.php:713
-msgid "June"
-msgstr "Juin"
+#: ../../mod/filestorage.php:176
+msgid "Limit: "
+msgstr "Limite :"
 
-#: ../../include/text.php:713
-msgid "July"
-msgstr "Juillet"
+#: ../../mod/suggest.php:35
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Pas de suggestions pour l'instant. Si le site est récent, merci de re-tenter dans 24 heures."
 
-#: ../../include/text.php:713
-msgid "August"
-msgstr "Août"
+#: ../../mod/message.php:41
+msgid "Conversation removed."
+msgstr "Conversation supprimée."
 
-#: ../../include/text.php:713
-msgid "September"
-msgstr "Septembre"
+#: ../../mod/message.php:56
+msgid "No messages."
+msgstr "Pas de message."
 
-#: ../../include/text.php:713
-msgid "October"
-msgstr "Octobre"
+#: ../../mod/message.php:74
+msgid "D, d M Y - g:i A"
+msgstr "D d Y - H:i"
 
-#: ../../include/text.php:713
-msgid "November"
-msgstr "Novembre"
+#: ../../mod/pubsites.php:22
+msgid "Public Sites"
+msgstr "Sites publics"
 
-#: ../../include/text.php:713
-msgid "December"
-msgstr "Décembre"
+#: ../../mod/pubsites.php:25
+msgid ""
+"The listed sites allow public registration into the Red Matrix. All sites in"
+" the matrix are interlinked so membership on any of them conveys membership "
+"in the matrix as a whole. Some sites may require subscription or provide "
+"tiered service plans. The provider links may provide "
+"additional details."
+msgstr "Les sites listés autorisent l'inscription pour tous. Tous sont liés entre eux, de manière à ce qu'un compte sur un seul d'entre eux soit valable sur l'ensemble de la matrice. Certains sites peuvent demander des frais de souscriptions, ou fournir des forfaits ajustés. Le lien \"fournisseur\" peut vous donner des détails supplémentaires."
+
+#: ../../mod/pubsites.php:31
+msgid "Site URL"
+msgstr "URL du site"
+
+#: ../../mod/pubsites.php:31
+msgid "Access Type"
+msgstr "Type d'accès"
+
+#: ../../mod/pubsites.php:31
+msgid "Registration Policy"
+msgstr "Politique d'inscription"
 
-#: ../../include/text.php:783
-msgid "bytes"
-msgstr "octets"
+#: ../../mod/register.php:43
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr "Nombre d'inscriptions quotidiennes dépassé. Merci de recommencer demain."
 
-#: ../../include/text.php:875
-msgid "Select an alternate language"
-msgstr "Choisir une langue alternative"
+#: ../../mod/register.php:49
+msgid ""
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr "Merci d'indiquer votre adhésion aux Règles du Service. L'inscription a échoué."
 
-#: ../../include/text.php:887
-msgid "default"
-msgstr "défaut"
+#: ../../mod/register.php:77
+msgid "Passwords do not match."
+msgstr "Les mots de passe ne concordent pas."
 
-#: ../../include/nav.php:44
-msgid "End this session"
-msgstr "Mettre fin à cette session"
+#: ../../mod/register.php:105
+msgid ""
+"Registration successful. Please check your email for validation "
+"instructions."
+msgstr "Inscription réussie. Merci de vérifier vos courriels pour valider votre compte."
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
-msgstr "Vos notices et conversations"
+#: ../../mod/register.php:111
+msgid "Your registration is pending approval by the site owner."
+msgstr "Votre inscription est en attente de l'approbation d'un administrateur."
 
-#: ../../include/nav.php:48
-msgid "Your profile page"
-msgstr "Votre page de profil"
+#: ../../mod/register.php:114
+msgid "Your registration can not be processed."
+msgstr "Votre inscription ne peut être traîtée."
 
-#: ../../include/nav.php:49
-msgid "Your photos"
-msgstr "Vos photos"
+#: ../../mod/register.php:147
+msgid "Registration on this site/hub is by approval only."
+msgstr "L'inscription sur cette instance/ce site est soumis à une modération."
 
-#: ../../include/nav.php:50
-msgid "Your events"
-msgstr "Vos événements"
+#: ../../mod/register.php:148
+msgid "Register at another affiliated site/hub"
+msgstr "S'inscrire sur un site/hub affilié"
 
-#: ../../include/nav.php:51
-msgid "Personal notes"
-msgstr "Notes personnelles"
+#: ../../mod/register.php:156
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Ce site a dépassé le nombre de création de compte autorisé par jour. Merci de recommencer demain."
 
-#: ../../include/nav.php:51
-msgid "Your personal photos"
-msgstr "Vos photos personnelles"
+#: ../../mod/register.php:167
+msgid "Terms of Service"
+msgstr "les Règles du Service"
 
-#: ../../include/nav.php:62
-msgid "Sign in"
-msgstr "Se connecter"
+#: ../../mod/register.php:173
+#, php-format
+msgid "I accept the %s for this website"
+msgstr "J'accepte %s de ce site"
 
-#: ../../include/nav.php:73
-msgid "Home Page"
-msgstr "Page d'accueil"
+#: ../../mod/register.php:175
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr "J'ai treize (13) ans révolus, et j'accepte %s de ce site"
 
-#: ../../include/nav.php:77
-msgid "Create an account"
-msgstr "Créer un compte"
+#: ../../mod/register.php:194
+msgid "Membership on this site is by invitation only."
+msgstr "L'inscription à ce site se fait uniquement sur invitation."
 
-#: ../../include/nav.php:82
-msgid "Help and documentation"
-msgstr "Aide et documentation"
+#: ../../mod/register.php:195
+msgid "Please enter your invitation code"
+msgstr "Merci de saisir votre code d'invitation"
 
-#: ../../include/nav.php:85
-msgid "Apps"
-msgstr "Applications"
+#: ../../mod/register.php:198
+msgid "Your email address"
+msgstr "Votre adresse de courriel"
 
-#: ../../include/nav.php:85
-msgid "Addon applications, utilities, games"
-msgstr "Applications supplémentaires, utilitaires, jeux"
+#: ../../mod/register.php:199
+msgid "Choose a password"
+msgstr "Choisissez un mot de passe"
 
-#: ../../include/nav.php:87
-msgid "Search site content"
-msgstr "Rechercher dans le contenu du site"
+#: ../../mod/register.php:200
+msgid "Please re-enter your password"
+msgstr "Confirmez-le"
 
-#: ../../include/nav.php:97
-msgid "Conversations on this site"
-msgstr "Conversations ayant cours sur ce site"
+#: ../../mod/regmod.php:12
+msgid "Please login."
+msgstr "Merci de vous connecter."
 
-#: ../../include/nav.php:99
-msgid "Directory"
-msgstr "Annuaire"
+#: ../../mod/removeme.php:49
+msgid "Remove This Channel"
+msgstr "Supprimer ce canal"
 
-#: ../../include/nav.php:99
-msgid "People directory"
-msgstr "Annuaire des utilisateurs"
+#: ../../mod/removeme.php:50
+msgid ""
+"This will completely remove this channel from the network. Once this has "
+"been done it is not recoverable."
+msgstr "Ceci effacera complètement le canal du réseau. Une fois effacé, un canal ne PEUT PAS être récupéré."
 
-#: ../../include/nav.php:109
-msgid "Conversations from your friends"
-msgstr "Conversations de vos amis"
+#: ../../mod/removeme.php:51
+msgid "Please enter your password for verification:"
+msgstr "Merci de re-saisir votre mot de passe pour vérification :"
 
-#: ../../include/nav.php:117
-msgid "Friend Requests"
-msgstr "Demande d'amitié"
+#: ../../mod/removeme.php:52
+msgid "Remove this channel and all its clones from the network"
+msgstr "Supprimer ce canal ainsi que tous ses clones de par le réseau"
 
-#: ../../include/nav.php:122
-msgid "Private mail"
-msgstr "Messages privés"
+#: ../../mod/removeme.php:52
+msgid ""
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr "Par défaut, seule l'instance du canal présente sur ce hub sera supprimée du réseau"
 
-#: ../../include/nav.php:125
-msgid "Manage"
-msgstr "Gérer"
+#: ../../mod/removeme.php:53
+msgid "Remove Channel"
+msgstr "Enlever le canal"
 
-#: ../../include/nav.php:125
-msgid "Manage other pages"
-msgstr "Gérer les autres pages"
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
+msgstr "Impossible d'obtenir des informations sur le propriétaire de la page."
 
-#: ../../include/nav.php:130
-msgid "Manage/edit friends and contacts"
-msgstr "Gérer/éditer les amitiés et contacts"
+#: ../../mod/photos.php:97
+msgid "Album not found."
+msgstr "Album introuvable."
 
-#: ../../include/nav.php:137
-msgid "Admin"
-msgstr "Admin"
+#: ../../mod/photos.php:119 ../../mod/photos.php:668
+msgid "Delete Album"
+msgstr "Supprimer album"
 
-#: ../../include/nav.php:137
-msgid "Site setup and configuration"
-msgstr "Démarrage et configuration du site"
+#: ../../mod/photos.php:159 ../../mod/photos.php:951
+msgid "Delete Photo"
+msgstr "Supprimer photo"
 
-#: ../../include/nav.php:160
-msgid "Nothing new here"
-msgstr "Rien de neuf ici"
+#: ../../mod/photos.php:452
+msgid "No photos selected"
+msgstr "Aucune photo selectionnée"
 
-#: ../../include/conversation.php:210 ../../include/conversation.php:453
-msgid "Select"
-msgstr "Sélectionner"
+#: ../../mod/photos.php:499
+msgid "Access to this item is restricted."
+msgstr "L'accès à l'élément est restreint."
 
-#: ../../include/conversation.php:225 ../../include/conversation.php:550
-#: ../../include/conversation.php:551
+#: ../../mod/photos.php:573
 #, php-format
-msgid "View %s's profile @ %s"
-msgstr "Voir le profil de %s @ %s"
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Vous avez utilisé %1$.2f mégaoctets sur les %2$.2f autorisés pour le stockage des photos."
 
-#: ../../include/conversation.php:234 ../../include/conversation.php:562
+#: ../../mod/photos.php:576
 #, php-format
-msgid "%s from %s"
-msgstr "%s de %s"
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr "Vous avez utilisé %1$.2f mégaoctets pour le stockage des photos."
 
-#: ../../include/conversation.php:250
-msgid "View in context"
-msgstr "Voir dans le contexte"
+#: ../../mod/photos.php:595
+msgid "Upload Photos"
+msgstr "Téléverser des photos"
 
-#: ../../include/conversation.php:356
-#, php-format
-msgid "See all %d comments"
-msgstr "Voir les %d commentaires"
+#: ../../mod/photos.php:599 ../../mod/photos.php:663
+msgid "New album name: "
+msgstr "Créer un album :"
 
-#: ../../include/conversation.php:416
-msgid "like"
-msgstr "aime"
+#: ../../mod/photos.php:600
+msgid "or existing album name: "
+msgstr "ou choisir un album existant :"
 
-#: ../../include/conversation.php:417
-msgid "dislike"
-msgstr "n'aime pas"
+#: ../../mod/photos.php:601
+msgid "Do not show a status post for this upload"
+msgstr "Ne pas publier de statut pour cet envoi"
 
-#: ../../include/conversation.php:419
-msgid "Share this"
-msgstr "Partager ça"
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
+#: ../../mod/photos.php:1138
+msgid "Contact Photos"
+msgstr "Photos de contact"
 
-#: ../../include/conversation.php:419
-msgid "share"
-msgstr "partager"
+#: ../../mod/photos.php:678
+msgid "Edit Album"
+msgstr "Éditer l'album"
 
-#: ../../include/conversation.php:463
-msgid "add star"
-msgstr "mett en avant"
+#: ../../mod/photos.php:684
+msgid "Show Newest First"
+msgstr "Ordre anté-chronologique"
 
-#: ../../include/conversation.php:464
-msgid "remove star"
-msgstr "ne plus mettre en avant"
+#: ../../mod/photos.php:686
+msgid "Show Oldest First"
+msgstr "Ordre chronologique"
 
-#: ../../include/conversation.php:465
-msgid "toggle star status"
-msgstr "mettre en avant"
+#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+msgid "View Photo"
+msgstr "Voir photo"
 
-#: ../../include/conversation.php:468
-msgid "starred"
-msgstr "mis en avant"
+#: ../../mod/photos.php:775
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permission refusée. L'accès à cet élément peut avoir été restreint."
 
-#: ../../include/conversation.php:469
-msgid "add tag"
-msgstr "ajouter un tag"
+#: ../../mod/photos.php:777
+msgid "Photo not available"
+msgstr "Photo indisponible"
 
-#: ../../include/conversation.php:552
-msgid "to"
-msgstr "à"
+#: ../../mod/photos.php:837
+msgid "Use as profile photo"
+msgstr "Utiliser comme photo du profil"
 
-#: ../../include/conversation.php:553
-msgid "Wall-to-Wall"
-msgstr "Inter-mur"
+#: ../../mod/photos.php:861
+msgid "View Full Size"
+msgstr "Voir en taille réelle"
 
-#: ../../include/conversation.php:554
-msgid "via Wall-To-Wall:"
-msgstr "en Inter-mur:"
+#: ../../mod/photos.php:935
+msgid "Edit photo"
+msgstr "Éditer photo"
 
-#: ../../include/conversation.php:600
-msgid "Delete Selected Items"
-msgstr "Supprimer les éléments sélectionnés"
+#: ../../mod/photos.php:937
+msgid "Rotate CW (right)"
+msgstr "Rotation horaire (droite)"
 
-#: ../../include/conversation.php:730
-#, php-format
-msgid "%s likes this."
-msgstr "%s aime ça."
+#: ../../mod/photos.php:938
+msgid "Rotate CCW (left)"
+msgstr "Rotation anti-horaire (gauche)"
 
-#: ../../include/conversation.php:730
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s n'aime pas ça."
+#: ../../mod/photos.php:940
+msgid "New album name"
+msgstr "Nouveau nom d'album :"
 
-#: ../../include/conversation.php:734
-#, php-format
-msgid "%2$d people like this."
-msgstr "%2$d personnes aiment ça."
+#: ../../mod/photos.php:943
+msgid "Caption"
+msgstr "Titre/légende"
 
-#: ../../include/conversation.php:736
-#, php-format
-msgid "%2$d people don't like this."
-msgstr "%2$d personnes n'aiment pas ça."
+#: ../../mod/photos.php:945
+msgid "Add a Tag"
+msgstr "Ajouter une étiquette"
 
-#: ../../include/conversation.php:742
-msgid "and"
-msgstr "et"
+#: ../../mod/photos.php:948
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Exemple : @bob, @Barbara_Jensen, @jim@exemple.com, #Ile_de_France, #marathon"
 
-#: ../../include/conversation.php:745
-#, php-format
-msgid ", and %d other people"
-msgstr ", et %d autres personnes"
+#: ../../mod/photos.php:1101
+msgid "In This Photo:"
+msgstr "Dans cette photo :"
 
-#: ../../include/conversation.php:746
-#, php-format
-msgid "%s like this."
-msgstr "%s aiment ça."
+#: ../../mod/photos.php:1176
+msgid "View Album"
+msgstr "Voir album"
 
-#: ../../include/conversation.php:746
-#, php-format
-msgid "%s don't like this."
-msgstr "%s n'aiment pas ça."
+#: ../../mod/photos.php:1185
+msgid "Recent Photos"
+msgstr "Photos récentes"
 
-#: ../../include/conversation.php:766
-msgid "Visible to everybody"
-msgstr "Visible par tout le monde"
+#: ../../mod/mood.php:138
+msgid "Mood"
+msgstr "Humeur"
+
+#: ../../mod/mood.php:139
+msgid "Set your current mood and tell your friends"
+msgstr "Indiquez votre humeur du moment à vos amis"
+
+#: ../../mod/ping.php:192
+msgid "sent you a private message"
+msgstr "vous a envoyé un message privé"
+
+#: ../../mod/ping.php:250
+msgid "added your channel"
+msgstr "a ajouté votre canal"
+
+#: ../../mod/ping.php:294
+msgid "posted an event"
+msgstr "a publié un événement"
+
+#: ../../view/theme/redbasic/php/config.php:76
+msgid "Scheme Default"
+msgstr "Schéma de couleur par défaut"
+
+#: ../../view/theme/redbasic/php/config.php:87
+msgid "silver"
+msgstr "argent"
+
+#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/apw/php/config.php:234
+#: ../../view/theme/blogga/view/theme/blog/config.php:69
+#: ../../view/theme/blogga/php/config.php:69
+msgid "Theme settings"
+msgstr "Réglages du thème"
+
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/apw/php/config.php:235
+msgid "Set scheme"
+msgstr "Définir la palette de couleurs"
+
+#: ../../view/theme/redbasic/php/config.php:100
+msgid "Navigation bar colour"
+msgstr "Couleur de la barre de navigation"
+
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "link colour"
+msgstr "couleur des liens"
+
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Set font-colour for banner"
+msgstr "Définir la couleur du texte de la bannière"
+
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Set the background colour"
+msgstr "Définir la couleur d'arrière-plan"
+
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Set the background image"
+msgstr "Définir l'image d'arrière-plan"
+
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set the background colour of items"
+msgstr "Définir la couleur de fond des contributions"
+
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set the opacity of items"
+msgstr "Définir l'opacité des contributions"
+
+#: ../../view/theme/redbasic/php/config.php:107
+msgid "Set the basic colour for item icons"
+msgstr "Définir la couleur de base pour les icônes des éléments"
+
+#: ../../view/theme/redbasic/php/config.php:108
+msgid "Set the hover colour for item icons"
+msgstr "Définir la couleur de survol des icônes des éléments"
+
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Set font-size for the entire application"
+msgstr "Définir la taille de police pour l'application entière"
+
+#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/apw/php/config.php:236
+msgid "Set font-size for posts and comments"
+msgstr "Définir font-size pour contribution et commentaires"
+
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Set font-colour for posts and comments"
+msgstr "Définir font-colour pour les contributions et commentaires"
+
+#: ../../view/theme/redbasic/php/config.php:112
+msgid "Set radius of corners"
+msgstr "Définir le rayon des arrondis"
+
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Set shadow depth of photos"
+msgstr "Définir la profondeur de l'ombre des photos"
+
+#: ../../view/theme/redbasic/php/config.php:114
+msgid "Set maximum width of conversation regions"
+msgstr "Définir la largeur maximale des conversations"
+
+#: ../../view/theme/redbasic/php/config.php:115
+msgid "Set minimum opacity of nav bar - to hide it"
+msgstr "Définir l'opacité minimum du bandeau de navigation - pour le cacher"
+
+#: ../../view/theme/redbasic/php/config.php:116
+msgid "Set size of conversation author photo"
+msgstr "Définir la taille de la photo de l'auteur d'une conversation"
+
+#: ../../view/theme/redbasic/php/config.php:117
+msgid "Set size of followup author photos"
+msgstr "Définir la taille de la photo de l'auteur d'une réponse"
+
+#: ../../view/theme/redbasic/php/config.php:118
+msgid "Sloppy photo albums"
+msgstr "Albums photo \"en biais\""
+
+#: ../../view/theme/redbasic/php/config.php:118
+msgid "Are you a clean desk or a messy desk person?"
+msgstr "Vous êtes plutôt \"bureau bien rangé\" ou \"gros foutoir\"?"
+
+#: ../../view/theme/apw/php/config.php:193
+#: ../../view/theme/apw/php/config.php:211
+msgid "Schema Default"
+msgstr "Palette par défaut"
+
+#: ../../view/theme/apw/php/config.php:194
+msgid "Sans-Serif"
+msgstr "Sans empâtements"
+
+#: ../../view/theme/apw/php/config.php:195
+msgid "Monospace"
+msgstr "Châsse fixe"
 
-#: ../../include/conversation.php:768
-msgid "Please enter a video link/URL:"
-msgstr "Entrez un lien/URL video :"
+#: ../../view/theme/apw/php/config.php:237
+msgid "Set font face"
+msgstr "Définir la fonte"
 
-#: ../../include/conversation.php:769
-msgid "Please enter an audio link/URL:"
-msgstr "Entrez un lien/URL audio :"
+#: ../../view/theme/apw/php/config.php:238
+msgid "Set iconset"
+msgstr "Définir le jeu d'icônes"
 
-#: ../../include/conversation.php:770
-msgid "Tag term:"
-msgstr "Tag : "
+#: ../../view/theme/apw/php/config.php:239
+msgid "Set big shadow size, default 15px 15px 15px"
+msgstr "Définir la taille des grandes ombres, par défaut 15px 15px 15px"
 
-#: ../../include/conversation.php:771
-msgid "Where are you right now?"
-msgstr "Où êtes-vous présentemment?"
+#: ../../view/theme/apw/php/config.php:240
+msgid "Set small shadow size, default 5px 5px 5px"
+msgstr "Définir la taille des petites ombres, par défaut 5px 5px 5px"
 
-#: ../../include/conversation.php:772
-msgid "Enter a title for this item"
-msgstr "Saisissez un titre pour cet élément"
+#: ../../view/theme/apw/php/config.php:241
+msgid "Set shadow colour, default #000"
+msgstr "Définir la couleur des ombres, par défaut #000"
 
-#: ../../include/conversation.php:818
-msgid "Insert video link"
-msgstr "Insérer un lien video"
+#: ../../view/theme/apw/php/config.php:242
+msgid "Set radius size, default 5px"
+msgstr "Définir le rayon des arrondis, par défaut 5px"
 
-#: ../../include/conversation.php:819
-msgid "Insert audio link"
-msgstr "Insérer un lien audio"
+#: ../../view/theme/apw/php/config.php:243
+msgid "Set line-height for posts and comments"
+msgstr "Définir line-height pour contributions et commentaires"
 
-#: ../../include/conversation.php:822
-msgid "Set title"
-msgstr "Définir un titre"
+#: ../../view/theme/apw/php/config.php:244
+msgid "Set background image"
+msgstr "Définir l'image d'arrière-plan"
 
-#: ../../include/bb2diaspora.php:51
-msgid "view full size"
-msgstr "voir en pleine taille"
+#: ../../view/theme/apw/php/config.php:245
+msgid "Set background colour"
+msgstr "Définir la couleur d'arrière-plan"
 
-#: ../../include/bb2diaspora.php:102
-msgid "image/photo"
-msgstr "image/photo"
+#: ../../view/theme/apw/php/config.php:246
+msgid "Set section background image"
+msgstr "Définir l'image d'arrière-plan des sections"
 
-#: ../../include/dba.php:31
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-"Impossible de localiser les informations DNS pour le serveur de base de "
-"données '%s'"
+#: ../../view/theme/apw/php/config.php:247
+msgid "Set section background colour"
+msgstr "Définir la couleur d'arrière-plan des sections"
 
-#: ../../include/contact_widgets.php:6
-msgid "Add New Contact"
-msgstr "Ajouter un nouveau contact"
+#: ../../view/theme/apw/php/config.php:248
+msgid "Set colour of items - use hex"
+msgstr "Définir la couleur des éléments - en héxadécimal"
 
-#: ../../include/contact_widgets.php:7
-msgid "Enter address or web location"
-msgstr "Entrez son adresse ou sa localisation web"
+#: ../../view/theme/apw/php/config.php:249
+msgid "Set colour of links - use hex"
+msgstr "Définir la couleur des liens - en héxadécimal"
 
-#: ../../include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Exemple: bob@example.com, http://example.com/barbara"
+#: ../../view/theme/apw/php/config.php:250
+msgid "Set max-width for items.  Default 400px"
+msgstr "Définir la largeur maximal des éléments. Par défaut, 400px"
 
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
-msgstr "Inviter des amis"
+#: ../../view/theme/apw/php/config.php:251
+msgid "Set min-width for items.  Default 240px"
+msgstr "Définir la largeur minimale des éléments. Par défaut, 240px"
 
-#: ../../include/contact_widgets.php:24
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitation disponible"
-msgstr[1] "%d invitations disponibles"
+#: ../../view/theme/apw/php/config.php:252
+msgid "Set the generic content wrapper width.  Default 48%"
+msgstr "Définir la largeur du contenu. Par défaut, 48%"
 
-#: ../../include/contact_widgets.php:30
-msgid "Find People"
-msgstr "Trouver des personnes"
+#: ../../view/theme/apw/php/config.php:253
+msgid "Set colour of fonts - use hex"
+msgstr "Définir la couleur des fontes - en héxadécimal"
 
-#: ../../include/contact_widgets.php:31
-msgid "Enter name or interest"
-msgstr "Entrez un nom ou un centre d'intérêt"
+#: ../../view/theme/apw/php/config.php:254
+msgid "Set background-size element"
+msgstr "Définir background-size pour les éléments"
 
-#: ../../include/contact_widgets.php:32
-msgid "Connect/Follow"
-msgstr "Connecter/Suivre"
+#: ../../view/theme/apw/php/config.php:255
+msgid "Item opacity"
+msgstr "Opacité des éléments"
 
-#: ../../include/contact_widgets.php:33
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Exemples: Robert Morgenstein, Pêche"
+#: ../../view/theme/apw/php/config.php:256
+msgid "Display post previews only"
+msgstr "Afficher seulement l'aperçu des contributions"
 
-#: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
-msgstr "Intérêts similaires"
+#: ../../view/theme/apw/php/config.php:257
+msgid "Display side bar on channel page"
+msgstr "Afficher le panneau latéral sur la page du canal"
 
-#: ../../include/items.php:1829
-msgid "New mail received at "
-msgstr "Nouvel email reçu à "
+#: ../../view/theme/apw/php/config.php:258
+msgid "Colour of the navigation bar"
+msgstr "Couleur de la barre de navigation"
 
-#: ../../include/items.php:2438
-msgid "A new person is sharing with you at "
-msgstr "Une nouvelle personne partage avec vous à "
+#: ../../view/theme/apw/php/config.php:259
+msgid "Item float"
+msgstr "Alignement de l'élément"
 
-#: ../../include/items.php:2438
-msgid "You have a new follower at "
-msgstr "Vous avez un nouvel abonné à "
+#: ../../view/theme/apw/php/config.php:260
+msgid "Left offset of the section element"
+msgstr "Décalage gauche de l'élément section"
 
-#: ../../include/message.php:13
-msgid "[no subject]"
-msgstr "[pas de sujet]"
+#: ../../view/theme/apw/php/config.php:261
+msgid "Right offset of the section element"
+msgstr "Décalage droit de l'élément section"
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-"Un groupe supprimé a été recréé. Les permissions existantes "
-"pourraient s'appliquer à ce groupe et aux futurs membres. "
-"Si ce n'est pas le comportement attendu, merci de re-créer un autre groupe "
-"sous un autre nom."
+#: ../../view/theme/apw/php/config.php:262
+msgid "Section width"
+msgstr "Largeur de la section"
 
-#: ../../include/group.php:165
-msgid "Create a new group"
-msgstr "Créer un nouveau groupe"
+#: ../../view/theme/apw/php/config.php:263
+msgid "Left offset of the aside"
+msgstr "Décalage gauche du panneau latéral"
 
-#: ../../include/group.php:166
-msgid "Everybody"
-msgstr "Tout le monde"
+#: ../../view/theme/apw/php/config.php:264
+msgid "Right offset of the aside element"
+msgstr "Décalage droit du panneau latéral"
+
+#: ../../view/theme/blogga/view/theme/blog/config.php:47
+#: ../../view/theme/blogga/php/config.php:47
+msgid "None"
+msgstr ""
 
-#: ../../include/diaspora.php:544
-msgid "Sharing notification from Diaspora network"
-msgstr "Notification de partage du réseau Diaspora"
+#: ../../view/theme/blogga/view/theme/blog/config.php:70
+#: ../../view/theme/blogga/php/config.php:70
+msgid "Header image"
+msgstr "Têtière"
 
-#: ../../include/diaspora.php:1527
-msgid "Attachments:"
-msgstr "Pièces jointes : "
+#: ../../view/theme/blogga/view/theme/blog/config.php:71
+#: ../../view/theme/blogga/php/config.php:71
+msgid "Header image only on profile pages"
+msgstr "Têtière seulement sur les profils"
 
-#: ../../include/diaspora.php:1710
+#: ../../boot.php:1232
 #, php-format
-msgid "[Relayed] Comment authored by %s from network %s"
-msgstr "[Relayé] Commentaire de %s sur le réseau %s"
+msgid "Update %s failed. See error logs."
+msgstr "La mise-à-jour %s a échoué. Merci de consulter les journaux d'erreur."
 
-#: ../../include/oembed.php:122
-msgid "Embedded content"
-msgstr "Contenu incorporé"
+#: ../../boot.php:1235
+#, php-format
+msgid "Update Error at %s"
+msgstr "Erreur de mise-à-jour sur %s"
 
-#: ../../include/oembed.php:131
-msgid "Embedding disabled"
-msgstr "Incorporation désactivée"
+#: ../../boot.php:1399
+msgid ""
+"Create an account to access services and applications within the Red Matrix"
+msgstr "Créez un compte pour pouvoir accéder aux services et applications de la Matrice Red"
+
+#: ../../boot.php:1427
+msgid "Password"
+msgstr "Mot de pass"
+
+#: ../../boot.php:1428
+msgid "Remember me"
+msgstr "Se souvenir de moi"
+
+#: ../../boot.php:1433
+msgid "Forgot your password?"
+msgstr "Mot de passe oublié?"
+
+#: ../../boot.php:1498
+msgid "permission denied"
+msgstr "permission refusée"
 
+#: ../../boot.php:1499
+msgid "Got Zot?"
+msgstr "T'as Zot?"
 
+#: ../../boot.php:1899
+msgid "toggle mobile"
+msgstr "(dés)activer mobile"
diff --git a/view/fr/strings.php b/view/fr/strings.php
index e24070ab9..8e491a56a 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -1,1183 +1,1722 @@
  1);
+	return ($n > 1);;
 }
 ;
-$a->strings["Not Found"] = "Non trouvé";
-$a->strings["Page not found."] = "Page introuvable.";
-$a->strings["Permission denied"] = "Permission refusée";
-$a->strings["Permission denied."] = "Permission refusée.";
-$a->strings["Delete this item?"] = "Effacer cet élément?";
-$a->strings["Comment"] = "Commenter";
-$a->strings["Create a New Account"] = "Créer un nouveau compte";
-$a->strings["Register"] = "S'inscrire";
-$a->strings["Logout"] = "Se déconnecter";
+$a->strings["Visible to everybody"] = "Visible par tous";
+$a->strings["show"] = "montrer";
+$a->strings["don't show"] = "cacher";
+$a->strings[" and "] = "et";
+$a->strings["public profile"] = "profil public";
+$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s a changé %2\$s en “%3\$s”";
+$a->strings["Visit %1\$s's %2\$s"] = "Visiter %1\$s de %2\$s";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s a mis-à-jour %2\$s, modifiant %3\$s.";
+$a->strings["Logout"] = "Déconnexion";
+$a->strings["End this session"] = "Mettre fin à la session";
+$a->strings["Home"] = "Canal";
+$a->strings["Your posts and conversations"] = "Vos publications et conversations";
+$a->strings["View Profile"] = "Voir profil";
+$a->strings["Your profile page"] = "Votre profil";
+$a->strings["Edit Profiles"] = "Éditer profils";
+$a->strings["Manage/Edit profiles"] = "Gérer/éditer profils";
+$a->strings["Photos"] = "Photos";
+$a->strings["Your photos"] = "Vos photos";
+$a->strings["Files"] = "Fichiers";
+$a->strings["Your files"] = "Vos fichiers";
+$a->strings["Chat"] = "Discussion";
+$a->strings["Your chatrooms"] = "Vos salons";
+$a->strings["Events"] = "Événements";
+$a->strings["Your events"] = "Vos événements";
+$a->strings["Bookmarks"] = "Marque-pages";
+$a->strings["Your bookmarks"] = "Vos marque-pages";
+$a->strings["Webpages"] = "Pages web";
+$a->strings["Your webpages"] = "Vos pages web";
 $a->strings["Login"] = "Connexion";
-$a->strings["Nickname or Email address: "] = "Pseudo ou courriel: ";
-$a->strings["Password: "] = "Mot de passe: ";
-$a->strings["OpenID: "] = "OpenID: ";
-$a->strings["Forgot your password?"] = "Mot de passe oublié?";
-$a->strings["Password Reset"] = "Réinitialiser le mot de passe";
-$a->strings["No profile"] = "Aucun profil";
-$a->strings["Edit profile"] = "Editer le profil";
+$a->strings["Sign in"] = "Connexion";
+$a->strings["%s - click to logout"] = "%s - cliquer pour déconnecter";
+$a->strings["Click to authenticate to your home hub"] = "S'authentifier auprès de son hébergement";
+$a->strings["Home Page"] = "Page d'accueil";
+$a->strings["Register"] = "Inscription";
+$a->strings["Create an account"] = "Créer un compte";
+$a->strings["Help"] = "Aide";
+$a->strings["Help and documentation"] = "Aide et documentation";
+$a->strings["Apps"] = "Applications";
+$a->strings["Addon applications, utilities, games"] = "Applications supplémentaires, jeux, utilitaires";
+$a->strings["Search"] = "Recherche";
+$a->strings["Search site content"] = "Recherche parmi le contenu du site";
+$a->strings["Directory"] = "Annuaire";
+$a->strings["Channel Locator"] = "Localisation de canaux";
+$a->strings["Matrix"] = "Matrice";
+$a->strings["Your matrix"] = "Votre matrice";
+$a->strings["Mark all matrix notifications seen"] = "Marquer toutes les notifications de la matrice comme vues";
+$a->strings["Channel Home"] = "Mon canal";
+$a->strings["Channel home"] = "Mon canal";
+$a->strings["Mark all channel notifications seen"] = "Marquer toutes les notifications du canal comme vues";
+$a->strings["Intros"] = "Introductions";
+$a->strings["New Connections"] = "Nouvelles relations";
+$a->strings["Notices"] = "Notifications";
+$a->strings["Notifications"] = "Notifications";
+$a->strings["See all notifications"] = "Voir toutes les notifications";
+$a->strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme vues";
+$a->strings["Mail"] = "Messages";
+$a->strings["Private mail"] = "Messages privés";
+$a->strings["See all private messages"] = "Voir tous les messages privés";
+$a->strings["Mark all private messages seen"] = "Marquer tous les messages privés comme vus";
+$a->strings["Inbox"] = "Boîte de réception";
+$a->strings["Outbox"] = "Boîte d'envoi";
+$a->strings["New Message"] = "Nouveau message";
+$a->strings["Event Calendar"] = "Calendrier des événements";
+$a->strings["See all events"] = "Voir tous les événements";
+$a->strings["Mark all events seen"] = "Marquer tous les événements comme vus";
+$a->strings["Channel Select"] = "Changer de canal";
+$a->strings["Manage Your Channels"] = "Gérer vos canaux";
+$a->strings["Settings"] = "Réglages";
+$a->strings["Account/Channel Settings"] = "Compte/Canal";
+$a->strings["Connections"] = "Relations";
+$a->strings["Manage/Edit Friends and Connections"] = "Gérer les amis et relations";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site Setup and Configuration"] = "Configuration du site";
+$a->strings["Nothing new here"] = "Rien de neuf ici";
+$a->strings["Please wait..."] = "Merci de patienter...";
+$a->strings["prev"] = "préc.";
+$a->strings["first"] = "premier";
+$a->strings["last"] = "dernier";
+$a->strings["next"] = "suiv.";
+$a->strings["older"] = "plus ancien";
+$a->strings["newer"] = "plus récent";
+$a->strings["No connections"] = "Sans relations";
+$a->strings["%d Connection"] = array(
+	0 => "%d relation",
+	1 => "%d relations",
+);
+$a->strings["View Connections"] = "Voir les relations";
+$a->strings["Save"] = "Sauver";
+$a->strings["poke"] = "tapoter";
+$a->strings["poked"] = "tapoté";
+$a->strings["ping"] = "solliciter";
+$a->strings["pinged"] = "sollicité";
+$a->strings["prod"] = "aiguillonner";
+$a->strings["prodded"] = "aiguillonné";
+$a->strings["slap"] = "baffer";
+$a->strings["slapped"] = "baffé";
+$a->strings["finger"] = "pointer";
+$a->strings["fingered"] = "pointé";
+$a->strings["rebuff"] = "rejetter";
+$a->strings["rebuffed"] = "rejetté";
+$a->strings["happy"] = "bonheur";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "mélancolie";
+$a->strings["tired"] = "fatigue";
+$a->strings["perky"] = "impertinence";
+$a->strings["angry"] = "colère";
+$a->strings["stupified"] = "stupeur";
+$a->strings["puzzled"] = "perplexité";
+$a->strings["interested"] = "intérêt";
+$a->strings["bitter"] = "amertune";
+$a->strings["cheerful"] = "entrain";
+$a->strings["alive"] = "vivacité";
+$a->strings["annoyed"] = "agaçement";
+$a->strings["anxious"] = "anxiété";
+$a->strings["cranky"] = "mauvais poil";
+$a->strings["disturbed"] = "perturbation";
+$a->strings["frustrated"] = "frustration";
+$a->strings["motivated"] = "motivation";
+$a->strings["relaxed"] = "détente";
+$a->strings["surprised"] = "surprise";
+$a->strings["Monday"] = "Lundi";
+$a->strings["Tuesday"] = "Mardi";
+$a->strings["Wednesday"] = "Mercredi";
+$a->strings["Thursday"] = "Jeudi";
+$a->strings["Friday"] = "Vendredi";
+$a->strings["Saturday"] = "Samedi";
+$a->strings["Sunday"] = "Dimanche";
+$a->strings["January"] = "Janvier";
+$a->strings["February"] = "Février";
+$a->strings["March"] = "Mars";
+$a->strings["April"] = "Avril";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juin";
+$a->strings["July"] = "Juillet";
+$a->strings["August"] = "Août";
+$a->strings["September"] = "Septembre";
+$a->strings["October"] = "Octobre";
+$a->strings["November"] = "Novembre";
+$a->strings["December"] = "Décembre";
+$a->strings["unknown.???"] = "inconnu.???";
+$a->strings["bytes"] = "octets";
+$a->strings["remove category"] = "suppr. catégorie";
+$a->strings["remove from file"] = "supprimer du fichier";
+$a->strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
+$a->strings["link to source"] = "lien vers source";
+$a->strings["Select a page layout: "] = "Choisir une mise en page :";
+$a->strings["default"] = "défaut";
+$a->strings["Page content type: "] = "Type de contenu :";
+$a->strings["Select an alternate language"] = "Choisir une langue alternative";
+$a->strings["photo"] = "photo";
+$a->strings["event"] = "événement";
+$a->strings["status"] = "statut";
+$a->strings["comment"] = "commentaire";
+$a->strings["activity"] = "activité";
+$a->strings["Design"] = "Conception";
+$a->strings["Blocks"] = "Blocs";
+$a->strings["Menus"] = "Menus";
+$a->strings["Layouts"] = "Mises-en-page";
+$a->strings["Pages"] = "Pages";
+$a->strings["Categories"] = "Catégories";
 $a->strings["Connect"] = "Relier";
+$a->strings["Ignore/Hide"] = "Ignorer/Cacher";
+$a->strings["Suggestions"] = "Suggestion";
+$a->strings["See more..."] = "Voir plus...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Vous avez %1$.0f des %2$.0f relations autorisées.";
+$a->strings["Add New Connection"] = "Ajouter une nouvelle relation";
+$a->strings["Enter the channel address"] = "Adresse du canal";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple : bob@exemple.com, http://exemple.com/barbara";
+$a->strings["Notes"] = "Notes";
+$a->strings["Remove term"] = "Retirer le terme";
+$a->strings["Saved Searches"] = "Recherches sauvées";
+$a->strings["add"] = "ajouter";
+$a->strings["Saved Folders"] = "Dossiers sauvegardés";
+$a->strings["Everything"] = "Tout";
+$a->strings["Archives"] = "Archives";
+$a->strings["Refresh"] = "Actualiser";
+$a->strings["Me"] = "Moi";
+$a->strings["Best Friends"] = "Mes meilleurs amis";
+$a->strings["Friends"] = "Amis";
+$a->strings["Co-workers"] = "Mes collègues";
+$a->strings["Former Friends"] = "Mes anciens amis";
+$a->strings["Acquaintances"] = "Mes accointances";
+$a->strings["Everybody"] = "Tout le monde";
+$a->strings["Account settings"] = "Compte";
+$a->strings["Channel settings"] = "Canal";
+$a->strings["Additional features"] = "Fonc. supplémentaires";
+$a->strings["Feature settings"] = "Fonctionnalités";
+$a->strings["Display settings"] = "Affichage";
+$a->strings["Connected apps"] = "Applications";
+$a->strings["Export channel"] = "Exporter canal";
+$a->strings["Automatic Permissions (Advanced)"] = "Permissions automatiques (avancé)";
+$a->strings["Premium Channel Settings"] = "Canal Premium";
+$a->strings["Channel Sources"] = "Canaux sources";
+$a->strings["Check Mail"] = "Vérifier courriel";
+$a->strings["Chat Rooms"] = "Salons";
+$a->strings["New window"] = "Nouvelle fenêtre";
+$a->strings["Open the selected location in a different window or browser tab"] = "Ouvrir l'emplacement dans une fenêtre (ou un onglet) différent";
+$a->strings["General Features"] = "Fonctionnalités générales";
+$a->strings["Content Expiration"] = "Expiration de contenu";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Supprimer les contributions/commentaires et/ou messages privés à un moment futur";
+$a->strings["Multiple Profiles"] = "Profils multiples";
+$a->strings["Ability to create multiple profiles"] = "Possibilité de créer plusieurs profils";
+$a->strings["Web Pages"] = "Pages web";
+$a->strings["Provide managed web pages on your channel"] = "Fournir des pages web, sous votre contrôle, sur votre canal";
+$a->strings["Private Notes"] = "Notes privées";
+$a->strings["Enables a tool to store notes and reminders"] = "Active un outil pour stocker notes et mémos";
+$a->strings["Extended Identity Sharing"] = "Partage d'identité étendue";
+$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Partage votre identité avec tous les sites web du Monde. Si décoché, l'identité sera seulement partagée avec les sites de la matrice.";
+$a->strings["Expert Mode"] = "Mode expert";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Activer le mode expert pour accéder aux options avancées";
+$a->strings["Premium Channel"] = "Canal Premium";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Vous permet d'appliquer des règles et restrictions aux relations de votre canal";
+$a->strings["Post Composition Features"] = "Fonctionnalités de composition";
+$a->strings["Richtext Editor"] = "Éditeur enrichi";
+$a->strings["Enable richtext editor"] = "Activer l'éditeur de texte enrichi";
+$a->strings["Post Preview"] = "Aperçu avant publication";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Permettre de voir les publications/commentaires avant de les valider";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importe automatiquement le contenus d'autres canaux ou flux dans le canal en cours";
+$a->strings["Even More Encryption"] = "Encore plus de chiffrement";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permettre le chiffrement - optionnel - du contenu de bout-en-bout au moyen d'un secret partagé";
+$a->strings["Network and Stream Filtering"] = "Filtrage du réseau et des flux";
+$a->strings["Search by Date"] = "Chercher par date";
+$a->strings["Ability to select posts by date ranges"] = "Pouvoir choisir des publications par date";
+$a->strings["Collections Filter"] = "Filtre des collections";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Activer une boîte qui permet de filtrer les publications du réseau parmi les collections selectionnées";
+$a->strings["Save search terms for re-use"] = "Sauver des termes de recherche pour utilisation ultérieure";
+$a->strings["Network Personal Tab"] = "Onglet \"réseau personnel\"";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Activer un onglet affichant seulement les publications du réseau sur lesquelles vous êtes intervenu";
+$a->strings["Network New Tab"] = "Onglet \"nouveautés réseau\"";
+$a->strings["Enable tab to display all new Network activity"] = "Activer un onglet avec toute activité récente sur le réseau";
+$a->strings["Affinity Tool"] = "Gérer l'affinité";
+$a->strings["Filter stream activity by depth of relationships"] = "Filtrer le flux d'activité en fonction de la profondeur des relations";
+$a->strings["Suggest Channels"] = "Suggérer des canaux";
+$a->strings["Show channel suggestions"] = "Montrer les suggestions de canaux";
+$a->strings["Post/Comment Tools"] = "Gérer les publications/commentaires";
+$a->strings["Edit Sent Posts"] = "Éditer les publications envoyées";
+$a->strings["Edit and correct posts and comments after sending"] = "Permettre d'éditer/corriger les publications/commentaires après envoi";
+$a->strings["Tagging"] = "Marquage";
+$a->strings["Ability to tag existing posts"] = "Permettre de marquer les publications existantes";
+$a->strings["Post Categories"] = "Catégoriser les publications";
+$a->strings["Add categories to your posts"] = "Ajouter des catégories à vos publications";
+$a->strings["Ability to file posts under folders"] = "Permettre de classer les publications dans des dossiers";
+$a->strings["Dislike Posts"] = "Détester une publication";
+$a->strings["Ability to dislike posts/comments"] = "Pouvoir détester les publications/commentaires";
+$a->strings["Star Posts"] = "Mettre en avant les publications";
+$a->strings["Ability to mark special posts with a star indicator"] = "Pouvoir marquer certaines publications d'une étoile";
+$a->strings["Tag Cloud"] = "Nuage de tags";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Afficher un nuage de vos tags sur votre canal";
+$a->strings["Unknown | Not categorised"] = "Inconnu / Non-classé";
+$a->strings["Block immediately"] = "Bloquer directement";
+$a->strings["Shady, spammer, self-marketer"] = "Douteux, spammeur, donne dans l'auto-promotion";
+$a->strings["Known to me, but no opinion"] = "M'est connu, n'ai pas d'opinion à son sujet";
+$a->strings["OK, probably harmless"] = "OK, probablement anodin";
+$a->strings["Reputable, has my trust"] = "Réputé, je lui fais confiance";
+$a->strings["Frequently"] = "Constamment";
+$a->strings["Hourly"] = "Chaque heure";
+$a->strings["Twice daily"] = "Deux fois par jour";
+$a->strings["Daily"] = "Chaque jour";
+$a->strings["Weekly"] = "Chaque semaine";
+$a->strings["Monthly"] = "Chaque mois";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "Courriel";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "Linkedin";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Miscellaneous"] = "Divers";
+$a->strings["year"] = "année";
+$a->strings["month"] = "mois";
+$a->strings["day"] = "jour";
+$a->strings["never"] = "jamais";
+$a->strings["less than a second ago"] = "à l'instant";
+$a->strings["years"] = "années";
+$a->strings["months"] = "mois";
+$a->strings["week"] = "semaine";
+$a->strings["weeks"] = "semaines";
+$a->strings["days"] = "jours";
+$a->strings["hour"] = "heure";
+$a->strings["hours"] = "heures";
+$a->strings["minute"] = "minute";
+$a->strings["minutes"] = "minutes";
+$a->strings["second"] = "seconde";
+$a->strings["seconds"] = "secondes";
+$a->strings["%1\$d %2\$s ago"] = "il y a %1\$d %2\$s";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Impossible de trouver les infos DNS du serveur de DB '%s'";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\à G\\hi";
+$a->strings["Starts:"] = "Début :";
+$a->strings["Finishes:"] = "Fin :";
+$a->strings["Location:"] = "Localisation :";
+$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un groupe supprimé portant ce nom a été ressuscité. Les permissions liées aux éléments existants peuvent s'appliquer au groupe et aux membres futurs. Si ce n'est pas ce que vous attendiez, merci de recréer un nouveau groupe avec un nom différent.";
+$a->strings["Default privacy group for new contacts"] = "Groupe de confidentialité par défaut pour les nouveaux contacts";
+$a->strings["All Channels"] = "Tous canaux";
+$a->strings["edit"] = "éditer";
+$a->strings["Collections"] = "Collections";
+$a->strings["Edit collection"] = "Éditer collection";
+$a->strings["Create a new collection"] = "Créer collection";
+$a->strings["Channels not in any collection"] = "Canaux dans aucune collection";
+$a->strings["Delete this item?"] = "Supprimer cet élément?";
+$a->strings["Comment"] = "Commenter";
+$a->strings["show more"] = "montrer plus";
+$a->strings["show fewer"] = "montrer moins";
+$a->strings["Password too short"] = "Mot de passe trop court";
+$a->strings["Passwords do not match"] = "Les mots de passe ne correspondent pas";
+$a->strings["everybody"] = "tout le monde";
+$a->strings["Secret Passphrase"] = "Phrase de passe secrète";
+$a->strings["Passphrase hint"] = "Indice pour la phrase de passe";
+$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo";
+$a->strings["ago"] = "auparavant";
+$a->strings["from now"] = "de maintenant";
+$a->strings["less than a minute"] = "moins d'une minute";
+$a->strings["about a minute"] = "environ une minute";
+$a->strings["%d minutes"] = "%d minutes";
+$a->strings["about an hour"] = "environ une heure";
+$a->strings["about %d hours"] = "environ %d heures";
+$a->strings["a day"] = "un jour";
+$a->strings["%d days"] = "%d jours";
+$a->strings["about a month"] = "environ un mois";
+$a->strings["%d months"] = "%d mois";
+$a->strings["about a year"] = "environ un an";
+$a->strings["%d years"] = "%d années";
+$a->strings[" "] = "";
+$a->strings["timeago.numbers"] = "timeago.numbers";
+$a->strings["No recipient provided."] = "Pas de destinataire.";
+$a->strings["[no subject]"] = "[sans objet]";
+$a->strings["Unable to determine sender."] = "Impossible de déterminer l'émetteur.";
+$a->strings["Stored post could not be verified."] = "Le message stocké n'a pas pu être vérifié.";
+$a->strings["Profile Photos"] = "Photos du profil";
+$a->strings["Permission denied."] = "Permission refusée.";
+$a->strings["Item was not found."] = "Élément introuvable.";
+$a->strings["No source file."] = "Pas de fichier source.";
+$a->strings["Cannot locate file to replace"] = "Impossible de trouver le fichier à remplacer.";
+$a->strings["Cannot locate file to revise/update"] = "Impossible de trouver le fichier à corriger/mettre-à-jour";
+$a->strings["File exceeds size limit of %d"] = "Le fichier dépasse la taille limite de %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le stockage des pièces-jointes";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Envoi du fichier impossible. Limite système ou action avortée.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Le fichier stocké n'a pu être vérifié. Envoi impossible.";
+$a->strings["Path not available."] = "Chemin non disponible.";
+$a->strings["Empty pathname"] = "Chemin vide";
+$a->strings["duplicate filename or path"] = "doublon de chemin ou de fichier";
+$a->strings["Path not found."] = "Chemin introuvable.";
+$a->strings["mkdir failed."] = "mkdir a échoué.";
+$a->strings["database storage failed."] = "le stockage en BD a échoué";
+$a->strings["Image/photo"] = "Image/photo";
+$a->strings["Encrypted content"] = "Contenu chiffré";
+$a->strings["QR code"] = "QR code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s a écrit le %2\$s suivant %3\$s";
+$a->strings["post"] = "article";
+$a->strings["$1 wrote:"] = "$1 a écrit :";
+$a->strings["%1\$s's bookmarks"] = "Marque-pages de %1\$s";
+$a->strings["channel"] = "canal";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s aime %3\$s de %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s déteste %3\$s de %2\$s";
+$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s est désormais relié à %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s a tapoté %2\$s";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s est actuellement %2\$s";
+$a->strings["Select"] = "Sélectionner";
+$a->strings["Delete"] = "Supprimer";
+$a->strings["Message is verified"] = "Message vérifié";
+$a->strings["View %s's profile @ %s"] = "Voir le profil de %s @ %s";
+$a->strings["Categories:"] = "Catégories :";
+$a->strings["Filed under:"] = "Classé sous :";
+$a->strings[" from %s"] = "de %s";
+$a->strings["last edited: %s"] = "dernière édition : %s";
+$a->strings["Expires: %s"] = "Expire : %s";
+$a->strings["View in context"] = "Voir en contexte";
+$a->strings["Please wait"] = "Merci de patienter";
+$a->strings["remove"] = "supprimer";
+$a->strings["Loading..."] = "Chargement...";
+$a->strings["Delete Selected Items"] = "Supprimer les éléments selectionnés";
+$a->strings["View Source"] = "Voir source";
+$a->strings["Follow Thread"] = "Suivre discussion";
+$a->strings["View Status"] = "Voir état";
+$a->strings["View Photos"] = "Voir photos";
+$a->strings["Matrix Activity"] = "Activité de la matrice";
+$a->strings["Edit Contact"] = "Éditer contact";
+$a->strings["Send PM"] = "Message privé";
+$a->strings["Poke"] = "Tapoter";
+$a->strings["%s likes this."] = "%s aime ça.";
+$a->strings["%s doesn't like this."] = "%s déteste ça.";
+$a->strings["%2\$d people like this."] = array(
+	0 => "",
+	1 => "%2\$d personne(s) aime(nt) ça.",
+);
+$a->strings["%2\$d people don't like this."] = array(
+	0 => "",
+	1 => "%2\$d personne(s) déteste(nt) ça.",
+);
+$a->strings["and"] = "et";
+$a->strings[", and %d other people"] = array(
+	0 => "",
+	1 => ", et %d autre(s) personne(s)",
+);
+$a->strings["%s like this."] = "%s aime ça.";
+$a->strings["%s don't like this."] = "%s déteste ça.";
+$a->strings["Visible to everybody"] = "Visible par tout le monde";
+$a->strings["Please enter a link URL:"] = "Merci d'entrer l'URL d'un lien :";
+$a->strings["Please enter a video link/URL:"] = "Merci d'entrer l'URL d'une video :";
+$a->strings["Please enter an audio link/URL:"] = "Merci d'entrer l'URL d'un contenu audio&nsbp;:";
+$a->strings["Tag term:"] = "Étiquette :";
+$a->strings["Save to Folder:"] = "Classer dans Dossier :";
+$a->strings["Where are you right now?"] = "Où êtes-vous présentement?";
+$a->strings["Expires YYYY-MM-DD HH:MM"] = "Expire YYYY-MM-DD HH:MM";
+$a->strings["Preview"] = "Aperçu";
+$a->strings["Share"] = "Partager";
+$a->strings["Page link title"] = "Titre de la page liée";
+$a->strings["Upload photo"] = "Téléverser photo";
+$a->strings["upload photo"] = "téléverser photo";
+$a->strings["Attach file"] = "Attacher fichier";
+$a->strings["attach file"] = "attacher fichier";
+$a->strings["Insert web link"] = "Insérer lien web";
+$a->strings["web link"] = "lien web";
+$a->strings["Insert video link"] = "Insérer lien vidéo";
+$a->strings["video link"] = "lien vidéo";
+$a->strings["Insert audio link"] = "Insérer lien audio";
+$a->strings["audio link"] = "lien audio";
+$a->strings["Set your location"] = "Spécifier votre localisation";
+$a->strings["set location"] = "spécifier localisation";
+$a->strings["Clear browser location"] = "Nettoyer la localisation du navigateur";
+$a->strings["clear location"] = "nettoyer localisation";
+$a->strings["Set title"] = "Spécifier le titre";
+$a->strings["Categories (comma-separated list)"] = "Catégories (séparées par des virgules)";
+$a->strings["Permission settings"] = "Permissions";
+$a->strings["permissions"] = "permissions";
+$a->strings["Public post"] = "Contenu public";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: robert@exemple.com, marie@exemple.com";
+$a->strings["Set expiration date"] = "Définir la date d'expiration";
+$a->strings["Encrypt text"] = "Chiffrer le texte";
+$a->strings["OK"] = "Ok";
+$a->strings["Cancel"] = "Annuler";
+$a->strings["Commented Order"] = "Dans l'ordre des commentaires";
+$a->strings["Sort by Comment Date"] = "Trier par date de dernier commentaire";
+$a->strings["Posted Order"] = "Dans l'ordre des publications";
+$a->strings["Sort by Post Date"] = "Trier par date de publication";
+$a->strings["Personal"] = "Personnel";
+$a->strings["Posts that mention or involve you"] = "Publications qui vous mentionnent ou vous concernent d'une manière ou d'une autre";
+$a->strings["New"] = "Nouveautés";
+$a->strings["Activity Stream - by date"] = "Flux d'activité - par date";
+$a->strings["Starred"] = "Mis en avant";
+$a->strings["Favourite Posts"] = "Publications préférées";
+$a->strings["Spam"] = "Spam";
+$a->strings["Posts flagged as SPAM"] = "Publications marquées comme indésirables";
+$a->strings["Channel"] = "Canal";
+$a->strings["Status Messages and Posts"] = "Messages d'état et contributions";
+$a->strings["About"] = "À propos";
+$a->strings["Profile Details"] = "Détails du profil";
+$a->strings["Photo Albums"] = "Albums photo";
+$a->strings["Files and Storage"] = "Fichiers et Stockage";
+$a->strings["Chatrooms"] = "Salons";
+$a->strings["Events and Calendar"] = "Événements et agenda";
+$a->strings["Saved Bookmarks"] = "Marque-pages sauvegardés";
+$a->strings["Manage Webpages"] = "Gérer les pages web";
+$a->strings["Unable to obtain identity information from database"] = "Impossible d'obtenir les données d'identité depuis la base de données";
+$a->strings["Empty name"] = "Nom vide";
+$a->strings["Name too long"] = "Nom trop long";
+$a->strings["No account identifier"] = "Pas d'identifiant de compte";
+$a->strings["Nickname is required."] = "Un surnom est requis.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Le surnom contient des caractères interdits, ou est déjà pris sur ce site.";
+$a->strings["Unable to retrieve created identity"] = "Impossible de récupérer l'identité créée";
+$a->strings["Default Profile"] = "Profil par défaut";
+$a->strings["Requested channel is not available."] = "Canal demandé non-disponible.";
+$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Désolé, mais vous n'avez pas l'autorisation de voir ce profil.";
+$a->strings["Requested profile is not available."] = "Profil demandé inaccessible.";
+$a->strings["Change profile photo"] = "Changer la photo du profil";
 $a->strings["Profiles"] = "Profils";
-$a->strings["Manage/edit profiles"] = "Gérer/éditer les profils";
-$a->strings["Change profile photo"] = "Changer de photo de profil";
+$a->strings["Manage/edit profiles"] = "Gérer/éditer profils";
 $a->strings["Create New Profile"] = "Créer un nouveau profil";
+$a->strings["Edit Profile"] = "Éditer profil";
 $a->strings["Profile Image"] = "Image du profil";
 $a->strings["visible to everybody"] = "visible par tous";
-$a->strings["Edit visibility"] = "Changer la visibilité";
-$a->strings["Location:"] = "Localisation:";
-$a->strings["Gender:"] = "Genre:";
-$a->strings["Status:"] = "Statut:";
-$a->strings["Homepage:"] = "Page personnelle:";
-$a->strings["g A l F d"] = "g A | F d";
-$a->strings["F d"] = "F d";
-$a->strings["Birthday Reminders"] = "Rappels d'anniversaires";
-$a->strings["Birthdays this week:"] = "Anniversaires cette semaine:";
+$a->strings["Edit visibility"] = "Éditer la visibilité";
+$a->strings["Gender:"] = "Sexe :";
+$a->strings["Status:"] = "État :";
+$a->strings["Homepage:"] = "Site web :";
+$a->strings["Online Now"] = "Connecté";
+$a->strings["g A l F d"] = "H:i l d F";
+$a->strings["F d"] = "d F";
 $a->strings["[today]"] = "[aujourd'hui]";
+$a->strings["Birthday Reminders"] = "Rappels d'anniversaires";
+$a->strings["Birthdays this week:"] = "Anniversaires cette semaine :";
+$a->strings["[No description]"] = "[Pas de description]";
 $a->strings["Event Reminders"] = "Rappels d'événements";
-$a->strings["Events this week:"] = "Evénements cette semaine:";
-$a->strings["[No description]"] = "[Sans description]";
-$a->strings["Status"] = "Statut";
+$a->strings["Events this week:"] = "Événements cette semaine :";
 $a->strings["Profile"] = "Profil";
-$a->strings["Photos"] = "Photos";
-$a->strings["Events"] = "Evènements";
-$a->strings["Personal Notes"] = "Notes personnelles";
-$a->strings["Welcome back %s"] = "Bienvenue à nouveau, %s";
-$a->strings["Manage Identities and/or Pages"] = "Gérer les identités et/ou les pages";
-$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = "(Bascule entre les différentes identités ou pages qui se partagent votre compte.)";
-$a->strings["Select an identity to manage: "] = "Choisir une identité à gérer: ";
+$a->strings["Full Name:"] = "Nom complet :";
+$a->strings["j F, Y"] = "j F Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Date de naissance :";
+$a->strings["Age:"] = "Age :";
+$a->strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Orientation sexuelle :";
+$a->strings["Hometown:"] = "Ville natale :";
+$a->strings["Tags:"] = "Tags:";
+$a->strings["Political Views:"] = "Opinions politiques :";
+$a->strings["Religion:"] = "Religion :";
+$a->strings["About:"] = "À propos :";
+$a->strings["Hobbies/Interests:"] = "Occupations/Centres d'intérêt :";
+$a->strings["Likes:"] = "Aime :";
+$a->strings["Dislikes:"] = "N'aime pas :";
+$a->strings["Contact information and Social Networks:"] = "Coordonnées et réseaux sociaux :";
+$a->strings["My other channels:"] = "Mes autres canaux :";
+$a->strings["Musical interests:"] = "Goûts musicaux :";
+$a->strings["Books, literature:"] = "Lectures, goûts littéraires :";
+$a->strings["Television:"] = "Télévision :";
+$a->strings["Film/dance/culture/entertainment:"] = "Cinéma/danse/culture/divertissement&nsbp;:";
+$a->strings["Love/Romance:"] = "Vie sentimentale/amoureuse :";
+$a->strings["Work/employment:"] = "Travail :";
+$a->strings["School/education:"] = "Cursus :";
+$a->strings["Private Message"] = "Message Privé";
+$a->strings["Edit"] = "Éditer";
+$a->strings["save to folder"] = "classer dans un dossier";
+$a->strings["add star"] = "mettre en avant";
+$a->strings["remove star"] = "ne plus mettre en avant";
+$a->strings["toggle star status"] = "(dé)marquer";
+$a->strings["starred"] = "mis en avant";
+$a->strings["add tag"] = "étiquetter";
+$a->strings["I like this (toggle)"] = "J'aime (oui/non)";
+$a->strings["like"] = "aime";
+$a->strings["I don't like this (toggle)"] = "Je déteste (oui/non)";
+$a->strings["dislike"] = "déteste";
+$a->strings["Share this"] = "Partager ça";
+$a->strings["share"] = "partage";
+$a->strings["View %s's profile - %s"] = "Voir le profil de %s - %s";
+$a->strings["to"] = "à";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Mur-mur";
+$a->strings["via Wall-To-Wall:"] = "par Mur-mur :";
+$a->strings["Bookmark Links"] = "";
+$a->strings["%d comment"] = array(
+	0 => "%d commentaire",
+	1 => "%d commentaires",
+);
+$a->strings["This is you"] = "C'est vous";
 $a->strings["Submit"] = "Envoyer";
-$a->strings["People Search"] = "Recherche de personnes";
-$a->strings["No matches"] = "Aucune correspondance";
-$a->strings["Image exceeds size limit of %d"] = "L'image dépasse la taille limite de %d";
-$a->strings["Unable to process image."] = "Impossible de traiter l'image.";
-$a->strings["Wall Photos"] = "Photos du mur";
-$a->strings["Image upload failed."] = "Le téléversement de l'image a échoué.";
-$a->strings["Access to this profile has been restricted."] = "L'accès au profil a été restreint.";
-$a->strings["Tips for New Members"] = "Conseils aux nouveaux";
-$a->strings["Disallowed profile URL."] = "URL de profil interdite.";
-$a->strings["This site is not configured to allow communications with other networks."] = "Ce site n'est pas configuré pour dialoguer avec d'autres réseaux.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Aucun protocole de communication ni aucun flux n'a pu être découvert.";
-$a->strings["The profile address specified does not provide adequate information."] = "L'adresse de profil indiquée ne fournit par les informations adéquates.";
-$a->strings["An author or name was not found."] = "Aucun auteur ou nom d'auteur n'a pu être trouvé.";
-$a->strings["No browser URL could be matched to this address."] = "Aucune URL de navigation ne correspond à cette adresse.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "L'adresse de profil spécifiée correspond à un réseau qui a été désactivé sur ce site.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profil limité. Cette personne ne sera pas capable de recevoir des notifications directes/personnelles de votre part.";
-$a->strings["Unable to retrieve contact information."] = "Impossible de récupérer les informations du contact.";
-$a->strings["following"] = "following";
-$a->strings["Image uploaded but image cropping failed."] = "Image envoyée, mais impossible de la retailler.";
-$a->strings["Profile Photos"] = "Photos du profil";
-$a->strings["Image size reduction [%s] failed."] = "Réduction de la taille de l'image [%s] échouée.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement.";
-$a->strings["Unable to process image"] = "Impossible de traiter l'image";
-$a->strings["Upload File:"] = "Fichier à téléverser:";
-$a->strings["Upload Profile Photo"] = "Téléverser une photo de profil";
-$a->strings["Upload"] = "Téléverser";
-$a->strings["or"] = "ou";
-$a->strings["skip this step"] = "ignorer cette étape";
-$a->strings["select a photo from your photo albums"] = "choisissez une photo depuis vos albums";
-$a->strings["Crop Image"] = "(Re)cadrer l'image";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Ajustez le cadre de l'image pour une visualisation optimale.";
-$a->strings["Done Editing"] = "Édition terminée";
-$a->strings["Image uploaded successfully."] = "Image téléversée avec succès.";
-$a->strings["Welcome to %s"] = "Bienvenue sur %s";
-$a->strings["[Embedded content - reload page to view]"] = "[contenu incorporé - rechargez la page pour le voir]";
-$a->strings["File exceeds size limit of %d"] = "La taille du fichier dépasse la limite de %d";
-$a->strings["File upload failed."] = "Le téléversement a échoué.";
-$a->strings["Friend Suggestions"] = "Suggestions d'amitiés/contacts";
-$a->strings["No suggestions. This works best when you have more than one contact/friend."] = "Pas de suggestion. Ceci fonctionne mieux quand vous avez plus d'un ami/contact.";
-$a->strings["Ignore/Hide"] = "Ignorer/cacher";
-$a->strings["Registration details for %s"] = "Détails d'inscription pour %s";
+$a->strings["Bold"] = "Gras";
+$a->strings["Italic"] = "Italique";
+$a->strings["Underline"] = "Souligné";
+$a->strings["Quote"] = "Citation";
+$a->strings["Code"] = "Code";
+$a->strings["Image"] = "Image";
+$a->strings["Link"] = "Lien/URL";
+$a->strings["Video"] = "Vidéo";
+$a->strings["Public Timeline"] = "Fil public";
+$a->strings["view full size"] = "pleine taille";
+$a->strings["created a new post"] = "a publié";
+$a->strings["commented on %s's post"] = "a commenté la publication de %s";
+$a->strings["Male"] = "Mâle";
+$a->strings["Female"] = "Femelle";
+$a->strings["Currently Male"] = "Actuellement mâle";
+$a->strings["Currently Female"] = "Actuellement femelle";
+$a->strings["Mostly Male"] = "Surtout mâle";
+$a->strings["Mostly Female"] = "Surtotu femelle";
+$a->strings["Transgender"] = "Transgenre";
+$a->strings["Intersex"] = "Intersexuel";
+$a->strings["Transsexual"] = "Transsexuel";
+$a->strings["Hermaphrodite"] = "Hermaphrodite";
+$a->strings["Neuter"] = "Neutre";
+$a->strings["Non-specific"] = "Rien de spécifique";
+$a->strings["Other"] = "Autre";
+$a->strings["Undecided"] = "Indécis";
+$a->strings["Males"] = "Hommes";
+$a->strings["Females"] = "Femmes";
+$a->strings["Gay"] = "Gay";
+$a->strings["Lesbian"] = "Lesbienne";
+$a->strings["No Preference"] = "Sans préférence";
+$a->strings["Bisexual"] = "Bisexuel";
+$a->strings["Autosexual"] = "Autosexuel";
+$a->strings["Abstinent"] = "Abstinent";
+$a->strings["Virgin"] = "Vierge";
+$a->strings["Deviant"] = "Déviant";
+$a->strings["Fetish"] = "Fétichiste";
+$a->strings["Oodles"] = "Une floppée";
+$a->strings["Nonsexual"] = "Nonsexuel";
+$a->strings["Single"] = "Célibataire";
+$a->strings["Lonely"] = "Esseulé";
+$a->strings["Available"] = "Disponible";
+$a->strings["Unavailable"] = "Indisponible";
+$a->strings["Has crush"] = "A un béguin";
+$a->strings["Infatuated"] = "Amoureux transi";
+$a->strings["Dating"] = "Sort avec quelqu'un";
+$a->strings["Unfaithful"] = "Infidèle";
+$a->strings["Sex Addict"] = "Accro au sexe";
+$a->strings["Friends/Benefits"] = "Amis avec bénéfices";
+$a->strings["Casual"] = "Sans engagement";
+$a->strings["Engaged"] = "Fiancé(e)";
+$a->strings["Married"] = "Marrié(e)";
+$a->strings["Imaginarily married"] = "Marié(e) dans ses rêves";
+$a->strings["Partners"] = "Partenaires";
+$a->strings["Cohabiting"] = "En cohabitation";
+$a->strings["Common law"] = "Conjoints de fait";
+$a->strings["Happy"] = "Heureux";
+$a->strings["Not looking"] = "Pas en recherche";
+$a->strings["Swinger"] = "Infidèle";
+$a->strings["Betrayed"] = "Trahi(e)";
+$a->strings["Separated"] = "Séparé(e)";
+$a->strings["Unstable"] = "Instable";
+$a->strings["Divorced"] = "Divorcé(e)";
+$a->strings["Imaginarily divorced"] = "Divorcé(e) dans ses rêves";
+$a->strings["Widowed"] = "Veuf/veuve";
+$a->strings["Uncertain"] = "Incertain";
+$a->strings["It's complicated"] = "C'est compliqué";
+$a->strings["Don't care"] = "S'en fiche";
+$a->strings["Ask me"] = "Me demander";
+$a->strings["Missing room name"] = "Il manque le nom du salon";
+$a->strings["Duplicate room name"] = "Un salon de ce nom existe déjà";
+$a->strings["Invalid room specifier."] = "Identifiant de salon invalide.";
+$a->strings["Room not found."] = "Salon introuvable.";
+$a->strings["Room is full"] = "Le salon est plein";
+$a->strings["Tags"] = "Étiquettes";
+$a->strings["Keywords"] = "Mots-clefs";
+$a->strings["have"] = "ont";
+$a->strings["has"] = "a";
+$a->strings["want"] = "veulent";
+$a->strings["wants"] = "veut";
+$a->strings["likes"] = "aime";
+$a->strings["dislikes"] = "déteste";
+$a->strings["Logged out."] = "Deconnecté.";
+$a->strings["Failed authentication"] = "Échec de l'authentification";
+$a->strings["Login failed."] = "Échec de la connexion.";
+$a->strings["Not a valid email address"] = "Ce n'est pas une adresse de courriel valide";
+$a->strings["Your email domain is not among those allowed on this site"] = "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site";
+$a->strings["Your email address is already registered at this site."] = "Votre adresse de courriel est déjà inscrite sur ce site.";
+$a->strings["An invitation is required."] = "Une invitation est requise.";
+$a->strings["Invitation could not be verified."] = "Votre invitation n'a pas pu être vérifiée.";
+$a->strings["Please enter the required information."] = "Merci d'entrer les informations requises.";
+$a->strings["Failed to store account information."] = "Impossible de stocker les informations liées au compte.";
+$a->strings["Registration request at %s"] = "Demande d'inscription sur %s";
 $a->strings["Administrator"] = "Administrateur";
-$a->strings["Account approved."] = "Inscription validée.";
+$a->strings["your registration password"] = "votre mot de passe d'inscription";
+$a->strings["Registration details for %s"] = "Détails de l'inscription à %s";
+$a->strings["Account approved."] = "Compte approuvé.";
 $a->strings["Registration revoked for %s"] = "Inscription révoquée pour %s";
-$a->strings["Please login."] = "Merci de vous connecter.";
-$a->strings["Profile not found."] = "Profil introuvable.";
-$a->strings["Profile Name is required."] = "Le nom du profil est requis.";
-$a->strings["Profile updated."] = "Profil mis à jour.";
-$a->strings["Profile deleted."] = "Profil supprimé.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Nouveau profil créé.";
-$a->strings["Profile unavailable to clone."] = "Ce profil ne peut être cloné.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Cacher ma liste d'amis/contacts des visiteurs de ce profil?";
+$a->strings["Sort Options"] = "Options de tri";
+$a->strings["Alphabetic"] = "Alphabétique";
+$a->strings["Reverse Alphabetic"] = "Alphabétique inversé";
+$a->strings["Newest to Oldest"] = "Anté-chronologique";
+$a->strings["Enable Safe Search"] = "Activer la recherche sûre";
+$a->strings["Disable Safe Search"] = "Désactiver la recherche sûre";
+$a->strings["Safe Mode"] = "Mode sûr";
+$a->strings["Red Matrix Notification"] = "Notification Red Matrix";
+$a->strings["redmatrix"] = "redmatrix";
+$a->strings["Thank You,"] = "Merci,";
+$a->strings["%s Administrator"] = "l'administrateur de %s";
+$a->strings["%s "] = "%s ";
+$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notification] Nouveau message reçu sur %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, vous avez reçu un message privé sur %3\$s, de la part de %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s vous a envoyé %2\$s.";
+$a->strings["a private message"] = "un message privé";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Merci de visiter %s pour voir et/ou répondre à vos messages privés.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "";
+$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notification] Commentaire de %2\$s sur conversation #%1\$d";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Merci de visiter %s pour voir et/ou répondre sur cette conversation.";
+$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Notification] %s a publié sur votre profil";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "";
+$a->strings["[Red:Notify] %s tagged you"] = "[Red:Notification] %s vous a marqué";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, vous avez été étiqueté sur %3\$s par %2\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "";
+$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Notification] %1\$s vous a tapoté";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, vous avez été tapoté/pointé/sollicité par %2\$s sur %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "";
+$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Notification] %s a marqué votre publication";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "";
+$a->strings["[Red:Notify] Introduction received"] = "[Red:Notification] Nouvelle introduction";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "";
+$a->strings["You may visit their profile at %s"] = "Vous pouvez visiter leur profil sur %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Merci de visiter %s avant d'approuver (ou non) son introduction.";
+$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Notification] Nouvelle suggestion d'amitié";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "";
+$a->strings["Name:"] = "Nom :";
+$a->strings["Photo:"] = "Photo :";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Merci de visiter %s pour donner suite (ou non) à cette suggestion.";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "L'image dépasse la taille limite de %lu octets";
+$a->strings["Image file is empty."] = "L'image est vide.";
+$a->strings["Unable to process image"] = "Impossible de traiter l'image";
+$a->strings["Photo storage failed."] = "Le stockage de l'image a échoué.";
+$a->strings["Upload New Photos"] = "Ajouter des photos";
+$a->strings["Edit File properties"] = "Éditer les propriétés du fichier";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitation disponible",
+	1 => "%d invitations disponibles",
+);
+$a->strings["Find Channels"] = "Trouver des canaux";
+$a->strings["Enter name or interest"] = "Saisir nom ou centre d'intérêt";
+$a->strings["Connect/Follow"] = "Relier/Suivre";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Course à pieds";
+$a->strings["Find"] = "Trouver";
+$a->strings["Channel Suggestions"] = "Canaux suggérés";
+$a->strings["Random Profile"] = "Un profil au hasard";
+$a->strings["Invite Friends"] = "Inviter des amis";
+$a->strings["%d connection in common"] = array(
+	0 => "%d relation en commun",
+	1 => "%d relations en commun",
+);
+$a->strings["New Page"] = "Nouvelle page";
+$a->strings["Click here to upgrade."] = "Cliquez ici pour mettre à jour.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Cette action outrepasserait les limites prévues par votre forfait.";
+$a->strings["This action is not available under your subscription plan."] = "Cette action n'est pas possible avec la formule choisie.";
+$a->strings["Channel is blocked on this site."] = "Ce canal est bloqué sur ce site.";
+$a->strings["Channel location missing."] = "Localisation du canal manquante.";
+$a->strings["Channel discovery failed. Website may be down or misconfigured."] = "Découverte du canal impossible. Le site est peut-être en dérangement ou mal configuré.";
+$a->strings["Response from remote channel was not understood."] = "La réponse du canal distant n'a pas été comprise.";
+$a->strings["Response from remote channel was incomplete."] = "La réponse du canal distant était incomplète.";
+$a->strings["local account not found."] = "compte local introuvable.";
+$a->strings["Cannot connect to yourself."] = "Ne peut pas se connecter à vous.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert depuis trop longtemps (plus de 3 heures).";
+$a->strings["Default"] = "Défaut";
+$a->strings["Embedded content"] = "Contenu imbriqué";
+$a->strings["Embedding disabled"] = "Imbrication désactivée";
+$a->strings["Can view my \"public\" stream and posts"] = "Peut voir mon flux et mes publications \"publiques\"";
+$a->strings["Can view my \"public\" channel profile"] = "Peut voir mon le canal \"public\" de mon profil";
+$a->strings["Can view my \"public\" photo albums"] = "Peut voir mes albums photos \"publics\"";
+$a->strings["Can view my \"public\" address book"] = "Peut voir mes contacts \"publics\"";
+$a->strings["Can view my \"public\" file storage"] = "Peut voir mes fichiers \"publics\"";
+$a->strings["Can view my \"public\" pages"] = "Peut voir mes pages \"publiques\"";
+$a->strings["Can send me their channel stream and posts"] = "Peut m'envoyer le flux et les publications de leur canal";
+$a->strings["Can post on my channel page (\"wall\")"] = "Peut poster sur la page de mon canal (\"mur\")";
+$a->strings["Can comment on my posts"] = "Peut commenter mes publications";
+$a->strings["Can send me private mail messages"] = "Peut m'envoyer des messages privés";
+$a->strings["Can post photos to my photo albums"] = "Peut ajouter des photos à mes albums";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Peut faire suivre à tous les contacts du mon canal via @truc";
+$a->strings["Advanced - useful for creating group forum channels"] = "Avancé - utile seulement pour les canaux de type \"forum/groupe\"";
+$a->strings["Can chat with me (when available)"] = "Peut discuter avec moi (sous réserve de disponibilité)";
+$a->strings["Can write to my \"public\" file storage"] = "Peut écrire dans mon stockage \"public\" de fichiers";
+$a->strings["Can edit my \"public\" pages"] = "Peut éditer mes pages \"publiques\"";
+$a->strings["Can source my \"public\" posts in derived channels"] = "Peut utiliser mes contributions \"publiques\" comme source de canaux dérivés";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Plutôt avancé - très utile dans les communautés ouvertes";
+$a->strings["Can send me bookmarks"] = "Peut m'envoyer des marque-pages";
+$a->strings["Can administer my channel resources"] = "Peut administrer les ressources de mon canal";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Très avancé. Ne pas toucher, sauf si vous savez VRAIMENT ce que vous faites";
+$a->strings["Permission denied"] = "Accès refusé";
+$a->strings["Item not found."] = "Élément introuvable.";
+$a->strings["Collection not found."] = "Collection introuvable.";
+$a->strings["Collection is empty."] = "Collection vide.";
+$a->strings["Collection: %s"] = "Collection : %s";
+$a->strings["Connection: %s"] = "Relation : %s";
+$a->strings["Connection not found."] = "Relation introuvable.";
+$a->strings["Invalid data packet"] = "Paquet de données invalide";
+$a->strings["Unable to verify channel signature"] = "Impossible de vérifier la signature du canal";
+$a->strings["Unable to verify site signature for %s"] = "Impossible de vérifier la signature de site pour %s";
+$a->strings["No channel."] = "Pas de canal.";
+$a->strings["Common connections"] = "Relations communes";
+$a->strings["No connections in common."] = "Pas de relations en commun.";
+$a->strings["Event title and start time are required."] = "Un titre et une date de début sont requises pour l'événement.";
+$a->strings["l, F j"] = "l j F";
+$a->strings["Edit event"] = "Éditer événement";
+$a->strings["Create New Event"] = "Créer événement";
+$a->strings["Previous"] = "Précédent";
+$a->strings["Next"] = "Suivant";
+$a->strings["hour:minute"] = "heure:minute";
+$a->strings["Event details"] = "Détails de l'événement";
+$a->strings["Format is %s %s. Starting date and Title are required."] = "Le format est %s %s. Date de début et titre obligatoires.";
+$a->strings["Event Starts:"] = "L'événement débute :";
+$a->strings["Required"] = "Requis";
+$a->strings["Finish date/time is not known or not relevant"] = "Date/heure de fin inconnue ou sans objet";
+$a->strings["Event Finishes:"] = "L'événement termine :";
+$a->strings["Adjust for viewer timezone"] = "Ajuster au fuseau horaire du visiteur";
+$a->strings["Description:"] = "Description:";
+$a->strings["Title:"] = "Titre:";
+$a->strings["Share this event"] = "Partager cet événement";
+$a->strings["Thing updated"] = "Chose mise-à-jour";
+$a->strings["Object store: failed"] = "Stockage de l'objet : échec";
+$a->strings["Thing added"] = "Chose ajoutée";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+$a->strings["Show Thing"] = "Montrer chose";
+$a->strings["item not found."] = "élément introuvable.";
+$a->strings["Edit Thing"] = "Éditer chose";
+$a->strings["Select a profile"] = "Choisissez un profil";
+$a->strings["Select a category of stuff. e.g. I ______ something"] = "Choisissez une catégorie de choses. p.ex. Je ______ quelque-chose";
+$a->strings["Name of thing e.g. something"] = "Nom de la chose, p.ex. quelque-chose";
+$a->strings["URL of thing (optional)"] = "URL de la chose (optionnel)";
+$a->strings["URL for photo of thing (optional)"] = "URL de l'image de la chose (optionnel)";
+$a->strings["Add Thing to your Profile"] = "Ajouter la chose à votre profil";
+$a->strings["Total invitation limit exceeded."] = "Limite du nombre total d'invitation dépassée.";
+$a->strings["%s : Not a valid email address."] = "%s : adresse courriel invalide.";
+$a->strings["Please join us on Red"] = "Rejoignez-nous sur Red";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limite d'invitations dépassée. Merci de contacter l'administration de votre site.";
+$a->strings["%s : Message delivery failed."] = "%s : Échec dans la livraison du message.";
+$a->strings["%d message sent."] = array(
+	0 => "%d message envoyé.",
+	1 => "%d messages envoyés.",
+);
+$a->strings["You have no more invitations available"] = "Vous ne disposez plus d'aucune invitation";
+$a->strings["Send invitations"] = "Envoyer des invitations";
+$a->strings["Enter email addresses, one per line:"] = "Entrez les adresses de courriel, une par ligne :";
+$a->strings["Your message:"] = "Votre message :";
+$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Vous êtes cordialement invité à me rejoindre, ainsi que d'autres amis proches, sur la Matrice Red - un nouvel outil de communication acentré/décentralisé et révolutionnaire.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vous devrez fournir ce code d'invitation : \$invite_code";
+$a->strings["Please visit my channel at"] = "Merci de me rendre visite sur";
+$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Une fois inscrit (sur N'IMPORTE QUEL site Red Matrix - ils sont tous inter-connectés), merci de vous relier à l'adresse de mon canal :";
+$a->strings["Click the [Register] link on the following page to join."] = "Cliquez le lien [Inscription] sur la page suivante pour nous rejoindre.";
+$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Pour plus d'information sur le projet Red Matrix, et sa capacité à remodeler Internet, merci de visiter http://getzot.com";
+$a->strings["Unable to locate original post."] = "Impossible de localiser la publication initiale.";
+$a->strings["Empty post discarded."] = "Publication vide défaussée.";
+$a->strings["Executable content type not permitted to this channel."] = "Les contenus de type 'exécutable' ne sont pas autorisés sur ce canal.";
+$a->strings["System error. Post not saved."] = "Erreur système. Publication non sauvegardée.";
+$a->strings["Wall Photos"] = "Photos du mur";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Vous avez atteint votre limite de %1$.0f contributions \"racine\".";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Vous avez atteint votre limite de %1$.0f pages web.";
+$a->strings["Menu updated."] = "Menu mis à jour.";
+$a->strings["Unable to update menu."] = "Impossible de mettre le menu à jour.";
+$a->strings["Menu created."] = "Menu créé.";
+$a->strings["Unable to create menu."] = "Impossible de créer le menu.";
+$a->strings["Manage Menus"] = "Gérer les menus";
+$a->strings["Drop"] = "Supprimer";
+$a->strings["Create a new menu"] = "Créer un nouveau menu";
+$a->strings["Delete this menu"] = "Supprimer ce menu";
+$a->strings["Edit menu contents"] = "Éditer le contenu du menu";
+$a->strings["Edit this menu"] = "Éditer le menu";
+$a->strings["New Menu"] = "Nouveau menu";
+$a->strings["Menu name"] = "Nom du menu";
+$a->strings["Must be unique, only seen by you"] = "Doit être unique, ne sera vu que par vous";
+$a->strings["Menu title"] = "Titre du menu";
+$a->strings["Menu title as seen by others"] = "Titre du menu tel que vu par les visiteurs";
+$a->strings["Allow bookmarks"] = "Autoriser les marque-pages";
+$a->strings["Menu may be used to store saved bookmarks"] = "Le menu pourra être utilisé pour stocker des marque-pages";
+$a->strings["Create"] = "Créer";
+$a->strings["Menu not found."] = "Menu introuvable.";
+$a->strings["Menu deleted."] = "Menu supprimé.";
+$a->strings["Menu could not be deleted."] = "Impossible de supprimer le menu.";
+$a->strings["Edit Menu"] = "Éditer le menu";
+$a->strings["Add or remove entries to this menu"] = "Ajouter/supprimer des entrées à ce menu";
+$a->strings["Modify"] = "Modifier";
+$a->strings["Not found."] = "Introuvable.";
+$a->strings["View"] = "Vue";
+$a->strings["Authorize application connection"] = "Autoriser l'application à se connecter";
+$a->strings["Return to your app and insert this Securty Code:"] = "Merci de retourner vers votre application, et d'y insérer ce Code de Sécurité :";
+$a->strings["Please login to continue."] = "Merci de vous connecter pour continuer.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à publier en votre nom?";
 $a->strings["Yes"] = "Oui";
 $a->strings["No"] = "Non";
-$a->strings["Edit Profile Details"] = "Éditer les détails du profil";
-$a->strings["View this profile"] = "Voir ce profil";
-$a->strings["Create a new profile using these settings"] = "Créer un nouveau profil en utilisant ces réglages";
-$a->strings["Clone this profile"] = "Cloner ce profil";
-$a->strings["Delete this profile"] = "Supprimer ce profil";
-$a->strings["Profile Name:"] = "Nom du profil:";
-$a->strings["Your Full Name:"] = "Votre nom complet:";
-$a->strings["Title/Description:"] = "Titre/Description:";
-$a->strings["Your Gender:"] = "Votre genre:";
-$a->strings["Birthday (%s):"] = "Anniversaire (%s):";
-$a->strings["Street Address:"] = "Adresse postale:";
-$a->strings["Locality/City:"] = "Ville/Localité:";
-$a->strings["Postal/Zip Code:"] = "Code postal:";
-$a->strings["Country:"] = "Pays:";
-$a->strings["Region/State:"] = "Région/État:";
-$a->strings["♥ Marital Status:"] = "♥ Statut marital:";
-$a->strings["Who: (if applicable)"] = "Qui: (si pertinent)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples: cathy123, Cathy Williams, cathy@example.com";
-$a->strings["Sexual Preference:"] = "Préférence sexuelle:";
-$a->strings["Homepage URL:"] = "Page personnelle:";
-$a->strings["Political Views:"] = "Opinions politiques:";
-$a->strings["Religious Views:"] = "Opinions religieuses:";
-$a->strings["Public Keywords:"] = "Mots-clés publics:";
-$a->strings["Private Keywords:"] = "Mots-clés privés:";
-$a->strings["Example: fishing photography software"] = "Exemple: football dessin programmation";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Utilisés pour vous suggérer des amis potentiels, peuvent être vus par autrui)";
-$a->strings["(Used for searching profiles, never shown to others)"] = "(Utilisés pour rechercher dans les profils, ne seront jamais montrés à autrui)";
-$a->strings["Tell us about yourself..."] = "Parlez-nous de vous...";
-$a->strings["Hobbies/Interests"] = "Passe-temps/Centres d'intérêt";
-$a->strings["Contact information and Social Networks"] = "Coordonées/Réseaux sociaux";
-$a->strings["Musical interests"] = "Goûts musicaux";
-$a->strings["Books, literature"] = "Lectures";
-$a->strings["Television"] = "Télévision";
-$a->strings["Film/dance/culture/entertainment"] = "Cinéma/Danse/Culture/Divertissement";
-$a->strings["Love/romance"] = "Amour/Romance";
-$a->strings["Work/employment"] = "Activité professionnelle/Occupation";
-$a->strings["School/education"] = "Études/Formation";
-$a->strings["This is your public profile.
                                      It may be visible to anybody using the internet."] = "Ceci est votre profil public.
                                      Il peut être visible par n'importe quel utilisateur d'Internet.";
-$a->strings["Age: "] = "Age: ";
-$a->strings["Edit/Manage Profiles"] = "Editer/gérer les profils";
-$a->strings["Item not found."] = "Élément introuvable.";
-$a->strings["everybody"] = "tout le monde";
-$a->strings["Missing some important data!"] = "Il manque certaines informations importantes!";
-$a->strings["Update"] = "Mises-à-jour";
-$a->strings["Failed to connect with email account using the settings provided."] = "Impossible de se connecter au compte courriel configuré.";
-$a->strings["Email settings updated."] = "Réglages de courriel mis-à-jour.";
-$a->strings["Passwords do not match. Password unchanged."] = "Les mots de passe ne correspondent pas. Aucun changement appliqué.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Les mots de passe vides sont interdits. Aucun changement appliqué.";
-$a->strings["Password changed."] = "Mots de passe changés.";
-$a->strings["Password update failed. Please try again."] = "Le changement de mot de passe a échoué. Merci de recommencer.";
-$a->strings[" Please use a shorter name."] = " Merci d'utiliser un nom plus court.";
-$a->strings[" Name too short."] = " Nom trop court.";
-$a->strings[" Not valid email."] = " Email invalide.";
-$a->strings[" Cannot change to that email."] = " Impossible de changer pour cet email.";
-$a->strings["Settings updated."] = "Réglages mis à jour.";
-$a->strings["Account settings"] = "Réglages du compte";
-$a->strings["Connector settings"] = "Réglages des connecteurs";
-$a->strings["Plugin settings"] = "Réglages des extensions";
-$a->strings["Connections"] = "Connexions";
-$a->strings["Export personal data"] = "Exporter les données personnelles";
+$a->strings["No installed applications."] = "Aucune application installée.";
+$a->strings["Applications"] = "Applications";
+$a->strings["Edit post"] = "Éditer la contribution";
+$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix - Pour les invités: Username={votre courriel}, MDP=+++";
+$a->strings["Bookmark added"] = "Marque-page ajouté";
+$a->strings["My Bookmarks"] = "Mes marque-pages";
+$a->strings["My Connections Bookmarks"] = "Marque-pages de mes relations";
+$a->strings["Name is required"] = "Le nom est requis";
+$a->strings["Key and Secret are required"] = "Clef et secret sont requis";
+$a->strings["Update"] = "Mise-à-jour";
+$a->strings["Passwords do not match. Password unchanged."] = "Les deux saisies du mot de passe ne correspondent pas. Il n'a donc pas été changé.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Le mot de passe ne peut pas être vide. Il n'a donc pas été changé.";
+$a->strings["Password changed."] = "Le mot de passe a été changé.";
+$a->strings["Password update failed. Please try again."] = "La mise-à-jour du mot de passe a échoué. Merci de recommencer.";
+$a->strings["Not valid email."] = "Adresse de courriel non-valide.";
+$a->strings["Protected email address. Cannot change to that email."] = "Adresse de courriel protégée. Impossible de l'utiliser.";
+$a->strings["System failure storing new email. Please try again."] = "Défaillance système lors du stockage de la nouvelle adresse de courriel. Merci de ré-essayer.";
+$a->strings["Settings updated."] = "Réglages sauvegardés.";
 $a->strings["Add application"] = "Ajouter une application";
-$a->strings["Cancel"] = "Annuler";
 $a->strings["Name"] = "Nom";
-$a->strings["Consumer Key"] = "Clé utilisateur";
-$a->strings["Consumer Secret"] = "Secret utilisateur";
-$a->strings["Redirect"] = "Rediriger";
+$a->strings["Name of application"] = "Nom de l'application";
+$a->strings["Consumer Key"] = "Clef de consommateur";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères.";
+$a->strings["Consumer Secret"] = "Secret de consommateur";
+$a->strings["Redirect"] = "Redirection";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirection - laissez blanc, sauf si l'application a demandé autrement";
 $a->strings["Icon url"] = "URL de l'icône";
+$a->strings["Optional"] = "Facultatif";
 $a->strings["You can't edit this application."] = "Vous ne pouvez pas éditer cette application.";
 $a->strings["Connected Apps"] = "Applications connectées";
-$a->strings["Edit"] = "Éditer";
-$a->strings["Delete"] = "Supprimer";
-$a->strings["Client key starts with"] = "La clé cliente commence par";
+$a->strings["Client key starts with"] = "La clef cliente commence par";
 $a->strings["No name"] = "Sans nom";
 $a->strings["Remove authorization"] = "Révoquer l'autorisation";
-$a->strings["No Plugin settings configured"] = "Pas de réglages d'extensions configurés";
-$a->strings["Plugin Settings"] = "Réglages des extensions";
-$a->strings["Built-in support for %s connectivity is %s"] = "Le support natif pour la connectivité %s est %s";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["enabled"] = "activé";
-$a->strings["disabled"] = "désactivé";
-$a->strings["StatusNet"] = "StatusNet";
-$a->strings["Connector Settings"] = "Réglages des connecteurs";
-$a->strings["Email/Mailbox Setup"] = "Réglages de courriel/boîte à lettre";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si vous souhaitez communiquer avec vos contacts \"courriel\" (facultatif), merci de nous indiquer comment vous connecter à votre boîte.";
-$a->strings["Last successful email check:"] = "Dernière vérification réussie des courriels:";
-$a->strings["Email access is disabled on this site."] = "L'accès courriel est désactivé sur ce site.";
-$a->strings["IMAP server name:"] = "Nom du serveur IMAP:";
-$a->strings["IMAP port:"] = "Port IMAP:";
-$a->strings["Security:"] = "Sécurité:";
-$a->strings["None"] = "Aucun(e)";
-$a->strings["Email login name:"] = "Nom de connexion:";
-$a->strings["Email password:"] = "Mot de passe:";
-$a->strings["Reply-to address:"] = "Adresse de réponse:";
-$a->strings["Send public posts to all email contacts:"] = "Les notices publiques vont à tous les contacts courriel:";
-$a->strings["Normal Account"] = "Compte normal";
-$a->strings["This account is a normal personal profile"] = "Ce compte correspond à un profil normal, pour une seule personne (physique, généralement)";
-$a->strings["Soapbox Account"] = "Compte \"boîte à savon\"";
-$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans 'en lecture seule'";
-$a->strings["Community/Celebrity Account"] = "Compte de communauté/célébrité";
-$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans en 'lecture/écriture'";
-$a->strings["Automatic Friend Account"] = "Compte auto-amical";
-$a->strings["Automatically approve all connection/friend requests as friends"] = "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des amis";
-$a->strings["OpenID:"] = "OpenID:";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "&nbsp;(Facultatif) Autoriser cet OpenID à se connecter à ce compte.";
-$a->strings["Publish your default profile in your local site directory?"] = "Publier votre profil par défaut sur l'annuaire local de ce site?";
-$a->strings["Publish your default profile in the global social directory?"] = "Publier votre profil par défaut sur l'annuaire social global?";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Cacher votre liste de contacts/amis des visiteurs de votre profil par défaut?";
-$a->strings["Hide profile details and all your messages from unknown viewers?"] = "Masquer les détails du profil ainsi que tous vos messages aux visiteurs inconnus?";
-$a->strings["Allow friends to post to your profile page?"] = "Autoriser vos amis à publier sur votre profil?";
-$a->strings["Allow friends to tag your posts?"] = "Autoriser vos amis à tagguer vos notices?";
-$a->strings["Profile is not published."] = "Ce profil n'est pas publié.";
-$a->strings["Your Identity Address is"] = "L'adresse de votre identité est";
-$a->strings["Account Settings"] = "Réglages du compte";
-$a->strings["Password Settings"] = "Réglages de mot de passe";
-$a->strings["New Password:"] = "Nouveau mot de passe:";
-$a->strings["Confirm:"] = "Confirmer:";
-$a->strings["Leave password fields blank unless changing"] = "Laissez les champs de mot de passe vierges, sauf si vous désirez les changer";
-$a->strings["Basic Settings"] = "Réglages basiques";
-$a->strings["Full Name:"] = "Nom complet:";
-$a->strings["Email Address:"] = "Adresse courriel:";
-$a->strings["Your Timezone:"] = "Votre fuseau horaire:";
-$a->strings["Default Post Location:"] = "Publication par défaut depuis :";
-$a->strings["Use Browser Location:"] = "Utiliser la localisation géographique du navigateur:";
-$a->strings["Display Theme:"] = "Thème d'affichage:";
-$a->strings["Security and Privacy Settings"] = "Réglages de sécurité et vie privée";
-$a->strings["Maximum Friend Requests/Day:"] = "Nombre maximal de requêtes d'amitié/jour:";
-$a->strings["(to prevent spam abuse)"] = "(pour limiter l'impact du spam)";
-$a->strings["Default Post Permissions"] = "Permissions par défaut sur les articles";
+$a->strings["No feature settings configured"] = "Pas de fonctionnalité à configurer";
+$a->strings["Feature Settings"] = "Fonctionnalités";
+$a->strings["Account Settings"] = "Compte";
+$a->strings["Password Settings"] = "Mot de passe";
+$a->strings["New Password:"] = "Nouveau mot de passe :";
+$a->strings["Confirm:"] = "Confirmation :";
+$a->strings["Leave password fields blank unless changing"] = "Laissez les mots de passe vides si vous ne voulez pas les modifier";
+$a->strings["Email Address:"] = "Adresse de courriel :";
+$a->strings["Remove Account"] = "Supprimer le compte";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Attention : cette action est permanente et irréversible.";
+$a->strings["Off"] = "Inactif";
+$a->strings["On"] = "Actif";
+$a->strings["Additional Features"] = "Fonctionnalités additionnelles";
+$a->strings["Connector Settings"] = "Connecteurs";
+$a->strings["No special theme for mobile devices"] = "Pas de thème spécifique aux périphériques mobiles";
+$a->strings["Display Settings"] = "Affichage";
+$a->strings["Display Theme:"] = "Thème :";
+$a->strings["Mobile Theme:"] = "Thème mobile :";
+$a->strings["Update browser every xx seconds"] = "Rafraîchir le navigateur toutes les xx secondes";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 secondes, pas de maximum";
+$a->strings["Maximum number of conversations to load at any time:"] = "Nombre maximal de conversations pouvant être chargées en même temps :";
+$a->strings["Maximum of 100 items"] = "100 éléments au maximum";
+$a->strings["Don't show emoticons"] = "Ne pas montrer les frimousses/émoticones";
+$a->strings["Nobody except yourself"] = "Personne sauf vous";
+$a->strings["Only those you specifically allow"] = "Seulement ceux que vous autorisez spécifiquement";
+$a->strings["Anybody in your address book"] = "Tous vos contacts";
+$a->strings["Anybody on this website"] = "Tous les utilisateurs du site";
+$a->strings["Anybody in this network"] = "Tous les utilisateurs du réseau";
+$a->strings["Anybody on the internet"] = "Tout les utilisateurs d'Internet";
+$a->strings["Publish your default profile in the network directory"] = "Publier votre profil par défaut dans l'annuaire du réseau";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Nous autoriser à vous suggérer comme relation potentielle aux nouveaux arrivants?";
+$a->strings["or"] = "ou";
+$a->strings["Your channel address is"] = "Votre canal a pour adresse";
+$a->strings["Channel Settings"] = "Canal";
+$a->strings["Basic Settings"] = "Basique";
+$a->strings["Your Timezone:"] = "Zone de temps :";
+$a->strings["Default Post Location:"] = "Localisation par défaut :";
+$a->strings["Use Browser Location:"] = "Utiliser la localisation fournie par le navigateur :";
+$a->strings["Adult Content"] = "Contenu \"adulte\"";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Ce canal publie plus ou moins fréquemment du contenu pour adultes. (Merci d'indiquer tout contenu pour adulte ou potentiellement choquant avec le tag #NSFW - Not Safe For Work)";
+$a->strings["Security and Privacy Settings"] = "Sécurité et vie privée";
+$a->strings["Hide my online presence"] = "Cacher ma présence en ligne";
+$a->strings["Prevents displaying in your profile that you are online"] = "Cacher votre statut (en ligne/hors ligne) sur votre profil";
+$a->strings["Simple Privacy Settings:"] = "Réglages simples :";
+$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Très public - extrèmement permissif (à n'utiliser qu'en connaissance de cause)";
+$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Classique - public par défaut, privé en cas de besoin (comparable dans le principe aux réseaux sociaux centralisés, avec un mode privé plus efficace)";
+$a->strings["Private - default private, never open or public"] = "Privé - privé par défaut, jamais ouvert ni public";
+$a->strings["Blocked - default blocked to/from everybody"] = "Bloqué - par défaut, bloqué de/vers tout le monde";
+$a->strings["Advanced Privacy Settings"] = "Réglages avancés";
+$a->strings["Maximum Friend Requests/Day:"] = "Nombre maximum de mises en relation par jour :";
+$a->strings["May reduce spam activity"] = "Contribue à réduire l'impact du spam";
+$a->strings["Default Post Permissions"] = "Permissions par défaut des publications";
 $a->strings["(click to open/close)"] = "(cliquer pour ouvrir/fermer)";
-$a->strings["Automatically expire posts after days:"] = "Les notices expirent automatiquement au bout de (en jours):";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si elles sont vides, les notices n'expireront pas. Les notices expirées seront supprimées";
-$a->strings["Notification Settings"] = "Réglages de notification";
-$a->strings["Send a notification email when:"] = "Envoyer un courriel de notification quand:";
+$a->strings["Maximum private messages per day from unknown people:"] = "Nombre maximum de messages privés émanant d'inconnus, par jour :";
+$a->strings["Useful to reduce spamming"] = "Utile pour réduire le spam";
+$a->strings["Notification Settings"] = "Notifications";
+$a->strings["By default post a status message when:"] = "Par défaut, publier un statut quand:";
+$a->strings["accepting a friend request"] = "acceptez une mise en relation";
+$a->strings["joining a forum/community"] = "joignez un forum ou à une communauté";
+$a->strings["making an interesting profile change"] = "faites une modification intéressante de votre profil";
+$a->strings["Send a notification email when:"] = "Envoyer un courriel de notification quand :";
 $a->strings["You receive an introduction"] = "Vous recevez une introduction";
-$a->strings["Your introductions are confirmed"] = "Vos introductions sont confirmées";
+$a->strings["Your introductions are confirmed"] = "Vos introductions sont acceptées/confirmées";
 $a->strings["Someone writes on your profile wall"] = "Quelqu'un écrit sur votre mur";
-$a->strings["Someone writes a followup comment"] = "Quelqu'un vous commente";
-$a->strings["You receive a private message"] = "Vous recevez un message privé";
-$a->strings["Advanced Page Settings"] = "Réglages avancés";
-$a->strings["Saved Searches"] = "Recherches sauvées";
-$a->strings["Remove term"] = "Retirer le terme";
+$a->strings["Someone writes a followup comment"] = "Quelqu'un commente sur vos publications";
+$a->strings["You receive a private message"] = "Vous recevez un Message Privé";
+$a->strings["You receive a friend suggestion"] = "Vous recevez une suggestion d'amitié/relation";
+$a->strings["You are tagged in a post"] = "Vous êtes étiqueté dans une publication";
+$a->strings["You are poked/prodded/etc. in a post"] = "Vous êtes tapoté/pointé/etc. dans une publication";
+$a->strings["Advanced Account/Page Type Settings"] = "Type de page/Compte (avancé)";
+$a->strings["Change the behaviour of this account for special situations"] = "Modifie le comportement de ce compte pour certains cas particuliers";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s suit %3\$s de %2\$s";
+$a->strings["[Embedded content - reload page to view]"] = "[Contenu embarqué - rechargez la page pour le voir]";
+$a->strings["Channel not found."] = "Canal introuvable.";
+$a->strings["toggle full screen mode"] = "(dés)activer le mode plein-écran";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a étiqueté le %3\$s de %2\$s par %4\$s";
+$a->strings["You must be logged in to see this page."] = "Vous devez vous connecter pour voir cette page.";
+$a->strings["Leave Room"] = "Quitter le salon";
+$a->strings["I am away right now"] = "Je suis momentanément absent";
+$a->strings["I am online"] = "Je suis en ligne";
+$a->strings["New Chatroom"] = "Nouveau salon";
+$a->strings["Chatroom Name"] = "Nom du salon";
+$a->strings["%1\$s's Chatrooms"] = "Salons de %1\$s";
 $a->strings["Public access denied."] = "Accès public refusé.";
-$a->strings["Search This Site"] = "Rechercher sur ce site";
-$a->strings["No results."] = "Aucun résultat.";
-$a->strings["Photo Albums"] = "Albums photo";
-$a->strings["Contact Photos"] = "Photos du contact";
-$a->strings["Contact information unavailable"] = "Informations de contact indisponibles";
-$a->strings["Album not found."] = "Album introuvable.";
-$a->strings["Delete Album"] = "Effacer l'album";
-$a->strings["Delete Photo"] = "Effacer la photo";
-$a->strings["was tagged in a"] = "a été identifié dans";
-$a->strings["photo"] = "photo";
-$a->strings["by"] = "par";
-$a->strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de  ";
-$a->strings["Image file is empty."] = "Fichier image vide.";
-$a->strings["No photos selected"] = "Aucune photo sélectionnée";
-$a->strings["Access to this item is restricted."] = "Accès restreint à cet élément.";
-$a->strings["Upload Photos"] = "Téléverser des photos";
-$a->strings["New album name: "] = "Nom du nouvel album: ";
-$a->strings["or existing album name: "] = "ou nom d'un album existant: ";
-$a->strings["Do not show a status post for this upload"] = "Ne pas publier de notice pour cet envoi";
-$a->strings["Permissions"] = "Permissions";
-$a->strings["Edit Album"] = "Éditer l'album";
-$a->strings["View Photo"] = "Voir la photo";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Interdit. L'accès à cet élément peut avoir été restreint.";
-$a->strings["Photo not available"] = "Photo indisponible";
-$a->strings["View photo"] = "Voir photo";
-$a->strings["Edit photo"] = "Éditer la photo";
-$a->strings["Use as profile photo"] = "Utiliser comme photo de profil";
-$a->strings["Private Message"] = "Message privé";
-$a->strings["View Full Size"] = "Voir en taille réelle";
-$a->strings["Tags: "] = "Étiquettes: ";
-$a->strings["[Remove any tag]"] = "[Retirer toutes les étiquettes]";
-$a->strings["New album name"] = "Nom du nouvel album";
-$a->strings["Caption"] = "Titre";
-$a->strings["Add a Tag"] = "Ajouter une étiquette";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances";
-$a->strings["I like this (toggle)"] = "I like this (bascule)";
-$a->strings["I don't like this (toggle)"] = "I don't like this (bascule)";
-$a->strings["Share"] = "Partager";
-$a->strings["Please wait"] = "Patientez";
-$a->strings["This is you"] = "C'est vous";
-$a->strings["Recent Photos"] = "Photos récentes";
-$a->strings["Upload New Photos"] = "Téléverser de nouvelles photos";
-$a->strings["View Album"] = "Voir l'album";
-$a->strings["Welcome to Friendika"] = "Bienvenue sur Friendica";
-$a->strings["New Member Checklist"] = "Checklist du nouvel utilisateur";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page."] = "Nous souhaiterions vous donner quelques astuces et pointeurs pour rendre votre expérience la plus plaisante possible. Cliquez sur n'importe quel élément pour visiter la page correspondante.";
-$a->strings["On your Settings page -  change your initial password. Also make a note of your Identity Address. This will be useful in making friends."] = "Sur votre page Réglages - changez votre mot de passe originel. Profitez-en pour prendre note de votre Adresse d'Identité. Elle vous sera utile pour vous faire de nouveaux amis.";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver.";
-$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Téléversez (envoyez) une photo de profil si vous n'en avez pas déjà une. Les études montrent que les gens qui affichent de vraies photos d'eux sont dix fois plus susceptibles de se faire des amis.";
-$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook.";
-$a->strings["Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Entrez les paramètres de votre adresse de courriel sur la page des Réglages si vous souhaitez importer et interagir avec vos contacts conventionnels.";
-$a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil par défaut à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus.";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent.";
-$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Connect dialog."] = "Votre page Contacts est l'endroit rêvé pour gérer vos relations et contacts, et vous relier à des amis issus d'autres réseaux. En général, il suffit d'entrer leur adresse d'identité ou l'URL de leur site dans le champ Relier";
-$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "La page Annuaire vous permet de trouver d'autres personnes au sein de ce réseaux ou parmi d'autres sites fédérés. Cherchez un lien Relier ou Suivre sur leur profil. Vous pourrez avoir besoin d'indiquer votre adresse d'identité.";
-$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Une fois que vous avez trouvé quelques amis, organisez-les en groupes de conversation privés depuis le panneau latéral de la page Contacts. Vous pourrez ensuite interagir avec chaque groupe de manière privée depuis la page Réseau.";
-$a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Nos pages d'aide peuvent être consultées pour davantage de détails sur les fonctionnalités ou les ressources.";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Time Conversion"] = "Conversion temporelle";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire.";
-$a->strings["UTC time: %s"] = "Temps UTC : %s";
-$a->strings["Current timezone: %s"] = "Zone de temps courante : %s";
-$a->strings["Converted localtime: %s"] = "Temps local converti : %s";
-$a->strings["Please select your timezone:"] = "Sélectionner votre zone :";
-$a->strings["Item has been removed."] = "Cet élément a été enlevé.";
-$a->strings["Item not found"] = "Élément introuvable";
-$a->strings["Edit post"] = "Éditer la publication";
-$a->strings["Post to Email"] = "Publier aussi par courriel";
-$a->strings["Upload photo"] = "Joindre photo";
-$a->strings["Attach file"] = "Joindre fichier";
-$a->strings["Insert web link"] = "Insérer lien web";
-$a->strings["Insert YouTube video"] = "Insérer une vidéo Youtube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Insérer un lien vidéo Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Insérer un lien audio Vorbis [.ogg]";
-$a->strings["Set your location"] = "Définir votre localisation";
-$a->strings["Clear browser location"] = "Effacer la localisation du navigateur";
-$a->strings["Permission settings"] = "Réglages des permissions";
-$a->strings["CC: email addresses"] = "CC: adresses de courriel";
-$a->strings["Public post"] = "Notice publique";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@exemple.com, mary@exemple.com";
-$a->strings["%s : Not a valid email address."] = "%s : Adresse de courriel invalide.";
-$a->strings["Please join my network on %s"] = "Vous pouvez rejoindre mon réseau sur %s";
-$a->strings["%s : Message delivery failed."] = "%s : L'envoi du message a échoué.";
-$a->strings["%d message sent."] = array(
-	0 => "%d message envoyé.",
-	1 => "%d messages envoyés.",
-);
-$a->strings["You have no more invitations available"] = "Vous n'avez plus d'invitations disponibles";
-$a->strings["Send invitations"] = "Envoyer des invitations";
-$a->strings["Enter email addresses, one per line:"] = "Entrez les adresses email, une par ligne:";
-$a->strings["Your message:"] = "Votre message:";
-$a->strings["Please join my social network on %s"] = "Vous pouvez rejoindre mon réseau social sur %s";
-$a->strings["To accept this invitation, please visit:"] = "Pour accepter cette invitation, rendez vous sur:";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vous devrez fournir ce code d'invitation: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Une fois inscrit, connectez-vous à la page de mon profil sur:";
-$a->strings["{0} wants to be your friend"] = "{0} souhaite être votre ami(e)";
-$a->strings["{0} sent you a message"] = "{0} vous a envoyé un message";
-$a->strings["{0} requested registration"] = "{0} a demandé à s'inscrire";
-$a->strings["{0} commented %s's post"] = "{0} a commenté une notice de %s";
-$a->strings["{0} liked %s's post"] = "{0} a aimé une notice de %s";
-$a->strings["{0} disliked %s's post"] = "{0} n'a pas aimé une notice de %s";
-$a->strings["{0} is now friends with %s"] = "{0} est désormais ami(e) avec %s";
-$a->strings["{0} posted"] = "{0} a posté";
-$a->strings["{0} tagged %s's post with #%s"] = "{0} a taggué la notice de %s avec #%s";
-$a->strings["Could not access contact record."] = "Impossible d'accéder à l'enregistrement du contact.";
-$a->strings["Could not locate selected profile."] = "Impossible de localiser le profil séléctionné.";
-$a->strings["Contact updated."] = "Contact mis-à-jour.";
-$a->strings["Failed to update contact record."] = "Échec de mise-à-jour du contact.";
-$a->strings["Contact has been blocked"] = "Le contact a été bloqué";
-$a->strings["Contact has been unblocked"] = "Le contact n'est plus bloqué";
-$a->strings["Contact has been ignored"] = "Le contact a été ignoré";
-$a->strings["Contact has been unignored"] = "Le contact n'est plus ignoré";
-$a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["Contact has been removed."] = "Ce contact a été retiré.";
-$a->strings["You are mutual friends with %s"] = "Vous êtes ami (et réciproquement) avec %s";
-$a->strings["You are sharing with %s"] = "Vous partagez avec %s";
-$a->strings["%s is sharing with you"] = "%s partage avec vous";
-$a->strings["Private communications are not available for this contact."] = "Les communications privées ne sont pas disponibles pour ce contact.";
-$a->strings["Never"] = "Jamais";
-$a->strings["(Update was successful)"] = "(Mise à jour effectuée avec succès)";
-$a->strings["(Update was not successful)"] = "(Mise à jour échouée)";
-$a->strings["Suggest friends"] = "Suggérer amitié/contact";
-$a->strings["Network type: %s"] = "Type de réseau %s";
-$a->strings["%d contact in common"] = array(
-	0 => "%d contact en commun",
-	1 => "%d contacts en commun",
-);
-$a->strings["View all contacts"] = "Voir tous les contacts";
-$a->strings["Unblock"] = "Débloquer";
-$a->strings["Block"] = "Bloquer";
-$a->strings["Unignore"] = "Ne plus ignorer";
-$a->strings["Ignore"] = "Ignorer";
-$a->strings["Repair"] = "Réparer";
-$a->strings["Contact Editor"] = "Éditeur de contact";
-$a->strings["Profile Visibility"] = "Visibilité du profil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée.";
-$a->strings["Contact Information / Notes"] = "Informations de contact / Notes";
-$a->strings["Edit contact notes"] = "Editer les notes des contacts";
+$a->strings["No connections."] = "Pas de relations.";
 $a->strings["Visit %s's profile [%s]"] = "Visiter le profil de %s [%s]";
-$a->strings["Block/Unblock contact"] = "Bloquer/débloquer ce contact";
-$a->strings["Ignore contact"] = "Ignorer ce contact";
-$a->strings["Repair URL settings"] = "Réparer les réglages d'URL";
-$a->strings["View conversations"] = "Voir les conversations";
-$a->strings["Delete contact"] = "Effacer ce contact";
-$a->strings["Last update:"] = "Dernière mise-à-jour :";
-$a->strings["Update public posts"] = "Met ses entrées publiques à jour: ";
-$a->strings["Update now"] = "Mettre à jour";
-$a->strings["Currently blocked"] = "Actuellement bloqué";
-$a->strings["Currently ignored"] = "Actuellement ignoré";
-$a->strings["Contacts"] = "Contacts";
-$a->strings["Show Blocked Connections"] = "Montrer les connexions bloquées";
-$a->strings["Hide Blocked Connections"] = "Cacher les connexion bloquées";
-$a->strings["Search your contacts"] = "Rechercher dans vos contacts";
-$a->strings["Finding: "] = "Trouvé: ";
-$a->strings["Find"] = "Trouver";
-$a->strings["Mutual Friendship"] = "Relation réciproque";
-$a->strings["is a fan of yours"] = "est un fan de vous";
-$a->strings["you are a fan of"] = "vous êtes un fan de";
-$a->strings["Edit contact"] = "Éditer le contact";
-$a->strings["Remote privacy information not available."] = "Informations de confidentialité indisponibles.";
-$a->strings["Visible to:"] = "Visible par:";
-$a->strings["An invitation is required."] = "Une invitation est requise.";
-$a->strings["Invitation could not be verified."] = "L'invitation fournie n'a pu être validée.";
-$a->strings["Invalid OpenID url"] = "Adresse OpenID invalide";
-$a->strings["Please enter the required information."] = "Entrez les informations requises.";
-$a->strings["Please use a shorter name."] = "Utilisez un nom plus court.";
-$a->strings["Name too short."] = "Nom trop court.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Ceci ne semble pas être votre nom complet (Prénom Nom).";
-$a->strings["Your email domain is not among those allowed on this site."] = "Votre domaine de courriel n'est pas autorisé sur ce site.";
-$a->strings["Not a valid email address."] = "Ceci n'est pas une adresse courriel valide.";
-$a->strings["Cannot use that email."] = "Impossible d'utiliser ce courriel.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Votre \"pseudo\" peut seulement contenir les caractères \"a-z\", \"0-9\", \"-\", and \"_\", et doit commencer par une lettre.";
-$a->strings["Nickname is already registered. Please choose another."] = "Pseudo déjà utilisé. Merci d'en choisir un autre.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERREUR SÉRIEUSE: La génération des clés de sécurité a échoué.";
-$a->strings["An error occurred during registration. Please try again."] = "Une erreur est survenue lors de l'inscription. Merci de recommencer.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer.";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Inscription réussie. Vérifiez vos emails pour la suite des instructions.";
-$a->strings["Failed to send email message. Here is the message that failed."] = "Impossible d'envoyer un email. Voici le message qui a échoué.";
-$a->strings["Your registration can not be processed."] = "Votre inscription ne peut être traitée.";
-$a->strings["Registration request at %s"] = "Demande d'inscription à %s";
-$a->strings["Your registration is pending approval by the site owner."] = "Votre inscription attend une validation du propriétaire du site.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. Fournissez votre OpenID et cliquez \"S'inscrire\".";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste.";
-$a->strings["Your OpenID (optional): "] = "Votre OpenID (facultatif): ";
-$a->strings["Include your profile in member directory?"] = "Inclure votre profil dans l'annuaire des membres?";
-$a->strings["Membership on this site is by invitation only."] = "L'inscription à ce site se fait uniquement sur invitation.";
-$a->strings["Your invitation ID: "] = "Votre ID d'invitation: ";
-$a->strings["Registration"] = "Inscription";
-$a->strings["Your Full Name (e.g. Joe Smith): "] = "Votre nom complet (p.ex. Michel Dupont): ";
-$a->strings["Your Email Address: "] = "Votre adresse courriel: ";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = "Choisissez un pseudo. Celui devra commencer par une lettre. L'adresse de votre profil en découlera sous la forme '<strong>pseudo@\$sitename</strong>'.";
-$a->strings["Choose a nickname: "] = "Choisir un pseudo: ";
-$a->strings["Post successful."] = "Publication réussie.";
-$a->strings["Friends of %s"] = "Amis de %s";
-$a->strings["No friends to display."] = "Pas d'amis à afficher.";
-$a->strings["Help:"] = "Aide:";
-$a->strings["Help"] = "Aide";
-$a->strings["Could not create/connect to database."] = "Impossible de créer/atteindre la base de données.";
-$a->strings["Connected to database."] = "Connecté à la base de données.";
-$a->strings["Proceed with Installation"] = "Commencer l'installation";
-$a->strings["Your Friendika site database has been installed."] = "La base de données de votre site Friendika a été installée.";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le 'poller'.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Référez-vous au fichier \"INSTALL.txt\".";
-$a->strings["Proceed to registration"] = "Commencer l'inscription";
-$a->strings["Database import failed."] = "Import de base échoué.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" manuellement au moyen de phpmyadmin ou de la commande mysql.";
-$a->strings["Welcome to Friendika."] = "Bienvenue sur Friendika.";
-$a->strings["Friendika Social Network"] = "Réseau social Friendika";
-$a->strings["Installation"] = "Installation";
-$a->strings["In order to install Friendika we need to know how to connect to your database."] = "Pour installer Friendika, nous avons besoin de contacter votre base de données.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Merci de vous tourner vers votre hébergeur et/ou administrateur pour toute question concernant ces réglages.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de données que vous spécifierez doit exister. Si ce n'est pas encore le cas, merci de la créer avant de continuer.";
-$a->strings["Database Server Name"] = "Serveur de base de données";
-$a->strings["Database Login Name"] = "Nom d'utilisateur de la base";
-$a->strings["Database Login Password"] = "Mot de passe de la base";
-$a->strings["Database Name"] = "Nom de la base";
-$a->strings["Please select a default timezone for your website"] = "Sélectionner un fuseau horaire par défaut pour votre site";
-$a->strings["Site administrator email address. Your account email address must match this in order to use the web admin panel."] = "Adresse courriel de l'administrateur du site. L'adresse courriel de votre compte doit correspondre si vous voulez utiliser l'administration web.";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web.";
-$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "Ceci est requis. Merci d'ajuster la configuration dans le fichier .htconfig.php en conséquence.";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version \"ligne de commande\" de PHP de votre système n'a pas \"register_argc_argv\" d'activé.";
-$a->strings["This is required for message delivery to work."] = "Ceci est requis pour que la livraison des messages fonctionne.";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de générer des clés de chiffrement";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur: Le module \"rewrite\" du serveur web Apache est requis mais pas installé.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Erreur: Le module PHP \"libCURL\" est requis mais pas installé.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erreur: Le module PHP \"GD\" disposant du support JPEG est requis mais pas installé.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Erreur: Le module PHP \"openssl\" est requis mais pas installé.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Erreur: Le module PHP \"mysqli\" est requis mais pas installé.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Erreur: le module PHP mb_string est requis mais pas installé.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "L'installeur web doit être en mesure de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais il en est incapable.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Le plus souvent, il s'agit d'un problème de permission. Le serveur web peut ne pas être capable d'écrire dans votre répertoire - alors que vous-même le pouvez.";
-$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Merci de vérifier - avec la documentation ou le support de votre hébergement - que la situation peut être corrigée.";
-$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Dans le cas contraire, vous pouvez pratiquer une installation manuelle. Référez-vous au fichier \"INSTALL.txt\" pour les instructions.";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Le fichier de configuration de la base (\".htconfig.php\") ne peut être créé. Merci d'utiliser le texte ci-joint pour créer ce fichier à la racine de votre hébergement.";
-$a->strings["Errors encountered creating database tables."] = "Des erreurs ont été signalées lors de la création des tables.";
-$a->strings["Commented Order"] = "Dans l'ordre des commentaires";
-$a->strings["Posted Order"] = "Dans l'ordre des notices";
-$a->strings["New"] = "Nouveau";
-$a->strings["Starred"] = "Mis en avant";
-$a->strings["Bookmarks"] = "Marqué";
-$a->strings["Warning: This group contains %s member from an insecure network."] = array(
-	0 => "Attention: Ce groupe contient %s membre d'un réseau non-sûr.",
-	1 => "Attention: Ce groupe contient %s membres d'un réseau non-sûr.",
-);
-$a->strings["Private messages to this group are at risk of public disclosure."] = "Les messages privés envoyés à ce groupe s'exposent à une diffusion incontrôlée.";
-$a->strings["No such group"] = "Groupe inexistant";
-$a->strings["Group is empty"] = "Groupe vide";
-$a->strings["Group: "] = "Groupe: ";
-$a->strings["Contact: "] = "Contact: ";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Les messages privés envoyés à ce contact s'exposent à une diffusion incontrôlée.";
-$a->strings["Invalid contact."] = "Contact invalide.";
+$a->strings["View Connnections"] = "Voir les relations";
+$a->strings["Tag removed"] = "Étiquette retirée";
+$a->strings["Remove Item Tag"] = "Retirer une étiquette à l'élément";
+$a->strings["Select a tag to remove: "] = "Étiquette à retirer :";
+$a->strings["Remove"] = "Retirer";
+$a->strings["Continue"] = "Continuer";
+$a->strings["Premium Channel Setup"] = "Configuration du canal Premium";
+$a->strings["Enable premium channel connection restrictions"] = "Activer les restrictions liées au canal premium";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Merci de saisir les restrictions et/ou conditions - reçu Paypal, transaction Bitcoin, ligne de conduite, ...";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Avant d'autoriser la mise en relation, ce canal attire votre attention sur les conditions suivantes :";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Les relations potentielles verront ce qui suit avant de pouvoir continuer :";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuant, je certifie que je me suis acquitté de toutes les instructions indiquées sur cette page.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Aucune instruction spécifique n'a été établie par le propriétaire du canal.)";
+$a->strings["Restricted or Premium Channel"] = "Canal Premium ou restreint";
+$a->strings["No potential page delegates located."] = "Aucun délégué potentiel n'a été trouvé pour cette page.";
+$a->strings["Delegate Page Management"] = "Gestion des délégués de la page";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Les délégués sont capables de gérer tous les aspects de ce compte ou de cette page, à l'exception des réglages basiques du compte. Merci de ne déléguer votre compte personnel qu'à quelqu'un en qui vous avez une confiance aveugle.";
+$a->strings["Existing Page Managers"] = "Actuels gestionnaires de pages";
+$a->strings["Existing Page Delegates"] = "Actuels délégués";
+$a->strings["Potential Delegates"] = "Délégués potentiels";
+$a->strings["Add"] = "Ajouter";
+$a->strings["No entries."] = "Aucune entrée.";
+$a->strings["Away"] = "Absent";
+$a->strings["Online"] = "En ligne";
+$a->strings["Item not available."] = "Élément indisponible.";
+$a->strings["Menu element updated."] = "Entrée de menu mis-à-jour.";
+$a->strings["Unable to update menu element."] = "Impossible de mettre l'entrée de menu à jour.";
+$a->strings["Menu element added."] = "Entrée de menu ajouté.";
+$a->strings["Unable to add menu element."] = "Impossible d'ajouter l'entrée de menu.";
+$a->strings["Manage Menu Elements"] = "Gérer les entrées de menu";
+$a->strings["Edit menu"] = "Éditer le menu";
+$a->strings["Edit element"] = "Éditer l'entrée";
+$a->strings["Drop element"] = "Supprimer l'entrée";
+$a->strings["New element"] = "Nouvelle entrée";
+$a->strings["Edit this menu container"] = "Éditer ce bloc de menu";
+$a->strings["Add menu element"] = "Ajouter une entrée au menu";
+$a->strings["Delete this menu item"] = "Supprimer cet entrée du menu";
+$a->strings["Edit this menu item"] = "Éditer cette entrée du menu";
+$a->strings["New Menu Element"] = "Nouvelle entrée de menu";
+$a->strings["Menu Item Permissions"] = "Permissions de l'entrée de menu";
+$a->strings["Link text"] = "Texte du lien";
+$a->strings["URL of link"] = "URL du lien";
+$a->strings["Use Red magic-auth if available"] = "Utiliser l'authentification automagique de Red, si possible";
+$a->strings["Open link in new window"] = "Ouvrir le lien dans une nouvelle fenêtre";
+$a->strings["Order in list"] = "Ordre dans la liste";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Les nombres les plus élevés seront descendus au bas de la liste";
+$a->strings["Menu item not found."] = "Entrée de menu introuvable.";
+$a->strings["Menu item deleted."] = "Entrée de menu supprimée.";
+$a->strings["Menu item could not be deleted."] = "Impossible de supprimer l'entrée de menu.";
+$a->strings["Edit Menu Element"] = "Éditer l'entrée de menu";
+$a->strings["Collection created."] = "Collection créée.";
+$a->strings["Could not create collection."] = "Impossible de créer la collection.";
+$a->strings["Collection updated."] = "Collection mise-à-jour.";
+$a->strings["Create a collection of channels."] = "Créez une collection de canaux.";
+$a->strings["Collection Name: "] = "Nom de la collection :";
+$a->strings["Members are visible to other channels"] = "Les membres sont visibles par les autres canaux";
+$a->strings["Collection removed."] = "Collection supprimée.";
+$a->strings["Unable to remove collection."] = "Impossible de supprimer la collection.";
+$a->strings["Collection Editor"] = "Éditeur de collection";
+$a->strings["Members"] = "Membres";
+$a->strings["All Connected Channels"] = "Tous canaux connectés";
+$a->strings["Click on a channel to add or remove."] = "Cliquer sur un canal pour ajouter ou supprimer";
 $a->strings["Invalid profile identifier."] = "Identifiant de profil invalide.";
-$a->strings["Profile Visibility Editor"] = "Éditer la visibilité du profil";
-$a->strings["Click on a contact to add or remove."] = "Cliquez sur un contact pour l'ajouter ou le supprimer.";
+$a->strings["Profile Visibility Editor"] = "Éditeur de visibilité de profil";
+$a->strings["Click on a contact to add or remove."] = "Cliquez sur un contact pour l'ajouter ou le retirer.";
 $a->strings["Visible To"] = "Visible par";
-$a->strings["All Contacts (with secure profile access)"] = "Tous les contacts (ayant un accès sécurisé)";
-$a->strings["Event description and start time are required."] = "Une description et une heure de début sont requises.";
-$a->strings["Create New Event"] = "Créer un nouvel événement";
-$a->strings["Previous"] = "Précédent";
-$a->strings["Next"] = "Suivant";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Editer l'événement";
-$a->strings["link to source"] = "lien original";
-$a->strings["hour:minute"] = "heures:minutes";
-$a->strings["Event details"] = "Détails de l'événement";
-$a->strings["Format is %s %s. Starting date and Description are required."] = "Le format est %s %s. Une date de début et une description sont requises.";
-$a->strings["Event Starts:"] = "Début de l'événement:";
-$a->strings["Finish date/time is not known or not relevant"] = "Date/heure de fin inconnue ou sans objet";
-$a->strings["Event Finishes:"] = "Fin de l'événement:";
-$a->strings["Adjust for viewer timezone"] = "Ajuster à la zone horaire du visiteur";
-$a->strings["Description:"] = "Description:";
-$a->strings["Share this event"] = "Partager cet événement";
-$a->strings["Invalid request identifier."] = "Identifiant de demande invalide.";
-$a->strings["Discard"] = "Défausser";
-$a->strings["Network"] = "Réseau";
-$a->strings["Home"] = "Accueil";
-$a->strings["Introductions"] = "Introductions";
-$a->strings["Messages"] = "Messages";
-$a->strings["Show Ignored Requests"] = "Voir les demandes ignorées";
-$a->strings["Hide Ignored Requests"] = "Cacher les demandes ignorées";
-$a->strings["Notification type: "] = "Type de notification: ";
-$a->strings["Friend Suggestion"] = "Suggestion d'amitié/contact";
-$a->strings["suggested by %s"] = "suggéré(e) par %s";
-$a->strings["Approve"] = "Approuver";
-$a->strings["Claims to be known to you: "] = "Prétend que vous le connaissez: ";
-$a->strings["yes"] = "oui";
-$a->strings["no"] = "non";
-$a->strings["Approve as: "] = "Approuver en tant que: ";
-$a->strings["Friend"] = "Ami";
-$a->strings["Sharer"] = "Initiateur du partage";
-$a->strings["Fan/Admirer"] = "Fan/Admirateur";
-$a->strings["Friend/Connect Request"] = "Demande de connexion/relation";
-$a->strings["New Follower"] = "Nouvel abonné";
-$a->strings["No notifications."] = "Pas de notification.";
-$a->strings["Notifications"] = "Notifications";
-$a->strings["%s liked %s's post"] = "%s a aimé la notice de %s";
-$a->strings["%s disliked %s's post"] = "%s n'a pas aimé la notice de %s";
-$a->strings["%s is now friends with %s"] = "%s est désormais ami(e) avec %s";
-$a->strings["%s created a new post"] = "%s a publié une notice";
-$a->strings["%s commented on %s's post"] = "%s a commenté une notice de %s";
-$a->strings["Nothing new!"] = "Rien de neuf!";
-$a->strings["Contact settings applied."] = "Réglages du contact appliqués.";
-$a->strings["Contact update failed."] = "Impossible d'appliquer les réglages.";
-$a->strings["Contact not found."] = "Contact introuvable.";
-$a->strings["Repair Contact Settings"] = "Réglages du réparateur de contacts";
-$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ATTENTION: Manipulation réservée aux experts, toute information incorrecte pourrait empêcher la communication avec ce contact.";
-$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "une photo";
-$a->strings["Account Nickname"] = "Pseudo du compte";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@NomDuTag - prend le pas sur Nom/Pseudo";
-$a->strings["Account URL"] = "URL du compte";
-$a->strings["Friend Request URL"] = "Echec du téléversement de l'image.";
-$a->strings["Friend Confirm URL"] = "Accès public refusé.";
-$a->strings["Notification Endpoint URL"] = "Aucune photo sélectionnée";
-$a->strings["Poll/Feed URL"] = "Téléverser des photos";
-$a->strings["New photo from this URL"] = "Nouvelle photo depuis cette URL";
-$a->strings["This introduction has already been accepted."] = "Cette introduction a déjà été acceptée.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "L'emplacement du profil est invalide ou ne contient pas de profil valide.";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Attention: l'emplacement du profil n'a pas de nom identifiable.";
-$a->strings["Warning: profile location has no profile photo."] = "Attention: l'emplacement du profil n'a pas de photo de profil.";
-$a->strings["%d required parameter was not found at the given location"] = array(
-	0 => "%d paramètre requis n'a pas été trouvé à l'endroit indiqué",
-	1 => "%d paramètres requis n'ont pas été trouvés à l'endroit indiqué",
-);
-$a->strings["Introduction complete."] = "Phase de présentation achevée.";
-$a->strings["Unrecoverable protocol error."] = "Erreur de protocole non-récupérable.";
-$a->strings["Profile unavailable."] = "Profil indisponible.";
-$a->strings["%s has received too many connection requests today."] = "%s a reçu trop de demande d'introduction aujourd'hui.";
-$a->strings["Spam protection measures have been invoked."] = "Des mesures de protection contre le spam ont été déclenchées.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "Les relations sont encouragées à attendre 24 heures pour recommencer.";
-$a->strings["Invalid locator"] = "Localisateur invalide";
-$a->strings["Unable to resolve your name at the provided location."] = "Impossible de résoudre votre nom à l'emplacement fourni.";
-$a->strings["You have already introduced yourself here."] = "Vous vous êtes déjà présenté ici.";
-$a->strings["Apparently you are already friends with %s."] = "Il semblerait que vous soyez déjà ami avec %s.";
-$a->strings["Invalid profile URL."] = "URL de profil invalide.";
-$a->strings["Your introduction has been sent."] = "Votre présentation a été envoyée.";
-$a->strings["Please login to confirm introduction."] = "Connectez-vous pour confirmer l'introduction.";
-$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Identité incorrecte actuellement connectée. Merci de vous connecter à ce profil.";
-$a->strings["Welcome home %s."] = "Bienvenue chez vous, %s.";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Merci de confirmer votre demande d'introduction auprès de %s.";
-$a->strings["Confirm"] = "Confirmer";
-$a->strings["[Name Withheld]"] = "[Nom non-publié]";
-$a->strings["Introduction received at "] = "Introduction reçue sur ";
-$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Membres de Diaspora : N'utilisez pas ce formulaire. Entrez plutôt \"%s\" dans votre barre de recherche Diaspora.";
-$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Saisissez votre \"Adresse d'identité\" de l'un des réseaux sociaux suivants:";
-$a->strings["Friend/Connection Request"] = "Requête de relation/amitié";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Exemples : jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Merci de répondre à ce qui suit:";
-$a->strings["Does %s know you?"] = "Est-ce que %s vous connaît?";
-$a->strings["Add a personal note:"] = "Ajouter une note personnelle:";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
-$a->strings["- please share from your own site as noted above"] = "- partagez depuis votre propre site comme indiqué ci-dessus";
-$a->strings["Your Identity Address:"] = "Votre adresse d'identité:";
-$a->strings["Submit Request"] = "Envoyer la requête";
-$a->strings["Authorize application connection"] = "Autoriser l'application à se connecter";
-$a->strings["Return to your app and insert this Securty Code:"] = "Retournez à votre application et saisissez ce Code de Sécurité : ";
-$a->strings["Please login to continue."] = "Merci de vous connecter pour continuer.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos notices et contacts, et/ou à créer des notices à votre place?";
-$a->strings["status"] = "le statut";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a taggué %3\$s de %2\$s avec %4\$s";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s aime %3\$s de %2\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s n'aime pas %3\$s de %2\$s";
-$a->strings["No valid account found."] = "Impossible de trouver un compte valide.";
-$a->strings["Password reset request issued. Check your email."] = "Réinitialisation du mot de passe en cours. Vérifiez votre courriel.";
-$a->strings["Password reset requested at %s"] = "Requête de réinitialisation de mot de passe à %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utilisée par le passé.) La réinitialisation a échoué.";
-$a->strings["Your password has been reset as requested."] = "Votre mot de passe a bien été réinitialisé.";
-$a->strings["Your new password is"] = "Votre nouveau mot de passe est ";
-$a->strings["Save or copy your new password - and then"] = "Sauvez ou copiez ce nouveau mot de passe - puis";
-$a->strings["click here to login"] = "cliquez ici pour vous connecter";
-$a->strings["Your password may be changed from the Settings page after successful login."] = "Votre mot de passe peut être changé depuis la page <em>Réglages</em>, une fois que vous serez connecté.";
-$a->strings["Forgot your Password?"] = "Mot de passe oublié?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entrez votre adresse de courriel et validez pour réinitialiser votre mot de passe. Vous recevrez la suite des instructions par courriel.";
-$a->strings["Nickname or Email: "] = "Pseudo ou Courriel: ";
-$a->strings["Reset"] = "Réinitialiser";
-$a->strings["This is Friendica, version"] = "Motorisé par Friendica version";
-$a->strings["running at web location"] = "hébergé sur";
-$a->strings["Please visit Project.Friendika.com to learn more about the Friendica project."] = "Pour en savoir plus, vous pouvez nous rendre visite sur <a href=\"http://project.friendica.com\">Project.Friendica.com</a>";
-$a->strings["Bug reports and issues: please visit"] = "Pour les rapports de bugs: rendez vous sur";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggestions, remerciements, donations, etc. - écrivez à \"Info\" arob. Friendica - point com";
-$a->strings["Installed plugins/addons/apps"] = "Extensions/greffons/applications installées";
-$a->strings["No installed plugins/addons/apps"] = "Aucune extension/greffon/application installée";
-$a->strings["Remove My Account"] = "Supprimer mon compte";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Ceci supprimera totalement votre compte. Cette opération est irréversible.";
-$a->strings["Please enter your password for verification:"] = "Merci de saisir votre mot de passe pour vérification:";
-$a->strings["Applications"] = "Applications";
-$a->strings["No installed applications."] = "Pas d'application installée.";
-$a->strings["Save"] = "Sauver";
-$a->strings["Friend suggestion sent."] = "Suggestion d'amitié/contact envoyée.";
-$a->strings["Suggest Friends"] = "Suggérer des amis/contacts";
-$a->strings["Suggest a friend for %s"] = "Suggérer un ami/contact pour %s";
-$a->strings["Access denied."] = "Accès refusé.";
-$a->strings["Global Directory"] = "Annuaire global";
-$a->strings["Normal site view"] = "Vue normale";
-$a->strings["Admin - View all site entries"] = "Admin - voir toutes les entrées";
-$a->strings["Find on this site"] = "Trouver sur ce site";
-$a->strings["Site Directory"] = "Annuaire local";
-$a->strings["Gender: "] = "Genre: ";
-$a->strings["No entries (some entries may be hidden)."] = "Aucune entrée (certaines peuvent être cachées).";
+$a->strings["All Connections"] = "Toutes les relations";
+$a->strings["Theme settings updated."] = "Réglages du thème sauvegardés.";
 $a->strings["Site"] = "Site";
 $a->strings["Users"] = "Utilisateurs";
 $a->strings["Plugins"] = "Extensions";
+$a->strings["Themes"] = "Thèmes";
+$a->strings["Server"] = "Serveur";
+$a->strings["DB updates"] = "MàJ BD";
 $a->strings["Logs"] = "Journaux";
-$a->strings["User registrations waiting for confirmation"] = "Inscriptions en attente de confirmation";
+$a->strings["Plugin Features"] = "Fonctionnalités liées aux extensions";
+$a->strings["User registrations waiting for confirmation"] = "Inscriptions en attente";
+$a->strings["Message queues"] = "File des messages";
 $a->strings["Administration"] = "Administration";
 $a->strings["Summary"] = "Résumé";
 $a->strings["Registered users"] = "Utilisateurs inscrits";
 $a->strings["Pending registrations"] = "Inscriptions en attente";
-$a->strings["Version"] = "Versio";
-$a->strings["Active plugins"] = "Extensions activés";
-$a->strings["Site settings updated."] = "Réglages du site mis-à-jour.";
+$a->strings["Version"] = "Version";
+$a->strings["Active plugins"] = "Extensions actives";
+$a->strings["Site settings updated."] = "Réglages du site sauvegardés.";
+$a->strings["No special theme for accessibility"] = "Pas de thème spécifique pour l'accessibilité";
 $a->strings["Closed"] = "Fermé";
-$a->strings["Requires approval"] = "Demande une apptrobation";
+$a->strings["Requires approval"] = "Après approbation";
 $a->strings["Open"] = "Ouvert";
-$a->strings["File upload"] = "Téléversement de fichier";
-$a->strings["Policies"] = "Politiques";
+$a->strings["Private"] = "Privé";
+$a->strings["Paid Access"] = "Accès payant";
+$a->strings["Free Access"] = "Accès gratuit";
+$a->strings["Tiered Access"] = "Accès par paliers";
+$a->strings["Registration"] = "Inscription";
+$a->strings["File upload"] = "Envoi de fichier";
+$a->strings["Policies"] = "Stratégies";
 $a->strings["Advanced"] = "Avancé";
 $a->strings["Site name"] = "Nom du site";
-$a->strings["Banner/Logo"] = "Bannière/Logo";
+$a->strings["Banner/Logo"] = "Bannière/logo";
+$a->strings["Administrator Information"] = "Information sur l'administration";
+$a->strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Coordonnées de l'administration du site. Affichée sur la page 'siteinfo'. Vous pouvez utiliser du BBCode ici";
 $a->strings["System language"] = "Langue du système";
 $a->strings["System theme"] = "Thème du système";
+$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Thème par défaut - il peut être changé pour chaque profil utilisateur - modifier le thème";
+$a->strings["Mobile system theme"] = "Thème système pour mobile";
+$a->strings["Theme for mobile devices"] = "Thème dédié aux périphériques mobiles";
+$a->strings["Accessibility system theme"] = "Thème système pour l'accessibilité";
+$a->strings["Accessibility theme"] = "Thème pour l'accessibilité";
+$a->strings["Channel to use for this website's static pages"] = "Canal à utiliser pour les pages statiques de ce site";
+$a->strings["Site Channel"] = "Canal du site";
 $a->strings["Maximum image size"] = "Taille maximale des images";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Taille maximum, en octets, des images envoyées. Par défaut 0, soit sans limite.";
 $a->strings["Register policy"] = "Politique d'inscription";
+$a->strings["Access policy"] = "Politique d'accès";
 $a->strings["Register text"] = "Texte d'inscription";
+$a->strings["Will be displayed prominently on the registration page."] = "Sera affiché de manière bien visible sur le formulaire d'inscription.";
 $a->strings["Accounts abandoned after x days"] = "Les comptes sont abandonnés après x jours";
-$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
-$a->strings["Allowed friend domains"] = "Domaines autorisés";
-$a->strings["Allowed email domains"] = "Domaines courriel autorisés";
-$a->strings["Block public"] = "Interdire la publication globale";
-$a->strings["Force publish"] = "Forcer la publication globale";
-$a->strings["Global directory update URL"] = "URL de mise-à-jour de l'annuaire global";
-$a->strings["Block multiple registrations"] = "Interdire les inscriptions multiples";
-$a->strings["OpenID support"] = "Support OpenID";
-$a->strings["Gravatar support"] = "Support Gravatar";
-$a->strings["Fullname check"] = "Vérification du \"Prénom Nom\"";
-$a->strings["UTF-8 Regular expressions"] = "Regex UTF-8";
-$a->strings["Show Community Page"] = "Montrer la \"Place publique\"";
-$a->strings["Enable OStatus support"] = "Activer le support d'OStatus";
-$a->strings["Enable Diaspora support"] = "Activer le support de Diaspora";
-$a->strings["Only allow Friendika contacts"] = "N'autoriser que les contacts Friendica";
-$a->strings["Verify SSL"] = "Vérifier SSL";
-$a->strings["Proxy user"] = "Utilisateur du proxy";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour éviter de gaspiller les ressources du système en essayer de mettre à jour des comptes abandonnés. Mettez 0 pour ne pas avoir de limite de temps.";
+$a->strings["Allowed friend domains"] = "Domaines amicaux";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste de noms de domaines - séparés par des virgules - pour lesquels ce site acceptera les demandes d'amitié ou de mise en relation. Les caractères génériques (*) sont acceptés. Laissez vide pour accepter tous les domaines.";
+$a->strings["Allowed email domains"] = "Domaines de courriels amicaux";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste de noms de domaines - séparés par des virgules - dont les adresses de courriel seront autorisées lors de l'inscription à ce site. Les caractères génériques (*) sont acceptés. Laissez vide pour accepter tous les domaines.";
+$a->strings["Block public"] = "Bloquer public";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Cocher pour interdire tout accès public, y compris aux pages marquées comme publiques, aux visiteurs anonymes.";
+$a->strings["Force publish"] = "Forcer publication";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Cocher pour forcer la publication de tous les profils du site dans l'annuaire.";
+$a->strings["No login on Homepage"] = "Pas de connexion depuis la page d'accueil";
+$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "";
+$a->strings["Proxy user"] = "Utilisateurs du proxy";
 $a->strings["Proxy URL"] = "URL du proxy";
-$a->strings["Network timeout"] = "Dépassement du délai d'attente du réseau";
-$a->strings["%s user blocked"] = array(
-	0 => "%s utilisateur bloqué",
-	1 => "%s utilisateurs (dé)bloqués",
+$a->strings["Network timeout"] = "Délai maximal du réseau";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "En secondes. Mettre à 0 pour ne pas avoir de délai maximal (pas recommandé).";
+$a->strings["Delivery interval"] = "Intervalle de distribution";
+$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Temporise le processus de distribution de tant de secondes pour réduire la charge sur le système. Valeurs recommandées : 4-5 pour les serveurs mutualisés, 2-3 pour les VPS. 0-1 pour les gros serveurs dédiés.";
+$a->strings["Poll interval"] = "Intervalle de scrutation";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Temporise le processus de scrutation en tâche de fond de tant de secondes, pour réduire la charge. Si 0, utilise l'intervalle de distribution.";
+$a->strings["Maximum Load Average"] = "Charge moyenne maximale";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Charge système maximale au-delà de laquelle distribution et scrutation sont mis en pause - par défaut 50.";
+$a->strings["No server found"] = "Serveur introuvable";
+$a->strings["ID"] = "ID";
+$a->strings["for channel"] = "pour le canal";
+$a->strings["on server"] = "sur le serveur";
+$a->strings["Status"] = "État";
+$a->strings["Update has been marked successful"] = "La mise à jour a été marquée comme réussie";
+$a->strings["Executing %s failed. Check system logs."] = "L'éxecution de %s a échoué. Merci de vérifier les journaux du système.";
+$a->strings["Update %s was successfully applied."] = "La mise à jour %s a été appliquée avec succès.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "La mise à jour %s n'a pas retourné d'information. Impossible de savoir si elle a réussi ou non.";
+$a->strings["Update function %s could not be found."] = "La fonction de mise à jour %s est introuvable.";
+$a->strings["No failed updates."] = "Aucune mise à jour défaillante.";
+$a->strings["Failed Updates"] = "Mises à jour défaillantes";
+$a->strings["Mark success (if update was manually applied)"] = "Marquer comme réussie (si la mise à jour a été réalisée manuellement)";
+$a->strings["Attempt to execute this update step automatically"] = "Tenter de réaliser cette étape de mise à jour automatiquement";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s utilisateur bloqué/débloqué",
+	1 => "%s utilisateurs bloqués/débloqués",
 );
 $a->strings["%s user deleted"] = array(
 	0 => "%s utilisateur supprimé",
 	1 => "%s utilisateurs supprimés",
 );
+$a->strings["Account not found"] = "Compte introuvable";
 $a->strings["User '%s' deleted"] = "Utilisateur '%s' supprimé";
 $a->strings["User '%s' unblocked"] = "Utilisateur '%s' débloqué";
 $a->strings["User '%s' blocked"] = "Utilisateur '%s' bloqué";
 $a->strings["select all"] = "tout sélectionner";
-$a->strings["User registrations waiting for confirm"] = "Inscriptions d'utilisateurs en attente de confirmation";
+$a->strings["User registrations waiting for confirm"] = "Inscriptions en attente d'approbation";
 $a->strings["Request date"] = "Date de la demande";
-$a->strings["Email"] = "Courriel";
 $a->strings["No registrations."] = "Pas d'inscriptions.";
-$a->strings["Deny"] = "Rejetter";
+$a->strings["Approve"] = "Approuver";
+$a->strings["Deny"] = "Refuser";
+$a->strings["Block"] = "Bloquer";
+$a->strings["Unblock"] = "Débloquer";
 $a->strings["Register date"] = "Date d'inscription";
 $a->strings["Last login"] = "Dernière connexion";
-$a->strings["Last item"] = "Dernier élément";
-$a->strings["Account"] = "Compte";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés vont être supprimés!\\n\\nTout ce qu'ils ont posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utilisateur {0} va être supprimé!\\n\\nTout ce qu'il a posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?";
+$a->strings["Expires"] = "Expire";
+$a->strings["Service Class"] = "Classe de service";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Les utilisateurs sélectionnés seront supprimés!\\n\\nTout ce que ces utilisateurs ont publié sur ce site sera détruit de manière définitive!\\n\\nÊtes-vous certain?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utilisateur {0} sera supprimé!\\n\\nTout ce que cet utilisateur a publié sur ce site sera détruit de manière définitive!\\n\\nÊtes-vous certain?";
 $a->strings["Plugin %s disabled."] = "Extension %s désactivée.";
 $a->strings["Plugin %s enabled."] = "Extension %s activée.";
 $a->strings["Disable"] = "Désactiver";
 $a->strings["Enable"] = "Activer";
-$a->strings["Toggle"] = "Activer/Désactiver";
-$a->strings["Settings"] = "Réglages";
-$a->strings["Log settings updated."] = "Réglages des journaux mis-à-jour.";
-$a->strings["Clear"] = "Effacer";
-$a->strings["Debugging"] = "Déboguage";
-$a->strings["Log file"] = "Fichier de journaux";
-$a->strings["Must be writable by web server. Relative to your Friendika index.php."] = "Doit être accessible en écriture pour le serveur web. Le chemin est relative à l'index.php de Friendica.";
-$a->strings["Log level"] = "Niveau de journalisaton";
-$a->strings["Close"] = "Fermer";
-$a->strings["FTP Host"] = "Hôte FTP";
-$a->strings["FTP Path"] = "Chemin FTP";
-$a->strings["FTP User"] = "Utilisateur FTP";
-$a->strings["FTP Password"] = "Mot de passe FTP";
-$a->strings["Unable to locate original post."] = "Impossible de localiser l'article original.";
-$a->strings["Empty post discarded."] = "Article vide défaussé.";
-$a->strings["noreply"] = "noreply";
-$a->strings["Administrator@"] = "Administrator@";
-$a->strings["%s commented on an item at %s"] = "%s a commenté un élément à %s";
-$a->strings["%s posted to your profile wall at %s"] = "%s a posté sur votre mur à %s";
-$a->strings["System error. Post not saved."] = "Erreur système. Publication non sauvée.";
-$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "Ce message vous a été envoyé par %s, un membre du réseau social Friendica.";
-$a->strings["You may visit them online at %s"] = "Vous pouvez leur rendre visite sur %s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Merci de contacter l'émeteur en répondant à cette publication si vous ne souhaitez pas recevoir ces messages.";
-$a->strings["%s posted an update."] = "%s a publié une mise à jour.";
-$a->strings["Tag removed"] = "Étiquette enlevée";
-$a->strings["Remove Item Tag"] = "Enlever l'étiquette de l'élément";
-$a->strings["Select a tag to remove: "] = "Choisir une étiquette à enlever: ";
-$a->strings["Remove"] = "Utiliser comme photo de profil";
-$a->strings["No recipient selected."] = "Pas de destinataire sélectionné.";
-$a->strings["Unable to locate contact information."] = "Impossible de localiser les informations du contact.";
-$a->strings["Message could not be sent."] = "Impossible d'envoyer le message.";
-$a->strings["Message sent."] = "Message envoyé.";
-$a->strings["Inbox"] = "Messages entrants";
-$a->strings["Outbox"] = "Messages sortants";
-$a->strings["New Message"] = "Nouveau message";
+$a->strings["Toggle"] = "(Dés)activer";
+$a->strings["Author: "] = "Auteur :";
+$a->strings["Maintainer: "] = "Maintenu par :";
+$a->strings["No themes found."] = "Aucun thème trouvé.";
+$a->strings["Screenshot"] = "Aperçu";
+$a->strings["[Experimental]"] = "[Expérimental]";
+$a->strings["[Unsupported]"] = "[Non-supporté]";
+$a->strings["Log settings updated."] = "Réglages du journal sauvegardés.";
+$a->strings["Clear"] = "Vider";
+$a->strings["Debugging"] = "Débogage";
+$a->strings["Log file"] = "Fichier du journal";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Doit être accessible en écriture par le serveur web. Chemin relatif à la racine de Red.";
+$a->strings["Log level"] = "Niveau de journalisation";
+$a->strings["- select -"] = "- choisir -";
+$a->strings["Welcome to %s"] = "Bienvenue sur %s";
+$a->strings["Item not found"] = "Élément introuvable";
+$a->strings["Item is not editable"] = "Élément non-éditable";
+$a->strings["Delete item?"] = "Supprimer l'élément?";
+$a->strings["Insert YouTube video"] = "Insérer une vidéo YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "Insérer une vidéo Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Insérer un son Vorbis [.ogg]";
+$a->strings["Age: "] = "Age :";
+$a->strings["Gender: "] = "Sexe/genre :";
+$a->strings["Finding:"] = "Recherche :";
+$a->strings["next page"] = "page suiv.";
+$a->strings["previous page"] = "page préc.";
+$a->strings["No entries (some entries may be hidden)."] = "Pas d'entrées (certaines peuvent être cachées).";
+$a->strings["Could not access contact record."] = "Impossible d'accéder aux détails du contact.";
+$a->strings["Could not locate selected profile."] = "Impossible de localiser le profil sélectionné.";
+$a->strings["Connection updated."] = "Connexion mise à jour.";
+$a->strings["Failed to update connection record."] = "Impossible de mettre à jour les détails de la relation.";
+$a->strings["Could not access address book record."] = "Impossible d'accéder aux détails du carnet d'adresses.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Actualisation impossible - le canal est momentanément indisponible.";
+$a->strings["Channel has been unblocked"] = "Le canal n'est plus bloqué";
+$a->strings["Channel has been blocked"] = "Le canal est bloqué";
+$a->strings["Unable to set address book parameters."] = "Impossible de régler les paramètres du carnet d'adresses.";
+$a->strings["Channel has been unignored"] = "Le canal n'est plus ignoré";
+$a->strings["Channel has been ignored"] = "Le canal est ignoré";
+$a->strings["Channel has been unarchived"] = "Le canal n'est plus archivé";
+$a->strings["Channel has been archived"] = "Le canal est archivé";
+$a->strings["Channel has been unhidden"] = "Le canal n'est plus caché";
+$a->strings["Channel has been hidden"] = "Le canal est caché";
+$a->strings["Channel has been approved"] = "Le canal est approuvé";
+$a->strings["Channel has been unapproved"] = "Le canal n'est plus approuvé";
+$a->strings["Contact has been removed."] = "Le canal a été supprimé";
+$a->strings["View %s's profile"] = "Voir le profil de %s";
+$a->strings["Refresh Permissions"] = "Actualiser les permissions";
+$a->strings["Fetch updated permissions"] = "Récupérer les permissions les plus récentes";
+$a->strings["Recent Activity"] = "Activité récente";
+$a->strings["View recent posts and comments"] = "Voir les contributions et commentaires récentes";
+$a->strings["Block or Unblock this connection"] = "Bloquer ou Débloquer cette relation";
+$a->strings["Unignore"] = "Ne plus ignorer";
+$a->strings["Ignore"] = "Ignorer";
+$a->strings["Ignore or Unignore this connection"] = "Ignorer ou ne plus ignorer cette relation";
+$a->strings["Unarchive"] = "Ne plus archiver";
+$a->strings["Archive"] = "Archiver";
+$a->strings["Archive or Unarchive this connection"] = "Archiver ou ne plus archiver cette relation";
+$a->strings["Unhide"] = "Ne plus cacher";
+$a->strings["Hide"] = "Cacher";
+$a->strings["Hide or Unhide this connection"] = "Cacher ou ne plus cacher cette relation";
+$a->strings["Delete this connection"] = "Supprimer cette relation";
+$a->strings["Unknown"] = "Inconnu";
+$a->strings["Approve this connection"] = "Approuver cette relation";
+$a->strings["Accept connection to allow communication"] = "Accepter la relation pour permettre la communication";
+$a->strings["Automatic Permissions Settings"] = "Permissions automatiques";
+$a->strings["Connections: settings for %s"] = "Relations : réglages pour %s";
+$a->strings["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."] = "Pour chaque introduction reçue, toutes les permissions définies ici seront appliquées aux nouvelles relations automatiquement, et l'introduction sera approuvée. Laissez cette page telle quelle si vous ne souhaitez pas utiliser ce mécanisme.";
+$a->strings["Slide to adjust your degree of friendship"] = "Faites glisser pour ajuster le niveau de la relation";
+$a->strings["inherited"] = "par héritage";
+$a->strings["Connection has no individual permissions!"] = "Cette relation n'a aucune permission spécifique!";
+$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Ceci devrait correspondre à vos réglages de vie privée, mais vous pouvez toujours contrôler les \"Permissions avancées\".";
+$a->strings["Profile Visibility"] = "Visibilité du profil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Merci de choisir le profil que vous souhaitez montrer quand %s visite votre profil de manière authentifiée.";
+$a->strings["Contact Information / Notes"] = "Notes / Information de contact";
+$a->strings["Edit contact notes"] = "Éditer les notes du contact";
+$a->strings["Their Settings"] = "Ses réglages";
+$a->strings["My Settings"] = "Mes réglages";
+$a->strings["Forum Members"] = "Membres de forum";
+$a->strings["Soapbox"] = "Boîte à savon";
+$a->strings["Full Sharing (typical social network permissions)"] = "Partage complet (fonctionnement habituel des réseaux sociaux)";
+$a->strings["Cautious Sharing "] = "Partage modéré";
+$a->strings["Follow Only"] = "Suivi uniquement";
+$a->strings["Individual Permissions"] = "Permissions spécifiques";
+$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Certaines permissions peuvent être héritées de vos réglages de vie privée, lesquels sont prioritaires sur les réglages spécifiques. Changer ces permissions héritées sur la présente page n'aura aucun effet.";
+$a->strings["Advanced Permissions"] = "Permissions avancées";
+$a->strings["Simple Permissions (select one and submit)"] = "Permissions simples (en choisir une, puis valider)";
+$a->strings["Visit %s's profile - %s"] = "Visiter le profil de %s - %s";
+$a->strings["Block/Unblock contact"] = "Bloquer/Débloquer le contact";
+$a->strings["Ignore contact"] = "Ignorer le contact";
+$a->strings["Repair URL settings"] = "Réparer les réglages d'URL";
+$a->strings["View conversations"] = "Voir les conversations";
+$a->strings["Delete contact"] = "Supprimer le contact";
+$a->strings["Last update:"] = "Dernière mise-à-jour :";
+$a->strings["Update public posts"] = "Mettre à jour les publications";
+$a->strings["Update now"] = "Mettre à jour maintenant";
+$a->strings["Currently blocked"] = "Actuellement bloqué";
+$a->strings["Currently ignored"] = "Actuellement ignoré";
+$a->strings["Currently archived"] = "Actuellement archivé";
+$a->strings["Currently pending"] = "Actuellement en attente";
+$a->strings["Hide this contact from others"] = "Dissimuler ce contact aux autres";
+$a->strings["Replies/likes to your public posts may still be visible"] = "Les réponses et autres réactions à vos contributions publiques pourraient être toujours visibles";
+$a->strings["Layout Help"] = "Aide à la mise en page";
+$a->strings["Help with this feature"] = "Aide avec cette fonctionnalité";
+$a->strings["Layout Name"] = "Nom de la mise-en-page";
+$a->strings["Help:"] = "Aide :";
+$a->strings["Not Found"] = "Introuvable";
+$a->strings["Page not found."] = "Page introuvable.";
+$a->strings["Remote Authentication"] = "Authentification distante";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Entrez l'adresse de votre canal (p.ex. moncanal@monsite.com)";
+$a->strings["Authenticate"] = "Authentifier";
+$a->strings["Invalid item."] = "Élément invalide.";
+$a->strings["No such group"] = "Rien de tel comme groupe";
+$a->strings["Search Results For:"] = "Résultats de recherche pour :";
+$a->strings["Collection is empty"] = "Collection vide";
+$a->strings["Collection: "] = "Collection :";
+$a->strings["Connection: "] = "Relation :";
+$a->strings["Invalid connection."] = "Relation invalide.";
+$a->strings["Profile not found."] = "Profil introuvable.";
+$a->strings["Profile deleted."] = "Profil supprimé.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Nouveau profil créé.";
+$a->strings["Profile unavailable to clone."] = "Profil impossible à cloner.";
+$a->strings["Profile Name is required."] = "Le nom du profil est requis.";
+$a->strings["Marital Status"] = "Statut marital";
+$a->strings["Romantic Partner"] = "Partenaire";
+$a->strings["Likes"] = "Aime";
+$a->strings["Dislikes"] = "Déteste";
+$a->strings["Work/Employment"] = "Travail/Occupation";
+$a->strings["Religion"] = "Religion/Croyance";
+$a->strings["Political Views"] = "Opinions politiques";
+$a->strings["Gender"] = "Sexe/Genre";
+$a->strings["Sexual Preference"] = "Préférence sexuelle";
+$a->strings["Homepage"] = "Site Internet";
+$a->strings["Interests"] = "Centres d'intérêt";
+$a->strings["Address"] = "Adresse";
+$a->strings["Location"] = "Localisation";
+$a->strings["Profile updated."] = "Profil mis à jour.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Cacher vos contacts/relations aux visiteurs de ce profil?";
+$a->strings["Edit Profile Details"] = "Éditer les détails du profil";
+$a->strings["View this profile"] = "Voir le profil";
+$a->strings["Change Profile Photo"] = "Changer la photo du profil";
+$a->strings["Create a new profile using these settings"] = "Créer un nouveau profil avec ces réglages";
+$a->strings["Clone this profile"] = "Cloner le profil";
+$a->strings["Delete this profile"] = "Supprimer le profil";
+$a->strings["Profile Name:"] = "Nom du profil :";
+$a->strings["Your Full Name:"] = "Votre nom complet :";
+$a->strings["Title/Description:"] = "Titre/description :";
+$a->strings["Your Gender:"] = "Sexe/Genre :";
+$a->strings["Birthday (%s):"] = "Date de naissance (%s) :";
+$a->strings["Street Address:"] = "Adresse postale :";
+$a->strings["Locality/City:"] = "Ville/Localité :";
+$a->strings["Postal/Zip Code:"] = "Code postal :";
+$a->strings["Country:"] = "Pays :";
+$a->strings["Region/State:"] = "Région/Province/État :";
+$a->strings["♥ Marital Status:"] = "♥Statut marital :";
+$a->strings["Who: (if applicable)"] = "Avec : (si pertinent)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples : cathy123, Cathy Williams, cathy@exemple.com";
+$a->strings["Since [date]:"] = "Depuis [date] :";
+$a->strings["Homepage URL:"] = "URL de mon site Internet :";
+$a->strings["Religious Views:"] = "Opinions religieuses :";
+$a->strings["Keywords:"] = "Mots-clefs :";
+$a->strings["Example: fishing photography software"] = "Exemple : escrime photographie modélisme";
+$a->strings["Used in directory listings"] = "Utilisé pour le référencement dans l'annuaire";
+$a->strings["Tell us about yourself..."] = "Parlez nous de vous...";
+$a->strings["Hobbies/Interests"] = "Loisirs/Centres d'intêret";
+$a->strings["Contact information and Social Networks"] = "Coordonnées et réseaux sociaux";
+$a->strings["My other channels"] = "Mes autres canaux";
+$a->strings["Musical interests"] = "Goûts musicaux";
+$a->strings["Books, literature"] = "Littérature";
+$a->strings["Television"] = "Télévision";
+$a->strings["Film/dance/culture/entertainment"] = "Cinéma/Danse/Culture/Divertissement";
+$a->strings["Love/romance"] = "Amour/Romance";
+$a->strings["Work/employment"] = "Travail/Occupation";
+$a->strings["School/education"] = "Études";
+$a->strings["This is your public profile.
                                      It may be visible to anybody using the internet."] = "Ceci est votre profil public.
                                      Il pourrait être visible par tout utilisateur - fut-il anonyme - d'Internet.";
+$a->strings["Edit/Manage Profiles"] = "Éditer/gérer les profils";
+$a->strings["Add profile things"] = "Ajouter des choses de profil";
+$a->strings["Include desirable objects in your profile"] = "Incluez des objets souhaitables dans votre profil";
+$a->strings["Channel added."] = "Canal ajouté.";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authentification distante bloquée. Vous êtes connecté sur ce site localement. Merci de vous en déconnecter et de recommencer.";
+$a->strings["Welcome %s. Remote authentication successful."] = "Bienvenue %s. L'authentification distante a fonctionné.";
+$a->strings["This site is not a directory server"] = "Ce site n'est pas un serveur d'annuaire";
+$a->strings["Failed to create source. No channel selected."] = "Impossible de créer la source. Aucun canal selectionné.";
+$a->strings["Source created."] = "Source créée.";
+$a->strings["Source updated."] = "Source mise à jour.";
+$a->strings["*"] = "";
+$a->strings["Manage remote sources of content for your channel."] = "Gérer les sources distantes du contenu de votre canal.";
+$a->strings["New Source"] = "Nouvelle source";
+$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importer tout ou partie du contenu du canal suivant dans le canal en cours, et le distribuer en concordance avec les réglages de votre canal.";
+$a->strings["Only import content with these words (one per line)"] = "N'importer le contenu que s'ils contient ces mots (un par ligne)";
+$a->strings["Leave blank to import all public content"] = "Laissez en blanc pour importer tout le contenu public";
+$a->strings["Channel Name"] = "Nom du canal";
+$a->strings["Source not found."] = "Source introuvable.";
+$a->strings["Edit Source"] = "Éditer source";
+$a->strings["Delete Source"] = "Supprimer source";
+$a->strings["Source removed"] = "Source supprimée";
+$a->strings["Unable to remove source."] = "Impossible de supprimer la source.";
+$a->strings["Remote privacy information not available."] = "Les informations de vie privée à distance ne sont pas disponibles.";
+$a->strings["Visible to:"] = "Visible par :";
+$a->strings["Hub not found."] = "Instance introuvable.";
+$a->strings["Red Matrix Server - Setup"] = "Serveur Red Matrix - Configuration";
+$a->strings["Could not connect to database."] = "Impossible de se connecter à la base de données.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Impossible de se connecter au site par l'URL indiquée. Problème potentiel de certificat SSL/TLS ou de DNS.";
+$a->strings["Could not create table."] = "Impossible de créer la table.";
+$a->strings["Your site database has been installed."] = "La base de données de votre site a été installée.";
+$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Vous pourriez avoir besoin d'importer le fichier \"install/database.sql\" manuellement via phpmyadmin ou mysql.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Merci de consulter le fichier \"install/INSTALL.txt\".";
+$a->strings["System check"] = "Vérification du système";
+$a->strings["Check again"] = "Re-vérifier";
+$a->strings["Database connection"] = "Connexion à la base de données";
+$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Pour installer Red Matrix, nous avons besoin de savoir comment contacter votre base de données.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Merci de contacter votre prestataire d'hébergement ou votre administration système si vous avez des doutes à propos de ces paramètres.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de données que vous allez spécifier doit exister. Si ce n'est pas déjà le cas, merci de la créer avant de continuer.";
+$a->strings["Database Server Name"] = "Nom du serveur de BD";
+$a->strings["Default is localhost"] = "Par défaut, localhost";
+$a->strings["Database Port"] = "Port du serveur";
+$a->strings["Communication port number - use 0 for default"] = "Numéro TCP du port - utilisez 0 pour la valeur par défaut";
+$a->strings["Database Login Name"] = "Identifiant de connexion à la BD";
+$a->strings["Database Login Password"] = "Mot de passe de connexion à la BD";
+$a->strings["Database Name"] = "Nom de la base de données";
+$a->strings["Site administrator email address"] = "Adresse de courriel de l'administrateur du site";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Votre compte devra utiliser la même adresse de courriel pour pouvoir utiliser l'administration web.";
+$a->strings["Website URL"] = "URL du site";
+$a->strings["Please use SSL (https) URL if available."] = "Merci d'utiliser SSL/TLS (https) autant que possible.";
+$a->strings["Please select a default timezone for your website"] = "Merci de choisir une zone de temps (fuseau horaire) pour votre site";
+$a->strings["Site settings"] = "Réglages du site";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Impossible de trouver une version CLI de PHP dans le PATH du serveur web.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "En l'absence de version CLI de PHP sur votre serveur, vous ne pourrez pas utiliser la mise-à-jour en arrière-plan via cron.";
+$a->strings["PHP executable path"] = "Chemin vers l'éxecutable PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entrez le chemin complet vers l'exécutable php. Vous pouvez continuer l'installation sans.";
+$a->strings["Command line PHP"] = "PHP en ligne de commande (CLI)";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La version CLI de PHP sur votre système n'a pas l'option \"register_argc_argv\" activée.";
+$a->strings["This is required for message delivery to work."] = "Elle est nécessaire pour la livraison de messages.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erreur : la fonction \"openssl_pkey_new\" de ce système n'est pas capable de générer des clefs de chiffrement";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si vous êtes sur un serveur Windows, merci de consulter \"http://www.php.net/manual/fr/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Générer les clefs de chiffrement";
+$a->strings["libCurl PHP module"] = "module PHP libCurl";
+$a->strings["GD graphics PHP module"] = "module PHP GD graphics";
+$a->strings["OpenSSL PHP module"] = "module PHP OpenSSL";
+$a->strings["mysqli PHP module"] = "module PHP mysqli";
+$a->strings["mb_string PHP module"] = "module PHP mb_string";
+$a->strings["mcrypt PHP module"] = "module PHP mcrypt";
+$a->strings["Apache mod_rewrite module"] = "module Apache mod_rewrite";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur : le module mod-rewrite du serveur web Apache est requis, mais pas installé.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Erreur : proc_open est requis, mais soit n'est pas installé, soit est désactivé dans le php.ini";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Erreur : le module libCURL de PHP est requis, mais pas installé.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erreur : le module GD de PHP (avec support JPEG) est requis, mais pas installé.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Erreur : le module openssl de PHP est requis, mais pas installé.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Erreur : le module mysqli de PHP est requis, mais pas installé.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Erreur : le module mb_string de PHP est requis, mais pas installé.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Erreur : le module mcrypt de PHP est requis, mais pas installé.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais en est incapable.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "C'est généralement lié à un problème de droits, à cause duquel le serveur web est interdit d'écriture dans le répertoire concerné - alors que votre propre utilisateur a le droit.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Au terme de cette procédure, nous vous transmettrons un texte à sauvegarder dans un fichier nommé .htconfig.php, à la racine de votre installation de Red.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Autrement, vous pouvez contourner toute cette procédure et réaliser l'installation manuellement. Merci de consulter le fichier \"install/INSTALL.txt\" pour les instructions détaillées.";
+$a->strings[".htconfig.php is writable"] = "Le fichier .htconfig.php est accessible en écriture";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red utilise le moteur de template Smarty3 pour mettre son contenu en forme. Smarty3 compile ses templates vers du PHP natif pour accélérer le rendu.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Pour stocker ces templates compilées, le serveur web nécessite de pouvoir écrire dans le répertoire view/tpl/smarty3/.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Merci de vous assurer que l'utilisateur sous lequel le serveur web tourne (le plus souvent, www-data) a bien l'autorisation d'écrire dans ce répertoire.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Note : pour renforcer la sécurité, vous pouvez décider de ne donner l'accès en écrire qu'au répertoire view/tpl/smarty3 - et pas aux fichiers de templates (.tpl) qu'il contient.";
+$a->strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 est accessible en écriture";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red utilise le répertoire 'store' - situé à la racine de Red - pour sauvegarder les fichiers envoyés. Le serveur web aura donc besoin de pouvoir y écrire.";
+$a->strings["store is writable"] = "'store' est accessible en écriture";
+$a->strings["SSL certificate validation"] = "Validation du certificat SSL/TLS";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Le certificat SSL/TLS n'a pas pu être validé. Merci de le corriger, ou de désactiver l'accès https à ce site.";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La réécriture d'URL définie dans le .htaccess ne fonctionne pas. Merci de vérifier la configuration de votre serveur web.";
+$a->strings["Url rewrite is working"] = "La réécriture d'URL fonctionne";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Le fichier de configuration de la base de données - \".htconfig.php\" - ne peut être écrit. Merci de copier le texte généré dans un fichier à ce nom, à la racine de votre serveur web.";
+$a->strings["Errors encountered creating database tables."] = "Erreurs rencontrées pendant la création de tables de BD.";
+$a->strings["
                                      What next
                                      "] = "
                                      Et maintenant
                                      ";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT : Vous devez créer [manuellement] une tâche planifiée pour les mises-à-jour.";
+$a->strings["Version %s"] = "Version %s";
+$a->strings["Installed plugins/addons/apps:"] = "Extensions/applications installées :";
+$a->strings["No installed plugins/addons/apps"] = "Aucune extension/application installée";
+$a->strings["Red"] = "Red";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Ceci est une instance - un hub - de la Matrice Red - un réseau global et coopératif de sites web qui respectent la vie privée de manière décentralisée/acentrée.";
+$a->strings["Running at web location"] = "En train de tourner chez";
+$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Merci de visiter GetZot.com pour en apprendre davantage sur la Matrice Red.";
+$a->strings["Bug reports and issues: please visit"] = "Pour remonter bogues et problèmes, merci de visiter";
+$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com";
+$a->strings["Site Administrators"] = "Administrateurs du site";
+$a->strings["Add a Channel"] = "Ajouter un canal";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Un canal est une collection de pages web reliées entre elles, sous votre contrôle. Il peut contenir des profils de réseau social, des blogs, des groupes de conversation, des forums, des pages de célébrités, et bien plus encore. Vous pouvez créer autant de canaux que votre fournisseur vous y autorise.";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Exemples : \"Bob Jameson\", \"Lisa et ses chevaux sauvages\", \"Football\", \"Groupe des amateurs de tir à l'arc\"";
+$a->strings["Choose a short nickname"] = "Choisissez un nom court";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Ce nom court sera utilisé pour créer une adresse de canal, facile à retenir - un peu comme une adresse de courriel - que vous pourrez partager avec d'autres.";
+$a->strings["Or import an existing channel from another location"] = "Ou importez un canal existant à un autre endroit";
+$a->strings["No valid account found."] = "Aucun compte valide trouvé.";
+$a->strings["Password reset request issued. Check your email."] = "Réinitialisation du mot de passe demandée. Vérifiez vos courriels.";
+$a->strings["Site Member (%s)"] = "Membre du site (%s)";
+$a->strings["Password reset requested at %s"] = "Demande de réinitialisation de mot de passe sur %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué.";
+$a->strings["Password Reset"] = "Réinitialiser le mot de passe";
+$a->strings["Your password has been reset as requested."] = "Votre mot de passe a bien été réinitialisé.";
+$a->strings["Your new password is"] = "Votre nouveau mot de passe est";
+$a->strings["Save or copy your new password - and then"] = "Sauvez-le ou copiez-le, puis";
+$a->strings["click here to login"] = "cliquez ici pour vous connecter";
+$a->strings["Your password may be changed from the Settings page after successful login."] = "Votre mot de passe peut être changé depuis la page des Réglages une fois connecté.";
+$a->strings["Your password has changed at %s"] = "Votre mot de passe de %s a été changé";
+$a->strings["Forgot your Password?"] = "Mot de passe oublié?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Saisissez votre adresse de courriel, et validez, pour réinitialiser votre mot de passe. Vérifiez ensuite votre boîte à lettres pour la suite des instructions.";
+$a->strings["Email Address"] = "Adresse de courriel";
+$a->strings["Reset"] = "Réinitialiser";
+$a->strings["Nothing to import."] = "Rien à importer.";
+$a->strings["Unable to download data from old server"] = "Impossible de récupérer les données de l'ancien serveur";
+$a->strings["Imported file is empty."] = "Le fichier importé est vide.";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Impossible de créer un doublon d'un identifiant de canal. L'import a échoué.";
+$a->strings["Channel clone failed. Import failed."] = "Le clonage du canal a échoué. L'import a échoué.";
+$a->strings["Cloned channel not found. Import failed."] = "Le canal cloné n'a pas été trouvé. L'import a échoué.";
+$a->strings["Import completed."] = "L'import est terminé.";
+$a->strings["You must be logged in to use this feature."] = "Vous devez vous connecter pour utiliser cette fonctionnalité.";
+$a->strings["Import Channel"] = "Importation de canal";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Utilisez ce formulaire pour importer un canal existant sur un serveur différent. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export. Seules les données d'identité et de relations seront importées. L'importation des contenus n'est pas encore disponible.";
+$a->strings["File to Upload"] = "Fichier à envoyer";
+$a->strings["Or provide the old server/hub details"] = "Ou fournissez les détails de l'ancien serveur";
+$a->strings["Your old identity address (xyz@example.com)"] = "Votre ancienne identité (zyx@exemple.com)";
+$a->strings["Your old login email address"] = "Votre ancienne adresse de courriel";
+$a->strings["Your old login password"] = "Votre ancien mot de passe";
+$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Quelle que soit l'option choisie, merci de décider si cette nouvelle adresse sera la primaire, ou si votre ancienne adresse continuera à jouer ce rôle. Vous pourrez publier depuis l'adresse de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media.";
+$a->strings["Make this hub my primary location"] = "Faire de cette adresse ma principale";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Vous avez créé %1$.0f des %2$.0f canaux autorisés.";
+$a->strings["Create a new channel"] = "Créer un nouveau canal";
+$a->strings["Channel Manager"] = "Gestionnaire du canal";
+$a->strings["Current Channel"] = "Canal actif";
+$a->strings["Attach to one of your channels by selecting it."] = "Branchez-vous à l'un de vos canaux en le selectionnant.";
+$a->strings["Default Channel"] = "Canal par défaut";
+$a->strings["Make Default"] = "Définir comme défaut";
+$a->strings["Total votes"] = "Suffrages exprimés";
+$a->strings["Average Rating"] = "Note moyenne";
+$a->strings["Profile Match"] = "Profils similaires";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Aucun mot-clef à comparer. Merci d'ajouter des mots-clefs à votre profil par défaut.";
+$a->strings["is interested in:"] = "s'intéresse à :";
+$a->strings["No matches"] = "Pas de correspondance";
+$a->strings["invalid target signature"] = "signature de la cible invalide";
+$a->strings["Unable to lookup recipient."] = "Impossible de localiser le destinataire.";
+$a->strings["Unable to communicate with requested channel."] = "Impossible de communiquer avec le canal demandé.";
+$a->strings["Cannot verify requested channel."] = "Impossible de vérifier le canal demandé.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Le canal choisi a des restrictions quant aux messages privés. L'envoi a échoué.";
+$a->strings["Messages"] = "Messages";
 $a->strings["Message deleted."] = "Message supprimé.";
-$a->strings["Conversation removed."] = "Conversation supprimée.";
-$a->strings["Please enter a link URL:"] = "Entrez un lien web:";
-$a->strings["Send Private Message"] = "Envoyer un message privé";
-$a->strings["To:"] = "À:";
-$a->strings["Subject:"] = "Sujet:";
-$a->strings["No messages."] = "Aucun message.";
-$a->strings["Delete conversation"] = "Effacer conversation";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["Message not available."] = "Message indisponible.";
-$a->strings["Delete message"] = "Effacer message";
-$a->strings["Send Reply"] = "Répondre";
-$a->strings["Response from remote site was not understood."] = "Réponse du site distant incomprise.";
-$a->strings["Unexpected response from remote site: "] = "Réponse inattendue du site distant: ";
-$a->strings["Confirmation completed successfully."] = "Confirmation achevée avec succès.";
-$a->strings["Remote site reported: "] = "Alerte du site distant: ";
-$a->strings["Temporary failure. Please wait and try again."] = "Échec temporaire. Merci de recommencer ultérieurement.";
-$a->strings["Introduction failed or was revoked."] = "Introduction échouée ou annulée.";
-$a->strings["Unable to set contact photo."] = "Impossible de définir la photo du contact.";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s est désormais lié à %2\$s";
-$a->strings["No user record found for '%s' "] = "Pas d'utilisateur trouvé pour '%s' ";
-$a->strings["Our site encryption key is apparently messed up."] = "Notre clé de chiffrement de site est apparemment corrompue.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "URL de site absente ou indéchiffrable.";
-$a->strings["Contact record was not found for you on our site."] = "Pas d'entrée pour ce contact sur notre site.";
-$a->strings["Site public key not available in contact record for URL %s."] = "La clé publique du site ne se trouve pas dans l'enregistrement du contact pour l'URL %s.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "L'identifiant fourni par votre système fait doublon sur le notre. Cela peut fonctionner si vous réessayez.";
-$a->strings["Unable to set your contact credentials on our system."] = "Impossible de vous définir des permissions sur notre système.";
-$a->strings["Unable to update your contact profile details on our system"] = "Impossible de mettre les détails de votre profil à jour sur notre système";
-$a->strings["Connection accepted at %s"] = "Connexion acceptée avec %s";
-$a->strings["Login failed."] = "Échec de connexion.";
-$a->strings["Welcome "] = "Bienvenue ";
-$a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil d'une image.";
-$a->strings["Welcome back "] = "Bienvenue à nouveau, ";
-$a->strings["%s welcomes %s"] = "%s accueille %s";
-$a->strings["View Contacts"] = "Voir les contacts";
-$a->strings["No contacts."] = "Aucun contact.";
-$a->strings["Group created."] = "Groupe créé.";
-$a->strings["Could not create group."] = "Impossible de créer le groupe.";
-$a->strings["Group not found."] = "Groupe introuvable.";
-$a->strings["Group name changed."] = "Groupe renommé.";
-$a->strings["Create a group of contacts/friends."] = "Créez un groupe de contacts/amis.";
-$a->strings["Group Name: "] = "Nom du groupe: ";
-$a->strings["Group removed."] = "Groupe enlevé.";
-$a->strings["Unable to remove group."] = "Impossible d'enlever le groupe.";
-$a->strings["Group Editor"] = "Éditeur de groupe";
-$a->strings["Members"] = "Membres";
-$a->strings["All Contacts"] = "Tout les contacts";
-$a->strings["Item not available."] = "Elément non disponible.";
-$a->strings["Item was not found."] = "Element introuvable.";
-$a->strings["Common Friends"] = "Amis communs";
-$a->strings["No friends in common."] = "Pas d'amis communs";
-$a->strings["Profile Match"] = "Correpondance de profils";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Aucun mot-clé en correspondance. Merci d'ajouter des mots-clés à votre profil par défaut.";
+$a->strings["Message recalled."] = "Message annulé/rappelé.";
+$a->strings["Send Private Message"] = "Envoyer un Message Privé";
+$a->strings["To:"] = "À :";
+$a->strings["Subject:"] = "Sujet :";
+$a->strings["Message not found."] = "Message introuvable.";
+$a->strings["Delete message"] = "Supprimer message";
+$a->strings["Recall message"] = "Rappeler/annuler le message";
+$a->strings["Message has been recalled."] = "Le message a été rappelé.";
+$a->strings["Private Conversation"] = "Conversation privée";
+$a->strings["Delete conversation"] = "Supprimer conversation";
+$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Aucune communication sécurisée n'est possible en l'état. Vous pourrez peut-être répondre depuis la page de profil de l'émetteur.";
+$a->strings["Send Reply"] = "Envoyer une réponse";
+$a->strings["Edit Layout"] = "Éditer mise-en-page";
+$a->strings["Delete layout?"] = "Supprimer la mise-en-page?";
+$a->strings["Delete Layout"] = "Supprimer mise-en-page";
+$a->strings["Image uploaded but image cropping failed."] = "L'image a été téléversée, mais le recadrage a échoué.";
+$a->strings["Image resize failed."] = "Le retaillage de l'image a échoué.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shirt-rechargez votre page, ou videz le cache du navigateur si la photo ne s'affiche pas immédiatement.";
+$a->strings["Image exceeds size limit of %d"] = "L'image dépasse la taille limite de %d";
+$a->strings["Unable to process image."] = "Impossible de traîter l'image.";
+$a->strings["Photo not available."] = "Photo inaccessible.";
+$a->strings["Upload File:"] = "Fichier :";
+$a->strings["Select a profile:"] = "Choisir un profil :";
+$a->strings["Upload Profile Photo"] = "Téléverser une photo de profil";
+$a->strings["Upload"] = "Envoyer";
+$a->strings["skip this step"] = "passer cette étape";
+$a->strings["select a photo from your photo albums"] = "choisir une photo dans vos albums";
+$a->strings["Crop Image"] = "Recadrer l'image";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Merci d'ajuter le cadre pour une visualisation optimale.";
+$a->strings["Done Editing"] = "J'ai terminé";
+$a->strings["Image uploaded successfully."] = "Image téléversée avec succès.";
+$a->strings["Image upload failed."] = "Le téléversement a échoué.";
+$a->strings["Image size reduction [%s] failed."] = "La réduction de taille [%s] a échoué.";
+$a->strings["Blocked"] = "Bloqué";
+$a->strings["Ignored"] = "Ignoré";
+$a->strings["Hidden"] = "Caché";
+$a->strings["Archived"] = "Archivé";
+$a->strings["All"] = "Tout";
+$a->strings["Suggest new connections"] = "Suggérer de nouvelles relations";
+$a->strings["Show pending (new) connections"] = "Voir les (nouvelles) relations en attente";
+$a->strings["Show all connections"] = "Voir toutes les relations";
+$a->strings["Unblocked"] = "Non bloquées";
+$a->strings["Only show unblocked connections"] = "Ne montrer que les relations non-bloquées";
+$a->strings["Only show blocked connections"] = "Ne montrer que les relations bloquées";
+$a->strings["Only show ignored connections"] = "Ne montrer que les relations ignorées";
+$a->strings["Only show archived connections"] = "Ne montrer que les relations archivées";
+$a->strings["Only show hidden connections"] = "Ne montrer que les relations cachées";
+$a->strings["%1\$s [%2\$s]"] = "";
+$a->strings["Edit contact"] = "Éditer contact";
+$a->strings["Search your connections"] = "Chercher parmi vos relations";
+$a->strings["Finding: "] = "Recherche :";
+$a->strings["Invalid request identifier."] = "Identifiant de requête invalide.";
+$a->strings["Discard"] = "Défausser";
+$a->strings["No more system notifications."] = "Pas d'autre notification du système.";
+$a->strings["System Notifications"] = "Notifications du système";
+$a->strings["Block Name"] = "Nom du bloc";
+$a->strings["Unable to find your hub."] = "Impossible de trouver votre instance.";
+$a->strings["Post successful."] = "Contribution effectuée.";
+$a->strings["Edit Webpage"] = "Éditer page web";
+$a->strings["Delete webpage?"] = "Supprimer la page web?";
+$a->strings["Delete Webpage"] = "Supprimer page web";
+$a->strings["Access to this profile has been restricted."] = "L'accès à ce profil a été restreint.";
+$a->strings["Poke/Prod"] = "Tapoter/Solliciter";
+$a->strings["poke, prod or do other things to somebody"] = "Tapoter, pointer, et autres choses à faire à quelqu'un";
+$a->strings["Recipient"] = "Destinataire";
+$a->strings["Choose what you wish to do to recipient"] = "Choisir quoi lui faire";
+$a->strings["Make this post private"] = "Rendre cette contribution privée";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permissions insuffisantes. Demande redirigée à la page du profil.";
 $a->strings["Not available."] = "Indisponible.";
 $a->strings["Community"] = "Communauté";
-$a->strings["Shared content is covered by the Creative Commons Attribution 3.0 license."] = "Le contenu est partagé suivant les termes de la licence Creative Commons Attribution 3.0.";
-$a->strings["Post to Tumblr"] = "Publier sur Tumblr";
-$a->strings["Tumblr Post Settings"] = "Réglages de Tumblr";
-$a->strings["Enable Tumblr Post Plugin"] = "Activer l'extension Tumblr";
-$a->strings["Tumblr login"] = "Login Tumblr";
-$a->strings["Tumblr password"] = "Mot de passe Tumblr";
-$a->strings["Post to Tumblr by default"] = "Publier sur Tumblr par défaut";
-$a->strings["Post from Friendica"] = "Publier depuis Friendica";
-$a->strings["Post to Twitter"] = "Poster sur Twitter";
-$a->strings["Twitter settings updated."] = "Réglages de Twitter mis-à-jour.";
-$a->strings["Twitter Posting Settings"] = "Réglages du connecteur Twitter";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Pas de paire de clés pour Twitter. Merci de contacter l'administrateur du site.";
-$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Sur cette instance de Friendika, le connecteur Twitter a été activé, mais vous n'avez pas encore connecté votre compte à Twitter. Pour ce faire, cliquez sur le bouton ci-dessous pour obtenir un PIN de Twitter, que vous aurez à coller dans la boîte ci-dessous. Ensuite, validez le formulaire. Seuls vos articles <strong>publics</strong> seront postés sur Twitter.";
-$a->strings["Log in with Twitter"] = "Se connecter à Twitter";
-$a->strings["Copy the PIN from Twitter here"] = "Copier le PIN de Twitter ici";
-$a->strings["Currently connected to: "] = "Actuellement connecté à: ";
-$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "En cas d'activation, toutes vos notices publiques seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction.";
-$a->strings["Allow posting to Twitter"] = "Autoriser la publication sur Twitter";
-$a->strings["Send public postings to Twitter by default"] = "Envoyer les éléments publics sur Twitter par défaut";
-$a->strings["Clear OAuth configuration"] = "Effacer la configuration OAuth";
-$a->strings["Consumer key"] = "Clé utilisateur";
-$a->strings["Consumer secret"] = "Secret utilisateur";
-$a->strings["Post to StatusNet"] = "Poster sur StatusNet";
-$a->strings["Please contact your site administrator.
                                      The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.
                                      L'URL d'API fournie est invalide.";
-$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Nous n'avons pas pu contacter l'API StatusNet avec le chemin saisi.";
-$a->strings["StatusNet settings updated."] = "Réglages StatusNet mis-à-jour.";
-$a->strings["StatusNet Posting Settings"] = "Réglages du connecteur StatusNet";
-$a->strings["Globally Available StatusNet OAuthKeys"] = "Clés OAuth StatusNet universelles";
-$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Ce sont des paires de clés OAuth préconfigurées pour certains serveurs StatusNet courants. Si vous utilisez l'un d'entre eux, merci de vous servir de ces clés. Autrement, vous pouvez vous connecter à n'importer quelle autre instance de StatusNet (voir ci-dessous).";
-$a->strings["Provide your own OAuth Credentials"] = "Fournissez vos propres paramètres OAuth";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
                                      Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation."] = "Aucune paire de clé n'a été trouvée pour StatusNet. Inscrivez votre compte Friendika comme client bureautique sur votre compte StatusNet, puis copiez la paire de clés d'utilisateur ici et renseignez le chemin de base de l'API.<br />Avant d'enregistrer votre propre paire de clés OAuth, merci de vérifier auprès de l'administrateur qu'il en existe pas déjà une pour votre fournisseur StatusNet.";
-$a->strings["OAuth Consumer Key"] = "Clé de consommateur OAuth";
-$a->strings["OAuth Consumer Secret"] = "Secret d'utilisateur OAuth";
-$a->strings["Base API Path (remember the trailing /)"] = "Chemin de base de l'API (n'oubliez pas le / final)";
-$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Pour vous connecter à votre compte StatusNet, cliquez sur le bouton ci-dessous pour obtenir un code de sécurité de StatusNet, que vous aurez à coller dans la boîte ci-dessous. Ensuite, validez le formulaire. Seuls vos articles <strong>publics</strong> seront postés sur StatusNet.";
-$a->strings["Log in with StatusNet"] = "Se connecter à StatusNet";
-$a->strings["Copy the security code from StatusNet here"] = "Coller le code de sécurité de StatusNet ici";
-$a->strings["Cancel Connection Process"] = "Annuler le processus de connexion";
-$a->strings["Current StatusNet API is"] = "L'API StatusNet courante est";
-$a->strings["Cancel StatusNet Connection"] = "Annuler la connexion à StatusNet";
-$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "En cas d'activation, toutes vos notices publiques seront transmises au compte StatusNet associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque notice séparément lors de sa rédaction.";
-$a->strings["Allow posting to StatusNet"] = "Autoriser la publication sur StatusNet";
-$a->strings["Send public postings to StatusNet by default"] = "Par défaut, envoyer les notices publiques à StatusNet";
-$a->strings["API URL"] = "URL de l'API";
-$a->strings["OEmbed settings updated"] = "Réglage OEmbed mis-à-jour";
-$a->strings["Use OEmbed for YouTube videos"] = "Utiliser OEmbed pour les vidéos Youtube";
-$a->strings["URL to embed:"] = "URL à incorporer:";
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "Morpion en trois dimensions";
-$a->strings["3D Tic-Tac-Toe"] = "Morpion 3D";
-$a->strings["New game"] = "Nouvelle partie";
-$a->strings["New game with handicap"] = "Nouvelle partie avec handicap";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Le morpion 3D, c'est comme la version traditionnelle. Sauf qu'on joue sur plusieurs étages en même temps.";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Dans le cas qui nous concerne, il y a trois étages. Vous gagnez en alignant trois coups dans n'importe quel étage, ainsi que verticalement ou en diagonale entre les étages.";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Le handicap interdit la position centrale de l'étage du milieu, parce que le joueur qui prend cette case obtient souvent un avantage.";
-$a->strings["You go first..."] = "À vous de jouer...";
-$a->strings["I'm going first this time..."] = "Je commence...";
-$a->strings["You won!"] = "Vous avez gagné!";
-$a->strings["\"Cat\" game!"] = "Match nul!";
-$a->strings["I won!"] = "J'ai gagné!";
-$a->strings["Allow to use your friendika id (%s) to connecto to external unhosted-enabled storage (like ownCloud)"] = "Autoriser votre identifiant friendica (%s) à se connecter à un stockage compatible unhosted (ownCloud, par exemple)";
-$a->strings["Unhosted DAV storage url"] = "URL de stockage DAV d'Unhosted";
-$a->strings["Impressum"] = "Impressum";
-$a->strings["Site Owner"] = "Propriétaire du site";
-$a->strings["Email Address"] = "Adresse courriel";
-$a->strings["Postal Address"] = "Adresse postale";
-$a->strings["The impressum addon needs to be configured!
                                      Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "L'extension \"Impressum\" (ou ours) n'est pas configuré!
                                      Merci d'ajouter au moins la variable owner à votre fichier de configuration. Pour les autres variables, reportez-vous au fichier README accompagnant l'extension.";
-$a->strings["Site Owners Profile"] = "Profil des propriétaires du site";
-$a->strings["Notes"] = "Notes";
-$a->strings["Facebook disabled"] = "Connecteur Facebook désactivé";
-$a->strings["Updating contacts"] = "Mise-à-jour des contacts";
-$a->strings["Facebook API key is missing."] = "Clé d'API Facebook manquante.";
-$a->strings["Facebook Connect"] = "Connecteur Facebook";
-$a->strings["Install Facebook connector for this account."] = "Installer le connecteur Facebook sur ce compte.";
-$a->strings["Remove Facebook connector"] = "Désinstaller le connecteur Facebook";
-$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Se ré-authentifier [nécessaire chaque fois que vous changez votre mot de passe Facebook.]";
-$a->strings["Post to Facebook by default"] = "Poster sur Facebook par défaut";
-$a->strings["Link all your Facebook friends and conversations on this website"] = "Lier tous vos amis et conversations Facebook sur ce site";
-$a->strings["Facebook conversations consist of your profile wall and your friend stream."] = "Les conversations Facebook se composent du mur du profil et des flux de vos amis.";
-$a->strings["On this website, your Facebook friend stream is only visible to you."] = "Sur ce site, les flux de vos amis Facebook ne sont visibles que par vous.";
-$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Les réglages suivants déterminent le niveau de vie privée de votre mur Facebook depuis ce site.";
-$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Sur ce site, les conversations de votre mur Facebook ne sont visibles que par vous.";
-$a->strings["Do not import your Facebook profile wall conversations"] = "Ne pas importer les conversations de votre mur Facebook.";
-$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Si vous choisissez de lier les conversations et de laisser ces deux cases non-cochées, votre mur Facebook sera fusionné avec votre mur de profil (sur ce site). Vos réglages (locaux) de vie privée serviront à en déterminer la visibilité.";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Facebook Connector Settings"] = "Réglages du connecteur Facebook";
-$a->strings["Post to Facebook"] = "Poster sur Facebook";
-$a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Publication sur Facebook annulée pour cause de conflit de permissions inter-réseaux.";
-$a->strings["Image: "] = "Image: ";
-$a->strings["View on Friendika"] = "Voir sur Friendica";
-$a->strings["Facebook post failed. Queued for retry."] = "Publication sur Facebook échouée. En attente pour re-tentative.";
-$a->strings["Generate new key"] = "Générer une nouvelle clé";
-$a->strings["Widgets key"] = "Clé des widgets";
-$a->strings["Widgets available"] = "Widgets disponibles";
-$a->strings["Connect on Friendika!"] = "Se connecter à Friendica!";
-$a->strings["%d person likes this"] = array(
-	0 => "%d personne aime ça",
-	1 => "%d personnes aiment ça",
-);
-$a->strings["%d person doesn't like this"] = array(
-	0 => "%d personne n'aime pas ça",
-	1 => "%d personnes n'aiment pas ça",
-);
-$a->strings["Report Bug"] = "Signaler un bug";
-$a->strings["\"Not Safe For Work\" Settings"] = "Réglages de \"Not Safe For Work\"";
-$a->strings["Comma separated words to treat as NSFW"] = "Liste de mots à considérer comme NSFW. Séparés par des virgules.";
-$a->strings["NSFW Settings saved."] = "Réglages NSFW sauvegardés.";
-$a->strings["%s - Click to open/close"] = "%s - cliquer pour ouvrir/fermer";
-$a->strings["OpenID"] = "OpenID";
-$a->strings["Last users"] = "Derniers utilisateurs";
-$a->strings["Most active users"] = "Utilisateurs les plus actifs";
-$a->strings["Last photos"] = "Dernières photos";
-$a->strings["Last likes"] = "Dernièrement aimé";
-$a->strings["event"] = "évènement";
-$a->strings[" - Member since: %s"] = " - Membre depuis: %s";
-$a->strings["Randplace Settings"] = "Réglages de Randplace";
-$a->strings["Enable Randplace Plugin"] = "Activer l'extension Randplace";
-$a->strings["This website is tracked using the Piwik analytics tool."] = "Ce site collecte ses statistiques grâce à Piwik.";
-$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si vous ne voulez pas que vos visites soient collectées par ce biais, vous pouvez activer un cookie qui empêchera Piwik de tenir compte de vos visites ultérieures (opt-out).";
-$a->strings["Piwik Base URL"] = "URL de base de Piwik";
-$a->strings["Site ID"] = "ID du site";
-$a->strings["Show opt-out cookie link?"] = "Montrer le lien d'opt-out?";
-$a->strings["Upload a file"] = "Téléverser un fichier";
-$a->strings["Drop files here to upload"] = "Déposer des fichiers ici pour les téléverser";
-$a->strings["Failed"] = "Échec";
-$a->strings["No files were uploaded."] = "Aucun fichier n'a été téléversé.";
-$a->strings["Uploaded file is empty"] = "Le fichier téléversé est vide";
-$a->strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi ";
-$a->strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur";
-$a->strings["Post to Wordpress"] = "Poster sur WordPress";
-$a->strings["WordPress Post Settings"] = "Réglages WordPress";
-$a->strings["Enable WordPress Post Plugin"] = "Activer l'extension WordPress";
-$a->strings["WordPress username"] = "Utilisateur WordPress";
-$a->strings["WordPress password"] = "Mot de passe WordPress";
-$a->strings["WordPress API URL"] = "URL de l'API WordPress";
-$a->strings["Post to WordPress by default"] = "Publier sur WordPress par défaut";
-$a->strings["(no subject)"] = "(sans titre)";
-$a->strings["Unknown | Not categorised"] = "Inconnu | Non-classé";
-$a->strings["Block immediately"] = "Bloquer immédiatement";
-$a->strings["Shady, spammer, self-marketer"] = "Douteux, spammeur, accro à l'auto-promotion";
-$a->strings["Known to me, but no opinion"] = "Connu de moi, mais sans opinion";
-$a->strings["OK, probably harmless"] = "OK, probablement inoffensif";
-$a->strings["Reputable, has my trust"] = "Réputé, a toute ma confiance";
-$a->strings["Frequently"] = "Fréquemment";
-$a->strings["Hourly"] = "Toutes les heures";
-$a->strings["Twice daily"] = "Deux fois par jour";
-$a->strings["Daily"] = "Chaque jour";
-$a->strings["Weekly"] = "Chaque semaine";
-$a->strings["Monthly"] = "Chaque mois";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["Male"] = "Masculin";
-$a->strings["Female"] = "Féminin";
-$a->strings["Currently Male"] = "Actuellement masculin";
-$a->strings["Currently Female"] = "Actuellement féminin";
-$a->strings["Mostly Male"] = "Principalement masculin";
-$a->strings["Mostly Female"] = "Principalement féminin";
-$a->strings["Transgender"] = "Transgenre";
-$a->strings["Intersex"] = "Inter-sexe";
-$a->strings["Transsexual"] = "Transsexuel";
-$a->strings["Hermaphrodite"] = "Hermaphrodite";
-$a->strings["Neuter"] = "Neutre";
-$a->strings["Non-specific"] = "Non-spécifique";
-$a->strings["Other"] = "Autre";
-$a->strings["Undecided"] = "Indécis";
-$a->strings["Males"] = "Hommes";
-$a->strings["Females"] = "Femmes";
-$a->strings["Gay"] = "Gay";
-$a->strings["Lesbian"] = "Lesbienne";
-$a->strings["No Preference"] = "Sans préférence";
-$a->strings["Bisexual"] = "Bisexuel";
-$a->strings["Autosexual"] = "Auto-sexuel";
-$a->strings["Abstinent"] = "Abstinent";
-$a->strings["Virgin"] = "Vierge";
-$a->strings["Deviant"] = "Déviant";
-$a->strings["Fetish"] = "Fétichiste";
-$a->strings["Oodles"] = "Oodles";
-$a->strings["Nonsexual"] = "Non-sexuel";
-$a->strings["Single"] = "Célibataire";
-$a->strings["Lonely"] = "Esseulé";
-$a->strings["Available"] = "Disponible";
-$a->strings["Unavailable"] = "Indisponible";
-$a->strings["Dating"] = "Dans une relation";
-$a->strings["Unfaithful"] = "Infidèle";
-$a->strings["Sex Addict"] = "Accro au sexe";
-$a->strings["Friends"] = "Amis";
-$a->strings["Friends/Benefits"] = "Amis par intérêt";
-$a->strings["Casual"] = "Casual";
-$a->strings["Engaged"] = "Fiancé";
-$a->strings["Married"] = "Marié";
-$a->strings["Partners"] = "Partenaire";
-$a->strings["Cohabiting"] = "En cohabitation";
-$a->strings["Happy"] = "Heureux";
-$a->strings["Not Looking"] = "Sans recherche";
-$a->strings["Swinger"] = "Échangiste";
-$a->strings["Betrayed"] = "Trahi(e)";
-$a->strings["Separated"] = "Séparé";
-$a->strings["Unstable"] = "Instable";
-$a->strings["Divorced"] = "Divorcé";
-$a->strings["Widowed"] = "Veuf/Veuve";
-$a->strings["Uncertain"] = "Incertain";
-$a->strings["Complicated"] = "Compliqué";
-$a->strings["Don't care"] = "S'en désintéresse";
-$a->strings["Ask me"] = "Me demander";
-$a->strings["Starts:"] = "Débute:";
-$a->strings["Finishes:"] = "Finit:";
-$a->strings["Visible to everybody"] = "Visible par tout le monde";
-$a->strings["show"] = "montrer";
-$a->strings["don't show"] = "ne pas montrer";
-$a->strings["Logged out."] = "Déconnecté.";
-$a->strings["Image/photo"] = "Image/photo";
-$a->strings["From: "] = "De: ";
-$a->strings["View status"] = "Voir le statut";
-$a->strings["View profile"] = "Voir le profil";
-$a->strings["View photos"] = "Voir les photos";
-$a->strings["View recent"] = "Voir nouveautés";
-$a->strings["Send PM"] = "Envoyer message privé";
-$a->strings["Miscellaneous"] = "Divers";
-$a->strings["year"] = "an";
-$a->strings["month"] = "mois";
-$a->strings["day"] = "jour";
-$a->strings["never"] = "jamais";
-$a->strings["less than a second ago"] = "il y a moins d'une seconde";
-$a->strings["years"] = "ans";
-$a->strings["months"] = "mois";
-$a->strings["week"] = "semaine";
-$a->strings["weeks"] = "semaines";
-$a->strings["days"] = "jours";
-$a->strings["hour"] = "heure";
-$a->strings["hours"] = "heures";
-$a->strings["minute"] = "minute";
-$a->strings["minutes"] = "minutes";
-$a->strings["second"] = "seconde";
-$a->strings["seconds"] = "secondes";
-$a->strings[" ago"] = " auparavant";
-$a->strings["Birthday:"] = "Anniversaire:";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Age:"] = "Age:";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["About:"] = "À propos:";
-$a->strings["Hobbies/Interests:"] = "Passe-temps/Centres d'intérêt:";
-$a->strings["Contact information and Social Networks:"] = "Coordonées/Réseaux sociaux:";
-$a->strings["Musical interests:"] = "Goûts musicaux:";
-$a->strings["Books, literature:"] = "Lectures:";
-$a->strings["Television:"] = "Télévision:";
-$a->strings["Film/dance/culture/entertainment:"] = "Cinéma/Danse/Culture/Divertissement:";
-$a->strings["Love/Romance:"] = "Amour/Romance:";
-$a->strings["Work/employment:"] = "Activité professionnelle/Occupation:";
-$a->strings["School/education:"] = "Études/Formation:";
-$a->strings["prev"] = "précédent";
-$a->strings["first"] = "premier";
-$a->strings["last"] = "dernier";
-$a->strings["next"] = "suivant";
-$a->strings["No contacts"] = "Aucun contact";
-$a->strings["%d Contact"] = array(
-	0 => "%d contact",
-	1 => "%d contacts",
-);
-$a->strings["Search"] = "Recherche";
-$a->strings["Monday"] = "Lundi";
-$a->strings["Tuesday"] = "Mardi";
-$a->strings["Wednesday"] = "Mercredi";
-$a->strings["Thursday"] = "Jeudi";
-$a->strings["Friday"] = "Vendredi";
-$a->strings["Saturday"] = "Samedi";
-$a->strings["Sunday"] = "Dimanche";
-$a->strings["January"] = "Janvier";
-$a->strings["February"] = "Février";
-$a->strings["March"] = "Mars";
-$a->strings["April"] = "Avril";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juin";
-$a->strings["July"] = "Juillet";
-$a->strings["August"] = "Août";
-$a->strings["September"] = "Septembre";
-$a->strings["October"] = "Octobre";
-$a->strings["November"] = "Novembre";
-$a->strings["December"] = "Décembre";
-$a->strings["bytes"] = "octets";
-$a->strings["Select an alternate language"] = "Choisir une langue alternative";
-$a->strings["default"] = "défaut";
-$a->strings["End this session"] = "Mettre fin à cette session";
-$a->strings["Your posts and conversations"] = "Vos notices et conversations";
-$a->strings["Your profile page"] = "Votre page de profil";
-$a->strings["Your photos"] = "Vos photos";
-$a->strings["Your events"] = "Vos événements";
-$a->strings["Personal notes"] = "Notes personnelles";
-$a->strings["Your personal photos"] = "Vos photos personnelles";
-$a->strings["Sign in"] = "Se connecter";
-$a->strings["Home Page"] = "Page d'accueil";
-$a->strings["Create an account"] = "Créer un compte";
-$a->strings["Help and documentation"] = "Aide et documentation";
-$a->strings["Apps"] = "Applications";
-$a->strings["Addon applications, utilities, games"] = "Applications supplémentaires, utilitaires, jeux";
-$a->strings["Search site content"] = "Rechercher dans le contenu du site";
-$a->strings["Conversations on this site"] = "Conversations ayant cours sur ce site";
-$a->strings["Directory"] = "Annuaire";
-$a->strings["People directory"] = "Annuaire des utilisateurs";
-$a->strings["Conversations from your friends"] = "Conversations de vos amis";
-$a->strings["Friend Requests"] = "Demande d'amitié";
-$a->strings["Private mail"] = "Messages privés";
-$a->strings["Manage"] = "Gérer";
-$a->strings["Manage other pages"] = "Gérer les autres pages";
-$a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts";
-$a->strings["Admin"] = "Admin";
-$a->strings["Site setup and configuration"] = "Démarrage et configuration du site";
-$a->strings["Nothing new here"] = "Rien de neuf ici";
-$a->strings["Select"] = "Sélectionner";
-$a->strings["View %s's profile @ %s"] = "Voir le profil de %s @ %s";
-$a->strings["%s from %s"] = "%s de %s";
-$a->strings["View in context"] = "Voir dans le contexte";
-$a->strings["See all %d comments"] = "Voir les %d commentaires";
-$a->strings["like"] = "aime";
-$a->strings["dislike"] = "n'aime pas";
-$a->strings["Share this"] = "Partager ça";
-$a->strings["share"] = "partager";
-$a->strings["add star"] = "mett en avant";
-$a->strings["remove star"] = "ne plus mettre en avant";
-$a->strings["toggle star status"] = "mettre en avant";
-$a->strings["starred"] = "mis en avant";
-$a->strings["add tag"] = "ajouter un tag";
-$a->strings["to"] = "à";
-$a->strings["Wall-to-Wall"] = "Inter-mur";
-$a->strings["via Wall-To-Wall:"] = "en Inter-mur:";
-$a->strings["Delete Selected Items"] = "Supprimer les éléments sélectionnés";
-$a->strings["%s likes this."] = "%s aime ça.";
-$a->strings["%s doesn't like this."] = "%s n'aime pas ça.";
-$a->strings["%2\$d people like this."] = "%2\$d personnes aiment ça.";
-$a->strings["%2\$d people don't like this."] = "%2\$d personnes n'aiment pas ça.";
-$a->strings["and"] = "et";
-$a->strings[", and %d other people"] = ", et %d autres personnes";
-$a->strings["%s like this."] = "%s aiment ça.";
-$a->strings["%s don't like this."] = "%s n'aiment pas ça.";
-$a->strings["Visible to everybody"] = "Visible par tout le monde";
-$a->strings["Please enter a video link/URL:"] = "Entrez un lien/URL video :";
-$a->strings["Please enter an audio link/URL:"] = "Entrez un lien/URL audio :";
-$a->strings["Tag term:"] = "Tag : ";
-$a->strings["Where are you right now?"] = "Où êtes-vous présentemment?";
-$a->strings["Enter a title for this item"] = "Saisissez un titre pour cet élément";
-$a->strings["Insert video link"] = "Insérer un lien video";
-$a->strings["Insert audio link"] = "Insérer un lien audio";
-$a->strings["Set title"] = "Définir un titre";
-$a->strings["view full size"] = "voir en pleine taille";
-$a->strings["image/photo"] = "image/photo";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Impossible de localiser les informations DNS pour le serveur de base de données '%s'";
-$a->strings["Add New Contact"] = "Ajouter un nouveau contact";
-$a->strings["Enter address or web location"] = "Entrez son adresse ou sa localisation web";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple: bob@example.com, http://example.com/barbara";
-$a->strings["Invite Friends"] = "Inviter des amis";
-$a->strings["%d invitation available"] = array(
-	0 => "%d invitation disponible",
-	1 => "%d invitations disponibles",
-);
-$a->strings["Find People"] = "Trouver des personnes";
-$a->strings["Enter name or interest"] = "Entrez un nom ou un centre d'intérêt";
-$a->strings["Connect/Follow"] = "Connecter/Suivre";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Pêche";
-$a->strings["Similar Interests"] = "Intérêts similaires";
-$a->strings["New mail received at "] = "Nouvel email reçu à ";
-$a->strings["A new person is sharing with you at "] = "Une nouvelle personne partage avec vous à ";
-$a->strings["You have a new follower at "] = "Vous avez un nouvel abonné à ";
-$a->strings["[no subject]"] = "[pas de sujet]";
-$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un groupe supprimé a été recréé. Les permissions existantes pourraient s'appliquer à ce groupe et aux futurs membres. Si ce n'est pas le comportement attendu, merci de re-créer un autre groupe sous un autre nom.";
-$a->strings["Create a new group"] = "Créer un nouveau groupe";
-$a->strings["Everybody"] = "Tout le monde";
-$a->strings["Sharing notification from Diaspora network"] = "Notification de partage du réseau Diaspora";
-$a->strings["Attachments:"] = "Pièces jointes : ";
-$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Relayé] Commentaire de %s sur le réseau %s";
-$a->strings["Embedded content"] = "Contenu incorporé";
-$a->strings["Embedding disabled"] = "Incorporation désactivée";
+$a->strings["No results."] = "Aucun résultat.";
+$a->strings["Contact not found."] = "Contact introuvable.";
+$a->strings["Friend suggestion sent."] = "Suggestion d'amitié/relation envoyée.";
+$a->strings["Suggest Friends"] = "Suggérer une relation";
+$a->strings["Suggest a friend for %s"] = "Suggérer une relation à %s";
+$a->strings["Edit Block"] = "Éditer bloc";
+$a->strings["Delete block?"] = "Supprimer le bloc?";
+$a->strings["Delete Block"] = "Supprimer bloc";
+$a->strings["Status: "] = "État :";
+$a->strings["Sexual Preference: "] = "Orientation sexuelle :";
+$a->strings["Homepage: "] = "Site web :";
+$a->strings["Hometown: "] = "Ville natale :";
+$a->strings["About: "] = "À propos :";
+$a->strings["Keywords: "] = "Mots-clefs :";
+$a->strings["Permission Denied."] = "Permission refusée.";
+$a->strings["File not found."] = "Fichier introuvable.";
+$a->strings["Edit file permissions"] = "Éditer les permissions du fichier";
+$a->strings["Permissions"] = "Permissions";
+$a->strings["Include all files and sub folders"] = "Inclure tous fichiers et sous-répertoires";
+$a->strings["Return to file list"] = "Retourner à la liste des fichiers";
+$a->strings["Copy/paste this code to attach file to a post"] = "Copiez/collez ce code pour joindre le fichier à une publication";
+$a->strings["Copy/paste this URL to link file from a web page"] = "Copiez/collez cette URL pour lier le fichier depuis une page web";
+$a->strings["Download"] = "Télécharger";
+$a->strings["Used: "] = "Utilisé :";
+$a->strings["[directory]"] = "[répertoire]";
+$a->strings["Limit: "] = "Limite :";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Pas de suggestions pour l'instant. Si le site est récent, merci de re-tenter dans 24 heures.";
+$a->strings["Conversation removed."] = "Conversation supprimée.";
+$a->strings["No messages."] = "Pas de message.";
+$a->strings["D, d M Y - g:i A"] = "D d Y - H:i";
+$a->strings["Public Sites"] = "Sites publics";
+$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details."] = "Les sites listés autorisent l'inscription pour tous. Tous sont liés entre eux, de manière à ce qu'un compte sur un seul d'entre eux soit valable sur l'ensemble de la matrice. Certains sites peuvent demander des frais de souscriptions, ou fournir des forfaits ajustés. Le lien \"fournisseur\" peut vous donner des détails supplémentaires.";
+$a->strings["Site URL"] = "URL du site";
+$a->strings["Access Type"] = "Type d'accès";
+$a->strings["Registration Policy"] = "Politique d'inscription";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Nombre d'inscriptions quotidiennes dépassé. Merci de recommencer demain.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Merci d'indiquer votre adhésion aux Règles du Service. L'inscription a échoué.";
+$a->strings["Passwords do not match."] = "Les mots de passe ne concordent pas.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "Inscription réussie. Merci de vérifier vos courriels pour valider votre compte.";
+$a->strings["Your registration is pending approval by the site owner."] = "Votre inscription est en attente de l'approbation d'un administrateur.";
+$a->strings["Your registration can not be processed."] = "Votre inscription ne peut être traîtée.";
+$a->strings["Registration on this site/hub is by approval only."] = "L'inscription sur cette instance/ce site est soumis à une modération.";
+$a->strings["Register at another affiliated site/hub"] = "S'inscrire sur un site/hub affilié";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Ce site a dépassé le nombre de création de compte autorisé par jour. Merci de recommencer demain.";
+$a->strings["Terms of Service"] = "les Règles du Service";
+$a->strings["I accept the %s for this website"] = "J'accepte %s de ce site";
+$a->strings["I am over 13 years of age and accept the %s for this website"] = "J'ai treize (13) ans révolus, et j'accepte %s de ce site";
+$a->strings["Membership on this site is by invitation only."] = "L'inscription à ce site se fait uniquement sur invitation.";
+$a->strings["Please enter your invitation code"] = "Merci de saisir votre code d'invitation";
+$a->strings["Your email address"] = "Votre adresse de courriel";
+$a->strings["Choose a password"] = "Choisissez un mot de passe";
+$a->strings["Please re-enter your password"] = "Confirmez-le";
+$a->strings["Please login."] = "Merci de vous connecter.";
+$a->strings["Remove This Channel"] = "Supprimer ce canal";
+$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Ceci effacera complètement le canal du réseau. Une fois effacé, un canal ne PEUT PAS être récupéré.";
+$a->strings["Please enter your password for verification:"] = "Merci de re-saisir votre mot de passe pour vérification :";
+$a->strings["Remove this channel and all its clones from the network"] = "Supprimer ce canal ainsi que tous ses clones de par le réseau";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Par défaut, seule l'instance du canal présente sur ce hub sera supprimée du réseau";
+$a->strings["Remove Channel"] = "Enlever le canal";
+$a->strings["Page owner information could not be retrieved."] = "Impossible d'obtenir des informations sur le propriétaire de la page.";
+$a->strings["Album not found."] = "Album introuvable.";
+$a->strings["Delete Album"] = "Supprimer album";
+$a->strings["Delete Photo"] = "Supprimer photo";
+$a->strings["No photos selected"] = "Aucune photo selectionnée";
+$a->strings["Access to this item is restricted."] = "L'accès à l'élément est restreint.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Vous avez utilisé %1$.2f mégaoctets sur les %2$.2f autorisés pour le stockage des photos.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Vous avez utilisé %1$.2f mégaoctets pour le stockage des photos.";
+$a->strings["Upload Photos"] = "Téléverser des photos";
+$a->strings["New album name: "] = "Créer un album :";
+$a->strings["or existing album name: "] = "ou choisir un album existant :";
+$a->strings["Do not show a status post for this upload"] = "Ne pas publier de statut pour cet envoi";
+$a->strings["Contact Photos"] = "Photos de contact";
+$a->strings["Edit Album"] = "Éditer l'album";
+$a->strings["Show Newest First"] = "Ordre anté-chronologique";
+$a->strings["Show Oldest First"] = "Ordre chronologique";
+$a->strings["View Photo"] = "Voir photo";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permission refusée. L'accès à cet élément peut avoir été restreint.";
+$a->strings["Photo not available"] = "Photo indisponible";
+$a->strings["Use as profile photo"] = "Utiliser comme photo du profil";
+$a->strings["View Full Size"] = "Voir en taille réelle";
+$a->strings["Edit photo"] = "Éditer photo";
+$a->strings["Rotate CW (right)"] = "Rotation horaire (droite)";
+$a->strings["Rotate CCW (left)"] = "Rotation anti-horaire (gauche)";
+$a->strings["New album name"] = "Nouveau nom d'album :";
+$a->strings["Caption"] = "Titre/légende";
+$a->strings["Add a Tag"] = "Ajouter une étiquette";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemple : @bob, @Barbara_Jensen, @jim@exemple.com, #Ile_de_France, #marathon";
+$a->strings["In This Photo:"] = "Dans cette photo :";
+$a->strings["View Album"] = "Voir album";
+$a->strings["Recent Photos"] = "Photos récentes";
+$a->strings["Mood"] = "Humeur";
+$a->strings["Set your current mood and tell your friends"] = "Indiquez votre humeur du moment à vos amis";
+$a->strings["sent you a private message"] = "vous a envoyé un message privé";
+$a->strings["added your channel"] = "a ajouté votre canal";
+$a->strings["posted an event"] = "a publié un événement";
+$a->strings["Scheme Default"] = "Schéma de couleur par défaut";
+$a->strings["silver"] = "argent";
+$a->strings["Theme settings"] = "Réglages du thème";
+$a->strings["Set scheme"] = "Définir la palette de couleurs";
+$a->strings["Navigation bar colour"] = "Couleur de la barre de navigation";
+$a->strings["link colour"] = "couleur des liens";
+$a->strings["Set font-colour for banner"] = "Définir la couleur du texte de la bannière";
+$a->strings["Set the background colour"] = "Définir la couleur d'arrière-plan";
+$a->strings["Set the background image"] = "Définir l'image d'arrière-plan";
+$a->strings["Set the background colour of items"] = "Définir la couleur de fond des contributions";
+$a->strings["Set the opacity of items"] = "Définir l'opacité des contributions";
+$a->strings["Set the basic colour for item icons"] = "Définir la couleur de base pour les icônes des éléments";
+$a->strings["Set the hover colour for item icons"] = "Définir la couleur de survol des icônes des éléments";
+$a->strings["Set font-size for the entire application"] = "Définir la taille de police pour l'application entière";
+$a->strings["Set font-size for posts and comments"] = "Définir font-size pour contribution et commentaires";
+$a->strings["Set font-colour for posts and comments"] = "Définir font-colour pour les contributions et commentaires";
+$a->strings["Set radius of corners"] = "Définir le rayon des arrondis";
+$a->strings["Set shadow depth of photos"] = "Définir la profondeur de l'ombre des photos";
+$a->strings["Set maximum width of conversation regions"] = "Définir la largeur maximale des conversations";
+$a->strings["Set minimum opacity of nav bar - to hide it"] = "Définir l'opacité minimum du bandeau de navigation - pour le cacher";
+$a->strings["Set size of conversation author photo"] = "Définir la taille de la photo de l'auteur d'une conversation";
+$a->strings["Set size of followup author photos"] = "Définir la taille de la photo de l'auteur d'une réponse";
+$a->strings["Sloppy photo albums"] = "Albums photo \"en biais\"";
+$a->strings["Are you a clean desk or a messy desk person?"] = "Vous êtes plutôt \"bureau bien rangé\" ou \"gros foutoir\"?";
+$a->strings["Schema Default"] = "Palette par défaut";
+$a->strings["Sans-Serif"] = "Sans empâtements";
+$a->strings["Monospace"] = "Châsse fixe";
+$a->strings["Set font face"] = "Définir la fonte";
+$a->strings["Set iconset"] = "Définir le jeu d'icônes";
+$a->strings["Set big shadow size, default 15px 15px 15px"] = "Définir la taille des grandes ombres, par défaut 15px 15px 15px";
+$a->strings["Set small shadow size, default 5px 5px 5px"] = "Définir la taille des petites ombres, par défaut 5px 5px 5px";
+$a->strings["Set shadow colour, default #000"] = "Définir la couleur des ombres, par défaut #000";
+$a->strings["Set radius size, default 5px"] = "Définir le rayon des arrondis, par défaut 5px";
+$a->strings["Set line-height for posts and comments"] = "Définir line-height pour contributions et commentaires";
+$a->strings["Set background image"] = "Définir l'image d'arrière-plan";
+$a->strings["Set background colour"] = "Définir la couleur d'arrière-plan";
+$a->strings["Set section background image"] = "Définir l'image d'arrière-plan des sections";
+$a->strings["Set section background colour"] = "Définir la couleur d'arrière-plan des sections";
+$a->strings["Set colour of items - use hex"] = "Définir la couleur des éléments - en héxadécimal";
+$a->strings["Set colour of links - use hex"] = "Définir la couleur des liens - en héxadécimal";
+$a->strings["Set max-width for items.  Default 400px"] = "Définir la largeur maximal des éléments. Par défaut, 400px";
+$a->strings["Set min-width for items.  Default 240px"] = "Définir la largeur minimale des éléments. Par défaut, 240px";
+$a->strings["Set the generic content wrapper width.  Default 48%"] = "Définir la largeur du contenu. Par défaut, 48%";
+$a->strings["Set colour of fonts - use hex"] = "Définir la couleur des fontes - en héxadécimal";
+$a->strings["Set background-size element"] = "Définir background-size pour les éléments";
+$a->strings["Item opacity"] = "Opacité des éléments";
+$a->strings["Display post previews only"] = "Afficher seulement l'aperçu des contributions";
+$a->strings["Display side bar on channel page"] = "Afficher le panneau latéral sur la page du canal";
+$a->strings["Colour of the navigation bar"] = "Couleur de la barre de navigation";
+$a->strings["Item float"] = "Alignement de l'élément";
+$a->strings["Left offset of the section element"] = "Décalage gauche de l'élément section";
+$a->strings["Right offset of the section element"] = "Décalage droit de l'élément section";
+$a->strings["Section width"] = "Largeur de la section";
+$a->strings["Left offset of the aside"] = "Décalage gauche du panneau latéral";
+$a->strings["Right offset of the aside element"] = "Décalage droit du panneau latéral";
+$a->strings["None"] = "";
+$a->strings["Header image"] = "Têtière";
+$a->strings["Header image only on profile pages"] = "Têtière seulement sur les profils";
+$a->strings["Update %s failed. See error logs."] = "La mise-à-jour %s a échoué. Merci de consulter les journaux d'erreur.";
+$a->strings["Update Error at %s"] = "Erreur de mise-à-jour sur %s";
+$a->strings["Create an account to access services and applications within the Red Matrix"] = "Créez un compte pour pouvoir accéder aux services et applications de la Matrice Red";
+$a->strings["Password"] = "Mot de pass";
+$a->strings["Remember me"] = "Se souvenir de moi";
+$a->strings["Forgot your password?"] = "Mot de passe oublié?";
+$a->strings["permission denied"] = "permission refusée";
+$a->strings["Got Zot?"] = "T'as Zot?";
+$a->strings["toggle mobile"] = "(dés)activer mobile";
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 144ecb17c..9eb552767 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -2,33 +2,33 @@
 
 	var aStr = {
 
-		'delitem'    : '{{$delitem}}',
-		'comment'    : '{{$comment}}',
-		'showmore'   : '{{$showmore}}',
-		'showfewer'  : '{{$showfewer}}',
-		'pwshort'    : '{{$pwshort}}',
-		'pwnomatch'  : '{{$pwnomatch}}',
-		'everybody'  : '{{$everybody}}',
-		'passphrase' : '{{$passphrase}}',
-		'passhint'   : '{{$passhint}}',
+		'delitem'    : "{{$delitem}}",
+		'comment'    : "{{$comment}}",
+		'showmore'   : "{{$showmore}}",
+		'showfewer'  : "{{$showfewer}}",
+		'pwshort'    : "{{$pwshort}}",
+		'pwnomatch'  : "{{$pwnomatch}}",
+		'everybody'  : "{{$everybody}}",
+		'passphrase' : "{{$passphrase}}",
+		'passhint'   : "{{$passhint}}",
 
 		't01' :  {{$t01}},
 		't02' :  {{$t02}},
-		't03' : '{{$t03}}',
-		't04' : '{{$t04}}',
-		't05' : '{{$t05}}',
-		't06' : '{{$t06}}',
-		't07' : '{{$t07}}',
-		't08' : '{{$t08}}',
-		't09' : '{{$t09}}',
-		't10' : '{{$t10}}',
-		't11' : '{{$t11}}',
-		't12' : '{{$t12}}',
-		't13' : '{{$t13}}',
-		't14' : '{{$t14}}',
-		't15' : '{{$t15}}',
-		't16' : '{{$t16}}',
-		't17' : '{{$t17}}',
+		't03' : "{{$t03}}",
+		't04' : "{{$t04}}",
+		't05' : "{{$t05}}",
+		't06' : "{{$t06}}",
+		't07' : "{{$t07}}",
+		't08' : "{{$t08}}",
+		't09' : "{{$t09}}",
+		't10' : "{{$t10}}",
+		't11' : "{{$t11}}",
+		't12' : "{{$t12}}",
+		't13' : "{{$t13}}",
+		't14' : "{{$t14}}",
+		't15' : "{{$t15}}",
+		't16' : "{{$t16}}",
+		't17' : "{{$t17}}",
 	};
 
 
-- 
cgit v1.2.3


From ae6bd7dc1e87805447e765e08d7a31ae5ac03f32 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 7 Feb 2014 15:41:31 -0800
Subject: fix issue with double linkify in the git feed

---
 mod/item.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mod/item.php b/mod/item.php
index 47a3f1961..e8a58fe76 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -422,9 +422,15 @@ function item_post(&$a) {
 
 		/**
 		 * fix naked links by passing through a callback to see if this is a red site
-		 * (already known to us) which will get a zrl, otherwise link with url
+		 * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both.
+		 * First wrap any url which is part of link anchor text already in quotes so we don't double link it.
+		 * e.g. [url=http://foobar.com]something with http://elsewhere.com in it[/url]
+		 * becomes [url=http://foobar.com]something with "http://elsewhere.com" in it[/url]
+		 * otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
 		 */
 
+		$body = preg_replace('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','[$1rl$2]$3"$4"$5[/$6rl]',$body);
+
 		$body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
 		/**
-- 
cgit v1.2.3


From 8c845f5d506e333ecd8eaed3139bcd7e344ef346 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 7 Feb 2014 22:47:03 -0800
Subject: set default for account_level in DB

---
 boot.php             | 2 +-
 install/database.sql | 2 +-
 install/update.php   | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index 1d462eff8..41282bb13 100755
--- a/boot.php
+++ b/boot.php
@@ -46,7 +46,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
 
-define ( 'DB_UPDATE_VERSION',       1096  );
+define ( 'DB_UPDATE_VERSION',       1097  );
 
 define ( 'EOL',                    '
                                      ' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/install/database.sql b/install/database.sql
index 86531a415..cd31a0285 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` (
   `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `account_service_class` char(32) NOT NULL DEFAULT '',
-  `account_level` int(10) unsigned NOT NULL,
+  `account_level` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_id`),
   KEY `account_email` (`account_email`),
   KEY `account_service_class` (`account_service_class`),
diff --git a/install/update.php b/install/update.php
index 93442a81f..ccfec9ddf 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 
Date: Fri, 7 Feb 2014 23:33:40 -0800
Subject: make bookmarks message into an 'info' so it expires and goes away
 after a bit

---
 mod/bookmarks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index de30d9bb6..67208937d 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -35,7 +35,7 @@ function bookmarks_init(&$a) {
 		}
 		foreach($terms as $t) {
 			bookmark_add($u,$s[0],$t,$item['item_private']);
-			notice( t('Bookmark added') . EOL);
+			info( t('Bookmark added') . EOL);
 		}
 	}
 	killme();
-- 
cgit v1.2.3


From 97739920ebfa0d7b0db95c61187d5820c0939f14 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 8 Feb 2014 00:48:19 -0800
Subject: create a new "subdued" CSS class for things that shouldn't be in your
 face unless you want them and intentionally hover over them. Typically this
 would be accomplished via an opacity or colour change, but themes are free to
 use other methods. Also changed the channel_tabs "chatroom" link to use the
 subdued class if no rooms have been created rather than a count of chatrooms.
 Themse should probably create a .subdued and .subdued:hover definition
 because we'll probably take most of the stuff which is now hardwired to use
 opacity by id and change it to use the class definition instead.

---
 include/conversation.php          | 6 +++---
 version.inc                       | 2 +-
 view/theme/redbasic/css/style.css | 9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 77c7bac70..16ac4e909 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1491,11 +1491,11 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 
 	require_once('include/chat.php');
 	$chats = chatroom_list($a->profile['profile_uid']);
-
+	$subdued = ((count($chats)) ? '' : ' subdued');
 	$tabs[] = array(
-		'label' => t('Chatrooms') . '(' . count($chats) . ')',
+		'label' => t('Chatrooms'),
 		'url'	=> $a->get_baseurl() . '/chat/' . $nickname,
-		'sel' 	=> ((argv(0) == 'chat') ? 'active' : ''),
+		'sel' 	=> ((argv(0) == 'chat') ? 'active' . $subdued : '' . $subdued),
 		'title' => t('Chatrooms'),
 		'id'    => 'chat-tab',
 	);
diff --git a/version.inc b/version.inc
index a760a1660..bd1fa0985 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-07.581
+2014-02-08.582
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 776b4c31a..209399d0c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -114,6 +114,15 @@ blockquote {
 	margin-right: 5px;
 }
 
+.subdued {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+.subdued:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
 
 
 #langselector {
-- 
cgit v1.2.3


From 3222b154856b2286a7bc28abb5f5adc7f6453835 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Sat, 8 Feb 2014 17:49:09 +0000
Subject: Pass mids to conv_item template

---
 include/ItemObject.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 9b1a6fbcd..2922ee473 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -241,6 +241,7 @@ class Item extends BaseObject {
 			'like'      => $like,
 			'dislike'   => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
 			'share'     => $share,
+			'rawmid'	=> $item['mid'],
 			'plink'     => get_plink($item),
 			'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
 			'star'      => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
-- 
cgit v1.2.3


From 92dea7888b40fde2774b79825530d6763ec133ed Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 8 Feb 2014 11:53:47 -0800
Subject: allow somebody to type #^{{naked link}} --  auto-linkify it and
 create a bookmark tag.

---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/item.php b/mod/item.php
index e8a58fe76..48ecdf1a1 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -431,7 +431,7 @@ function item_post(&$a) {
 
 		$body = preg_replace('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','[$1rl$2]$3"$4"$5[/$6rl]',$body);
 
-		$body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
+		$body = preg_replace_callback("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
 		/**
 		 *
-- 
cgit v1.2.3


From e71571f619e94ab6fbbd92dea819a0effa071484 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 8 Feb 2014 12:02:45 -0800
Subject: revert last fix, it double tags

---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/item.php b/mod/item.php
index 48ecdf1a1..e8a58fe76 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -431,7 +431,7 @@ function item_post(&$a) {
 
 		$body = preg_replace('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','[$1rl$2]$3"$4"$5[/$6rl]',$body);
 
-		$body = preg_replace_callback("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
+		$body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
 		/**
 		 *
-- 
cgit v1.2.3


From e346aa7560b93d1e5a331fa4ad9b16c70fe83ef7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 8 Feb 2014 12:08:07 -0800
Subject: that's better

---
 include/items.php | 2 ++
 mod/item.php      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 88b258604..efc2322d5 100755
--- a/include/items.php
+++ b/include/items.php
@@ -159,6 +159,8 @@ function red_zrl_callback($matches) {
 		if($r)
 			$zrl = true;
 	}
+	if($matches[1] === '#^')
+		$matches[1] = '';
 	if($zrl)
 		return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]';
 	return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]';
diff --git a/mod/item.php b/mod/item.php
index e8a58fe76..19d771832 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -431,7 +431,7 @@ function item_post(&$a) {
 
 		$body = preg_replace('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','[$1rl$2]$3"$4"$5[/$6rl]',$body);
 
-		$body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
+		$body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
 		/**
 		 *
-- 
cgit v1.2.3


From c9192991c95a5145e5d515f7c6268c61e6400476 Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Sun, 9 Feb 2014 01:37:09 +0100
Subject: Add class to bookmark links to make it better them able

E.g.: css (not yet included)
.bookmark-identifier{
display:none;
}
.bookmark:hover:before{
text-decoration:none;
content:"#^";
color:#000000;
background:#FFFFFF;
}

.bookmark:hover{
	color: #FFFFFF;
	background: #3465A4;
}
---
 include/bbcode.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/bbcode.php b/include/bbcode.php
index bd2c7d11a..9cd5ad58c 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -443,10 +443,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		}
 	  }
 	if (strpos($Text,'[/url]') !== false) {
+	    $Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '#^$1', $Text);
+		$Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '#^$2', $Text);
 		$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text);
 		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text);
     }
 	if (strpos($Text,'[/zrl]') !== false) {
+	    $Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '#^$1', $Text);
+		$Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '#^$2', $Text);	
 		$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text);
 		$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text);
     }
-- 
cgit v1.2.3


From 176b0881ce6fd9b820c9dffaa926b542007f98df Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Sun, 9 Feb 2014 01:39:37 +0100
Subject: .

---
 view/theme/redbasic/css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 209399d0c..6164407e8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2459,3 +2459,4 @@ img.mail-list-sender-photo {
 	color: red;
 	cursor: pointer;
 }
+
-- 
cgit v1.2.3


From c5f0b85357e04f436402d16a3b3781df47f30812 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 00:30:43 -0800
Subject: fix wall photos

---
 include/items.php | 9 +++++++++
 mod/item.php      | 2 +-
 version.inc       | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/items.php b/include/items.php
index efc2322d5..acf05ed11 100755
--- a/include/items.php
+++ b/include/items.php
@@ -167,6 +167,15 @@ function red_zrl_callback($matches) {
 }
 
 
+// If we've got a url or zrl tag with a naked url somewhere in the link text, 
+// escape it with quotes unless the naked url is a linked photo. 
+
+function red_escape_zrl_callback($matches) {
+
+	if((strpos($matches[3],'zmg') !== false) || (strpos($matches[3],'img') !== false))
+		return $matches[0];
+	return '[' . $matches[1] . 'rl' . $matches[2] . ']' . $matches[3] . '"' . $matches[4] . '"' . $matches[5] . '[/' . $matches[6] . 'rl]';
+}
 
 /**
  * @function post_activity_item($arr)
diff --git a/mod/item.php b/mod/item.php
index 19d771832..69cc624ea 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -429,7 +429,7 @@ function item_post(&$a) {
 		 * otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
 		 */
 
-		$body = preg_replace('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','[$1rl$2]$3"$4"$5[/$6rl]',$body);
+		$body = preg_replace_callback('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','red_escape_zrl_callback',$body);
 
 		$body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
diff --git a/version.inc b/version.inc
index bd1fa0985..fc4e28cab 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-08.582
+2014-02-09.583
-- 
cgit v1.2.3


From 8bf7b0fffd8ec53fa7032fd86023245366f6df51 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Sun, 9 Feb 2014 18:09:50 +0000
Subject: Doco - abcjsplugin from Olivier

---
 doc/External-Resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/External-Resources.md b/doc/External-Resources.md
index 9339d0352..c0880f362 100644
--- a/doc/External-Resources.md
+++ b/doc/External-Resources.md
@@ -14,6 +14,7 @@ External Resources
 **Third-Party Addons**
 
 * [BBCode Extensions for Webpages/Wikis](https://github.com/beardy-unixer/red-addons-extra)
+* [ABCjs integration - display scores in posts (WIP)](https://abcentric.net/git/abcjsplugin.git)
 
 **Related projects**
 
-- 
cgit v1.2.3


From 8727a75437f11f337dfbd97f671e5ba77355f29f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 13:46:40 -0800
Subject: fix the "every other link gets messed up" problem

---
 include/items.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index acf05ed11..c69ac2c84 100755
--- a/include/items.php
+++ b/include/items.php
@@ -172,7 +172,9 @@ function red_zrl_callback($matches) {
 
 function red_escape_zrl_callback($matches) {
 
-	if((strpos($matches[3],'zmg') !== false) || (strpos($matches[3],'img') !== false))
+	// Uncertain why the url/zrl forms weren't picked up by the non-greedy regex.
+
+	if((strpos($matches[3],'zmg') !== false) || (strpos($matches[3],'img') !== false) || (strpos($matches[3],'zrl') !== false) || (strpos($matches[3],'url') !== false))
 		return $matches[0];
 	return '[' . $matches[1] . 'rl' . $matches[2] . ']' . $matches[3] . '"' . $matches[4] . '"' . $matches[5] . '[/' . $matches[6] . 'rl]';
 }
-- 
cgit v1.2.3


From 4fc0126661f2389843599a4a6829d8eb79a109e4 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Sun, 9 Feb 2014 23:52:09 +0100
Subject: theming chat a little

---
 view/css/mod_chat.css             | 29 +++++++++++++++++++++++++++--
 view/theme/redbasic/css/style.css |  8 ++++++++
 view/tpl/chat.tpl                 |  7 ++++---
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index ce6e59af1..99bd1b154 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -27,5 +27,30 @@
  section {
 	 padding-bottom: 0;
  }
- 
- 
\ No newline at end of file
+
+.chat-item {
+	padding: 3px;
+}
+
+.chat-item-end {
+	clear: both;
+}
+
+.chat-item-photo {
+	float: left;
+	height: 32px;
+	width: 32px;
+}
+
+.chat-body {
+	float: left;
+	width: 80%;
+	margin-left: 15px;
+}
+
+.chat-item-text {
+	float: left;
+	background-color:#eee;
+	padding: 3px;
+	display:inline-block;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6164407e8..08129aabb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2455,8 +2455,16 @@ img.mail-list-sender-photo {
 .abook-self {
 	background-color: #ffdddd;
 }
+
 .online-now {
 	color: red;
 	cursor: pointer;
 }
 
+.chat-item-photo {
+	border-radius: $radiuspx;
+}
+
+.chat-item-text {
+	border-radius: $radiuspx;
+}
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 7073a0a52..51aeb836e 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,5 +1,5 @@
 
                                      {{$room_name}}
                                      
-
                                      
+
                                      
 
     
                                      
     	
                                      
@@ -64,7 +64,7 @@ function update_inroom(inroom) {
 	$.each( inroom, function(index, item) {
 		var newNode = document.createElement('div');
 		$(newNode).html('' + item.name + ' ' + item.status + '
                                      ' + item.name + '
                                      ');
-		html.appendChild(newNode); 		
+		html.appendChild(newNode);
 	});
 	$('#chatUsers').html(html);	
 }
@@ -75,7 +75,8 @@ function update_chats(chats) {
 	$.each( chats, function(index, item) {
 		last_chat = item.id;
 		var newNode = document.createElement('div');
-		$(newNode).html('
                                      ' + item.name + '
                                      ' + item.name + ' ' + item.localtime + '
                                      ' + item.text + '
                                      ');
+		newNode.setAttribute('class', 'chat-item');
+		$(newNode).html('' + item.name + '
                                      ' + item.name + ' ' + item.localtime + '
                                      ' + item.text + '
                                      ');
 		$('#chatLineHolder').append(newNode);
 		$(".autotime").timeago();
 
-- 
cgit v1.2.3


From b92f00587b8791b5aea20ae2dc390b084c8ca444 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 14:56:52 -0800
Subject: don't allow the browser to open uploaded html/css/js

---
 include/reddav.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/reddav.php b/include/reddav.php
index af79a0db1..63d073d2a 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -443,11 +443,18 @@ class RedFile extends DAV\Node implements DAV\IFile {
 	function get() {
 		logger('RedFile::get: ' . basename($this->name), LOGGER_DEBUG);
 
-		$r = q("select data, flags from attach where hash = '%s' and uid = %d limit 1",
+		$r = q("select data, flags, filename, filetype from attach where hash = '%s' and uid = %d limit 1",
 			dbesc($this->data['hash']),
 			intval($this->data['uid'])
 		);
 		if($r) {
+			$unsafe_types = array('text/html','text/css','application/javascript');
+
+			if(in_array($r[0]['filetype'],$unsafe_types)) {
+				header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
+				header('Content-type: text/plain');
+			}
+
 			if($r[0]['flags'] & ATTACH_FLAG_OS ) {
 				$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $r[0]['data'];
 				return fopen($f,'rb');
@@ -463,6 +470,10 @@ class RedFile extends DAV\Node implements DAV\IFile {
 
 
 	function getContentType() {
+		$unsafe_types = array('text/html','text/css','application/javascript');
+		if(in_array($this->data['filetype'],$unsafe_types)) {
+			return 'text/plain';
+		}
 		return $this->data['filetype'];
 	}
 
-- 
cgit v1.2.3


From 46153e4a5795a6ad6f088304233a4524a1e8409c Mon Sep 17 00:00:00 2001
From: marijus 
Date: Sun, 9 Feb 2014 23:59:19 +0100
Subject: moving background-color to style.css

---
 view/css/mod_chat.css             | 3 +--
 view/theme/redbasic/css/style.css | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 99bd1b154..7963fbbd6 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -50,7 +50,6 @@
 
 .chat-item-text {
 	float: left;
-	background-color:#eee;
 	padding: 3px;
-	display:inline-block;
+	display: inline-block;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 08129aabb..8a43f5a51 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2467,4 +2467,5 @@ img.mail-list-sender-photo {
 
 .chat-item-text {
 	border-radius: $radiuspx;
+	background-color:#eee;
 }
-- 
cgit v1.2.3


From 3ad9cf67c6e28f41c191dea52fac664471e5b107 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Mon, 10 Feb 2014 00:00:35 +0100
Subject: whitespace

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8a43f5a51..78fdac0cd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2467,5 +2467,5 @@ img.mail-list-sender-photo {
 
 .chat-item-text {
 	border-radius: $radiuspx;
-	background-color:#eee;
+	background-color: #eee;
 }
-- 
cgit v1.2.3


From b58baa5e4a80657f7b0c7848f16fd12714e4a11a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 15:00:47 -0800
Subject: more XSS blockage of uploaded files

---
 mod/attach.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mod/attach.php b/mod/attach.php
index d0d3296e1..cf72d09c6 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -24,7 +24,16 @@ function attach_init(&$a) {
 	if(! $c)
 		return;
 
-	header('Content-type: ' . $r['data']['filetype']);
+
+	$unsafe_types = array('text/html','text/css','application/javascript');
+
+	if(in_array($r['data']['filetype'],$unsafe_types)) {
+			header('Content-type: text/plain');
+	}
+	else {
+		header('Content-type: ' . $r['data']['filetype']);
+	}
+
 	header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"');
 	if($r['data']['flags'] & ATTACH_FLAG_OS ) {
 		$istream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb');
-- 
cgit v1.2.3


From cf3b76c0460888c56263f0f03a2115c7c666b8c7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 16:47:06 -0800
Subject: backend for chatroom activity monitor - honours permissions and
 returns (json) how many in room and last chat timestamp, regardless of
 whether the observer is actually in the room.

---
 mod/chat.php | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/mod/chat.php b/mod/chat.php
index 872571f8c..a960f4f37 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -99,6 +99,49 @@ function chat_content(&$a) {
 	}
 
 
+	if((argc() > 3) && intval(argv(2)) && (argv(3) === 'status')) {
+		$ret = array('success' => false);
+		$room_id = intval(argv(2));
+		if(! $room_id || ! $observer)
+			return;
+
+		$r = q("select * from chatroom where cr_id = %d limit 1",
+			intval($room_id)
+		);
+		if(! $r) {
+			json_return_and_die($ret);
+		}
+		require_once('include/security.php');
+		$sql_extra = permissions_sql($r[0]['cr_uid']);
+
+		$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+			intval($room_id),
+			intval($r[0]['cr_uid'])
+		);
+		if(! $x) {
+			json_return_and_die($ret);
+		}
+		$y = q("select count(*) as total from chatpresence where cp_room = %d",
+			intval($room_id)
+		);
+		if($y) {
+			$ret['success'] = true;
+			$ret['chatroom'] = $r[0]['cr_name'];
+			$ret['inroom'] = $y[0]['total'];
+		}
+
+		// figure out how to present a timestamp of the last activity, since we don't know the observer's timezone.
+
+		$z = q("select created from chat where chat_room = %d order by created desc limit 1",
+			intval($room_id)
+		);
+		if($z) {
+			$ret['last'] = $z[0]['created'];
+		}
+		json_return_and_die($ret);
+	}
+
+
 	if(argc() > 2 && intval(argv(2))) {
 		$room_id = intval(argv(2));
 		$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
-- 
cgit v1.2.3


From c7ffae03d83d9af29507c820a9b7a909db7546f7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 19:45:22 -0800
Subject: perform remote discovery on abook sync of nomadic clones if remote
 channel (xchan) is unknown

---
 include/zot.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/zot.php b/include/zot.php
index b7a22a099..7dfaada32 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2108,6 +2108,33 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 
 			$clean = array();
 			foreach($arr['abook'] as $abook) {
+
+				// Perform discovery if the referenced xchan hasn't ever been seen on this hub.
+				// This relies on the undocumented behaviour that red sites send xchan info with the abook
+
+				if($abook['abook_xchan'] && $abook['xchan_address']) {
+					$h = zot_get_hublocs($abook['abook_xchan']);
+					if(! $h) {
+						$f = zot_finger($abook['xchan_address'],$channel);
+						if(! $f['success']) {
+							logger('process_channel_sync_delivery: abook not probe-able' . $abook['xchan_address']);
+							continue;
+						}
+						$j = json_decode($f['body'],true);
+				        if(! ($j['success'] && $j['guid'])) {
+							logger('process_channel_sync_delivery: probe failed.');
+							continue;
+						}
+
+						$x = import_xchan($j);
+
+						if(! $x['success']) {
+							logger('process_channel_sync_delivery: import failed.');
+							continue;
+						}
+					}
+				}
+
 				foreach($abook as $k => $v) {
 					if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0))
 						continue;
-- 
cgit v1.2.3


From eb96a04d345fcb9abc489578573cb54a11f5a41c Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 9 Feb 2014 20:08:29 -0800
Subject: since the project donate section was added to siteinfo - add a way
 for the hub admin to add in a donation section to keep the hub running.

---
 mod/siteinfo.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 14ef17516..6b962c488 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -88,22 +88,28 @@ function siteinfo_content(&$a) {
 	else
 		$plugins_text = t('No installed plugins/addons/apps');
 
-		$admininfo = bbcode(get_config('system','admininfo'));
+	$admininfo = bbcode(get_config('system','admininfo'));
 
+	$project_donate = t('Project Donations');
+	$donate_text = t('
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
                                      ');
+	$alternatively = t('
                                      or
                                      ');
+	$recurring = t('Recurring Donation Options');
+	
 	$donate = <<< EOT
-
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
                                      
+
                                      {$project_donate}
                                      
+$donate_text
 
                                      
-
                                      or
                                      
-
+$alternatively
 

                                      
-
+
                                      Recurring Donation Options
                                      $recurring
 
                                      
 
 
                                      
 
                                      
 EOT;
 
-
+	if(file_exists('doc/site_donate.html'))
+		$donate .= file_get_contents('doc/site_donate.html');
 
 	$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
                 '$title' => t('Red'),
-- 
cgit v1.2.3


From a76c53657bca9ea6aa2246535f117f7043bb5205 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 01:11:59 -0800
Subject: don't add bookmark tags to naked links inside code blocks

---
 include/items.php | 9 +++++++++
 mod/item.php      | 5 +++++
 version.inc       | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index c69ac2c84..d78792839 100755
--- a/include/items.php
+++ b/include/items.php
@@ -179,6 +179,15 @@ function red_escape_zrl_callback($matches) {
 	return '[' . $matches[1] . 'rl' . $matches[2] . ']' . $matches[3] . '"' . $matches[4] . '"' . $matches[5] . '[/' . $matches[6] . 'rl]';
 }
 
+function red_escape_codeblock($m) {
+	return '[code]' . base64_encode($m[1]) . '[/code]';
+}
+
+function red_unescape_codeblock($m) {
+	return '[code]' . base64_decode($m[1]) . '[/code]';
+}
+
+
 /**
  * @function post_activity_item($arr)
  *
diff --git a/mod/item.php b/mod/item.php
index 69cc624ea..784ee31b4 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -429,10 +429,15 @@ function item_post(&$a) {
 		 * otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
 		 */
 
+		$body = preg_replace_callback('/\[code\](.*?)\[\/code\]/ism','red_escape_codeblock',$body);
+
 		$body = preg_replace_callback('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','red_escape_zrl_callback',$body);
 
 		$body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
+		$body = preg_replace_callback('/\[code\](.*?)\[\/code\]/ism','red_unescape_codeblock',$body);
+
+
 		/**
 		 *
 		 * When a photo was uploaded into the message using the (profile wall) ajax 
diff --git a/version.inc b/version.inc
index fc4e28cab..177a8cfe6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-09.583
+2014-02-10.584
-- 
cgit v1.2.3


From a7fa14800d083249539e884b8e9791de7a5cf1e3 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 01:44:21 -0800
Subject: better bookmark escaping

---
 include/items.php |  5 +++--
 mod/item.php      | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/items.php b/include/items.php
index d78792839..97994854a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -180,11 +180,12 @@ function red_escape_zrl_callback($matches) {
 }
 
 function red_escape_codeblock($m) {
-	return '[code]' . base64_encode($m[1]) . '[/code]';
+	return '[$b64' . $m[2] . base64_encode($m[1]) . '[/' . $m[2] . ']';
 }
 
 function red_unescape_codeblock($m) {
-	return '[code]' . base64_decode($m[1]) . '[/code]';
+	return '[' . $m[2] . base64_decode($m[1]) . '[/' . $m[2] . ']';
+	
 }
 
 
diff --git a/mod/item.php b/mod/item.php
index 784ee31b4..a9c0d80d3 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -429,13 +429,18 @@ function item_post(&$a) {
 		 * otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
 		 */
 
-		$body = preg_replace_callback('/\[code\](.*?)\[\/code\]/ism','red_escape_codeblock',$body);
+		$body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','red_escape_codeblock',$body);
+		$body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','red_escape_codeblock',$body);
+		$body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','red_escape_codeblock',$body);
 
-		$body = preg_replace_callback('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','red_escape_zrl_callback',$body);
+// no longer needed
+//		$body = preg_replace_callback('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','red_escape_zrl_callback',$body);
 
 		$body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
-		$body = preg_replace_callback('/\[code\](.*?)\[\/code\]/ism','red_unescape_codeblock',$body);
+		$body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','red_unescape_codeblock',$body);
+		$body = preg_replace_callback('/\[\$b64url(.*?)\[\/(url)\]/ism','red_unescape_codeblock',$body);
+		$body = preg_replace_callback('/\[\$b64code(.*?)\[\/(code)\]/ism','red_unescape_codeblock',$body);
 
 
 		/**
-- 
cgit v1.2.3


From 54a89eb4101021b9af498e25092f7227a5a164a4 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 03:31:26 -0800
Subject: more bookmark fixes

---
 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js     | 2 +-
 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
index 80e10d833..81b69e736 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/
                                        (.*?)<\/ul>/gi,"[list]$1[/list]");t(/
                                          (.*?)<\/ul>/gi,"[list=]$1[/list]");t(/
                                            (.*?)<\/ul>/gi,"[list=1]$1[/list]");t(/
                                              (.*?)<\/ul>/gi,"[list=i]$1[/list]");t(/
                                                (.*?)<\/ul>/gi,"[list=I]$1[/list]");t(/
                                                  (.*?)<\/ul>/gi,"[list=a]$1[/list]");t(/
                                                    (.*?)<\/ul>/gi,"[list=A]$1[/list]");t(/
                                                  • (.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/
                                                    /gi,"[hr]");t(/
                                                    /gi,"\n");t(//gi,"\n");t(/
                                                    /gi,"\n");t(/
                                                    /gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi,"
                                                    ");t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');t(/\[url\](.*?)\[\/url\]/gi,'$1');t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[list=\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[list=1\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[list=i\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[list=I\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[list=a\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[list=A\](.*?)\[\/list\]/gi,'
                                                      $1
                                                    ');t(/\[li\](.*?)\[\/li\]/gi,"
                                                  • $1
                                                    • ");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                                                    $1
                                                    ");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/
                                                      (.*?)<\/ul>/gi,"[list]$1[/list]");t(/
                                                        (.*?)<\/ul>/gi,"[list=]$1[/list]");t(/
                                                          (.*?)<\/ul>/gi,"[list=1]$1[/list]");t(/
                                                            (.*?)<\/ul>/gi,"[list=i]$1[/list]");t(/
                                                              (.*?)<\/ul>/gi,"[list=I]$1[/list]");t(/
                                                                (.*?)<\/ul>/gi,"[list=a]$1[/list]");t(/
                                                                  (.*?)<\/ul>/gi,"[list=A]$1[/list]");t(/
                                                                • (.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/
                                                                  /gi,"[hr]");t(/
                                                                  /gi,"\n");t(//gi,"\n");t(/
                                                                  /gi,"\n");t(/
                                                                  /gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi,"
                                                                  ");t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');t(/\[url\](.*?)\[\/url\]/gi,'$1');t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[list=\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[list=1\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[list=i\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[list=I\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[list=a\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[list=A\](.*?)\[\/list\]/gi,'
                                                                    $1
                                                                  ');t(/\[li\](.*?)\[\/li\]/gi,"
                                                                • $1
                                                                  • ");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                                                                  $1
                                                                  ");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 4606845b4..387ccdd59 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -75,7 +75,7 @@
 			
 			// example:  to [b]
 
-			rep(/(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");
+			rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");
 			rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");
 			rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");
 			rep(/(.*?)<\/font>/gi,"$1");
-- 
cgit v1.2.3


From 35a3b2d8ebe632fb64ecf1ff277faf3e0825eda6 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Mon, 10 Feb 2014 21:36:19 +0000
Subject: s/Options All/AllowOverride All

---
 install/INSTALL.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 500abb0f9..65efa9cfe 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -37,7 +37,7 @@ Decide if you will use SSL and obtain an SSL cert before software installation.
  
 
 1. Requirements
-	- Apache with mod-rewrite enabled and "Options All" so you can use a 
+	- Apache with mod-rewrite enabled and "AllowOverride All" so you can use a 
 local .htaccess file
 
 	- PHP 5.3+. The later the better. 
-- 
cgit v1.2.3


From bf09fc9bbe6881a4868e5a4489724fdf50cd60e6 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 14:37:50 -0800
Subject: getting bookmark support in tinymce is left as a FIXME. I've got
 something that almost works, but not quite in editor_plugin_src.js2

---
 .../tiny_mce/plugins/bbcode/editor_plugin.js2      |   1 +
 .../tiny_mce/plugins/bbcode/editor_plugin_src.js   |   7 +
 .../tiny_mce/plugins/bbcode/editor_plugin_src.js2  | 216 +++++++++++++++++++++
 3 files changed, 224 insertions(+)
 create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js2
 create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js2 b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js2
new file mode 100644
index 000000000..290508845
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js2
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/#\^(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");t(/(^|[^#\^])(.*?)<\/a>/gi,"$1#^[url=$2]$3[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/
                                                                    (.*?)<\/ul>/gi,"[list]$1[/list]");t(/
                                                                      (.*?)<\/ul>/gi,"[list=]$1[/list]");t(/
                                                                        (.*?)<\/ul>/gi,"[list=1]$1[/list]");t(/
                                                                          (.*?)<\/ul>/gi,"[list=i]$1[/list]");t(/
                                                                            (.*?)<\/ul>/gi,"[list=I]$1[/list]");t(/
                                                                              (.*?)<\/ul>/gi,"[list=a]$1[/list]");t(/
                                                                                (.*?)<\/ul>/gi,"[list=A]$1[/list]");t(/
                                                                              • (.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/
                                                                                /gi,"[hr]");t(/
                                                                                /gi,"\n");t(//gi,"\n");t(/
                                                                                /gi,"\n");t(/
                                                                                /gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi,"
                                                                                ");t(/[#\^]\[url=([^\]]+)\](.*?)\[\/url\]/gi,"#^$2");t(/[#\^]\[url\](.*?)\[\/url\]/gi,"#^$1");t(/(^|[^#\^])\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$1#^$3");t(/(^|[^#\^])\[url\](.*?)\[\/url\]/gi,"$1#^$2");t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[list=\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[list=1\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[list=i\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[list=I\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[list=a\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[list=A\](.*?)\[\/list\]/gi,'
                                                                                  $1
                                                                                ');t(/\[li\](.*?)\[\/li\]/gi,"
                                                                              • $1
                                                                                • ");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                                                                                $1
                                                                                ");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 387ccdd59..ff0109b23 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -10,6 +10,13 @@
 
 /* Macgirvin Aug-2010 changed from punbb to dfrn dialect */
 
+/**
+ * If you want to try and get bookmark content (#^{somelink}) working in tinymce,
+ * I've made some progress, but one or the other of insert-url or insert-link gets it wrong, 
+ * and the error compounds on every edit.
+ * See editor_plugin_src.js2/editor_plugin.js2 if you're interested in fixing this.
+ */
+
 (function() {
 	tinymce.create('tinymce.plugins.BBCodePlugin', {
 		init : function(ed, url) {
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2 b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2
new file mode 100644
index 000000000..bfb4bd9c7
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2
@@ -0,0 +1,216 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+/* Macgirvin Aug-2010 changed from punbb to dfrn dialect */
+
+(function() {
+	tinymce.create('tinymce.plugins.BBCodePlugin', {
+		init : function(ed, url) {
+			var t = this, dialect = ed.getParam('bbcode_dialect', 'dfrn').toLowerCase();
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = t['_' + dialect + '_bbcode2html'](o.content);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.set)
+					o.content = t['_' + dialect + '_bbcode2html'](o.content);
+
+				if (o.get)
+					o.content = t['_' + dialect + '_html2bbcode'](o.content);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'BBCode Plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		// HTML -> BBCode in DFRN dialect
+		_dfrn_html2bbcode : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re,str);
+			};
+
+
+			/* oembed */
+			function _h2b_cb(match) {
+				var f, g, tof = [], tor = [];
+				var find_spanc = /]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;
+				while (f = find_spanc.exec(match)) {
+					var find_a = /]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;
+					if (g = find_a.exec(f[1])) {
+						var find_href = /href=[\"']([^\"']*)[\"']/ig;
+						var m2 = find_href.exec(g[1]);
+						if (m2[1]) {
+							tof.push(f[0]);
+							tor.push("[EMBED]" + m2[1] + "[/EMBED]");
+						}
+					}
+				}
+				for (var i = 0; i < tof.length; i++) match = match.replace(tof[i], tor[i]);
+				
+				return match;
+			}
+			if (s.indexOf('class="oembed')>=0){
+				//alert("request oembed html2bbcode");
+				s = _h2b_cb(s);
+			}
+			
+			// example:  to [b]
+
+			rep(/#\^(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");
+			rep(/(^|[^#\^])(.*?)<\/a>/gi,"$1#^[url=$2]$3[/url]");
+			rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");
+			rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");
+			rep(/(.*?)<\/font>/gi,"$1");
+			rep(//gi,"[img=$1x$2]$3[/img]");
+			rep(//gi,"[img=$2x$1]$3[/img]");
+			rep(//gi,"[img=$3x$2]$1[/img]");
+			rep(//gi,"[img=$2x$3]$1[/img]");
+			rep(//gi,"[img]$1[/img]");
+
+			rep(/
                                                                                  (.*?)<\/ul>/gi,"[list]$1[/list]");
+			rep(/
                                                                                    (.*?)<\/ul>/gi,"[list=]$1[/list]");
+			rep(/
                                                                                      (.*?)<\/ul>/gi,"[list=1]$1[/list]");
+			rep(/
                                                                                        (.*?)<\/ul>/gi,"[list=i]$1[/list]");
+			rep(/
                                                                                          (.*?)<\/ul>/gi,"[list=I]$1[/list]");
+			rep(/
                                                                                            (.*?)<\/ul>/gi,"[list=a]$1[/list]");
+			rep(/
                                                                                              (.*?)<\/ul>/gi,"[list=A]$1[/list]");
+			rep(/
                                                                                            • (.*?)<\/li>/gi,'[li]$1[/li]');
+
+			rep(/(.*?)<\/code>/gi,"[code]$1[/code]");
+			rep(/<\/(strong|b)>/gi,"[/b]");
+			rep(/<(strong|b)>/gi,"[b]");
+			rep(/<\/(em|i)>/gi,"[/i]");
+			rep(/<(em|i)>/gi,"[i]");
+			rep(/<\/u>/gi,"[/u]");
+			rep(/(.*?)<\/span>/gi,"[u]$1[/u]");
+			rep(//gi,"[u]");
+			rep(/]*>/gi,"[quote]");
+			rep(/<\/blockquote>/gi,"[/quote]");
+			rep(/
                                                                                              /gi,"[hr]");
+			rep(/
                                                                                              /gi,"\n");
+			rep(//gi,"\n");
+			rep(/
                                                                                              /gi,"\n");
+			rep(/
                                                                                              /gi,"");
+			rep(/<\/p>/gi,"\n");
+			rep(/ /gi," ");
+			rep(/"/gi,"\"");
+			rep(/</gi,"<");
+			rep(/>/gi,">");
+			rep(/&/gi,"&");
+
+			return s; 
+		},
+
+		// BBCode -> HTML from DFRN dialect
+		_dfrn_bbcode2html : function(s) {
+			s = tinymce.trim(s);
+
+
+                        function rep(re, str) {
+
+
+                                //modify code to keep stuff intact within [code][/code] blocks
+                                //Waitman Gobble NO WARRANTY
+
+
+                                var o = new Array();
+                                var x = s.split("[code]");
+                                var i = 0;
+
+                                var si = "";
+                                si = x.shift();
+                                si = si.replace(re,str);
+                                o.push(si);
+
+                                for (i = 0; i < x.length; i++) {
+                                        var no = new Array();
+                                        var j = x.shift();
+                                        var g = j.split("[/code]");
+                                        no.push(g.shift());
+                                        si = g.shift();
+                                        si = si.replace(re,str);
+                                        no.push(si);
+                                        o.push(no.join("[/code]"));
+                                }
+
+                                s = o.join("[code]");
+
+                        };
+
+
+
+
+
+			// example: [b] to 
+			rep(/\n/gi,"
                                                                                              ");
+			rep(/\[b\]/gi,"");
+			rep(/\[\/b\]/gi,"");
+			rep(/\[i\]/gi,"");
+			rep(/\[\/i\]/gi,"");
+			rep(/\[u\]/gi,"");
+			rep(/\[\/u\]/gi,"");
+			rep(/\[hr\]/gi,"
                                                                                              ");
+			rep(/[#\^]\[url=([^\]]+)\](.*?)\[\/url\]/gi,"#^$2");
+			rep(/[#\^]\[url\](.*?)\[\/url\]/gi,"#^$1");
+			rep(/(^|[^#\^])\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$1#^$3");
+			rep(/(^|[^#\^])\[url\](.*?)\[\/url\]/gi,"$1#^$2");
+			rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"");
+			rep(/\[img\](.*?)\[\/img\]/gi,"");
+
+			rep(/\[list\](.*?)\[\/list\]/gi, '
                                                                                                $1
                                                                                              ');
+			rep(/\[list=\](.*?)\[\/list\]/gi, '
                                                                                                $1
                                                                                              ');
+			rep(/\[list=1\](.*?)\[\/list\]/gi, '
                                                                                                $1
                                                                                              ');
+			rep(/\[list=i\](.*?)\[\/list\]/gi,'
                                                                                                $1
                                                                                              ');
+			rep(/\[list=I\](.*?)\[\/list\]/gi, '
                                                                                                $1
                                                                                              ');
+			rep(/\[list=a\](.*?)\[\/list\]/gi, '
                                                                                                $1
                                                                                              ');
+			rep(/\[list=A\](.*?)\[\/list\]/gi, '
                                                                                                $1
                                                                                              ');
+			rep(/\[li\](.*?)\[\/li\]/gi, '
                                                                                            • $1
                                                                                              • ');
+			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2");
+			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2");
+			rep(/\[code\](.*?)\[\/code\]/gi,"$1");
+			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                                                                                              $1
                                                                                              ");
+
+			/* oembed */
+			function _b2h_cb(match, url) {
+				url = bin2hex(url);
+				function s_b2h(data) {
+						match = data;
+				}
+				$.ajax({
+					url: 'oembed/b2h?url=' + url,
+					async: false,
+					success: s_b2h,
+					dataType: 'html'
+				});
+				return match;
+			}
+			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);
+			
+			/* /oembed */
+
+			return s; 
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
+})();
-- 
cgit v1.2.3


From 12319c41e3c0565745060d7ade97f194229dddb2 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 15:14:03 -0800
Subject: add chanview mode to settings

---
 mod/settings.php              | 6 +++++-
 view/tpl/settings_display.tpl | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mod/settings.php b/mod/settings.php
index 7889538f3..c5aff62b8 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -150,9 +150,12 @@ function settings_post(&$a) {
 			set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
 		}
 
+		$chanview_full = ((x($_POST,'chanview_full')) ? intval($_POST['chanview_full']) : 0);
+
 		set_pconfig(local_user(),'system','update_interval', $browser_update);
 		set_pconfig(local_user(),'system','itemspage', $itemspage);
 		set_pconfig(local_user(),'system','no_smilies',$nosmile);
+		set_pconfig(local_user(),'system','chanview_full',$chanview_full);
 
 
 		if ($theme == $a->channel['channel_theme']){
@@ -734,6 +737,7 @@ function settings_content(&$a) {
 		$nosmile = get_pconfig(local_user(),'system','no_smilies');
 		$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
 
+		$chanview = intval(get_pconfig(local_user(),'system','chanview_full'));
 
 		$theme_config = "";
 		if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){
@@ -754,7 +758,7 @@ function settings_content(&$a) {
 			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
 			'$itemspage'   => array('itemspage',  t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
 			'$nosmile'	=> array('nosmile', t("Don't show emoticons"), $nosmile, ''),
-			
+			'$chanview_full' => array('chanview_full', t('View remote profiles as webpages'), $chanview, t('By default open in a sub-window of your own site')), 			
 			'$theme_config' => $theme_config,
 		));
 		
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index ddd3ca56d..a8fb002fb 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -9,6 +9,7 @@
 {{include file="field_input.tpl" field=$ajaxint}}
 {{include file="field_input.tpl" field=$itemspage}}
 {{include file="field_checkbox.tpl" field=$nosmile}}
+{{include file="field_checkbox.tpl" field=$chanview_full}}
 
 
 
                                                                                              
-- 
cgit v1.2.3


From e6185eea282a07424c615414b1d0d6a8e395759b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 15:39:19 -0800
Subject: The scenario is that you're authenticated via magic-auth on a remote
 hub and you change channels locally. Next time you start an auth exchange
 we'll look to see if your identity changed and we should start fresh if
 that's the case, rather than just falling through and keeping the old
 credentials.

---
 include/identity.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 2db5d8ece..0e01b4a0d 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1023,12 +1023,14 @@ function zid_init(&$a) {
 	if(validate_email($tmp_str)) {
 		proc_run('php','include/gprobe.php',bin2hex($tmp_str));
 		$arr = array('zid' => $tmp_str, 'url' => $a->cmd);
-		call_hooks('zid_init',$arr);
-		if((! local_user()) && (! remote_user())) {
-			logger('zid_init: not authenticated. Invoking reverse magic-auth for ' . $tmp_str);
+		call_hooks('zid_init',$arr);		
+		if(! local_user()) {
 			$r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc limit 1",
 				dbesc($tmp_str)
 			);
+			if($r && remote_user() && remote_user() === $r[0]['hubloc_hash'])
+				return;
+			logger('zid_init: not authenticated. Invoking reverse magic-auth for ' . $tmp_str);
 			// try to avoid recursion - but send them home to do a proper magic auth
 			$query = $a->query_string;
 			$query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query);
-- 
cgit v1.2.3


From dfcb863c70e8957ec5f1b1fd0da97838cec936df Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 18:20:23 -0800
Subject: fix ambiguous result message from authtest

---
 mod/authtest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/authtest.php b/mod/authtest.php
index 7747ea504..c997a5cf9 100644
--- a/mod/authtest.php
+++ b/mod/authtest.php
@@ -34,7 +34,7 @@ function authtest_content(&$a) {
 				if(! $j)
 					$o .= 'json_decode failure from remote site. ' . print_r($z['body'],true);
 				$o .= 'Remote site responded: ' . print_r($j,true);
-				if(strpos($j,'Authentication Success'))
+				if(j['success'] && strpos($j[message'],'Authentication Success'))
 					$auth_success = true;
 			}
 			else {
-- 
cgit v1.2.3


From 7f741a7e85b9b62c71f4fd5464c9292ca236f88e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 19:18:09 -0800
Subject: add channel_notify_flags to list of things which should *not* be
 synced across nomads. You probably only want one site to send you
 notification emails for the same events as opposed to all of them.

---
 include/zot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zot.php b/include/zot.php
index 7dfaada32..f712d9394 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2085,7 +2085,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 		}
 
 		if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
-			$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address');
+			$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notify_flags');
 
 			$clean = array();
 			foreach($arr['channel'] as $k => $v) {
-- 
cgit v1.2.3


From 74fb7d158b770906aafab9e85641c5de3d2488cf Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 19:20:55 -0800
Subject: Check for the correct DB name before pushing.

---
 include/zot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zot.php b/include/zot.php
index f712d9394..d35f43161 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2085,7 +2085,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 		}
 
 		if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
-			$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notify_flags');
+			$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags');
 
 			$clean = array();
 			foreach($arr['channel'] as $k => $v) {
-- 
cgit v1.2.3


From 59094cda5166e58a451cb0372a59d8059cbacd6f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 20:38:26 -0800
Subject: reversed args in update_modtime, incorrect ud_guid and ud_hash

---
 include/dir_fns.php   | 4 ++--
 include/directory.php | 2 +-
 include/poller.php    | 2 +-
 include/zot.php       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/dir_fns.php b/include/dir_fns.php
index ab8b67985..74e12c078 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -221,8 +221,8 @@ function syncdirs($uid) {
 		}
 	}
 
-	$ud_hash = random_string();
-	update_modtime($ud_hash,$hash,$p[0]['channel_address'] . '@' . get_app()->get_hostname(),1);
+	$ud_hash = random_string() . '@' . get_app()->get_hostname();
+	update_modtime($hash,$ud_hash,$p[0]['channel_address'] . '@' . get_app()->get_hostname(),1);
 
 }
 	
diff --git a/include/directory.php b/include/directory.php
index 491240a9d..233899e88 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -10,7 +10,7 @@ function directory_run($argv, $argc){
 
 	cli_startup();		 
 
-	if($argc != 2)
+	if($argc < 2)
 		return;
 
 	logger('directory update', LOGGER_DEBUG);
diff --git a/include/poller.php b/include/poller.php
index 0dcec4c0f..76c82db09 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -64,7 +64,7 @@ function poller_run($argv, $argc){
 	$r = q("select channel_id from channel where channel_dirdate < UTC_TIMESTAMP() - INTERVAL 30 DAY");
 	if($r) {
 		foreach($r as $rr) {
-			proc_run('php','include/directory.php',$rr['channel_id']);
+			proc_run('php','include/directory.php',$rr['channel_id'],'ping');
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
 		}
diff --git a/include/zot.php b/include/zot.php
index d35f43161..109744c53 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -518,7 +518,7 @@ function zot_register_hub($arr) {
 
 /**
  * @function import_xchan($arr,$ud_flags = 1)
- *   Takes an associative array of a fecthed discovery packet and updates
+ *   Takes an associative array of a fetched discovery packet and updates
  *   all internal data structures which need to be updated as a result.
  * 
  * @param array $arr => json_decoded discovery packet
-- 
cgit v1.2.3


From 841f3922aab013ac1ae1b7715de95f8246fe4f25 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 10 Feb 2014 20:40:12 -0800
Subject: typos in authtest

---
 mod/authtest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/authtest.php b/mod/authtest.php
index c997a5cf9..3044a880b 100644
--- a/mod/authtest.php
+++ b/mod/authtest.php
@@ -34,7 +34,7 @@ function authtest_content(&$a) {
 				if(! $j)
 					$o .= 'json_decode failure from remote site. ' . print_r($z['body'],true);
 				$o .= 'Remote site responded: ' . print_r($j,true);
-				if(j['success'] && strpos($j[message'],'Authentication Success'))
+				if($j['success'] && strpos($j['message'],'Authentication Success'))
 					$auth_success = true;
 			}
 			else {
-- 
cgit v1.2.3


From 2d9655627a0006dbf7d10afbbc2bcc0fdc2a3750 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Tue, 11 Feb 2014 20:14:45 +0000
Subject: Clear out old notifications in the poller.

---
 include/poller.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/poller.php b/include/poller.php
index 76c82db09..4d191b853 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -56,7 +56,11 @@ function poller_run($argv, $argc){
 		foreach($r as $rr)
 			drop_item($rr['id'],false);
 	}
-  
+
+	// expire any read notifications over a month old
+
+	q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY");
+
 	// Ensure that every channel pings a directory server once a month. This way we can discover
 	// channels and sites that quietly vanished and prevent the directory from accumulating stale
 	// or dead entries.
-- 
cgit v1.2.3


From d02529fde1ee9d7ecf317ae30abce666e1b33eb4 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 14:19:20 -0800
Subject: implement a forced directory update mode where we unconditionally
 create a directory sync packet. This is needed to ensure that monthly
 directory pings are propagated to other directory servers so they can each
 prove for themselves whether or not an account is alive or dead. We do not
 trust other directories to provide us information beyond "look at this entry
 and decide for yourself" as doing otherwise would invite rogue directory
 manipulations. As this scheduled update occurs on all channels across all
 servers, we should also pick up refresh messages from all existing channel
 clones and these should also propagate out to all directory servers using the
 same mechanism (though perhaps not at the same time).

---
 include/dir_fns.php   | 13 ++++++++-----
 include/directory.php |  9 +++++++--
 include/poller.php    |  2 +-
 include/zot.php       | 15 +++++++++------
 mod/post.php          | 11 +++++++----
 version.inc           |  2 +-
 6 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/include/dir_fns.php b/include/dir_fns.php
index 74e12c078..c2e614831 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -139,12 +139,15 @@ function update_directory_entry($ud) {
 }
 
 
+/**
+ * @function local_dir_update($uid,$force)
+ *     push local channel updates to a local directory server 
+ *
+ */
 
+function local_dir_update($uid,$force) {
 
-
-function syncdirs($uid) {
-
-	logger('syncdirs', LOGGER_DEBUG);
+	logger('local_dir_update', LOGGER_DEBUG);
 
 	$p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
 		intval($uid)
@@ -222,7 +225,7 @@ function syncdirs($uid) {
 	}
 
 	$ud_hash = random_string() . '@' . get_app()->get_hostname();
-	update_modtime($hash,$ud_hash,$p[0]['channel_address'] . '@' . get_app()->get_hostname(),1);
+	update_modtime($hash,$ud_hash,$p[0]['channel_address'] . '@' . get_app()->get_hostname(),(($force) ? (-1) : 1));
 
 }
 	
diff --git a/include/directory.php b/include/directory.php
index 233899e88..794420b6f 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -13,6 +13,10 @@ function directory_run($argv, $argc){
 	if($argc < 2)
 		return;
 
+	$force = false;
+	if(($argc > 2) && ($argv[2] === 'force'))
+		$force = true;
+
 	logger('directory update', LOGGER_DEBUG);
 
 	$dirmode = get_config('system','directory_mode');
@@ -29,7 +33,8 @@ function directory_run($argv, $argc){
 
 
 	if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
-		syncdirs($argv[1]);
+
+		local_dir_update($argv[1],$force);
 
 		q("update channel set channel_dirdate = '%s' where channel_id = %d limit 1",
 			dbesc(datetime_convert()),
@@ -53,7 +58,7 @@ function directory_run($argv, $argc){
 
 	// ensure the upstream directory is updated
 
-	$packet = zot_build_packet($channel,'refresh');
+	$packet = zot_build_packet($channel,(($force) ? 'force_refresh' : 'refresh'));
 	$z = zot_zot($url,$packet);
 
 	// re-queue if unsuccessful
diff --git a/include/poller.php b/include/poller.php
index 76c82db09..eba765278 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -64,7 +64,7 @@ function poller_run($argv, $argc){
 	$r = q("select channel_id from channel where channel_dirdate < UTC_TIMESTAMP() - INTERVAL 30 DAY");
 	if($r) {
 		foreach($r as $rr) {
-			proc_run('php','include/directory.php',$rr['channel_id'],'ping');
+			proc_run('php','include/directory.php',$rr['channel_id'],'force');
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
 		}
diff --git a/include/zot.php b/include/zot.php
index 109744c53..21eef073c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -79,12 +79,12 @@ function zot_get_hublocs($hash) {
  *    zot it to the other side
  *
  * @param array $channel     => sender channel structure
- * @param string $type       => packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'notify', 'auth_check'
+ * @param string $type       => packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'force_refresh', 'notify', 'auth_check'
  * @param array $recipients  => envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
  * @param string $remote_key => optional public site key of target hub used to encrypt entire packet
  *    NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others 
  * @param string $secret     => random string, required for packets which require verification/callback
- *    e.g. 'pickup', 'purge', 'notify', 'auth_check' --- 'ping' and 'refresh' do not require verification 
+ *    e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification 
  *
  * @returns string json encoded zot packet
  */
@@ -228,7 +228,7 @@ function zot_finger($webbie,$channel,$autofallback = true) {
 }
 
 /**
- * @function: zot_refresh($them, $channel = null)
+ * @function: zot_refresh($them, $channel = null, $force = false)
  *
  *   zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified
  *   to fetch new permissions via a finger/discovery operation. This may result in a new connection 
@@ -251,7 +251,7 @@ function zot_finger($webbie,$channel,$autofallback = true) {
  * @returns boolean true if successful, else false 
  */
 
-function zot_refresh($them,$channel = null) {
+function zot_refresh($them,$channel = null, $force = false) {
 
 	logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA);
 	if($channel)
@@ -305,7 +305,7 @@ function zot_refresh($them,$channel = null) {
 			return false;
 		}
 
-		$x = import_xchan($j);
+		$x = import_xchan($j,(($force) ? (-1) : 1));
 
 		if(! $x['success'])
 			return false;
@@ -524,6 +524,9 @@ function zot_register_hub($arr) {
  * @param array $arr => json_decoded discovery packet
  * @param int $ud_flags
  *    Determines whether to create a directory update record if any changes occur, default 1 or true
+ *    $ud_flags = (-1) indicates a forced refresh where we unconditionally create a directory update record
+ *      this typically occurs once a month for each channel as part of a scheduled ping to notify the directory
+ *      that the channel still exists
  *
  * @returns array =>  'success' (boolean true or false)
  *                    'message' (optional error string only if success is false)
@@ -885,7 +888,7 @@ function import_xchan($arr,$ud_flags = 1) {
 		}
 	}
 	
-	if($changed) {
+	if(($changed) || ($ud_flags == (-1))) {
 		$guid = random_string() . '@' . get_app()->get_hostname();		
 		update_modtime($xchan_hash,$guid,$arr['address'],$ud_flags);
 		logger('import_xchan: changed: ' . $what,LOGGER_DEBUG);
diff --git a/mod/post.php b/mod/post.php
index cb0dc8302..919f09a35 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -304,9 +304,9 @@ function post_init(&$a) {
  *
  *     Once decrypted, one will find the normal json_encoded zot message packet. 
  * 
- * Defined packet types are: notify, purge, refresh, auth_check, ping, and pickup 
+ * Defined packet types are: notify, purge, refresh, force_refresh, auth_check, ping, and pickup 
  *
- * Standard packet: (used by notify, purge, refresh, and auth_check)
+ * Standard packet: (used by notify, purge, refresh, force_refresh, and auth_check)
  *
  * {
  *  "type": "notify",
@@ -793,10 +793,13 @@ function post_post(&$a) {
 		}
 	}
 
-	if($msgtype === 'refresh') {
+	if(($msgtype === 'refresh') || ($msgtype === 'force_refresh')) {
 
 		// remote channel info (such as permissions or photo or something)
 		// has been updated. Grab a fresh copy and sync it.
+		// The difference between refresh and force_refresh is that 
+		// force_refresh unconditionally creates a directory update record,
+		// even if no changes were detected upon processing.
 
 		if($recipients) {
 
@@ -814,7 +817,7 @@ function post_post(&$a) {
 						'xchan_guid'     => $sender['guid'], 
 						'xchan_guid_sig' => $sender['guid_sig'],
 						'hubloc_url'     => $sender['url']
-				),$r[0]);
+				),$r[0], (($msgtype === 'force_refresh') ? true : false));
 			}
 		}
 		else {
diff --git a/version.inc b/version.inc
index 177a8cfe6..8b63ff8da 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-10.584
+2014-02-11.585
-- 
cgit v1.2.3


From 9498ed17ab4d71d926c47d02f4c9ae2f97e1a1d1 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 14:35:02 -0800
Subject: move expiration of notifications to the equivalent of "cron daily" to
 try and reduce the number of things the poller has to do on every run.

---
 include/poller.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/poller.php b/include/poller.php
index f75ba2f22..ce9b75eb3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -47,6 +47,8 @@ function poller_run($argv, $argc){
 
 	q("delete from mail where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() ");
 
+	// expire any expired items
+
 	$r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() 
 		and not ( item_restrict & %d ) ",
 		intval(ITEM_DELETED)
@@ -57,9 +59,6 @@ function poller_run($argv, $argc){
 			drop_item($rr['id'],false);
 	}
 
-	// expire any read notifications over a month old
-
-	q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY");
 
 	// Ensure that every channel pings a directory server once a month. This way we can discover
 	// channels and sites that quietly vanished and prevent the directory from accumulating stale
@@ -107,8 +106,16 @@ function poller_run($argv, $argc){
 
 	$dirmode = get_config('system','directory_mode');
 
+
+	// Actions in the following block are executed once per day, not on every poller run
+	
 	if($d2 != intval($d1)) {
 
+		// expire any read notifications over a month old
+
+		q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY");
+
+
 		// If this is a directory server, request a sync with an upstream
 		// directory at least once a day, up to once every poll interval. 
 		// Pull remote changes and push local changes.
@@ -119,14 +126,8 @@ function poller_run($argv, $argc){
 			sync_directories($dirmode);
 		}
 
-
 		set_config('system','last_expire_day',$d2);
 
-// Uncomment when expire protocol component is working
-// Update - this is not going to happen. We are only going to
-// implement per-item expire, not blanket expiration
-//		proc_run('php','include/expire.php');
-
 		proc_run('php','include/cli_suggest.php');
 
 	}
-- 
cgit v1.2.3


From b5728fa42efa0d12da8814711e0875da7fb88672 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 16:56:39 -0800
Subject: fixes to thing profile assignments

---
 include/contact_selectors.php | 2 +-
 mod/connections.php           | 2 +-
 mod/connedit.php              | 2 +-
 mod/item.php                  | 2 +-
 mod/thing.php                 | 7 +++++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index b56a77937..a3cfd2489 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -5,7 +5,7 @@ function contact_profile_assign($current) {
 
 	$o = '';
 
-	$o .= "\r\n";
 
 	$r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d",
 		intval($_SESSION['uid']));
diff --git a/mod/connections.php b/mod/connections.php
index 3da9cec74..e36cb5fc7 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -41,7 +41,7 @@ function connections_post(&$a) {
 
 	call_hooks('contact_edit_post', $_POST);
 
-	$profile_id = $_POST['profile-assign'];
+	$profile_id = $_POST['profile_assign'];
 	if($profile_id) {
 		$r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($profile_id),
diff --git a/mod/connedit.php b/mod/connedit.php
index 3f507cc3b..c6f64ccfc 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -53,7 +53,7 @@ function connedit_post(&$a) {
 
 	call_hooks('contact_edit_post', $_POST);
 
-	$profile_id = $_POST['profile-assign'];
+	$profile_id = $_POST['profile_assign'];
 	if($profile_id) {
 		$r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($profile_id),
diff --git a/mod/item.php b/mod/item.php
index a9c0d80d3..173198f4a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -44,7 +44,7 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_REQUEST);
 
-	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+	// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
 
diff --git a/mod/thing.php b/mod/thing.php
index d3b47ebb9..9b362cecd 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -9,6 +9,9 @@ function thing_init(&$a) {
 	if(! local_user())
 		return;
 
+
+
+
 	$account_id = $a->get_account();
 	$channel    = $a->get_channel();
 
@@ -16,7 +19,7 @@ function thing_init(&$a) {
 
 	$name = escape_tags($_REQUEST['term']);
 	$verb = escape_tags($_REQUEST['verb']);
-	$profile_guid = escape_tags($_REQUEST['profile']);
+	$profile_guid = escape_tags($_REQUEST['profile_assign']);
 	$url = $_REQUEST['link'];
 	$photo = $_REQUEST['img'];
 
@@ -99,6 +102,7 @@ function thing_init(&$a) {
 	$p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1",
 		intval(local_user())
 	);
+
 	if($p)
 		$profile = $p[0];
 	else
@@ -209,7 +213,6 @@ function thing_init(&$a) {
 	}
 	
 	$ret = post_activity_item($arr);
-
 	
 }
 
-- 
cgit v1.2.3


From 95a45a119dd61241ae8d0f0f8eda467cff64d855 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 18:45:50 -0800
Subject: shamelessly steal, and cut/paste from the settings page to get
 mod_photos edit permissions working - and it looks like we still have some
 other fancybox instances (yet another lightbox) which haven't yet been
 converted to colorbox and will need to be fixed. Way too many lightboxes.

---
 mod/photos.php          |  4 ++++
 view/js/mod_photos.js   |  8 ++++++++
 view/tpl/photo_view.tpl | 25 +++++++++++++------------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 6798cb002..2fe2d8a74 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -281,6 +281,7 @@ function photos_post(&$a) {
 		);
 		if(count($p)) {
 			$ext = $phototypes[$p[0]['type']];
+
 			$r = q("UPDATE `photo` SET `description` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d",
 				dbesc($desc),
 				dbesc($albname),
@@ -504,6 +505,9 @@ function photos_content(&$a) {
 
 	$o = "";
 
+		$o .= "\r\n";
+
 	// tabs
 
 	$_is_owner = (local_user() && (local_user() == $owner_uid));
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 82957ae44..c9d13f742 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -1,5 +1,13 @@
+
+var ispublic = aStr['everybody'];
+
 $(document).ready(function() {
 
+		  $("a#settings-default-perms-menu").colorbox({ 
+				  'inline' : true, 
+				  'transition' : 'elastic' 
+			});
+
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 8c19d39d7..f5e5bb7b5 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,4 +1,4 @@
-
                                                                                              
+
                                                                                              
 
                                                                                              {{$album.1}}
                                                                                              
 
 
 	
                                                                                              
 
-	
                                                                                              
-		
-			{{$edit.permissions}}
-		
-		
                                                                                              
-		
-		
                                                                                              
-			
                                                                                              
-				{{$edit.aclselect}}
+	
                                                                                              
+		
+		{{$edit.permissions}}
+		
                                                                                              
+		
-	
                                                                                              
-	
                                                                                              
+	
                                                                                                                                                                                
+	
                                                                                              
+	
                                                                                              
 
 	
 	
-- 
cgit v1.2.3


From 655b6445d5f3354b0af3b9ee22b33be828499d41 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 19:51:43 -0800
Subject: use profile photo on vcard before reverting to xchan photo

---
 include/Contact.php | 2 +-
 include/auth.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/Contact.php b/include/Contact.php
index fd450033c..2dab62fd8 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -114,7 +114,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
 					
 	return replace_macros(get_markup_template('xchan_vcard.tpl'),array(
 		'$name'    => $xchan['xchan_name'],
-		'$photo'   => $xchan['xchan_photo_l'],
+		'$photo'   => ((array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']),
 		'$follow'  => $xchan['xchan_addr'],
 		'$connect' => $connect,
 		'$newwin'  => (($mode === 'chanview') ? t('New window') : ''),
diff --git a/include/auth.php b/include/auth.php
index a92f998bf..2b7c385fd 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -52,7 +52,7 @@ function account_verify_password($email,$pass) {
 	// Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention
 	$authlog = get_config('system', 'authlog');
 	if ($authlog)
-	@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
+		@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
 
 	return null;
 }
-- 
cgit v1.2.3


From 7f3f981d96338093ed8a01597e80916c6d8ea212 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 20:45:17 -0800
Subject: fix a mysql error which popped up in the dbfail log

---
 mod/settings.php | 2 +-
 mod/thing.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index c5aff62b8..506141a1f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -39,7 +39,7 @@ function settings_post(&$a) {
 	if(! local_user())
 		return;
 
-// logger('mod_settings: ' . print_r($_REQUEST,true));
+	// logger('mod_settings: ' . print_r($_REQUEST,true));
 
 	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
 		return;
diff --git a/mod/thing.php b/mod/thing.php
index 9b362cecd..2620d660e 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -199,14 +199,14 @@ function thing_init(&$a) {
 	if(! $profile['is_default']) {
 		$arr['item_private'] = true;
 		$str = '';
-		$r = q("select abook_hash from abook where abook_channel = %d and abook_profile = '%s'",
+		$r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
 			intval(local_user()),
 			dbesc($profile_guid)
 		);
 		if($r) {
 			$arr['allow_cid'] = '';
 			foreach($r as $rr)
-				$arr['allow_cid'] .= '<' . $rr['abook_hash'] . '>';
+				$arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
 		}
 		else
 			$arr['allow_cid'] = '<' . get_observer_hash() . '>';
-- 
cgit v1.2.3


From 8089c3202bb6af5019ee3e34c6ff37cff0c907c9 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 11 Feb 2014 21:20:34 -0800
Subject: better auth logging in dav

---
 include/reddav.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/reddav.php b/include/reddav.php
index 63d073d2a..7fcd81d61 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -217,6 +217,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 
 	function getDir() {
 		logger('getDir: ' . $this->ext_path, LOGGER_DEBUG);
+		$this->auth->log();
 
 		$file = $this->ext_path;
 
@@ -810,6 +811,17 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 		$this->browser = $browser;
 	}
 		
+
+	function log() {
+		logger('dav: auth: channel_name ' . $this->channel_name);
+		logger('dav: auth: channel_id ' . $this->channel_id);
+		logger('dav: auth: channel_hash ' . $this->channel_hash);
+		logger('dav: auth: observer ' . $this->observer);
+		logger('dav: auth: owner_id ' . $this->owner_id);
+		logger('dav: auth: owner_nick ' . $this->owner_nick);
+	}
+
+
 }
 
 
-- 
cgit v1.2.3


From 8ffd07688442ce837e3040f2d8933ea402738910 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff 
Date: Wed, 12 Feb 2014 09:01:42 +0100
Subject: DE: update to the strings

---
 view/de/messages.po | 7844 ++++++++++++++++++++++++++-------------------------
 view/de/strings.php | 2011 ++++++-------
 2 files changed, 4993 insertions(+), 4862 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index bcaad338a..9116932b7 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-31 00:02-0800\n"
-"PO-Revision-Date: 2014-02-04 06:40+0000\n"
+"POT-Creation-Date: 2014-02-07 00:03-0800\n"
+"PO-Revision-Date: 2014-02-12 07:57+0000\n"
 "Last-Translator: bavatar \n"
 "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -64,15 +64,15 @@ msgstr "Besuche %1$s's %2$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 
-#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420
+#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1423
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../../include/nav.php:72 ../../include/nav.php:87
+#: ../../include/nav.php:72 ../../include/nav.php:91
 msgid "End this session"
 msgstr "Beende diese Sitzung"
 
-#: ../../include/nav.php:75 ../../include/nav.php:121
+#: ../../include/nav.php:75 ../../include/nav.php:125
 msgid "Home"
 msgstr "Home"
 
@@ -81,7 +81,7 @@ msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
 #: ../../include/nav.php:76 ../../include/conversation.php:933
-#: ../../mod/connedit.php:309 ../../mod/connedit.php:423
+#: ../../mod/connedit.php:312 ../../mod/connedit.php:426
 msgid "View Profile"
 msgstr "Profil ansehen"
 
@@ -94,8 +94,8 @@ msgid "Edit Profiles"
 msgstr "Profile bearbeiten"
 
 #: ../../include/nav.php:78
-msgid "Manage/Edit Profiles"
-msgstr "Verwalte/Bearbeite Profile"
+msgid "Manage/Edit profiles"
+msgstr "Profile verwalten"
 
 #: ../../include/nav.php:79 ../../include/conversation.php:1475
 #: ../../mod/fbrowser.php:25
@@ -106,903 +106,758 @@ msgstr "Fotos"
 msgid "Your photos"
 msgstr "Deine Bilder"
 
-#: ../../include/nav.php:85 ../../boot.php:1421
+#: ../../include/nav.php:80 ../../include/conversation.php:1484
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr "Dateien"
+
+#: ../../include/nav.php:80
+msgid "Your files"
+msgstr "Deine Dateien"
+
+#: ../../include/nav.php:81
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../include/nav.php:81
+msgid "Your chatrooms"
+msgstr "Deine Chat-Räume"
+
+#: ../../include/nav.php:82 ../../include/nav.php:175
+#: ../../include/conversation.php:1506 ../../mod/events.php:354
+msgid "Events"
+msgstr "Veranstaltungen"
+
+#: ../../include/nav.php:82
+msgid "Your events"
+msgstr "Deine Veransctaltungen"
+
+#: ../../include/nav.php:83 ../../include/conversation.php:1514
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
+#: ../../include/nav.php:83
+msgid "Your bookmarks"
+msgstr "Deine Lesezeichen"
+
+#: ../../include/nav.php:85 ../../include/conversation.php:1525
+msgid "Webpages"
+msgstr "Webseiten"
+
+#: ../../include/nav.php:85
+msgid "Your webpages"
+msgstr "Deine Webseiten"
+
+#: ../../include/nav.php:89 ../../boot.php:1424
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:102
+#: ../../include/nav.php:106
 #, php-format
 msgid "%s - click to logout"
 msgstr "%s - Klick zum Abmelden"
 
-#: ../../include/nav.php:107
+#: ../../include/nav.php:111
 msgid "Click to authenticate to your home hub"
 msgstr "Klick zum Authentifizieren bei Deinem Heimat-Hub"
 
-#: ../../include/nav.php:121
+#: ../../include/nav.php:125
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:125 ../../mod/register.php:206 ../../boot.php:1397
+#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1400
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:129
 msgid "Create an account"
 msgstr "Erzeuge ein Konto"
 
-#: ../../include/nav.php:130 ../../mod/help.php:60 ../../mod/help.php:64
+#: ../../include/nav.php:134 ../../mod/help.php:60 ../../mod/help.php:64
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:134
 msgid "Help and documentation"
 msgstr "Hilfe und Dokumentation"
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:137
 msgid "Apps"
 msgstr "Apps"
 
-#: ../../include/nav.php:133
+#: ../../include/nav.php:137
 msgid "Addon applications, utilities, games"
 msgstr "Addon Programme, Helferlein, Spiele"
 
-#: ../../include/nav.php:135 ../../include/text.php:736
-#: ../../include/text.php:750 ../../mod/search.php:29
+#: ../../include/nav.php:139 ../../include/text.php:752
+#: ../../include/text.php:766 ../../mod/search.php:29
 msgid "Search"
 msgstr "Suche"
 
-#: ../../include/nav.php:135
+#: ../../include/nav.php:139
 msgid "Search site content"
 msgstr "Durchsuche Seiten-Inhalt"
 
-#: ../../include/nav.php:138 ../../mod/directory.php:210
+#: ../../include/nav.php:142 ../../mod/directory.php:210
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:142
 msgid "Channel Locator"
 msgstr "Kanal-Anzeiger"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:153
 msgid "Matrix"
 msgstr "Matrix"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:153
 msgid "Your matrix"
 msgstr "Deine Matrix"
 
-#: ../../include/nav.php:150
+#: ../../include/nav.php:154
 msgid "Mark all matrix notifications seen"
 msgstr "Markiere alle Matrix-Benachrichtigungen als angesehen"
 
-#: ../../include/nav.php:152
+#: ../../include/nav.php:156
 msgid "Channel Home"
 msgstr "Mein Kanal"
 
-#: ../../include/nav.php:152
+#: ../../include/nav.php:156
 msgid "Channel home"
 msgstr "Mein Kanal"
 
-#: ../../include/nav.php:153
+#: ../../include/nav.php:157
 msgid "Mark all channel notifications seen"
 msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
 
-#: ../../include/nav.php:156
+#: ../../include/nav.php:160
 msgid "Intros"
 msgstr "Vorstellungen"
 
-#: ../../include/nav.php:156 ../../mod/connections.php:242
+#: ../../include/nav.php:160 ../../mod/connections.php:244
 msgid "New Connections"
 msgstr "Neue Verbindungen"
 
-#: ../../include/nav.php:159
+#: ../../include/nav.php:163
 msgid "Notices"
 msgstr "Benachrichtigungen"
 
-#: ../../include/nav.php:159
+#: ../../include/nav.php:163
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../../include/nav.php:160
+#: ../../include/nav.php:164
 msgid "See all notifications"
 msgstr "Alle Benachrichtigungen ansehen"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:165
 msgid "Mark all system notifications seen"
 msgstr "Markiere alle System-Benachrichtigungen als gesehen"
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:167
 msgid "Mail"
 msgstr "Mail"
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:167
 msgid "Private mail"
 msgstr "Persönliche Mail"
 
-#: ../../include/nav.php:164
+#: ../../include/nav.php:168
 msgid "See all private messages"
 msgstr "Alle persönlichen Nachrichten ansehen"
 
-#: ../../include/nav.php:165
+#: ../../include/nav.php:169
 msgid "Mark all private messages seen"
 msgstr "Markiere alle persönlichen Nachrichten als gesehen"
 
-#: ../../include/nav.php:166
+#: ../../include/nav.php:170
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../../include/nav.php:167
+#: ../../include/nav.php:171
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../../include/nav.php:168 ../../include/widgets.php:509
+#: ../../include/nav.php:172 ../../include/widgets.php:509
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../../include/nav.php:171 ../../include/conversation.php:1493
-#: ../../mod/events.php:354
-msgid "Events"
-msgstr "Veranstaltungen"
-
-#: ../../include/nav.php:171
+#: ../../include/nav.php:175
 msgid "Event Calendar"
 msgstr "Veranstaltungskalender"
 
-#: ../../include/nav.php:172
+#: ../../include/nav.php:176
 msgid "See all events"
 msgstr "Alle Ereignisse ansehen"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:177
 msgid "Mark all events seen"
 msgstr "Markiere alle Ereignisse als gesehen"
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:179
 msgid "Channel Select"
 msgstr "Kanal-Auswahl"
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:179
 msgid "Manage Your Channels"
 msgstr "Verwalte Deine Kanäle"
 
-#: ../../include/nav.php:177 ../../include/widgets.php:487
+#: ../../include/nav.php:181 ../../include/widgets.php:487
 #: ../../mod/admin.php:837 ../../mod/admin.php:1042
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:181
 msgid "Account/Channel Settings"
 msgstr "Konto-/Kanal-Einstellungen"
 
-#: ../../include/nav.php:179 ../../mod/connections.php:349
+#: ../../include/nav.php:183 ../../mod/connections.php:351
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: ../../include/nav.php:179
+#: ../../include/nav.php:183
 msgid "Manage/Edit Friends and Connections"
 msgstr "Verwalte/Bearbeite Freunde und Verbindungen"
 
-#: ../../include/nav.php:186 ../../mod/admin.php:112
+#: ../../include/nav.php:190 ../../mod/admin.php:112
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../include/nav.php:186
+#: ../../include/nav.php:190
 msgid "Site Setup and Configuration"
 msgstr "Seiten-Einrichtung und -Konfiguration"
 
-#: ../../include/nav.php:212
+#: ../../include/nav.php:216
 msgid "Nothing new here"
 msgstr "Nichts Neues hier"
 
-#: ../../include/nav.php:217
+#: ../../include/nav.php:221
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../../include/chat.php:10
-msgid "Missing room name"
-msgstr "Der Chatraum hat keinen Namen"
+#: ../../include/text.php:315
+msgid "prev"
+msgstr "vorherige"
 
-#: ../../include/chat.php:19
-msgid "Duplicate room name"
-msgstr "Name des Chatraums bereits vergeben"
+#: ../../include/text.php:317
+msgid "first"
+msgstr "erste"
 
-#: ../../include/chat.php:68 ../../include/chat.php:76
-msgid "Invalid room specifier."
-msgstr "Ungültiger Raumbezeichner."
+#: ../../include/text.php:346
+msgid "last"
+msgstr "letzte"
 
-#: ../../include/chat.php:102
-msgid "Room not found."
-msgstr "Chatraum konnte nicht gefunden werden."
+#: ../../include/text.php:349
+msgid "next"
+msgstr "nächste"
 
-#: ../../include/chat.php:113 ../../include/photos.php:15
-#: ../../include/attach.php:97 ../../include/attach.php:128
-#: ../../include/attach.php:184 ../../include/attach.php:199
-#: ../../include/attach.php:232 ../../include/attach.php:246
-#: ../../include/attach.php:267 ../../include/attach.php:462
-#: ../../include/attach.php:540 ../../include/items.php:3454
-#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
-#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../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/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:522
-#: ../../mod/chat.php:84 ../../mod/chat.php:89 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../mod/connections.php:167
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
-#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
-#: ../../mod/filestorage.php:98 ../../mod/manage.php:6
-#: ../../mod/settings.php:486 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:347
-msgid "Permission denied."
-msgstr "Zugang verweigert"
+#: ../../include/text.php:361
+msgid "older"
+msgstr "älter"
 
-#: ../../include/Contact.php:104 ../../include/identity.php:628
-#: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:170
-msgid "Connect"
-msgstr "Verbinden"
+#: ../../include/text.php:363
+msgid "newer"
+msgstr "neuer"
 
-#: ../../include/Contact.php:120
-msgid "New window"
-msgstr "Neues Fenster"
+#: ../../include/text.php:670
+msgid "No connections"
+msgstr "Keine Verbindungen"
 
-#: ../../include/Contact.php:121
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
+#: ../../include/text.php:681
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d Verbindung"
+msgstr[1] "%d Verbindungen"
 
-#: ../../include/contact_selectors.php:30
-msgid "Unknown | Not categorised"
-msgstr "Unbekannt | Nicht kategorisiert"
+#: ../../include/text.php:693
+msgid "View Connections"
+msgstr "Zeige Verbindungen"
 
-#: ../../include/contact_selectors.php:31
-msgid "Block immediately"
-msgstr "Sofort blockieren"
+#: ../../include/text.php:754 ../../include/text.php:768
+#: ../../include/widgets.php:173 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Speichern"
 
-#: ../../include/contact_selectors.php:32
-msgid "Shady, spammer, self-marketer"
-msgstr "Zwielichtig, Spammer, Selbstdarsteller"
+#: ../../include/text.php:834
+msgid "poke"
+msgstr "anstupsen"
 
-#: ../../include/contact_selectors.php:33
-msgid "Known to me, but no opinion"
-msgstr "Mir bekannt, aber keine Meinung"
+#: ../../include/text.php:834 ../../include/conversation.php:240
+msgid "poked"
+msgstr "stupste"
 
-#: ../../include/contact_selectors.php:34
-msgid "OK, probably harmless"
-msgstr "Ok, wahrscheinlich harmlos"
+#: ../../include/text.php:835
+msgid "ping"
+msgstr "anpingen"
 
-#: ../../include/contact_selectors.php:35
-msgid "Reputable, has my trust"
-msgstr "Seriös, hat mein Vertrauen"
+#: ../../include/text.php:835
+msgid "pinged"
+msgstr "pingte"
 
-#: ../../include/contact_selectors.php:54
-msgid "Frequently"
-msgstr "Häufig"
+#: ../../include/text.php:836
+msgid "prod"
+msgstr "knuffen"
 
-#: ../../include/contact_selectors.php:55
-msgid "Hourly"
-msgstr "Stündlich"
+#: ../../include/text.php:836
+msgid "prodded"
+msgstr "knuffte"
 
-#: ../../include/contact_selectors.php:56
-msgid "Twice daily"
-msgstr "Zwei Mal am Tag"
+#: ../../include/text.php:837
+msgid "slap"
+msgstr "ohrfeigen"
 
-#: ../../include/contact_selectors.php:57
-msgid "Daily"
-msgstr "Täglich"
+#: ../../include/text.php:837
+msgid "slapped"
+msgstr "ohrfeigte"
 
-#: ../../include/contact_selectors.php:58
-msgid "Weekly"
-msgstr "Wöchentlich"
+#: ../../include/text.php:838
+msgid "finger"
+msgstr "befummeln"
 
-#: ../../include/contact_selectors.php:59
-msgid "Monthly"
-msgstr "Monatlich"
+#: ../../include/text.php:838
+msgid "fingered"
+msgstr "befummelte"
 
-#: ../../include/contact_selectors.php:74
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../include/text.php:839
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
 
-#: ../../include/contact_selectors.php:75
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../include/text.php:839
+msgid "rebuffed"
+msgstr "abfuhrerteilte"
 
-#: ../../include/contact_selectors.php:76
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../include/text.php:851
+msgid "happy"
+msgstr "glücklich"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
-#: ../../mod/admin.php:750 ../../boot.php:1423
-msgid "Email"
-msgstr "E-Mail"
+#: ../../include/text.php:852
+msgid "sad"
+msgstr "traurig"
 
-#: ../../include/contact_selectors.php:78
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../include/text.php:853
+msgid "mellow"
+msgstr "sanft"
 
-#: ../../include/contact_selectors.php:79
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../include/text.php:854
+msgid "tired"
+msgstr "müde"
 
-#: ../../include/contact_selectors.php:80
-msgid "Zot!"
-msgstr "Zot!"
+#: ../../include/text.php:855
+msgid "perky"
+msgstr "frech"
 
-#: ../../include/contact_selectors.php:81
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/text.php:856
+msgid "angry"
+msgstr "sauer"
 
-#: ../../include/contact_selectors.php:82
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/text.php:857
+msgid "stupified"
+msgstr "verblüfft"
 
-#: ../../include/contact_selectors.php:83
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/text.php:858
+msgid "puzzled"
+msgstr "verwirrt"
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
+#: ../../include/text.php:859
+msgid "interested"
+msgstr "interessiert"
 
-#: ../../include/datetime.php:152 ../../include/datetime.php:284
-msgid "year"
-msgstr "Jahr"
+#: ../../include/text.php:860
+msgid "bitter"
+msgstr "verbittert"
 
-#: ../../include/datetime.php:157 ../../include/datetime.php:285
-msgid "month"
-msgstr "Monat"
+#: ../../include/text.php:861
+msgid "cheerful"
+msgstr "fröhlich"
 
-#: ../../include/datetime.php:162 ../../include/datetime.php:287
-msgid "day"
-msgstr "Tag"
-
-#: ../../include/datetime.php:275
-msgid "never"
-msgstr "Nie"
+#: ../../include/text.php:862
+msgid "alive"
+msgstr "lebendig"
 
-#: ../../include/datetime.php:281
-msgid "less than a second ago"
-msgstr "Vor weniger als einer Sekunde"
+#: ../../include/text.php:863
+msgid "annoyed"
+msgstr "verärgert"
 
-#: ../../include/datetime.php:284
-msgid "years"
-msgstr "Jahre"
+#: ../../include/text.php:864
+msgid "anxious"
+msgstr "unruhig"
 
-#: ../../include/datetime.php:285
-msgid "months"
-msgstr "Monate"
+#: ../../include/text.php:865
+msgid "cranky"
+msgstr "schrullig"
 
-#: ../../include/datetime.php:286
-msgid "week"
-msgstr "Woche"
+#: ../../include/text.php:866
+msgid "disturbed"
+msgstr "verstört"
 
-#: ../../include/datetime.php:286
-msgid "weeks"
-msgstr "Wochen"
+#: ../../include/text.php:867
+msgid "frustrated"
+msgstr "frustriert"
 
-#: ../../include/datetime.php:287
-msgid "days"
-msgstr "Tage"
+#: ../../include/text.php:868
+msgid "motivated"
+msgstr "motiviert"
 
-#: ../../include/datetime.php:288
-msgid "hour"
-msgstr "Stunde"
+#: ../../include/text.php:869
+msgid "relaxed"
+msgstr "entspannt"
 
-#: ../../include/datetime.php:288
-msgid "hours"
-msgstr "Stunden"
+#: ../../include/text.php:870
+msgid "surprised"
+msgstr "überrascht"
 
-#: ../../include/datetime.php:289
-msgid "minute"
-msgstr "Minute"
+#: ../../include/text.php:1031
+msgid "Monday"
+msgstr "Montag"
 
-#: ../../include/datetime.php:289
-msgid "minutes"
-msgstr "Minuten"
+#: ../../include/text.php:1031
+msgid "Tuesday"
+msgstr "Dienstag"
 
-#: ../../include/datetime.php:290
-msgid "second"
-msgstr "Sekunde"
+#: ../../include/text.php:1031
+msgid "Wednesday"
+msgstr "Mittwoch"
 
-#: ../../include/datetime.php:290
-msgid "seconds"
-msgstr "Sekunden"
+#: ../../include/text.php:1031
+msgid "Thursday"
+msgstr "Donnerstag"
 
-#: ../../include/datetime.php:299
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr "vor %1$d %2$s"
+#: ../../include/text.php:1031
+msgid "Friday"
+msgstr "Freitag"
 
-#: ../../include/dba/dba_driver.php:50
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"
+#: ../../include/text.php:1031
+msgid "Saturday"
+msgstr "Samstag"
 
-#: ../../include/network.php:640
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
+#: ../../include/text.php:1031
+msgid "Sunday"
+msgstr "Sonntag"
 
-#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y\\\\, H:i"
+#: ../../include/text.php:1035
+msgid "January"
+msgstr "Januar"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
-msgid "Starts:"
-msgstr "Beginnt:"
+#: ../../include/text.php:1035
+msgid "February"
+msgstr "Februar"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
-msgid "Finishes:"
-msgstr "Endet:"
+#: ../../include/text.php:1035
+msgid "March"
+msgstr "März"
 
-#: ../../include/event.php:40 ../../include/identity.php:679
-#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
-msgid "Location:"
-msgstr "Ort:"
+#: ../../include/text.php:1035
+msgid "April"
+msgstr "April"
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:537
-#: ../../include/bbcode.php:540 ../../include/bbcode.php:545
-#: ../../include/bbcode.php:548 ../../include/bbcode.php:551
-#: ../../include/bbcode.php:554 ../../include/bbcode.php:559
-#: ../../include/bbcode.php:562 ../../include/bbcode.php:567
-#: ../../include/bbcode.php:570 ../../include/bbcode.php:573
-#: ../../include/bbcode.php:576
-msgid "Image/photo"
-msgstr "Bild/Foto"
+#: ../../include/text.php:1035
+msgid "May"
+msgstr "Mai"
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:582
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/text.php:1035
+msgid "June"
+msgstr "Juni"
 
-#: ../../include/bbcode.php:170
-msgid "QR code"
-msgstr "QR Code"
+#: ../../include/text.php:1035
+msgid "July"
+msgstr "Juli"
 
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
+#: ../../include/text.php:1035
+msgid "August"
+msgstr "August"
 
-#: ../../include/bbcode.php:215
-msgid "post"
-msgstr "Beitrag"
+#: ../../include/text.php:1035
+msgid "September"
+msgstr "September"
 
-#: ../../include/bbcode.php:505 ../../include/bbcode.php:525
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
+#: ../../include/text.php:1035
+msgid "October"
+msgstr "Oktober"
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr "Dieses Element löschen?"
+#: ../../include/text.php:1035
+msgid "November"
+msgstr "November"
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
-#: ../../mod/photos.php:972 ../../mod/photos.php:1059
-msgid "Comment"
-msgstr "Kommentar"
+#: ../../include/text.php:1035
+msgid "December"
+msgstr "Dezember"
 
-#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:125
-#: ../../include/ItemObject.php:270
-msgid "show more"
-msgstr "mehr zeigen"
+#: ../../include/text.php:1113
+msgid "unknown.???"
+msgstr "unbekannt.???"
 
-#: ../../include/js_strings.php:8
-msgid "show fewer"
-msgstr "Zeige weniger"
+#: ../../include/text.php:1114
+msgid "bytes"
+msgstr "Bytes"
 
-#: ../../include/js_strings.php:9
-msgid "Password too short"
-msgstr "Kennwort zu kurz"
+#: ../../include/text.php:1149
+msgid "remove category"
+msgstr "Kategorie entfernen"
 
-#: ../../include/js_strings.php:10
-msgid "Passwords do not match"
-msgstr "Kennwörter stimmen nicht überein"
+#: ../../include/text.php:1171
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
 
-#: ../../include/js_strings.php:11 ../../mod/photos.php:39
-msgid "everybody"
-msgstr "alle"
+#: ../../include/text.php:1229 ../../include/text.php:1241
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/js_strings.php:12
-msgid "Secret Passphrase"
-msgstr "geheime Passwort-Phrase"
+#: ../../include/text.php:1417 ../../mod/events.php:332
+msgid "link to source"
+msgstr "Link zum Originalbeitrag"
 
-#: ../../include/js_strings.php:13
-msgid "Passphrase hint"
-msgstr "Hinweis zur Phrase"
+#: ../../include/text.php:1436
+msgid "Select a page layout: "
+msgstr "Ein Seiten-Layout auswählen"
 
-#: ../../include/js_strings.php:15
-msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+#: ../../include/text.php:1439 ../../include/text.php:1504
+msgid "default"
+msgstr "Standard"
 
-#: ../../include/js_strings.php:16
-msgid "timeago.suffixAgo"
-msgstr "timeago.suffixAgo"
+#: ../../include/text.php:1475
+msgid "Page content type: "
+msgstr "Content-Typ der Seite"
 
-#: ../../include/js_strings.php:17
-msgid "ago"
-msgstr "her"
+#: ../../include/text.php:1516
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
 
-#: ../../include/js_strings.php:18
-msgid "from now"
-msgstr "von jetzt"
+#: ../../include/text.php:1637 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
+msgstr "Foto"
 
-#: ../../include/js_strings.php:19
-msgid "less than a minute"
-msgstr "weniger als eine Minute"
+#: ../../include/text.php:1640 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr "Ereignis"
 
-#: ../../include/js_strings.php:20
-msgid "about a minute"
-msgstr "ungefähr eine Minute"
+#: ../../include/text.php:1643 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr "Status"
 
-#: ../../include/js_strings.php:21
-#, php-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+#: ../../include/text.php:1645 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr "Kommentar"
 
-#: ../../include/js_strings.php:22
-msgid "about an hour"
-msgstr "ungefähr eine Stunde"
+#: ../../include/text.php:1650
+msgid "activity"
+msgstr "Aktivität"
 
-#: ../../include/js_strings.php:23
-#, php-format
-msgid "about %d hours"
-msgstr "ungefähr %d Stunden"
+#: ../../include/text.php:1907
+msgid "Design"
+msgstr "Design"
 
-#: ../../include/js_strings.php:24
-msgid "a day"
-msgstr "ein Tag"
+#: ../../include/text.php:1909
+msgid "Blocks"
+msgstr "Blöcke"
 
-#: ../../include/js_strings.php:25
-#, php-format
-msgid "%d days"
-msgstr "%d Tage"
+#: ../../include/text.php:1910
+msgid "Menus"
+msgstr "Menüs"
 
-#: ../../include/js_strings.php:26
-msgid "about a month"
-msgstr "ungefähr ein Monat"
+#: ../../include/text.php:1911
+msgid "Layouts"
+msgstr "Layouts"
 
-#: ../../include/js_strings.php:27
-#, php-format
-msgid "%d months"
-msgstr "%d Monate"
+#: ../../include/text.php:1912
+msgid "Pages"
+msgstr "Seiten"
 
-#: ../../include/js_strings.php:28
-msgid "about a year"
-msgstr "ungefähr ein Jahr"
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr "Kategorien"
 
-#: ../../include/js_strings.php:29
-#, php-format
-msgid "%d years"
-msgstr "%d Jahre"
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:183 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr "Verbinden"
 
-#: ../../include/js_strings.php:30
-msgid " "
-msgstr " "
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
 
-#: ../../include/js_strings.php:31
-msgid "timeago.numbers"
-msgstr "timeago.numbers"
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
+msgstr "Vorschläge"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Kein Empfänger angegeben"
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr "Mehr anzeigen..."
 
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[no subject]"
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."
 
-#: ../../include/message.php:42
-msgid "Unable to determine sender."
-msgstr "Kann Absender nicht bestimmen."
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
 
-#: ../../include/message.php:143
-msgid "Stored post could not be verified."
-msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr "Adresse des Kanals eingeben"
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
-#: ../../mod/photos.php:91 ../../mod/photos.php:652 ../../mod/photos.php:674
-#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
-#: ../../mod/profile_photo.php:336
-msgid "Profile Photos"
-msgstr "Profilfotos"
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
 
-#: ../../include/identity.php:29 ../../mod/item.php:1150
-msgid "Unable to obtain identity information from database"
-msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr "Notizen"
 
-#: ../../include/identity.php:62
-msgid "Empty name"
-msgstr "Namensfeld leer"
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr "Eintrag löschen"
 
-#: ../../include/identity.php:64
-msgid "Name too long"
-msgstr "Name ist zu lang"
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
+msgstr "Gesicherte Suchanfragen"
 
-#: ../../include/identity.php:143
-msgid "No account identifier"
-msgstr "Keine Account-Kennung"
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
+msgstr "hinzufügen"
 
-#: ../../include/identity.php:153
-msgid "Nickname is required."
-msgstr "Spitzname ist erforderlich."
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Gesicherte Ordner"
 
-#: ../../include/identity.php:167
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr "Alles"
 
-#: ../../include/identity.php:226
-msgid "Unable to retrieve created identity"
-msgstr "Kann die erstellte Identität nicht empfangen"
+#: ../../include/widgets.php:318 ../../include/items.php:3613
+msgid "Archives"
+msgstr "Archive"
 
-#: ../../include/identity.php:285
-msgid "Default Profile"
-msgstr "Standard-Profil"
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr "Aktualisieren"
 
-#: ../../include/identity.php:310 ../../include/profile_selectors.php:42
-#: ../../include/widgets.php:373 ../../mod/connedit.php:389
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
+msgstr "Ich"
+
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
+msgstr "Beste Freunde"
+
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../../include/identity.php:477
-msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr "Kollegen"
 
-#: ../../include/identity.php:489
-msgid " Sorry, you don't have the permission to view this profile. "
-msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
+msgstr "ehem. Freunde"
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
-#: ../../mod/connect.php:13 ../../mod/layouts.php:8
-#: ../../mod/achievements.php:8 ../../mod/filestorage.php:40
-#: ../../mod/blocks.php:10 ../../mod/profile.php:16
-msgid "Requested profile is not available."
-msgstr "Erwünschte Profil ist nicht verfügbar."
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
+msgstr "Bekanntschaften"
 
-#: ../../include/identity.php:642 ../../mod/profiles.php:603
-msgid "Change profile photo"
-msgstr "Ändere das Profilfoto"
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr "Jeder"
 
-#: ../../include/identity.php:648
-msgid "Profiles"
-msgstr "Profile"
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../include/identity.php:648
-msgid "Manage/edit profiles"
-msgstr "Verwalte/Bearbeite Profile"
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../include/identity.php:649 ../../mod/profiles.php:604
-msgid "Create New Profile"
-msgstr "Neues Profil erstellen"
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../include/identity.php:652
-msgid "Edit Profile"
-msgstr "Profile bearbeiten"
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr "Funktions-Einstellungen"
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:615
-msgid "Profile Image"
-msgstr "Profilfoto:"
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../include/identity.php:666 ../../mod/profiles.php:618
-msgid "visible to everybody"
-msgstr "sichtbar für jeden"
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr "Verbundene Apps"
 
-#: ../../include/identity.php:667 ../../mod/profiles.php:619
-msgid "Edit visibility"
-msgstr "Sichtbarkeit bearbeiten"
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr "Kanal exportieren"
 
-#: ../../include/identity.php:681 ../../include/identity.php:908
-#: ../../mod/directory.php:158
-msgid "Gender:"
-msgstr "Geschlecht:"
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr "Automatische Berechtigungen (Erweitert)"
 
-#: ../../include/identity.php:682 ../../include/identity.php:928
-#: ../../mod/directory.php:160
-msgid "Status:"
-msgstr "Status:"
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr "Prämium-Kanal Einstellungen"
 
-#: ../../include/identity.php:683 ../../include/identity.php:939
-#: ../../mod/directory.php:162
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanal Quellen"
 
-#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
-msgid "Online Now"
-msgstr "gerade online"
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr "E-Mails abrufen"
 
-#: ../../include/identity.php:752 ../../include/identity.php:832
-#: ../../mod/ping.php:256
-msgid "g A l F d"
-msgstr "l, d. F G \\\\U\\\\h\\\\r"
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Chaträume"
 
-#: ../../include/identity.php:753 ../../include/identity.php:833
-msgid "F d"
-msgstr "d. F"
+#: ../../include/Contact.php:120
+msgid "New window"
+msgstr "Neues Fenster"
 
-#: ../../include/identity.php:798 ../../include/identity.php:873
-#: ../../mod/ping.php:278
-msgid "[today]"
-msgstr "[Heute]"
+#: ../../include/Contact.php:121
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
 
-#: ../../include/identity.php:810
-msgid "Birthday Reminders"
-msgstr "Geburtstags Erinnerungen"
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr "Allgemeine Funktionen"
 
-#: ../../include/identity.php:811
-msgid "Birthdays this week:"
-msgstr "Geburtstage in dieser Woche:"
+#: ../../include/features.php:25
+msgid "Content Expiration"
+msgstr "Verfall von Inhalten"
 
-#: ../../include/identity.php:866
-msgid "[No description]"
-msgstr "[Keine Beschreibung]"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
 
-#: ../../include/identity.php:884
-msgid "Event Reminders"
-msgstr "Veranstaltungs- Erinnerungen"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
+msgstr "Mehrfachprofile"
 
-#: ../../include/identity.php:885
-msgid "Events this week:"
-msgstr "Veranstaltungen in dieser Woche:"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
+msgstr "Mehrfachprofile anlegen können"
 
-#: ../../include/identity.php:898 ../../include/identity.php:982
-#: ../../mod/profperm.php:107
-msgid "Profile"
-msgstr "Profil"
+#: ../../include/features.php:27
+msgid "Web Pages"
+msgstr "Webseiten"
 
-#: ../../include/identity.php:906 ../../mod/settings.php:916
-msgid "Full Name:"
-msgstr "Voller Name:"
-
-#: ../../include/identity.php:913
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: ../../include/identity.php:914
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/identity.php:921
-msgid "Birthday:"
-msgstr "Geburtstag:"
-
-#: ../../include/identity.php:925
-msgid "Age:"
-msgstr "Alter:"
-
-#: ../../include/identity.php:934
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "für %1$d %2$s"
-
-#: ../../include/identity.php:937 ../../mod/profiles.php:526
-msgid "Sexual Preference:"
-msgstr "Sexuelle Orientierung:"
-
-#: ../../include/identity.php:941 ../../mod/profiles.php:528
-msgid "Hometown:"
-msgstr "Heimatstadt:"
-
-#: ../../include/identity.php:943
-msgid "Tags:"
-msgstr "Schlagworte:"
-
-#: ../../include/identity.php:945 ../../mod/profiles.php:529
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
-
-#: ../../include/identity.php:947
-msgid "Religion:"
-msgstr "Religion:"
-
-#: ../../include/identity.php:949 ../../mod/directory.php:164
-msgid "About:"
-msgstr "Über:"
-
-#: ../../include/identity.php:951
-msgid "Hobbies/Interests:"
-msgstr "Hobbys/Interessen:"
-
-#: ../../include/identity.php:953 ../../mod/profiles.php:532
-msgid "Likes:"
-msgstr "Gefällt-mir:"
-
-#: ../../include/identity.php:955 ../../mod/profiles.php:533
-msgid "Dislikes:"
-msgstr "Gefällt-mir-nicht:"
-
-#: ../../include/identity.php:958
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformation und soziale Netzwerke:"
-
-#: ../../include/identity.php:960
-msgid "My other channels:"
-msgstr "Meine anderen Kanäle:"
-
-#: ../../include/identity.php:962
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
-
-#: ../../include/identity.php:964
-msgid "Books, literature:"
-msgstr "Bücher, Literatur:"
-
-#: ../../include/identity.php:966
-msgid "Television:"
-msgstr "Fernsehen:"
-
-#: ../../include/identity.php:968
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/Tanz/Kultur/Unterhaltung:"
-
-#: ../../include/identity.php:970
-msgid "Love/Romance:"
-msgstr "Liebe/Romantik:"
-
-#: ../../include/identity.php:972
-msgid "Work/employment:"
-msgstr "Arbeit/Anstellung:"
-
-#: ../../include/identity.php:974
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
-
-#: ../../include/reddav.php:1018
-msgid "Edit File properties"
-msgstr "Dateieigenschaften ändern"
-
-#: ../../include/oembed.php:157
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
-
-#: ../../include/oembed.php:166
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
-
-#: ../../include/features.php:23
-msgid "General Features"
-msgstr "Allgemeine Funktionen"
-
-#: ../../include/features.php:25
-msgid "Content Expiration"
-msgstr "Verfall von Inhalten"
-
-#: ../../include/features.php:25
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
-
-#: ../../include/features.php:26
-msgid "Multiple Profiles"
-msgstr "Mehrfachprofile"
-
-#: ../../include/features.php:26
-msgid "Ability to create multiple profiles"
-msgstr "Mehrfachprofile anlegen können"
-
-#: ../../include/features.php:27
-msgid "Web Pages"
-msgstr "Webseiten"
-
-#: ../../include/features.php:27
-msgid "Provide managed web pages on your channel"
-msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
+#: ../../include/features.php:27
+msgid "Provide managed web pages on your channel"
+msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
 
 #: ../../include/features.php:28
 msgid "Private Notes"
@@ -1060,11 +915,6 @@ msgstr "Voransicht"
 msgid "Allow previewing posts and comments before publishing them"
 msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
 
-#: ../../include/features.php:43 ../../include/widgets.php:476
-#: ../../mod/sources.php:81
-msgid "Channel Sources"
-msgstr "Kanal Quellen"
-
 #: ../../include/features.php:43
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."
@@ -1098,10 +948,6 @@ msgstr "Filter für Sammlung"
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
 
-#: ../../include/features.php:52 ../../include/widgets.php:252
-msgid "Saved Searches"
-msgstr "Gesicherte Suchanfragen"
-
 #: ../../include/features.php:52
 msgid "Save search terms for re-use"
 msgstr "Gesicherte Suchbegriffe zur Wiederverwendung"
@@ -1166,11 +1012,6 @@ msgstr "Beitrags-Kategorien"
 msgid "Add categories to your posts"
 msgstr "Kategorien für Beiträge"
 
-#: ../../include/features.php:66 ../../include/widgets.php:283
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
-msgstr "Gesicherte Ordner"
-
 #: ../../include/features.php:66
 msgid "Ability to file posts under folders"
 msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
@@ -1199,1943 +1040,2148 @@ msgstr "Tag Wolke"
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"may apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."
-
-#: ../../include/group.php:223
-msgid "Default privacy group for new contacts"
-msgstr "Standard-Privatsphärengruppe für neue Kontakte"
+#: ../../include/contact_selectors.php:30
+msgid "Unknown | Not categorised"
+msgstr "Unbekannt | Nicht kategorisiert"
 
-#: ../../include/group.php:242 ../../mod/admin.php:750
-msgid "All Channels"
-msgstr "Alle Kanäle"
+#: ../../include/contact_selectors.php:31
+msgid "Block immediately"
+msgstr "Sofort blockieren"
 
-#: ../../include/group.php:264
-msgid "edit"
-msgstr "Bearbeiten"
+#: ../../include/contact_selectors.php:32
+msgid "Shady, spammer, self-marketer"
+msgstr "Zwielichtig, Spammer, Selbstdarsteller"
 
-#: ../../include/group.php:285
-msgid "Collections"
-msgstr "Sammlungen"
+#: ../../include/contact_selectors.php:33
+msgid "Known to me, but no opinion"
+msgstr "Mir bekannt, aber keine Meinung"
 
-#: ../../include/group.php:286
-msgid "Edit collection"
-msgstr "Bearbeite Sammlungen"
+#: ../../include/contact_selectors.php:34
+msgid "OK, probably harmless"
+msgstr "Ok, wahrscheinlich harmlos"
 
-#: ../../include/group.php:287
-msgid "Create a new collection"
-msgstr "Neue Sammlung erzeugen"
+#: ../../include/contact_selectors.php:35
+msgid "Reputable, has my trust"
+msgstr "Seriös, hat mein Vertrauen"
 
-#: ../../include/group.php:288
-msgid "Channels not in any collection"
-msgstr "Kanäle, die nicht in einer Sammlung sind"
+#: ../../include/contact_selectors.php:54
+msgid "Frequently"
+msgstr "Häufig"
 
-#: ../../include/group.php:290 ../../include/widgets.php:253
-msgid "add"
-msgstr "hinzufügen"
+#: ../../include/contact_selectors.php:55
+msgid "Hourly"
+msgstr "Stündlich"
 
-#: ../../include/notify.php:23
-msgid "created a new post"
-msgstr "Neuer Beitrag wurde erzeugt"
+#: ../../include/contact_selectors.php:56
+msgid "Twice daily"
+msgstr "Zwei Mal am Tag"
 
-#: ../../include/notify.php:24
-#, php-format
-msgid "commented on %s's post"
-msgstr "hat %s's Beitrag kommentiert"
+#: ../../include/contact_selectors.php:57
+msgid "Daily"
+msgstr "Täglich"
 
-#: ../../include/photos.php:89
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
+#: ../../include/contact_selectors.php:58
+msgid "Weekly"
+msgstr "Wöchentlich"
 
-#: ../../include/photos.php:96
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/contact_selectors.php:59
+msgid "Monthly"
+msgstr "Monatlich"
 
-#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
-msgid "Unable to process image"
-msgstr "Kann Bild nicht verarbeiten"
+#: ../../include/contact_selectors.php:74
+msgid "Friendica"
+msgstr "Friendica"
 
-#: ../../include/photos.php:185
-msgid "Photo storage failed."
-msgstr "Foto speichern schlug fehl"
+#: ../../include/contact_selectors.php:75
+msgid "OStatus"
+msgstr "OStatus"
 
-#: ../../include/photos.php:302 ../../include/conversation.php:1478
-msgid "Photo Albums"
-msgstr "Fotoalben"
+#: ../../include/contact_selectors.php:76
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
 
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1169
-msgid "Upload New Photos"
-msgstr "Lade neue Fotos hoch"
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1426
+msgid "Email"
+msgstr "E-Mail"
 
-#: ../../include/profile_selectors.php:6
-msgid "Male"
-msgstr "Männlich"
+#: ../../include/contact_selectors.php:78
+msgid "Diaspora"
+msgstr "Diaspora"
 
-#: ../../include/profile_selectors.php:6
-msgid "Female"
-msgstr "Weiblich"
+#: ../../include/contact_selectors.php:79
+msgid "Facebook"
+msgstr "Facebook"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Momentan männlich"
+#: ../../include/contact_selectors.php:80
+msgid "Zot!"
+msgstr "Zot!"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Momentan weiblich"
+#: ../../include/contact_selectors.php:81
+msgid "LinkedIn"
+msgstr "LinkedIn"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Größtenteils männlich"
+#: ../../include/contact_selectors.php:82
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Größtenteils weiblich"
+#: ../../include/contact_selectors.php:83
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transsexuell"
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Zwischengeschlechtlich"
+#: ../../include/datetime.php:152 ../../include/datetime.php:284
+msgid "year"
+msgstr "Jahr"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transsexuell"
+#: ../../include/datetime.php:157 ../../include/datetime.php:285
+msgid "month"
+msgstr "Monat"
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Zwitter"
+#: ../../include/datetime.php:162 ../../include/datetime.php:287
+msgid "day"
+msgstr "Tag"
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Geschlechtslos"
+#: ../../include/datetime.php:275
+msgid "never"
+msgstr "Nie"
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "unklar"
+#: ../../include/datetime.php:281
+msgid "less than a second ago"
+msgstr "Vor weniger als einer Sekunde"
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
-msgstr "Anders"
+#: ../../include/datetime.php:284
+msgid "years"
+msgstr "Jahre"
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Unentschieden"
+#: ../../include/datetime.php:285
+msgid "months"
+msgstr "Monate"
 
-#: ../../include/profile_selectors.php:23
-msgid "Males"
-msgstr "Männer"
+#: ../../include/datetime.php:286
+msgid "week"
+msgstr "Woche"
 
-#: ../../include/profile_selectors.php:23
-msgid "Females"
-msgstr "Frauen"
+#: ../../include/datetime.php:286
+msgid "weeks"
+msgstr "Wochen"
 
-#: ../../include/profile_selectors.php:23
-msgid "Gay"
-msgstr "Schwul"
+#: ../../include/datetime.php:287
+msgid "days"
+msgstr "Tage"
 
-#: ../../include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr "Lesbisch"
+#: ../../include/datetime.php:288
+msgid "hour"
+msgstr "Stunde"
 
-#: ../../include/profile_selectors.php:23
-msgid "No Preference"
-msgstr "Keine Bevorzugung"
+#: ../../include/datetime.php:288
+msgid "hours"
+msgstr "Stunden"
 
-#: ../../include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr "Bisexuell"
+#: ../../include/datetime.php:289
+msgid "minute"
+msgstr "Minute"
 
-#: ../../include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr "Autosexuell"
+#: ../../include/datetime.php:289
+msgid "minutes"
+msgstr "Minuten"
 
-#: ../../include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr "Enthaltsam"
+#: ../../include/datetime.php:290
+msgid "second"
+msgstr "Sekunde"
 
-#: ../../include/profile_selectors.php:23
-msgid "Virgin"
-msgstr "Jungfräulich"
+#: ../../include/datetime.php:290
+msgid "seconds"
+msgstr "Sekunden"
 
-#: ../../include/profile_selectors.php:23
-msgid "Deviant"
-msgstr "Abweichend"
+#: ../../include/datetime.php:299
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "vor %1$d %2$s"
 
-#: ../../include/profile_selectors.php:23
-msgid "Fetish"
-msgstr "Fetisch"
+#: ../../include/dba/dba_driver.php:50
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"
 
-#: ../../include/profile_selectors.php:23
-msgid "Oodles"
-msgstr "Unmengen"
+#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y\\\\, H:i"
 
-#: ../../include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr "Sexlos"
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
+msgid "Starts:"
+msgstr "Beginnt:"
 
-#: ../../include/profile_selectors.php:42
-msgid "Single"
-msgstr "Single"
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
+msgid "Finishes:"
+msgstr "Endet:"
 
-#: ../../include/profile_selectors.php:42
-msgid "Lonely"
-msgstr "Einsam"
+#: ../../include/event.php:40 ../../include/identity.php:679
+#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+msgid "Location:"
+msgstr "Ort:"
 
-#: ../../include/profile_selectors.php:42
-msgid "Available"
-msgstr "Verfügbar"
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"may apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente."
 
-#: ../../include/profile_selectors.php:42
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
+#: ../../include/group.php:223
+msgid "Default privacy group for new contacts"
+msgstr "Standard-Privatsphärengruppe für neue Kontakte"
 
-#: ../../include/profile_selectors.php:42
-msgid "Has crush"
-msgstr "Verguckt"
+#: ../../include/group.php:242 ../../mod/admin.php:750
+msgid "All Channels"
+msgstr "Alle Kanäle"
 
-#: ../../include/profile_selectors.php:42
-msgid "Infatuated"
-msgstr "Verknallt"
+#: ../../include/group.php:264
+msgid "edit"
+msgstr "Bearbeiten"
 
-#: ../../include/profile_selectors.php:42
-msgid "Dating"
-msgstr "Lerne gerade jemanden kennen"
+#: ../../include/group.php:285
+msgid "Collections"
+msgstr "Sammlungen"
 
-#: ../../include/profile_selectors.php:42
-msgid "Unfaithful"
-msgstr "Treulos"
+#: ../../include/group.php:286
+msgid "Edit collection"
+msgstr "Bearbeite Sammlungen"
 
-#: ../../include/profile_selectors.php:42
-msgid "Sex Addict"
-msgstr "Sexabhängig"
+#: ../../include/group.php:287
+msgid "Create a new collection"
+msgstr "Neue Sammlung erzeugen"
 
-#: ../../include/profile_selectors.php:42
-msgid "Friends/Benefits"
-msgstr "Freunde/Begünstigte"
+#: ../../include/group.php:288
+msgid "Channels not in any collection"
+msgstr "Kanäle, die nicht in einer Sammlung sind"
 
-#: ../../include/profile_selectors.php:42
-msgid "Casual"
-msgstr "Lose"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Dieses Element löschen?"
 
-#: ../../include/profile_selectors.php:42
-msgid "Engaged"
-msgstr "Verlobt"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
+#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../../include/profile_selectors.php:42
-msgid "Married"
-msgstr "Verheiratet"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/contact_widgets.php:125
+msgid "show more"
+msgstr "mehr zeigen"
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily married"
-msgstr "Gewissermaßen verheiratet"
+#: ../../include/js_strings.php:8
+msgid "show fewer"
+msgstr "Zeige weniger"
 
-#: ../../include/profile_selectors.php:42
-msgid "Partners"
-msgstr "Partner"
+#: ../../include/js_strings.php:9
+msgid "Password too short"
+msgstr "Kennwort zu kurz"
 
-#: ../../include/profile_selectors.php:42
-msgid "Cohabiting"
-msgstr "Lebensgemeinschaft"
+#: ../../include/js_strings.php:10
+msgid "Passwords do not match"
+msgstr "Kennwörter stimmen nicht überein"
 
-#: ../../include/profile_selectors.php:42
-msgid "Common law"
-msgstr "Informelle Ehe"
+#: ../../include/js_strings.php:11 ../../mod/photos.php:39
+msgid "everybody"
+msgstr "alle"
 
-#: ../../include/profile_selectors.php:42
-msgid "Happy"
-msgstr "Glücklich"
+#: ../../include/js_strings.php:12
+msgid "Secret Passphrase"
+msgstr "geheime Passwort-Phrase"
 
-#: ../../include/profile_selectors.php:42
-msgid "Not looking"
-msgstr "Nicht Ausschau haltend"
+#: ../../include/js_strings.php:13
+msgid "Passphrase hint"
+msgstr "Hinweis zur Phrase"
 
-#: ../../include/profile_selectors.php:42
-msgid "Swinger"
-msgstr "Swinger"
+#: ../../include/js_strings.php:15
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
 
-#: ../../include/profile_selectors.php:42
-msgid "Betrayed"
-msgstr "Betrogen"
+#: ../../include/js_strings.php:16
+msgid "timeago.suffixAgo"
+msgstr "timeago.suffixAgo"
 
-#: ../../include/profile_selectors.php:42
-msgid "Separated"
-msgstr "Getrennt"
+#: ../../include/js_strings.php:17
+msgid "ago"
+msgstr "her"
 
-#: ../../include/profile_selectors.php:42
-msgid "Unstable"
-msgstr "Labil"
+#: ../../include/js_strings.php:18
+msgid "from now"
+msgstr "von jetzt"
 
-#: ../../include/profile_selectors.php:42
-msgid "Divorced"
-msgstr "Geschieden"
+#: ../../include/js_strings.php:19
+msgid "less than a minute"
+msgstr "weniger als eine Minute"
 
-#: ../../include/profile_selectors.php:42
-msgid "Imaginarily divorced"
-msgstr "Gewissermaßen geschieden"
+#: ../../include/js_strings.php:20
+msgid "about a minute"
+msgstr "ungefähr eine Minute"
 
-#: ../../include/profile_selectors.php:42
-msgid "Widowed"
-msgstr "Verwitwet"
+#: ../../include/js_strings.php:21
+#, php-format
+msgid "%d minutes"
+msgstr "%d Minuten"
 
-#: ../../include/profile_selectors.php:42
-msgid "Uncertain"
-msgstr "Ungewiss"
+#: ../../include/js_strings.php:22
+msgid "about an hour"
+msgstr "ungefähr eine Stunde"
 
-#: ../../include/profile_selectors.php:42
-msgid "It's complicated"
-msgstr "Es ist kompliziert"
+#: ../../include/js_strings.php:23
+#, php-format
+msgid "about %d hours"
+msgstr "ungefähr %d Stunden"
 
-#: ../../include/profile_selectors.php:42
-msgid "Don't care"
-msgstr "Interessiert mich nicht"
+#: ../../include/js_strings.php:24
+msgid "a day"
+msgstr "ein Tag"
 
-#: ../../include/profile_selectors.php:42
-msgid "Ask me"
-msgstr "Frag mich mal"
+#: ../../include/js_strings.php:25
+#, php-format
+msgid "%d days"
+msgstr "%d Tage"
+
+#: ../../include/js_strings.php:26
+msgid "about a month"
+msgstr "ungefähr ein Monat"
+
+#: ../../include/js_strings.php:27
+#, php-format
+msgid "%d months"
+msgstr "%d Monate"
+
+#: ../../include/js_strings.php:28
+msgid "about a year"
+msgstr "ungefähr ein Jahr"
+
+#: ../../include/js_strings.php:29
+#, php-format
+msgid "%d years"
+msgstr "%d Jahre"
+
+#: ../../include/js_strings.php:30
+msgid " "
+msgstr " "
+
+#: ../../include/js_strings.php:31
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
+
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "Kein Empfänger angegeben"
+
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[no subject]"
+
+#: ../../include/message.php:42
+msgid "Unable to determine sender."
+msgstr "Kann Absender nicht bestimmen."
+
+#: ../../include/message.php:143
+msgid "Stored post could not be verified."
+msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+
+#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
+#: ../../mod/photos.php:652 ../../mod/photos.php:674
+msgid "Profile Photos"
+msgstr "Profilfotos"
 
-#: ../../include/attach.php:179 ../../include/attach.php:227
+#: ../../include/attach.php:98 ../../include/attach.php:129
+#: ../../include/attach.php:185 ../../include/attach.php:200
+#: ../../include/attach.php:233 ../../include/attach.php:247
+#: ../../include/attach.php:268 ../../include/attach.php:463
+#: ../../include/attach.php:541 ../../include/chat.php:113
+#: ../../include/photos.php:15 ../../include/items.php:3492
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
+#: ../../mod/chat.php:87 ../../mod/chat.php:92
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
+#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
+#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
+msgid "Permission denied."
+msgstr "Zugang verweigert"
+
+#: ../../include/attach.php:180 ../../include/attach.php:228
 msgid "Item was not found."
 msgstr "Beitrag wurde nicht gefunden."
 
-#: ../../include/attach.php:280
+#: ../../include/attach.php:281
 msgid "No source file."
 msgstr "Keine Quelldatei."
 
-#: ../../include/attach.php:297
+#: ../../include/attach.php:298
 msgid "Cannot locate file to replace"
 msgstr "Kann Datei zum Ersetzen nicht finden"
 
-#: ../../include/attach.php:315
+#: ../../include/attach.php:316
 msgid "Cannot locate file to revise/update"
 msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
 
-#: ../../include/attach.php:326
+#: ../../include/attach.php:327
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Datei überschreitet das Größen-Limit von %d"
 
-#: ../../include/attach.php:338
+#: ../../include/attach.php:339
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht."
 
-#: ../../include/attach.php:422
+#: ../../include/attach.php:423
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
 
-#: ../../include/attach.php:434
+#: ../../include/attach.php:435
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
 
-#: ../../include/attach.php:478 ../../include/attach.php:495
+#: ../../include/attach.php:479 ../../include/attach.php:496
 msgid "Path not available."
 msgstr "Pfad nicht verfügbar."
 
-#: ../../include/attach.php:545
+#: ../../include/attach.php:546
 msgid "Empty pathname"
 msgstr "leere Pfadangabe"
 
-#: ../../include/attach.php:563
+#: ../../include/attach.php:564
 msgid "duplicate filename or path"
 msgstr "doppelter Dateiname oder Pfad"
 
-#: ../../include/attach.php:588
+#: ../../include/attach.php:589
 msgid "Path not found."
 msgstr "Pfad nicht gefunden."
 
-#: ../../include/attach.php:633
+#: ../../include/attach.php:634
 msgid "mkdir failed."
 msgstr "mkdir fehlgeschlagen."
 
-#: ../../include/attach.php:637
+#: ../../include/attach.php:638
 msgid "database storage failed."
 msgstr "Speichern in der Datenbank fehlgeschlagen."
 
-#: ../../include/taxonomy.php:210
-msgid "Tags"
-msgstr "Tags"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
+#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
+#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
+#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
+#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
+#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
+#: ../../include/bbcode.php:626
+msgid "Image/photo"
+msgstr "Bild/Foto"
 
-#: ../../include/taxonomy.php:227
-msgid "Keywords"
-msgstr "Schlüsselbegriffe"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/taxonomy.php:252
-msgid "have"
-msgstr "habe"
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR Code"
 
-#: ../../include/taxonomy.php:252
-msgid "has"
-msgstr "hat"
+#: ../../include/bbcode.php:213
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
-#: ../../include/taxonomy.php:253
-msgid "want"
-msgstr "will"
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "Beitrag"
 
-#: ../../include/taxonomy.php:253
-msgid "wants"
-msgstr "will"
+#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
 
-#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:175
-msgid "like"
-msgstr "Gefällt-mir"
+#: ../../include/bookmarks.php:31
+#, php-format
+msgid "%1$s's bookmarks"
+msgstr "%1$s's Lesezeichen"
 
-#: ../../include/taxonomy.php:254
-msgid "likes"
-msgstr "Gefällt-mir"
+#: ../../include/conversation.php:123
+msgid "channel"
+msgstr "Kanal"
 
-#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:176
-msgid "dislike"
-msgstr "Gefällt-mir-nicht"
+#: ../../include/conversation.php:161 ../../mod/like.php:134
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s"
 
-#: ../../include/taxonomy.php:255
-msgid "dislikes"
-msgstr "Gefällt-mir-nicht"
+#: ../../include/conversation.php:164 ../../mod/like.php:136
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s nicht"
 
-#: ../../include/auth.php:76
-msgid "Logged out."
-msgstr "Ausgeloggt."
+#: ../../include/conversation.php:201
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s ist jetzt mit %2$s verbunden"
 
-#: ../../include/auth.php:188
-msgid "Failed authentication"
-msgstr "Authentifizierung fehlgeschlagen"
+#: ../../include/conversation.php:236
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s stupste %2$s"
 
-#: ../../include/auth.php:203
-msgid "Login failed."
-msgstr "Login fehlgeschlagen."
+#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s ist momentan %2$s"
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse"
+#: ../../include/conversation.php:631 ../../include/ItemObject.php:114
+msgid "Select"
+msgstr "Auswählen"
 
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"
+#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
+#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
+#: ../../mod/admin.php:745 ../../mod/connedit.php:359
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+#: ../../include/conversation.php:642 ../../include/ItemObject.php:161
+msgid "Message is verified"
+msgstr "Nachricht überprüft"
 
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr "Eine Einladung wird benötigt"
+#: ../../include/conversation.php:662
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Schaue Dir %s's Profil auf %s an."
 
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht bestätigt werden"
+#: ../../include/conversation.php:676
+msgid "Categories:"
+msgstr "Kategorien:"
 
-#: ../../include/account.php:119
-msgid "Please enter the required information."
-msgstr "Bitte gib die benötigten Informationen ein."
+#: ../../include/conversation.php:677
+msgid "Filed under:"
+msgstr "Gespeichert unter:"
 
-#: ../../include/account.php:187
-msgid "Failed to store account information."
-msgstr "Speichern der Account-Informationen fehlgeschlagen"
-
-#: ../../include/account.php:273
+#: ../../include/conversation.php:686 ../../include/ItemObject.php:226
 #, php-format
-msgid "Registration request at %s"
-msgstr "Registrierungsanfrage auf %s"
-
-#: ../../include/account.php:275 ../../include/account.php:302
-#: ../../include/account.php:359
-msgid "Administrator"
-msgstr "Administrator"
+msgid " from %s"
+msgstr "von %s"
 
-#: ../../include/account.php:297
-msgid "your registration password"
-msgstr "dein Registrierungspasswort"
+#: ../../include/conversation.php:689 ../../include/ItemObject.php:229
+#, php-format
+msgid "last edited: %s"
+msgstr "zuletzt bearbeitet: %s"
 
-#: ../../include/account.php:300 ../../include/account.php:357
+#: ../../include/conversation.php:690 ../../include/ItemObject.php:230
 #, php-format
-msgid "Registration details for %s"
-msgstr "Registrierungsdetails für %s"
+msgid "Expires: %s"
+msgstr "Verfällt: %s"
 
-#: ../../include/account.php:366
-msgid "Account approved."
-msgstr "Account bestätigt."
+#: ../../include/conversation.php:705
+msgid "View in context"
+msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/account.php:400
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrierung für %s widerrufen"
+#: ../../include/conversation.php:707 ../../include/conversation.php:1120
+#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
+#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
+#: ../../mod/photos.php:971
+msgid "Please wait"
+msgstr "Bitte warten"
 
-#: ../../include/dir_fns.php:15
-msgid "Sort Options"
-msgstr "Sortieroptionen"
+#: ../../include/conversation.php:834
+msgid "remove"
+msgstr "lösche"
 
-#: ../../include/dir_fns.php:16
-msgid "Alphabetic"
-msgstr "alphabetisch"
+#: ../../include/conversation.php:838
+msgid "Loading..."
+msgstr "Lädt ..."
 
-#: ../../include/dir_fns.php:17
-msgid "Reverse Alphabetic"
-msgstr "Entgegengesetzt alphabetisch"
+#: ../../include/conversation.php:839
+msgid "Delete Selected Items"
+msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/dir_fns.php:18
-msgid "Newest to Oldest"
-msgstr "Neueste zuerst"
+#: ../../include/conversation.php:930
+msgid "View Source"
+msgstr "Quelle anzeigen"
 
-#: ../../include/dir_fns.php:30
-msgid "Enable Safe Search"
-msgstr "Sichere Suche einschalten"
+#: ../../include/conversation.php:931
+msgid "Follow Thread"
+msgstr "Unterhaltung folgen"
 
-#: ../../include/dir_fns.php:32
-msgid "Disable Safe Search"
-msgstr "Sichere Suche ausschalten"
+#: ../../include/conversation.php:932
+msgid "View Status"
+msgstr "Status ansehen"
 
-#: ../../include/dir_fns.php:34
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
+#: ../../include/conversation.php:934
+msgid "View Photos"
+msgstr "Fotos ansehen"
 
-#: ../../include/enotify.php:40
-msgid "Red Matrix Notification"
-msgstr "Red Matrix Benachrichtigung"
+#: ../../include/conversation.php:935
+msgid "Matrix Activity"
+msgstr "Matrix Aktivität"
 
-#: ../../include/enotify.php:41
-msgid "redmatrix"
-msgstr "redmatrix"
+#: ../../include/conversation.php:936
+msgid "Edit Contact"
+msgstr "Kontakt bearbeiten"
 
-#: ../../include/enotify.php:43
-msgid "Thank You,"
-msgstr "Danke."
+#: ../../include/conversation.php:937
+msgid "Send PM"
+msgstr "Sende PN"
 
-#: ../../include/enotify.php:45
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrator"
+#: ../../include/conversation.php:938
+msgid "Poke"
+msgstr "Anstupsen"
 
-#: ../../include/enotify.php:80
+#: ../../include/conversation.php:1000
 #, php-format
-msgid "%s "
-msgstr "%s "
+msgid "%s likes this."
+msgstr "%s gefällt das."
 
-#: ../../include/enotify.php:84
+#: ../../include/conversation.php:1000
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red Notify] Neue Mail auf %s empfangen"
+msgid "%s doesn't like this."
+msgstr "%s gefällt das nicht."
 
-#: ../../include/enotify.php:86
+#: ../../include/conversation.php:1004
 #, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
+msgid "%2$d people like this."
+msgid_plural "%2$d people like this."
+msgstr[0] "%2$d Person gefällt das."
+msgstr[1] "%2$d Leuten gefällt das."
 
-#: ../../include/enotify.php:87
+#: ../../include/conversation.php:1006
 #, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s hat dir %2$s geschickt."
+msgid "%2$d people don't like this."
+msgid_plural "%2$d people don't like this."
+msgstr[0] "%2$d Person gefällt das nicht."
+msgstr[1] "%2$d Leuten gefällt das nicht."
 
-#: ../../include/enotify.php:87
-msgid "a private message"
-msgstr "eine private Nachricht"
+#: ../../include/conversation.php:1012
+msgid "and"
+msgstr "und"
 
-#: ../../include/enotify.php:88
+#: ../../include/conversation.php:1015
 #, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ", und %d andere"
 
-#: ../../include/enotify.php:142
+#: ../../include/conversation.php:1016
 #, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]a %4$s[/zrl] kommentiert"
+msgid "%s like this."
+msgstr "%s gefällt das."
 
-#: ../../include/enotify.php:150
+#: ../../include/conversation.php:1016
 #, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
+msgid "%s don't like this."
+msgstr "%s gefällt das nicht."
 
-#: ../../include/enotify.php:159
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
+#: ../../include/conversation.php:1066
+msgid "Visible to everybody"
+msgstr "Sichtbar für jeden"
 
-#: ../../include/enotify.php:170
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
+#: ../../mod/mail.php:269
+msgid "Please enter a link URL:"
+msgstr "Gib eine URL ein:"
 
-#: ../../include/enotify.php:171
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
+#: ../../include/conversation.php:1068
+msgid "Please enter a video link/URL:"
+msgstr "Gib einen Video-Link/URL ein:"
 
-#: ../../include/enotify.php:174 ../../include/enotify.php:189
-#: ../../include/enotify.php:215 ../../include/enotify.php:234
-#: ../../include/enotify.php:248
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
+#: ../../include/conversation.php:1069
+msgid "Please enter an audio link/URL:"
+msgstr "Gib einen Audio-Link/URL ein:"
 
-#: ../../include/enotify.php:180
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
+#: ../../include/conversation.php:1070
+msgid "Tag term:"
+msgstr "Schlagwort:"
 
-#: ../../include/enotify.php:182
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
+msgid "Save to Folder:"
+msgstr "Speichern in Ordner:"
 
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
+#: ../../include/conversation.php:1072
+msgid "Where are you right now?"
+msgstr "Wo bist du jetzt grade?"
 
-#: ../../include/enotify.php:208
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red Notify] %s hat dich getaggt"
+#: ../../include/conversation.php:1073 ../../mod/editpost.php:52
+#: ../../mod/mail.php:172 ../../mod/mail.php:270
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../include/enotify.php:209
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
+#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+msgid "Preview"
+msgstr "Vorschau"
 
-#: ../../include/enotify.php:210
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
+#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+msgid "Share"
+msgstr "Teilen"
 
-#: ../../include/enotify.php:223
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red Notify] %1$s hat dich angestupst"
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
+msgid "Page link title"
+msgstr "Seitentitel-Link"
 
-#: ../../include/enotify.php:224
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:104
+#: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:145 ../../mod/editblock.php:121
+msgid "Upload photo"
+msgstr "Foto hochladen"
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
+#: ../../include/conversation.php:1102
+msgid "upload photo"
+msgstr "Foto hochladen"
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Hinweis] %s hat Dich getaggt"
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:105
+#: ../../mod/mail.php:220 ../../mod/mail.php:333 ../../mod/editlayout.php:108
+#: ../../mod/editwebpage.php:146 ../../mod/editblock.php:122
+msgid "Attach file"
+msgstr "Datei anhängen"
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
-
-#: ../../include/enotify.php:243
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
+#: ../../include/conversation.php:1104
+msgid "attach file"
+msgstr "Datei anfügen"
 
-#: ../../include/enotify.php:255
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Notify] Vorstellung erhalten"
+#: ../../include/conversation.php:1105 ../../mod/editpost.php:106
+#: ../../mod/mail.php:221 ../../mod/mail.php:334 ../../mod/editlayout.php:109
+#: ../../mod/editwebpage.php:147 ../../mod/editblock.php:123
+msgid "Insert web link"
+msgstr "Link einfügen"
 
-#: ../../include/enotify.php:256
-#, php-format
-msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
-msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
+#: ../../include/conversation.php:1106
+msgid "web link"
+msgstr "Web-Link"
 
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
-msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
+#: ../../include/conversation.php:1107
+msgid "Insert video link"
+msgstr "Video-Link einfügen"
 
-#: ../../include/enotify.php:261 ../../include/enotify.php:280
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Du kannst Dir das Profil unter %s ansehen"
+#: ../../include/conversation.php:1108
+msgid "video link"
+msgstr "Video-Link"
 
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Bitte besuche %s um sie anzunehmen oder abzulehnen."
+#: ../../include/conversation.php:1109
+msgid "Insert audio link"
+msgstr "Audio-Link einfügen"
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
+#: ../../include/conversation.php:1110
+msgid "audio link"
+msgstr "Audio-Link"
 
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:110
+#: ../../mod/editlayout.php:113 ../../mod/editwebpage.php:151
+#: ../../mod/editblock.php:127
+msgid "Set your location"
+msgstr "Standort"
 
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
+#: ../../include/conversation.php:1112
+msgid "set location"
+msgstr "Standort"
 
-#: ../../include/enotify.php:278
-msgid "Name:"
-msgstr "Name:"
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:111
+#: ../../mod/editlayout.php:114 ../../mod/editwebpage.php:152
+#: ../../mod/editblock.php:128
+msgid "Clear browser location"
+msgstr "Browser-Standort löschen"
 
-#: ../../include/enotify.php:279
-msgid "Photo:"
-msgstr "Foto:"
+#: ../../include/conversation.php:1114
+msgid "clear location"
+msgstr "Standort löschen"
 
-#: ../../include/enotify.php:282
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
+#: ../../include/conversation.php:1116 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:127 ../../mod/editwebpage.php:169
+#: ../../mod/editblock.php:142
+msgid "Set title"
+msgstr "Titel"
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
-msgstr "Kategorien"
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:126
+#: ../../mod/editlayout.php:130 ../../mod/editwebpage.php:171
+#: ../../mod/editblock.php:145
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
+#: ../../include/conversation.php:1121 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:116 ../../mod/editwebpage.php:154
+#: ../../mod/editblock.php:130
+msgid "Permission settings"
+msgstr "Berechtigungs-Einstellungen"
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:236
-msgid "Suggestions"
-msgstr "Vorschläge"
+#: ../../include/conversation.php:1122
+msgid "permissions"
+msgstr "Berechtigungen"
 
-#: ../../include/widgets.php:124
-msgid "See more..."
-msgstr "Mehr anzeigen..."
+#: ../../include/conversation.php:1130 ../../mod/editpost.php:121
+#: ../../mod/editlayout.php:124 ../../mod/editwebpage.php:164
+#: ../../mod/editblock.php:139
+msgid "Public post"
+msgstr "Öffentlicher Beitrag"
 
-#: ../../include/widgets.php:146
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."
+#: ../../include/conversation.php:1132 ../../mod/editpost.php:127
+#: ../../mod/editlayout.php:131 ../../mod/editwebpage.php:172
+#: ../../mod/editblock.php:146
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Beispiel: bob@example.com, mary@example.com"
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:138
+#: ../../mod/mail.php:226 ../../mod/mail.php:339 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:156
+msgid "Set expiration date"
+msgstr "Verfallsdatum"
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
-msgstr "Adresse des Kanals eingeben"
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
+msgid "Encrypt text"
+msgstr "Text verschlüsseln"
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
+msgid "OK"
+msgstr "OK"
 
-#: ../../include/widgets.php:171
-msgid "Notes"
-msgstr "Notizen"
+#: ../../include/conversation.php:1150 ../../mod/settings.php:514
+#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: ../../include/widgets.php:173 ../../include/text.php:738
-#: ../../include/text.php:752 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Speichern"
+#: ../../include/conversation.php:1381
+msgid "Commented Order"
+msgstr "Neueste Kommentare"
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
-msgstr "Eintrag löschen"
+#: ../../include/conversation.php:1384
+msgid "Sort by Comment Date"
+msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
-msgstr "Alles"
+#: ../../include/conversation.php:1387
+msgid "Posted Order"
+msgstr "Neueste Beiträge"
 
-#: ../../include/widgets.php:318 ../../include/items.php:3575
-msgid "Archives"
-msgstr "Archive"
+#: ../../include/conversation.php:1390
+msgid "Sort by Post Date"
+msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/widgets.php:370
-msgid "Refresh"
-msgstr "Aktualisieren"
+#: ../../include/conversation.php:1394
+msgid "Personal"
+msgstr "Persönlich"
 
-#: ../../include/widgets.php:371 ../../mod/connedit.php:386
-msgid "Me"
-msgstr "Ich"
+#: ../../include/conversation.php:1397
+msgid "Posts that mention or involve you"
+msgstr "Beiträge mit Beteiligung deinerseits"
 
-#: ../../include/widgets.php:372 ../../mod/connedit.php:388
-msgid "Best Friends"
-msgstr "Beste Freunde"
+#: ../../include/conversation.php:1400 ../../mod/menu.php:61
+#: ../../mod/connections.php:211
+msgid "New"
+msgstr "Neu"
 
-#: ../../include/widgets.php:374
-msgid "Co-workers"
-msgstr "Kollegen"
+#: ../../include/conversation.php:1403
+msgid "Activity Stream - by date"
+msgstr "Activity Stream - nach Datum sortiert"
 
-#: ../../include/widgets.php:375 ../../mod/connedit.php:390
-msgid "Former Friends"
-msgstr "ehem. Freunde"
+#: ../../include/conversation.php:1410
+msgid "Starred"
+msgstr "Markiert"
 
-#: ../../include/widgets.php:376 ../../mod/connedit.php:391
-msgid "Acquaintances"
-msgstr "Bekanntschaften"
+#: ../../include/conversation.php:1413
+msgid "Favourite Posts"
+msgstr "Beiträge mit Sternchen"
 
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr "Jeder"
+#: ../../include/conversation.php:1420
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../include/widgets.php:409
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
+#: ../../include/conversation.php:1423
+msgid "Posts flagged as SPAM"
+msgstr "Nachrichten die als SPAM markiert wurden"
 
-#: ../../include/widgets.php:415
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
+#: ../../include/conversation.php:1454
+msgid "Channel"
+msgstr "Kanal"
 
-#: ../../include/widgets.php:421
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
+#: ../../include/conversation.php:1457
+msgid "Status Messages and Posts"
+msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/widgets.php:427
-msgid "Feature settings"
-msgstr "Funktions-Einstellungen"
+#: ../../include/conversation.php:1466
+msgid "About"
+msgstr "Über"
 
-#: ../../include/widgets.php:433
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../include/conversation.php:1469
+msgid "Profile Details"
+msgstr "Profil-Details"
 
-#: ../../include/widgets.php:439
-msgid "Connected apps"
-msgstr "Verbundene Apps"
+#: ../../include/conversation.php:1478 ../../include/photos.php:302
+msgid "Photo Albums"
+msgstr "Fotoalben"
 
-#: ../../include/widgets.php:445
-msgid "Export channel"
-msgstr "Kanal exportieren"
+#: ../../include/conversation.php:1487
+msgid "Files and Storage"
+msgstr "Dateien und Speicher"
 
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
-msgstr "Automatische Berechtigungen (Erweitert)"
+#: ../../include/conversation.php:1496 ../../include/conversation.php:1499
+msgid "Chatrooms"
+msgstr "Chat-Räume"
 
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
-msgstr "Prämium-Kanal Einstellungen"
+#: ../../include/conversation.php:1509
+msgid "Events and Calendar"
+msgstr "Veranstaltungen und Kalender"
 
-#: ../../include/widgets.php:504
-msgid "Check Mail"
-msgstr "E-Mails abrufen"
+#: ../../include/conversation.php:1517
+msgid "Saved Bookmarks"
+msgstr "Gespeicherte Lesezeichen"
 
-#: ../../include/widgets.php:585
-msgid "Chat Rooms"
-msgstr "Chaträume"
+#: ../../include/conversation.php:1528
+msgid "Manage Webpages"
+msgstr "Webseiten verwalten"
 
-#: ../../include/api.php:974
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
+#: ../../include/identity.php:29 ../../mod/item.php:1161
+msgid "Unable to obtain identity information from database"
+msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d Einladung verfügbar"
-msgstr[1] "%d Einladungen verfügbar"
+#: ../../include/identity.php:62
+msgid "Empty name"
+msgstr "Namensfeld leer"
 
-#: ../../include/contact_widgets.php:20
-msgid "Find Channels"
-msgstr "Finde Kanäle"
+#: ../../include/identity.php:64
+msgid "Name too long"
+msgstr "Name ist zu lang"
 
-#: ../../include/contact_widgets.php:21
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
+#: ../../include/identity.php:143
+msgid "No account identifier"
+msgstr "Keine Account-Kennung"
 
-#: ../../include/contact_widgets.php:22
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
+#: ../../include/identity.php:153
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
 
-#: ../../include/contact_widgets.php:23
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
+#: ../../include/identity.php:167
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:355
-msgid "Find"
-msgstr "Finde"
+#: ../../include/identity.php:226
+msgid "Unable to retrieve created identity"
+msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
-msgid "Channel Suggestions"
-msgstr "Kanal-Vorschläge"
+#: ../../include/identity.php:285
+msgid "Default Profile"
+msgstr "Standard-Profil"
 
-#: ../../include/contact_widgets.php:27
-msgid "Random Profile"
-msgstr "Zufallsprofil"
+#: ../../include/identity.php:477
+msgid "Requested channel is not available."
+msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../include/contact_widgets.php:28
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
+#: ../../include/identity.php:489
+msgid " Sorry, you don't have the permission to view this profile. "
+msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
 
-#: ../../include/contact_widgets.php:120
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeinsame Verbindung"
-msgstr[1] "%d gemeinsame Verbindungen"
+#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../mod/connect.php:13 ../../mod/layouts.php:8
+#: ../../mod/achievements.php:8 ../../mod/blocks.php:10
+#: ../../mod/profile.php:16 ../../mod/filestorage.php:40
+msgid "Requested profile is not available."
+msgstr "Erwünschte Profil ist nicht verfügbar."
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Neue Seite"
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
+msgid "Change profile photo"
+msgstr "Ändere das Profilfoto"
 
-#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
-#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:170
-#: ../../mod/settings.php:571 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:103 ../../mod/blocks.php:93
-#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
-msgid "Edit"
-msgstr "Bearbeiten"
+#: ../../include/identity.php:648
+msgid "Profiles"
+msgstr "Profile"
 
-#: ../../include/plugin.php:475 ../../include/plugin.php:477
-msgid "Click here to upgrade."
-msgstr "Klicke hier, um das Upgrade durchzuführen."
+#: ../../include/identity.php:648
+msgid "Manage/edit profiles"
+msgstr "Verwalte/Bearbeite Profile"
 
-#: ../../include/plugin.php:483
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
+msgid "Create New Profile"
+msgstr "Neues Profil erstellen"
 
-#: ../../include/plugin.php:488
-msgid "This action is not available under your subscription plan."
-msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+#: ../../include/identity.php:652
+msgid "Edit Profile"
+msgstr "Profile bearbeiten"
 
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
-msgstr "Der Kanal ist auf dieser Seite blockiert "
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
+msgid "Profile Image"
+msgstr "Profilfoto:"
 
-#: ../../include/follow.php:26
-msgid "Channel location missing."
-msgstr "Adresse des Kanals fehlt."
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
+msgid "visible to everybody"
+msgstr "sichtbar für jeden"
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein."
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
+msgid "Edit visibility"
+msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
-msgstr "Antwort des entfernten Kanals war unverständlich."
+#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../mod/directory.php:158
+msgid "Gender:"
+msgstr "Geschlecht:"
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
-msgstr "Antwort des entfernten Kanals war unvollständig."
+#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../mod/directory.php:160
+msgid "Status:"
+msgstr "Status:"
 
-#: ../../include/follow.php:129
-msgid "local account not found."
-msgstr "Lokales Konto nicht gefunden."
+#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../mod/directory.php:162
+msgid "Homepage:"
+msgstr "Homepage:"
 
-#: ../../include/follow.php:138
-msgid "Cannot connect to yourself."
-msgstr "Du kannst dich nicht mit dir selbst verbinden."
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
+msgstr "gerade online"
 
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
-msgstr "Kann meinen öffentlichen Stream und Beiträge sehen"
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:262
+msgid "g A l F d"
+msgstr "l, d. F G \\\\U\\\\h\\\\r"
 
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
-msgstr "Kann meinen öffentliches Kanal-Profil sehen"
+#: ../../include/identity.php:753 ../../include/identity.php:833
+msgid "F d"
+msgstr "d. F"
 
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
-msgstr "Kann meine öffentlichen Fotoalben sehen"
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:284
+msgid "[today]"
+msgstr "[Heute]"
 
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
-msgstr "Kann mein öffentliches Adressbuch sehen"
+#: ../../include/identity.php:810
+msgid "Birthday Reminders"
+msgstr "Geburtstags Erinnerungen"
 
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
-msgstr "Kann meinen öffentlichen Dateiordner sehen"
+#: ../../include/identity.php:811
+msgid "Birthdays this week:"
+msgstr "Geburtstage in dieser Woche:"
 
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
-msgstr "Kann meine öffentlichen Seiten sehen"
+#: ../../include/identity.php:866
+msgid "[No description]"
+msgstr "[Keine Beschreibung]"
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
-msgstr "Können mir den Stream und die Beiträge aus ihrem Kanal schicken"
+#: ../../include/identity.php:884
+msgid "Event Reminders"
+msgstr "Veranstaltungs- Erinnerungen"
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+#: ../../include/identity.php:885
+msgid "Events this week:"
+msgstr "Veranstaltungen in dieser Woche:"
 
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
-msgstr "Kann meine Beiträge kommentieren"
+#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../mod/profperm.php:107
+msgid "Profile"
+msgstr "Profil"
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
-msgstr "Kann mir private Nachrichten schicken"
+#: ../../include/identity.php:906 ../../mod/settings.php:920
+msgid "Full Name:"
+msgstr "Voller Name:"
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
-msgstr "Kann Fotos in meinen Fotoalben veröffentlichen"
+#: ../../include/identity.php:913
+msgid "j F, Y"
+msgstr "j F, Y"
 
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+#: ../../include/identity.php:914
+msgid "j F"
+msgstr "j F"
 
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+#: ../../include/identity.php:921
+msgid "Birthday:"
+msgstr "Geburtstag:"
 
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
+#: ../../include/identity.php:925
+msgid "Age:"
+msgstr "Alter:"
 
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
-msgstr "Benötigt ein kompatibles Chat-Plugin"
+#: ../../include/identity.php:934
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "für %1$d %2$s"
 
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
-msgstr "Kann in meinen öffentlichen Dateiordner schreiben"
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
+msgid "Sexual Preference:"
+msgstr "Sexuelle Orientierung:"
 
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
-msgstr "Kann meine öffentlichen Seiten bearbeiten"
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
+msgid "Hometown:"
+msgstr "Heimatstadt:"
 
-#: ../../include/permissions.php:31
-msgid "Can source my \"public\" posts in derived channels"
-msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden"
+#: ../../include/identity.php:943
+msgid "Tags:"
+msgstr "Schlagworte:"
 
-#: ../../include/permissions.php:31
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften."
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
 
-#: ../../include/permissions.php:32
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
+#: ../../include/identity.php:947
+msgid "Religion:"
+msgstr "Religion:"
 
-#: ../../include/permissions.php:32
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
+#: ../../include/identity.php:949 ../../mod/directory.php:164
+msgid "About:"
+msgstr "Über:"
 
-#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62
-#: ../../view/theme/apw/php/config.php:176
-msgid "Default"
-msgstr "Standard"
+#: ../../include/identity.php:951
+msgid "Hobbies/Interests:"
+msgstr "Hobbys/Interessen:"
 
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:346
-msgid "Permission denied"
-msgstr "Keine Berechtigung"
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
+msgid "Likes:"
+msgstr "Gefällt-mir:"
 
-#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:151
-#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
-#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
-msgid "Item not found."
-msgstr "Element nicht gefunden."
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
+msgid "Dislikes:"
+msgstr "Gefällt-mir-nicht:"
 
-#: ../../include/items.php:3748 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
-msgstr "Sammlung nicht gefunden"
+#: ../../include/identity.php:958
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/items.php:3763
-msgid "Collection is empty."
-msgstr "Sammlung ist leer."
+#: ../../include/identity.php:960
+msgid "My other channels:"
+msgstr "Meine anderen Kanäle:"
 
-#: ../../include/items.php:3770
-#, php-format
-msgid "Collection: %s"
-msgstr "Sammlung: %s"
+#: ../../include/identity.php:962
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
 
-#: ../../include/items.php:3781
-#, php-format
-msgid "Connection: %s"
-msgstr "Verbindung: %s"
+#: ../../include/identity.php:964
+msgid "Books, literature:"
+msgstr "Bücher, Literatur:"
 
-#: ../../include/items.php:3784
-msgid "Connection not found."
-msgstr "Die Verbindung wurde nicht gefunden."
+#: ../../include/identity.php:966
+msgid "Television:"
+msgstr "Fernsehen:"
 
-#: ../../include/security.php:280
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+#: ../../include/identity.php:968
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/text.php:315
-msgid "prev"
-msgstr "vorherige"
+#: ../../include/identity.php:970
+msgid "Love/Romance:"
+msgstr "Liebe/Romantik:"
 
-#: ../../include/text.php:317
-msgid "first"
-msgstr "erste"
+#: ../../include/identity.php:972
+msgid "Work/employment:"
+msgstr "Arbeit/Anstellung:"
 
-#: ../../include/text.php:346
-msgid "last"
-msgstr "letzte"
+#: ../../include/identity.php:974
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
 
-#: ../../include/text.php:349
-msgid "next"
-msgstr "nächste"
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+msgid "Private Message"
+msgstr "Private Nachricht"
 
-#: ../../include/text.php:361
-msgid "older"
-msgstr "älter"
+#: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
+#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/settings.php:575 ../../mod/editpost.php:103
+#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
+#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: ../../include/text.php:363
-msgid "newer"
-msgstr "neuer"
+#: ../../include/ItemObject.php:118
+msgid "save to folder"
+msgstr "In Ordner speichern"
 
-#: ../../include/text.php:654
-msgid "No connections"
-msgstr "Keine Verbindungen"
+#: ../../include/ItemObject.php:146
+msgid "add star"
+msgstr "markieren"
+
+#: ../../include/ItemObject.php:147
+msgid "remove star"
+msgstr "Markierung entfernen"
+
+#: ../../include/ItemObject.php:148
+msgid "toggle star status"
+msgstr "Stern-Status umschalten"
+
+#: ../../include/ItemObject.php:152
+msgid "starred"
+msgstr "markiert"
+
+#: ../../include/ItemObject.php:169
+msgid "add tag"
+msgstr "Schlagwort hinzufügen"
+
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+msgid "I like this (toggle)"
+msgstr "Ich mag das (Umschalter)"
+
+#: ../../include/ItemObject.php:184 ../../include/taxonomy.php:254
+msgid "like"
+msgstr "Gefällt-mir"
+
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+msgid "I don't like this (toggle)"
+msgstr "Ich mag das nicht (Umschalter)"
+
+#: ../../include/ItemObject.php:185 ../../include/taxonomy.php:255
+msgid "dislike"
+msgstr "Gefällt-mir-nicht"
 
-#: ../../include/text.php:665
+#: ../../include/ItemObject.php:187
+msgid "Share this"
+msgstr "Teile dies"
+
+#: ../../include/ItemObject.php:187
+msgid "share"
+msgstr "Teilen"
+
+#: ../../include/ItemObject.php:211 ../../include/ItemObject.php:212
 #, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Verbindung"
-msgstr[1] "%d Verbindungen"
+msgid "View %s's profile - %s"
+msgstr "Schaue dir %s's Profil an - %s"
 
-#: ../../include/text.php:677
-msgid "View Connections"
-msgstr "Zeige Verbindungen"
+#: ../../include/ItemObject.php:213
+msgid "to"
+msgstr "zu"
 
-#: ../../include/text.php:818
-msgid "poke"
-msgstr "anstupsen"
+#: ../../include/ItemObject.php:214
+msgid "via"
+msgstr "via"
 
-#: ../../include/text.php:818 ../../include/conversation.php:240
-msgid "poked"
-msgstr "stupste"
+#: ../../include/ItemObject.php:215
+msgid "Wall-to-Wall"
+msgstr "Wall-to-Wall"
+
+#: ../../include/ItemObject.php:216
+msgid "via Wall-To-Wall:"
+msgstr "via Wall-To-Wall:"
+
+#: ../../include/ItemObject.php:249
+msgid "Bookmark Links"
+msgstr "Setze Lesezeichen für die Verweise"
+
+#: ../../include/ItemObject.php:279
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d Kommentar"
+msgstr[1] "%d Kommentare"
+
+#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
+#: ../../mod/photos.php:1074
+msgid "This is you"
+msgstr "Das bist du"
+
+#: ../../include/ItemObject.php:547 ../../mod/events.php:469
+#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
+#: ../../mod/settings.php:513 ../../mod/settings.php:625
+#: ../../mod/settings.php:653 ../../mod/settings.php:677
+#: ../../mod/settings.php:748 ../../mod/settings.php:912
+#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
+#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
+#: ../../mod/connedit.php:437 ../../mod/profiles.php:506
+#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
+#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
+#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
+#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/apw/php/config.php:231
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/blogga/php/config.php:67
+msgid "Submit"
+msgstr "Bestätigen"
+
+#: ../../include/ItemObject.php:548
+msgid "Bold"
+msgstr "Fett"
+
+#: ../../include/ItemObject.php:549
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../../include/ItemObject.php:550
+msgid "Underline"
+msgstr "Unterstrichen"
+
+#: ../../include/ItemObject.php:551
+msgid "Quote"
+msgstr "Zitat"
+
+#: ../../include/ItemObject.php:552
+msgid "Code"
+msgstr "Code"
+
+#: ../../include/ItemObject.php:553
+msgid "Image"
+msgstr "Bild"
+
+#: ../../include/ItemObject.php:554
+msgid "Link"
+msgstr "Link"
+
+#: ../../include/ItemObject.php:555
+msgid "Video"
+msgstr "Video"
+
+#: ../../include/api.php:974
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
 
-#: ../../include/text.php:819
-msgid "ping"
-msgstr "anpingen"
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
 
-#: ../../include/text.php:819
-msgid "pinged"
-msgstr "pingte"
+#: ../../include/notify.php:23
+msgid "created a new post"
+msgstr "Neuer Beitrag wurde erzeugt"
 
-#: ../../include/text.php:820
-msgid "prod"
-msgstr "knuffen"
+#: ../../include/notify.php:24
+#, php-format
+msgid "commented on %s's post"
+msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../include/text.php:820
-msgid "prodded"
-msgstr "knuffte"
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Männlich"
 
-#: ../../include/text.php:821
-msgid "slap"
-msgstr "ohrfeigen"
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Weiblich"
 
-#: ../../include/text.php:821
-msgid "slapped"
-msgstr "ohrfeigte"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Momentan männlich"
 
-#: ../../include/text.php:822
-msgid "finger"
-msgstr "befummeln"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Momentan weiblich"
 
-#: ../../include/text.php:822
-msgid "fingered"
-msgstr "befummelte"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Größtenteils männlich"
 
-#: ../../include/text.php:823
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Größtenteils weiblich"
 
-#: ../../include/text.php:823
-msgid "rebuffed"
-msgstr "abfuhrerteilte"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transsexuell"
 
-#: ../../include/text.php:835
-msgid "happy"
-msgstr "glücklich"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Zwischengeschlechtlich"
 
-#: ../../include/text.php:836
-msgid "sad"
-msgstr "traurig"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transsexuell"
 
-#: ../../include/text.php:837
-msgid "mellow"
-msgstr "sanft"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Zwitter"
 
-#: ../../include/text.php:838
-msgid "tired"
-msgstr "müde"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Geschlechtslos"
 
-#: ../../include/text.php:839
-msgid "perky"
-msgstr "frech"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "unklar"
 
-#: ../../include/text.php:840
-msgid "angry"
-msgstr "sauer"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Anders"
 
-#: ../../include/text.php:841
-msgid "stupified"
-msgstr "verblüfft"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Unentschieden"
 
-#: ../../include/text.php:842
-msgid "puzzled"
-msgstr "verwirrt"
+#: ../../include/profile_selectors.php:23
+msgid "Males"
+msgstr "Männer"
 
-#: ../../include/text.php:843
-msgid "interested"
-msgstr "interessiert"
+#: ../../include/profile_selectors.php:23
+msgid "Females"
+msgstr "Frauen"
 
-#: ../../include/text.php:844
-msgid "bitter"
-msgstr "verbittert"
+#: ../../include/profile_selectors.php:23
+msgid "Gay"
+msgstr "Schwul"
 
-#: ../../include/text.php:845
-msgid "cheerful"
-msgstr "fröhlich"
+#: ../../include/profile_selectors.php:23
+msgid "Lesbian"
+msgstr "Lesbisch"
 
-#: ../../include/text.php:846
-msgid "alive"
-msgstr "lebendig"
+#: ../../include/profile_selectors.php:23
+msgid "No Preference"
+msgstr "Keine Bevorzugung"
 
-#: ../../include/text.php:847
-msgid "annoyed"
-msgstr "verärgert"
+#: ../../include/profile_selectors.php:23
+msgid "Bisexual"
+msgstr "Bisexuell"
 
-#: ../../include/text.php:848
-msgid "anxious"
-msgstr "unruhig"
+#: ../../include/profile_selectors.php:23
+msgid "Autosexual"
+msgstr "Autosexuell"
 
-#: ../../include/text.php:849
-msgid "cranky"
-msgstr "schrullig"
+#: ../../include/profile_selectors.php:23
+msgid "Abstinent"
+msgstr "Enthaltsam"
 
-#: ../../include/text.php:850
-msgid "disturbed"
-msgstr "verstört"
+#: ../../include/profile_selectors.php:23
+msgid "Virgin"
+msgstr "Jungfräulich"
 
-#: ../../include/text.php:851
-msgid "frustrated"
-msgstr "frustriert"
+#: ../../include/profile_selectors.php:23
+msgid "Deviant"
+msgstr "Abweichend"
 
-#: ../../include/text.php:852
-msgid "motivated"
-msgstr "motiviert"
+#: ../../include/profile_selectors.php:23
+msgid "Fetish"
+msgstr "Fetisch"
 
-#: ../../include/text.php:853
-msgid "relaxed"
-msgstr "entspannt"
+#: ../../include/profile_selectors.php:23
+msgid "Oodles"
+msgstr "Unmengen"
 
-#: ../../include/text.php:854
-msgid "surprised"
-msgstr "überrascht"
+#: ../../include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr "Sexlos"
 
-#: ../../include/text.php:1017
-msgid "Monday"
-msgstr "Montag"
+#: ../../include/profile_selectors.php:42
+msgid "Single"
+msgstr "Single"
 
-#: ../../include/text.php:1017
-msgid "Tuesday"
-msgstr "Dienstag"
+#: ../../include/profile_selectors.php:42
+msgid "Lonely"
+msgstr "Einsam"
 
-#: ../../include/text.php:1017
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: ../../include/profile_selectors.php:42
+msgid "Available"
+msgstr "Verfügbar"
 
-#: ../../include/text.php:1017
-msgid "Thursday"
-msgstr "Donnerstag"
+#: ../../include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
 
-#: ../../include/text.php:1017
-msgid "Friday"
-msgstr "Freitag"
+#: ../../include/profile_selectors.php:42
+msgid "Has crush"
+msgstr "Verguckt"
 
-#: ../../include/text.php:1017
-msgid "Saturday"
-msgstr "Samstag"
+#: ../../include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr "Verknallt"
 
-#: ../../include/text.php:1017
-msgid "Sunday"
-msgstr "Sonntag"
+#: ../../include/profile_selectors.php:42
+msgid "Dating"
+msgstr "Lerne gerade jemanden kennen"
 
-#: ../../include/text.php:1021
-msgid "January"
-msgstr "Januar"
+#: ../../include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr "Treulos"
 
-#: ../../include/text.php:1021
-msgid "February"
-msgstr "Februar"
+#: ../../include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr "Sexabhängig"
 
-#: ../../include/text.php:1021
-msgid "March"
-msgstr "März"
+#: ../../include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr "Freunde/Begünstigte"
 
-#: ../../include/text.php:1021
-msgid "April"
-msgstr "April"
+#: ../../include/profile_selectors.php:42
+msgid "Casual"
+msgstr "Lose"
 
-#: ../../include/text.php:1021
-msgid "May"
-msgstr "Mai"
+#: ../../include/profile_selectors.php:42
+msgid "Engaged"
+msgstr "Verlobt"
 
-#: ../../include/text.php:1021
-msgid "June"
-msgstr "Juni"
+#: ../../include/profile_selectors.php:42
+msgid "Married"
+msgstr "Verheiratet"
 
-#: ../../include/text.php:1021
-msgid "July"
-msgstr "Juli"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr "Gewissermaßen verheiratet"
 
-#: ../../include/text.php:1021
-msgid "August"
-msgstr "August"
+#: ../../include/profile_selectors.php:42
+msgid "Partners"
+msgstr "Partner"
 
-#: ../../include/text.php:1021
-msgid "September"
-msgstr "September"
+#: ../../include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr "Lebensgemeinschaft"
 
-#: ../../include/text.php:1021
-msgid "October"
-msgstr "Oktober"
+#: ../../include/profile_selectors.php:42
+msgid "Common law"
+msgstr "Informelle Ehe"
 
-#: ../../include/text.php:1021
-msgid "November"
-msgstr "November"
+#: ../../include/profile_selectors.php:42
+msgid "Happy"
+msgstr "Glücklich"
 
-#: ../../include/text.php:1021
-msgid "December"
-msgstr "Dezember"
+#: ../../include/profile_selectors.php:42
+msgid "Not looking"
+msgstr "Nicht Ausschau haltend"
 
-#: ../../include/text.php:1099
-msgid "unknown.???"
-msgstr "unbekannt.???"
+#: ../../include/profile_selectors.php:42
+msgid "Swinger"
+msgstr "Swinger"
 
-#: ../../include/text.php:1100
-msgid "bytes"
-msgstr "Bytes"
+#: ../../include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr "Betrogen"
 
-#: ../../include/text.php:1135
-msgid "remove category"
-msgstr "Kategorie entfernen"
+#: ../../include/profile_selectors.php:42
+msgid "Separated"
+msgstr "Getrennt"
 
-#: ../../include/text.php:1157
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
+#: ../../include/profile_selectors.php:42
+msgid "Unstable"
+msgstr "Labil"
 
-#: ../../include/text.php:1215 ../../include/text.php:1227
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
+#: ../../include/profile_selectors.php:42
+msgid "Divorced"
+msgstr "Geschieden"
 
-#: ../../include/text.php:1403 ../../mod/events.php:332
-msgid "link to source"
-msgstr "Link zum Originalbeitrag"
+#: ../../include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr "Gewissermaßen geschieden"
 
-#: ../../include/text.php:1422
-msgid "Select a page layout: "
-msgstr "Ein Seiten-Layout auswählen"
+#: ../../include/profile_selectors.php:42
+msgid "Widowed"
+msgstr "Verwitwet"
 
-#: ../../include/text.php:1425 ../../include/text.php:1490
-msgid "default"
-msgstr "Standard"
+#: ../../include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr "Ungewiss"
 
-#: ../../include/text.php:1461
-msgid "Page content type: "
-msgstr "Content-Typ der Seite"
+#: ../../include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr "Es ist kompliziert"
 
-#: ../../include/text.php:1502
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
+#: ../../include/profile_selectors.php:42
+msgid "Don't care"
+msgstr "Interessiert mich nicht"
 
-#: ../../include/text.php:1654 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
-msgstr "Foto"
+#: ../../include/profile_selectors.php:42
+msgid "Ask me"
+msgstr "Frag mich mal"
 
-#: ../../include/text.php:1657 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr "Ereignis"
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr "Der Chatraum hat keinen Namen"
 
-#: ../../include/text.php:1660 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
-msgstr "Status"
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr "Name des Chatraums bereits vergeben"
 
-#: ../../include/text.php:1662 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr "Kommentar"
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr "Ungültiger Raumbezeichner."
 
-#: ../../include/text.php:1667
-msgid "activity"
-msgstr "Aktivität"
+#: ../../include/chat.php:102
+msgid "Room not found."
+msgstr "Chatraum konnte nicht gefunden werden."
 
-#: ../../include/text.php:1929
-msgid "Design"
-msgstr "Design"
+#: ../../include/chat.php:123
+msgid "Room is full"
+msgstr "Der Raum ist voll"
 
-#: ../../include/text.php:1931
-msgid "Blocks"
-msgstr "Blöcke"
+#: ../../include/taxonomy.php:210
+msgid "Tags"
+msgstr "Tags"
 
-#: ../../include/text.php:1932
-msgid "Menus"
-msgstr "Menüs"
+#: ../../include/taxonomy.php:227
+msgid "Keywords"
+msgstr "Schlüsselbegriffe"
 
-#: ../../include/text.php:1933
-msgid "Layouts"
-msgstr "Layouts"
+#: ../../include/taxonomy.php:252
+msgid "have"
+msgstr "habe"
 
-#: ../../include/text.php:1934
-msgid "Pages"
-msgstr "Seiten"
+#: ../../include/taxonomy.php:252
+msgid "has"
+msgstr "hat"
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
-msgid "Private Message"
-msgstr "Private Nachricht"
+#: ../../include/taxonomy.php:253
+msgid "want"
+msgstr "will"
 
-#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:745
-#: ../../mod/group.php:176 ../../mod/photos.php:1023
-#: ../../mod/filestorage.php:171 ../../mod/settings.php:572
-msgid "Delete"
-msgstr "Löschen"
+#: ../../include/taxonomy.php:253
+msgid "wants"
+msgstr "will"
 
-#: ../../include/ItemObject.php:114 ../../include/conversation.php:631
-msgid "Select"
-msgstr "Auswählen"
+#: ../../include/taxonomy.php:254
+msgid "likes"
+msgstr "Gefällt-mir"
 
-#: ../../include/ItemObject.php:118
-msgid "save to folder"
-msgstr "In Ordner speichern"
+#: ../../include/taxonomy.php:255
+msgid "dislikes"
+msgstr "Gefällt-mir-nicht"
 
-#: ../../include/ItemObject.php:146
-msgid "add star"
-msgstr "markieren"
+#: ../../include/auth.php:76
+msgid "Logged out."
+msgstr "Ausgeloggt."
 
-#: ../../include/ItemObject.php:147
-msgid "remove star"
-msgstr "Markierung entfernen"
+#: ../../include/auth.php:188
+msgid "Failed authentication"
+msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../../include/ItemObject.php:148
-msgid "toggle star status"
-msgstr "Stern-Status umschalten"
+#: ../../include/auth.php:203
+msgid "Login failed."
+msgstr "Login fehlgeschlagen."
 
-#: ../../include/ItemObject.php:152
-msgid "starred"
-msgstr "markiert"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr "Ungültige E-Mail-Adresse"
 
-#: ../../include/ItemObject.php:161 ../../include/conversation.php:642
-msgid "Message is verified"
-msgstr "Nachricht überprüft"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"
 
-#: ../../include/ItemObject.php:169
-msgid "add tag"
-msgstr "Schlagwort hinzufügen"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
 
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:951
-msgid "I like this (toggle)"
-msgstr "Ich mag das (Umschalter)"
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr "Eine Einladung wird benötigt"
 
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:952
-msgid "I don't like this (toggle)"
-msgstr "Ich mag das nicht (Umschalter)"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht bestätigt werden"
 
-#: ../../include/ItemObject.php:178
-msgid "Share this"
-msgstr "Teile dies"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
+msgstr "Bitte gib die benötigten Informationen ein."
 
-#: ../../include/ItemObject.php:178
-msgid "share"
-msgstr "Teilen"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
+msgstr "Speichern der Account-Informationen fehlgeschlagen"
 
-#: ../../include/ItemObject.php:202 ../../include/ItemObject.php:203
+#: ../../include/account.php:273
 #, php-format
-msgid "View %s's profile - %s"
-msgstr "Schaue dir %s's Profil an - %s"
+msgid "Registration request at %s"
+msgstr "Registrierungsanfrage auf %s"
 
-#: ../../include/ItemObject.php:204
-msgid "to"
-msgstr "zu"
+#: ../../include/account.php:275 ../../include/account.php:302
+#: ../../include/account.php:359
+msgid "Administrator"
+msgstr "Administrator"
 
-#: ../../include/ItemObject.php:205
-msgid "via"
-msgstr "via"
+#: ../../include/account.php:297
+msgid "your registration password"
+msgstr "dein Registrierungspasswort"
 
-#: ../../include/ItemObject.php:206
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
+#: ../../include/account.php:300 ../../include/account.php:357
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registrierungsdetails für %s"
 
-#: ../../include/ItemObject.php:207
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
+#: ../../include/account.php:366
+msgid "Account approved."
+msgstr "Account bestätigt."
 
-#: ../../include/ItemObject.php:217 ../../include/conversation.php:686
+#: ../../include/account.php:400
 #, php-format
-msgid " from %s"
-msgstr "von %s"
+msgid "Registration revoked for %s"
+msgstr "Registrierung für %s widerrufen"
 
-#: ../../include/ItemObject.php:220 ../../include/conversation.php:689
-#, php-format
-msgid "last edited: %s"
-msgstr "zuletzt bearbeitet: %s"
+#: ../../include/dir_fns.php:15
+msgid "Sort Options"
+msgstr "Sortieroptionen"
 
-#: ../../include/ItemObject.php:221 ../../include/conversation.php:690
-#, php-format
-msgid "Expires: %s"
-msgstr "Verfällt: %s"
+#: ../../include/dir_fns.php:16
+msgid "Alphabetic"
+msgstr "alphabetisch"
 
-#: ../../include/ItemObject.php:248 ../../include/conversation.php:707
-#: ../../include/conversation.php:1120 ../../mod/photos.php:954
-#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:153
-#: ../../mod/editblock.php:129
-msgid "Please wait"
-msgstr "Bitte warten"
+#: ../../include/dir_fns.php:17
+msgid "Reverse Alphabetic"
+msgstr "Entgegengesetzt alphabetisch"
 
-#: ../../include/ItemObject.php:269
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d Kommentar"
-msgstr[1] "%d Kommentare"
+#: ../../include/dir_fns.php:18
+msgid "Newest to Oldest"
+msgstr "Neueste zuerst"
 
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:970
-#: ../../mod/photos.php:1057
-msgid "This is you"
-msgstr "Das bist du"
+#: ../../include/dir_fns.php:30
+msgid "Enable Safe Search"
+msgstr "Sichere Suche einschalten"
 
-#: ../../include/ItemObject.php:537 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
-#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:431 ../../mod/admin.php:738 ../../mod/admin.php:878
-#: ../../mod/admin.php:1077 ../../mod/admin.php:1164 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:933
-#: ../../mod/photos.php:973 ../../mod/photos.php:1060 ../../mod/chat.php:107
-#: ../../mod/chat.php:133 ../../mod/profiles.php:506
-#: ../../mod/filestorage.php:131 ../../mod/import.php:387
-#: ../../mod/settings.php:509 ../../mod/settings.php:621
-#: ../../mod/settings.php:649 ../../mod/settings.php:673
-#: ../../mod/settings.php:744 ../../mod/settings.php:908
-#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/poke.php:166
-#: ../../mod/fsuggest.php:108 ../../mod/mood.php:142
-#: ../../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
-msgid "Submit"
-msgstr "Bestätigen"
+#: ../../include/dir_fns.php:32
+msgid "Disable Safe Search"
+msgstr "Sichere Suche ausschalten"
 
-#: ../../include/ItemObject.php:538
-msgid "Bold"
-msgstr "Fett"
+#: ../../include/dir_fns.php:34
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
 
-#: ../../include/ItemObject.php:539
-msgid "Italic"
-msgstr "Kursiv"
+#: ../../include/enotify.php:40
+msgid "Red Matrix Notification"
+msgstr "Red Matrix Benachrichtigung"
 
-#: ../../include/ItemObject.php:540
-msgid "Underline"
-msgstr "Unterstrichen"
+#: ../../include/enotify.php:41
+msgid "redmatrix"
+msgstr "redmatrix"
 
-#: ../../include/ItemObject.php:541
-msgid "Quote"
-msgstr "Zitat"
+#: ../../include/enotify.php:43
+msgid "Thank You,"
+msgstr "Danke."
 
-#: ../../include/ItemObject.php:542
-msgid "Code"
-msgstr "Code"
+#: ../../include/enotify.php:45
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrator"
 
-#: ../../include/ItemObject.php:543
-msgid "Image"
-msgstr "Bild"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s "
+msgstr "%s "
 
-#: ../../include/ItemObject.php:544
-msgid "Link"
-msgstr "Link"
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
+msgstr "[Red Notify] Neue Mail auf %s empfangen"
 
-#: ../../include/ItemObject.php:545
-msgid "Video"
-msgstr "Video"
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
 
-#: ../../include/ItemObject.php:546 ../../include/conversation.php:1083
-#: ../../mod/webpages.php:122 ../../mod/photos.php:974
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:132
-#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
-msgid "Preview"
-msgstr "Vorschau"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s hat dir %2$s geschickt."
 
-#: ../../include/ItemObject.php:549 ../../include/conversation.php:1147
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:140
-msgid "Encrypt text"
-msgstr "Text verschlüsseln"
+#: ../../include/enotify.php:87
+msgid "a private message"
+msgstr "eine private Nachricht"
 
-#: ../../include/conversation.php:123
-msgid "channel"
-msgstr "Kanal"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
 
-#: ../../include/conversation.php:161 ../../mod/like.php:134
+#: ../../include/enotify.php:142
 #, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s"
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]a %4$s[/zrl] kommentiert"
 
-#: ../../include/conversation.php:164 ../../mod/like.php:136
+#: ../../include/enotify.php:150
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s nicht"
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
 
-#: ../../include/conversation.php:201
+#: ../../include/enotify.php:159
 #, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s ist jetzt mit %2$s verbunden"
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
 
-#: ../../include/conversation.php:236
+#: ../../include/enotify.php:170
 #, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s"
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
 
-#: ../../include/conversation.php:258 ../../mod/mood.php:63
+#: ../../include/enotify.php:171
 #, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s ist momentan %2$s"
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
 
-#: ../../include/conversation.php:662
+#: ../../include/enotify.php:174 ../../include/enotify.php:189
+#: ../../include/enotify.php:215 ../../include/enotify.php:234
+#: ../../include/enotify.php:248
 #, php-format
-msgid "View %s's profile @ %s"
-msgstr "Schaue Dir %s's Profil auf %s an."
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
 
-#: ../../include/conversation.php:676
-msgid "Categories:"
-msgstr "Kategorien:"
+#: ../../include/enotify.php:180
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
+msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
 
-#: ../../include/conversation.php:677
-msgid "Filed under:"
-msgstr "Gespeichert unter:"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
 
-#: ../../include/conversation.php:705
-msgid "View in context"
-msgstr "Im Zusammenhang anschauen"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
 
-#: ../../include/conversation.php:834
-msgid "remove"
-msgstr "lösche"
+#: ../../include/enotify.php:208
+#, php-format
+msgid "[Red:Notify] %s tagged you"
+msgstr "[Red Notify] %s hat dich getaggt"
 
-#: ../../include/conversation.php:838
-msgid "Loading..."
-msgstr "Lädt ..."
+#: ../../include/enotify.php:209
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
 
-#: ../../include/conversation.php:839
-msgid "Delete Selected Items"
-msgstr "Lösche die ausgewählten Elemente"
+#: ../../include/enotify.php:210
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
 
-#: ../../include/conversation.php:930
-msgid "View Source"
-msgstr "Quelle anzeigen"
+#: ../../include/enotify.php:223
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
+msgstr "[Red Notify] %1$s hat dich angestupst"
 
-#: ../../include/conversation.php:931
-msgid "Follow Thread"
-msgstr "Unterhaltung folgen"
+#: ../../include/enotify.php:224
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
 
-#: ../../include/conversation.php:932
-msgid "View Status"
-msgstr "Status ansehen"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
 
-#: ../../include/conversation.php:934
-msgid "View Photos"
-msgstr "Fotos ansehen"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
+msgstr "[Red:Hinweis] %s hat Dich getaggt"
 
-#: ../../include/conversation.php:935
-msgid "Matrix Activity"
-msgstr "Matrix Aktivität"
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
 
-#: ../../include/conversation.php:936
-msgid "Edit Contact"
-msgstr "Kontakt bearbeiten"
+#: ../../include/enotify.php:243
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
 
-#: ../../include/conversation.php:937
-msgid "Send PM"
-msgstr "Sende PN"
+#: ../../include/enotify.php:255
+msgid "[Red:Notify] Introduction received"
+msgstr "[Red:Notify] Vorstellung erhalten"
 
-#: ../../include/conversation.php:938
-msgid "Poke"
-msgstr "Anstupsen"
+#: ../../include/enotify.php:256
+#, php-format
+msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
+msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
 
-#: ../../include/conversation.php:1000
+#: ../../include/enotify.php:257
 #, php-format
-msgid "%s likes this."
-msgstr "%s gefällt das."
+msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
+msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
 
-#: ../../include/conversation.php:1000
+#: ../../include/enotify.php:261 ../../include/enotify.php:280
 #, php-format
-msgid "%s doesn't like this."
-msgstr "%s gefällt das nicht."
+msgid "You may visit their profile at %s"
+msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../include/conversation.php:1004
+#: ../../include/enotify.php:263
 #, php-format
-msgid "%2$d people like this."
-msgid_plural "%2$d people like this."
-msgstr[0] "%2$d Person gefällt das."
-msgstr[1] "%2$d Leuten gefällt das."
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Bitte besuche %s um sie anzunehmen oder abzulehnen."
 
-#: ../../include/conversation.php:1006
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Friend suggestion received"
+msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
+
+#: ../../include/enotify.php:271
 #, php-format
-msgid "%2$d people don't like this."
-msgid_plural "%2$d people don't like this."
-msgstr[0] "%2$d Person gefällt das nicht."
-msgstr[1] "%2$d Leuten gefällt das nicht."
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
 
-#: ../../include/conversation.php:1012
-msgid "and"
-msgstr "und"
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
 
-#: ../../include/conversation.php:1015
+#: ../../include/enotify.php:278
+msgid "Name:"
+msgstr "Name:"
+
+#: ../../include/enotify.php:279
+msgid "Photo:"
+msgstr "Foto:"
+
+#: ../../include/enotify.php:282
 #, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ", und %d andere"
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
+
+#: ../../include/photos.php:89
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
+
+#: ../../include/photos.php:96
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
 
-#: ../../include/conversation.php:1016
-#, php-format
-msgid "%s like this."
-msgstr "%s gefällt das."
+#: ../../include/photos.php:123 ../../mod/profile_photo.php:147
+msgid "Unable to process image"
+msgstr "Kann Bild nicht verarbeiten"
 
-#: ../../include/conversation.php:1016
-#, php-format
-msgid "%s don't like this."
-msgstr "%s gefällt das nicht."
+#: ../../include/photos.php:185
+msgid "Photo storage failed."
+msgstr "Foto speichern schlug fehl"
 
-#: ../../include/conversation.php:1066
-msgid "Visible to everybody"
-msgstr "Sichtbar für jeden"
+#: ../../include/photos.php:306 ../../mod/photos.php:690
+#: ../../mod/photos.php:1187
+msgid "Upload New Photos"
+msgstr "Lade neue Fotos hoch"
 
-#: ../../include/conversation.php:1067 ../../mod/mail.php:171
-#: ../../mod/mail.php:269
-msgid "Please enter a link URL:"
-msgstr "Gib eine URL ein:"
+#: ../../include/reddav.php:1018
+msgid "Edit File properties"
+msgstr "Dateieigenschaften ändern"
 
-#: ../../include/conversation.php:1068
-msgid "Please enter a video link/URL:"
-msgstr "Gib einen Video-Link/URL ein:"
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/conversation.php:1069
-msgid "Please enter an audio link/URL:"
-msgstr "Gib einen Audio-Link/URL ein:"
+#: ../../include/contact_widgets.php:20
+msgid "Find Channels"
+msgstr "Finde Kanäle"
 
-#: ../../include/conversation.php:1070
-msgid "Tag term:"
-msgstr "Schlagwort:"
+#: ../../include/contact_widgets.php:21
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
 
-#: ../../include/conversation.php:1071 ../../mod/filer.php:35
-msgid "Save to Folder:"
-msgstr "Speichern in Ordner:"
+#: ../../include/contact_widgets.php:22
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
 
-#: ../../include/conversation.php:1072
-msgid "Where are you right now?"
-msgstr "Wo bist du jetzt grade?"
+#: ../../include/contact_widgets.php:23
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
 
-#: ../../include/conversation.php:1073 ../../mod/mail.php:172
-#: ../../mod/mail.php:270 ../../mod/editpost.php:52
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Verfällt YYYY-MM-DD HH;MM"
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
+#: ../../mod/directory.php:211 ../../mod/connections.php:357
+msgid "Find"
+msgstr "Finde"
 
-#: ../../include/conversation.php:1097 ../../mod/photos.php:953
-msgid "Share"
-msgstr "Teilen"
+#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59
+msgid "Channel Suggestions"
+msgstr "Kanal-Vorschläge"
 
-#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
-msgid "Page link title"
-msgstr "Seitentitel-Link"
+#: ../../include/contact_widgets.php:27
+msgid "Random Profile"
+msgstr "Zufallsprofil"
 
-#: ../../include/conversation.php:1101 ../../mod/mail.php:219
-#: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:104 ../../mod/editwebpage.php:145
-#: ../../mod/editblock.php:121
-msgid "Upload photo"
-msgstr "Foto hochladen"
+#: ../../include/contact_widgets.php:28
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
 
-#: ../../include/conversation.php:1102
-msgid "upload photo"
-msgstr "Foto hochladen"
+#: ../../include/contact_widgets.php:120
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
 
-#: ../../include/conversation.php:1103 ../../mod/mail.php:220
-#: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:146
-#: ../../mod/editblock.php:122
-msgid "Attach file"
-msgstr "Datei anhängen"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Neue Seite"
 
-#: ../../include/conversation.php:1104
-msgid "attach file"
-msgstr "Datei anfügen"
+#: ../../include/plugin.php:475 ../../include/plugin.php:477
+msgid "Click here to upgrade."
+msgstr "Klicke hier, um das Upgrade durchzuführen."
 
-#: ../../include/conversation.php:1105 ../../mod/mail.php:221
-#: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:147
-#: ../../mod/editblock.php:123
-msgid "Insert web link"
-msgstr "Link einfügen"
+#: ../../include/plugin.php:483
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
 
-#: ../../include/conversation.php:1106
-msgid "web link"
-msgstr "Web-Link"
+#: ../../include/plugin.php:488
+msgid "This action is not available under your subscription plan."
+msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
 
-#: ../../include/conversation.php:1107
-msgid "Insert video link"
-msgstr "Video-Link einfügen"
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
+msgstr "Der Kanal ist auf dieser Seite blockiert "
 
-#: ../../include/conversation.php:1108
-msgid "video link"
-msgstr "Video-Link"
+#: ../../include/follow.php:26
+msgid "Channel location missing."
+msgstr "Adresse des Kanals fehlt."
 
-#: ../../include/conversation.php:1109
-msgid "Insert audio link"
-msgstr "Audio-Link einfügen"
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
+msgstr "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein."
 
-#: ../../include/conversation.php:1110
-msgid "audio link"
-msgstr "Audio-Link"
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
+msgstr "Antwort des entfernten Kanals war unverständlich."
 
-#: ../../include/conversation.php:1111 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:110 ../../mod/editwebpage.php:151
-#: ../../mod/editblock.php:127
-msgid "Set your location"
-msgstr "Standort"
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
+msgstr "Antwort des entfernten Kanals war unvollständig."
 
-#: ../../include/conversation.php:1112
-msgid "set location"
-msgstr "Standort"
+#: ../../include/follow.php:129
+msgid "local account not found."
+msgstr "Lokales Konto nicht gefunden."
 
-#: ../../include/conversation.php:1113 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:111 ../../mod/editwebpage.php:152
-#: ../../mod/editblock.php:128
-msgid "Clear browser location"
-msgstr "Browser-Standort löschen"
+#: ../../include/follow.php:138
+msgid "Cannot connect to yourself."
+msgstr "Du kannst dich nicht mit dir selbst verbinden."
 
-#: ../../include/conversation.php:1114
-msgid "clear location"
-msgstr "Standort löschen"
+#: ../../include/security.php:280
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
 
-#: ../../include/conversation.php:1116 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:124 ../../mod/editwebpage.php:169
-#: ../../mod/editblock.php:142
-msgid "Set title"
-msgstr "Titel"
+#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:64
+#: ../../view/theme/apw/php/config.php:176
+msgid "Default"
+msgstr "Standard"
 
-#: ../../include/conversation.php:1119 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:126 ../../mod/editwebpage.php:171
-#: ../../mod/editblock.php:145
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (Kommagetrennte Liste)"
+#: ../../include/oembed.php:157
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
 
-#: ../../include/conversation.php:1121 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:154
-#: ../../mod/editblock.php:130
-msgid "Permission settings"
-msgstr "Berechtigungs-Einstellungen"
+#: ../../include/oembed.php:166
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
 
-#: ../../include/conversation.php:1122
-msgid "permissions"
-msgstr "Berechtigungen"
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
+msgstr "Kann meinen öffentlichen Stream und Beiträge sehen"
 
-#: ../../include/conversation.php:1130 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:164
-#: ../../mod/editblock.php:139
-msgid "Public post"
-msgstr "Öffentlicher Beitrag"
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
+msgstr "Kann meinen öffentliches Kanal-Profil sehen"
 
-#: ../../include/conversation.php:1132 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:127 ../../mod/editwebpage.php:172
-#: ../../mod/editblock.php:146
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Beispiel: bob@example.com, mary@example.com"
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
+msgstr "Kann meine öffentlichen Fotoalben sehen"
 
-#: ../../include/conversation.php:1145 ../../mod/mail.php:226
-#: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:138 ../../mod/editwebpage.php:182
-#: ../../mod/editblock.php:156
-msgid "Set expiration date"
-msgstr "Verfallsdatum"
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
+msgstr "Kann mein öffentliches Adressbuch sehen"
 
-#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
-msgid "OK"
-msgstr "OK"
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
+msgstr "Kann meinen öffentlichen Dateiordner sehen"
 
-#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:510
-#: ../../mod/settings.php:536 ../../mod/editpost.php:143
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
-msgid "Cancel"
-msgstr "Abbrechen"
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
+msgstr "Kann meine öffentlichen Seiten sehen"
 
-#: ../../include/conversation.php:1381
-msgid "Commented Order"
-msgstr "Neueste Kommentare"
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
+msgstr "Können mir den Stream und die Beiträge aus ihrem Kanal schicken"
 
-#: ../../include/conversation.php:1384
-msgid "Sort by Comment Date"
-msgstr "Nach Kommentardatum sortiert"
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
 
-#: ../../include/conversation.php:1387
-msgid "Posted Order"
-msgstr "Neueste Beiträge"
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
+msgstr "Kann meine Beiträge kommentieren"
 
-#: ../../include/conversation.php:1390
-msgid "Sort by Post Date"
-msgstr "Nach Beitragsdatum sortiert"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
+msgstr "Kann mir private Nachrichten schicken"
 
-#: ../../include/conversation.php:1394
-msgid "Personal"
-msgstr "Persönlich"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
+msgstr "Kann Fotos in meinen Fotoalben veröffentlichen"
 
-#: ../../include/conversation.php:1397
-msgid "Posts that mention or involve you"
-msgstr "Beiträge mit Beteiligung deinerseits"
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
 
-#: ../../include/conversation.php:1400 ../../mod/menu.php:57
-#: ../../mod/connections.php:209
-msgid "New"
-msgstr "Neu"
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
+msgstr "Kann mit mir chatten (wenn verfügbar)"
 
-#: ../../include/conversation.php:1403
-msgid "Activity Stream - by date"
-msgstr "Activity Stream - nach Datum sortiert"
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
+msgstr "Kann in meinen öffentlichen Dateiordner schreiben"
 
-#: ../../include/conversation.php:1410
-msgid "Starred"
-msgstr "Markiert"
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
+msgstr "Kann meine öffentlichen Seiten bearbeiten"
 
-#: ../../include/conversation.php:1413
-msgid "Favourite Posts"
-msgstr "Beiträge mit Sternchen"
+#: ../../include/permissions.php:31
+msgid "Can source my \"public\" posts in derived channels"
+msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden"
 
-#: ../../include/conversation.php:1420
-msgid "Spam"
-msgstr "Spam"
+#: ../../include/permissions.php:31
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften."
 
-#: ../../include/conversation.php:1423
-msgid "Posts flagged as SPAM"
-msgstr "Nachrichten die als SPAM markiert wurden"
+#: ../../include/permissions.php:32
+msgid "Can send me bookmarks"
+msgstr "Darf mir Lesezeichen senden"
 
-#: ../../include/conversation.php:1454
-msgid "Channel"
-msgstr "Kanal"
+#: ../../include/permissions.php:33
+msgid "Can administer my channel resources"
+msgstr "Kann meine Kanäle administrieren"
 
-#: ../../include/conversation.php:1457
-msgid "Status Messages and Posts"
-msgstr "Statusnachrichten und Beiträge"
+#: ../../include/permissions.php:33
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
 
-#: ../../include/conversation.php:1466
-msgid "About"
-msgstr "Über"
+#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../index.php:350
+msgid "Permission denied"
+msgstr "Keine Berechtigung"
 
-#: ../../include/conversation.php:1469
-msgid "Profile Details"
-msgstr "Profil-Details"
+#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
+msgid "Item not found."
+msgstr "Element nicht gefunden."
 
-#: ../../include/conversation.php:1484 ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr "Dateien"
+#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
+msgstr "Sammlung nicht gefunden"
 
-#: ../../include/conversation.php:1487
-msgid "Files and Storage"
-msgstr "Dateien und Speicher"
+#: ../../include/items.php:3801
+msgid "Collection is empty."
+msgstr "Sammlung ist leer."
 
-#: ../../include/conversation.php:1496
-msgid "Events and Calendar"
-msgstr "Veranstaltungen und Kalender"
+#: ../../include/items.php:3808
+#, php-format
+msgid "Collection: %s"
+msgstr "Sammlung: %s"
 
-#: ../../include/conversation.php:1503
-msgid "Webpages"
-msgstr "Webseiten"
+#: ../../include/items.php:3819
+#, php-format
+msgid "Connection: %s"
+msgstr "Verbindung: %s"
 
-#: ../../include/conversation.php:1506
-msgid "Manage Webpages"
-msgstr "Webseiten verwalten"
+#: ../../include/items.php:3822
+msgid "Connection not found."
+msgstr "Die Verbindung wurde nicht gefunden."
 
 #: ../../include/zot.php:545
 msgid "Invalid data packet"
@@ -3361,333 +3407,136 @@ msgid ""
 "http://getzot.com"
 msgstr "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an"
 
-#: ../../mod/cloud.php:112
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
-msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"
-
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
-msgstr "Konnte auf den Kontakteintrag nicht zugreifen."
-
-#: ../../mod/connedit.php:63 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
-msgstr "Konnte das gewählte Profil nicht finden."
-
-#: ../../mod/connedit.php:104 ../../mod/connections.php:92
-msgid "Connection updated."
-msgstr "Verbindung aktualisiert."
-
-#: ../../mod/connedit.php:106 ../../mod/connections.php:94
-msgid "Failed to update connection record."
-msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
-
-#: ../../mod/connedit.php:201
-msgid "Could not access address book record."
-msgstr "Konnte nicht auf den Eintrag im Adressbuch zugreifen."
-
-#: ../../mod/connedit.php:215
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
-
-#: ../../mod/connedit.php:222
-msgid "Channel has been unblocked"
-msgstr "Kanal nicht mehr blockiert"
-
-#: ../../mod/connedit.php:223
-msgid "Channel has been blocked"
-msgstr "Kanal blockiert"
-
-#: ../../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 "Konnte die Adressbuch Parameter nicht setzen."
-
-#: ../../mod/connedit.php:234
-msgid "Channel has been unignored"
-msgstr "Kanal wird nicht mehr ignoriert"
-
-#: ../../mod/connedit.php:235
-msgid "Channel has been ignored"
-msgstr "Kanal wird ignoriert"
-
-#: ../../mod/connedit.php:246
-msgid "Channel has been unarchived"
-msgstr "Kanal wurde aus dem Archiv zurück geholt"
-
-#: ../../mod/connedit.php:247
-msgid "Channel has been archived"
-msgstr "Kanal wurde archiviert"
-
-#: ../../mod/connedit.php:258
-msgid "Channel has been unhidden"
-msgstr "Kanal wird nicht mehr versteckt"
-
-#: ../../mod/connedit.php:259
-msgid "Channel has been hidden"
-msgstr "Kanal wurde versteckt"
-
-#: ../../mod/connedit.php:273
-msgid "Channel has been approved"
-msgstr "Kanal wurde zugelassen"
-
-#: ../../mod/connedit.php:274
-msgid "Channel has been unapproved"
-msgstr "Zulassung des Kanals entfernt"
-
-#: ../../mod/connedit.php:292
-msgid "Contact has been removed."
-msgstr "Kontakt wurde entfernt."
-
-#: ../../mod/connedit.php:312
-#, php-format
-msgid "View %s's profile"
-msgstr "%s's Profil ansehen"
-
-#: ../../mod/connedit.php:316
-msgid "Refresh Permissions"
-msgstr "Zugriffsrechte auffrischen"
-
-#: ../../mod/connedit.php:319
-msgid "Fetch updated permissions"
-msgstr "Aktualisierte Zugriffsrechte abfragen"
-
-#: ../../mod/connedit.php:323
-msgid "Recent Activity"
-msgstr "Kürzliche Aktivitäten"
-
-#: ../../mod/connedit.php:326
-msgid "View recent posts and comments"
-msgstr "Betrachte die neuesten Beiträge und Kommentare"
-
-#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:747
-msgid "Unblock"
-msgstr "Freigeben"
-
-#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:746
-msgid "Block"
-msgstr "Blockieren"
-
-#: ../../mod/connedit.php:333
-msgid "Block or Unblock this connection"
-msgstr "Verbindung blockieren oder frei geben"
-
-#: ../../mod/connedit.php:337 ../../mod/connedit.php:473
-msgid "Unignore"
-msgstr "Nicht ignorieren"
-
-#: ../../mod/connedit.php:337 ../../mod/connedit.php:473
-#: ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorieren"
-
-#: ../../mod/connedit.php:340
-msgid "Ignore or Unignore this connection"
-msgstr "Verbindung ignorieren oder wieder beachten"
-
-#: ../../mod/connedit.php:343
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
-
-#: ../../mod/connedit.php:343
-msgid "Archive"
-msgstr "Archivieren"
-
-#: ../../mod/connedit.php:346
-msgid "Archive or Unarchive this connection"
-msgstr "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück"
-
-#: ../../mod/connedit.php:349
-msgid "Unhide"
-msgstr "aufdecken"
-
-#: ../../mod/connedit.php:349
-msgid "Hide"
-msgstr "Verbergen"
-
-#: ../../mod/connedit.php:352
-msgid "Hide or Unhide this connection"
-msgstr "Diese Verbindung verstecken oder aufdecken"
-
-#: ../../mod/connedit.php:359
-msgid "Delete this connection"
-msgstr "Verbindung löschen"
-
-#: ../../mod/connedit.php:392
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../../mod/connedit.php:402 ../../mod/connedit.php:431
-msgid "Approve this connection"
-msgstr "Verbindung genehmigen"
-
-#: ../../mod/connedit.php:402
-msgid "Accept connection to allow communication"
-msgstr "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen"
-
-#: ../../mod/connedit.php:418
-msgid "Automatic Permissions Settings"
-msgstr "Automatische Berechtigungs-Einstellungen"
-
-#: ../../mod/connedit.php:418
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Verbindungseinstellungen für %s"
-
-#: ../../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 "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest."
-
-#: ../../mod/connedit.php:424
-msgid "Slide to adjust your degree of friendship"
-msgstr "Schieben um den Grad der Freundschaft zu wählen"
-
-#: ../../mod/connedit.php:430
-msgid "inherited"
-msgstr "Geerbt"
-
-#: ../../mod/connedit.php:432
-msgid "Connection has no individual permissions!"
-msgstr "Diese Verbindung hat keine individuellen Zugriffseinstellungen."
-
-#: ../../mod/connedit.php:433
-msgid ""
-"This may be appropriate based on your privacy "
-"settings, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Abhängig von deinen Privatsphären Einstellungen könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen."
+#: ../../mod/item.php:145
+msgid "Unable to locate original post."
+msgstr "Originalbeitrag kann nicht gefunden werden."
 
-#: ../../mod/connedit.php:435
-msgid "Profile Visibility"
-msgstr "Sichtbarkeit des Profils"
+#: ../../mod/item.php:346
+msgid "Empty post discarded."
+msgstr "Leerer Beitrag verworfen."
 
-#: ../../mod/connedit.php:436
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
+#: ../../mod/item.php:388
+msgid "Executable content type not permitted to this channel."
+msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
 
-#: ../../mod/connedit.php:437
-msgid "Contact Information / Notes"
-msgstr "Kontaktinformationen / Notizen"
+#: ../../mod/item.php:819
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../mod/connedit.php:438
-msgid "Edit contact notes"
-msgstr "Kontaktnotizen editieren"
+#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+msgid "Wall Photos"
+msgstr "Wall Fotos"
 
-#: ../../mod/connedit.php:440
-msgid "Their Settings"
-msgstr "Deren Einstellungen"
+#: ../../mod/item.php:1166
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../mod/connedit.php:441
-msgid "My Settings"
-msgstr "Meine Einstellungen"
+#: ../../mod/item.php:1172
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../mod/connedit.php:443
-msgid "Forum Members"
-msgstr "Forum Mitglieder"
+#: ../../mod/menu.php:21
+msgid "Menu updated."
+msgstr "Menü aktualisiert."
 
-#: ../../mod/connedit.php:444
-msgid "Soapbox"
-msgstr "Marktschreier"
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
+msgstr "Kann Menü nicht aktualisieren."
 
-#: ../../mod/connedit.php:445
-msgid "Full Sharing"
-msgstr "Volles Teilen"
+#: ../../mod/menu.php:30
+msgid "Menu created."
+msgstr "Menü erstellt."
 
-#: ../../mod/connedit.php:446
-msgid "Cautious Sharing"
-msgstr "Vorsichtiges Teilen"
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
+msgstr "Kann Menü nicht erstellen."
 
-#: ../../mod/connedit.php:447
-msgid "Follow Only"
-msgstr "Nur Folgen"
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
+msgstr "Menüs verwalten"
 
-#: ../../mod/connedit.php:448
-msgid "Individual Permissions"
-msgstr "Individuelle Zugriffseinstellungen"
+#: ../../mod/menu.php:60
+msgid "Drop"
+msgstr "Löschen"
 
-#: ../../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 "Einige Genehmigungen können von deinen Sicherheits- und Datenschutz-Einstellungen geerbt sein (siehe Kennzeichnung), da diese eine höhere Priorität haben. Wenn du solche Genehmigungen hier änderst, hat das keine Auswirkungen."
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
+msgstr "Neues Menü erstellen"
 
-#: ../../mod/connedit.php:450
-msgid "Advanced Permissions"
-msgstr "Erweiterte Zugriffsrechte"
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
+msgstr "Lösche dieses Menü"
 
-#: ../../mod/connedit.php:451
-msgid "Quick Links"
-msgstr "Quick Links"
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
+msgstr "Bearbeite Menü Inhalte"
 
-#: ../../mod/connedit.php:455
-#, php-format
-msgid "Visit %s's profile - %s"
-msgstr "%s's Profil besuchen - %s"
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
+msgstr "Dieses Menü bearbeiten"
 
-#: ../../mod/connedit.php:456
-msgid "Block/Unblock contact"
-msgstr "Geblockt Status ein- / ausschalten"
+#: ../../mod/menu.php:80
+msgid "New Menu"
+msgstr "Neues Menü"
 
-#: ../../mod/connedit.php:457
-msgid "Ignore contact"
-msgstr "Kontakt ignorieren"
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
+msgstr "Menü Name"
 
-#: ../../mod/connedit.php:458
-msgid "Repair URL settings"
-msgstr "URL Einstellungen reparieren"
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
+msgstr "Muss unverwechselbar sein, nur für dich sichtbar"
 
-#: ../../mod/connedit.php:459
-msgid "View conversations"
-msgstr "Unterhaltungen anzeigen"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
+msgstr "Menü Titel"
 
-#: ../../mod/connedit.php:461
-msgid "Delete contact"
-msgstr "Kontakt löschen"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
+msgstr "Menü Titel wie er von anderen gesehen wird"
 
-#: ../../mod/connedit.php:464
-msgid "Last update:"
-msgstr "Letzte Aktualisierung:"
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
+msgstr "Erlaube Lesezeichen"
 
-#: ../../mod/connedit.php:466
-msgid "Update public posts"
-msgstr "Öffentliche Beiträge aktualisieren"
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 
-#: ../../mod/connedit.php:468
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
+#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
+msgid "Create"
+msgstr "Erstelle"
 
-#: ../../mod/connedit.php:474
-msgid "Currently blocked"
-msgstr "Derzeit blockiert"
+#: ../../mod/menu.php:92 ../../mod/mitem.php:14
+msgid "Menu not found."
+msgstr "Menü nicht gefunden"
 
-#: ../../mod/connedit.php:475
-msgid "Currently ignored"
-msgstr "Derzeit ignoriert"
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
+msgstr "Menü gelöscht."
 
-#: ../../mod/connedit.php:476
-msgid "Currently archived"
-msgstr "Derzeit archiviert"
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
+msgstr "Menü konnte nicht gelöscht werden."
 
-#: ../../mod/connedit.php:477
-msgid "Currently pending"
-msgstr "Derzeit anstehend"
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
+msgstr "Menü bearbeiten"
 
-#: ../../mod/connedit.php:478
-msgid "Hide this contact from others"
-msgstr "Diese Verbindung vor den anderen verbergen."
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
+msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 
-#: ../../mod/connedit.php:478
-msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"
+#: ../../mod/menu.php:114 ../../mod/mitem.php:186
+msgid "Modify"
+msgstr "Ändern"
+
+#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
+#: ../../mod/dirprofile.php:181
+msgid "Not found."
+msgstr "Nicht gefunden."
 
 #: ../../mod/webpages.php:121 ../../mod/layouts.php:105
 #: ../../mod/blocks.php:96
@@ -3712,13 +3561,13 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:870
-#: ../../mod/settings.php:875
+#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
+#: ../../mod/profiles.php:483
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:870
-#: ../../mod/settings.php:875
+#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
+#: ../../mod/profiles.php:484
 msgid "No"
 msgstr "Nein"
 
@@ -3730,372 +3579,421 @@ msgstr "Keine installierten Applikationen"
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
-msgstr "Ungültiges Element."
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
 
-#: ../../mod/page.php:47 ../../mod/chanview.php:77 ../../mod/home.php:50
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
+#: ../../mod/cloud.php:112
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"
 
-#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
+msgstr "Lesezeichen hinzugefügt"
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Element nicht verfügbar."
+#: ../../mod/bookmarks.php:53
+msgid "My Bookmarks"
+msgstr "Meine Lesezeichen"
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
-msgstr "Red Matrix Server - Installation"
+#: ../../mod/bookmarks.php:64
+msgid "My Connections Bookmarks"
+msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
-msgstr "Kann nicht mit der Datenbank verbinden."
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "Name wird benötigt"
 
-#: ../../mod/setup.php:171
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "Schlüssel und Geheimnis werden benötigt"
+
+#: ../../mod/settings.php:79 ../../mod/settings.php:539
+msgid "Update"
+msgstr "Update"
+
+#: ../../mod/settings.php:192
+msgid "Passwords do not match. Password unchanged."
+msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
+
+#: ../../mod/settings.php:196
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
+
+#: ../../mod/settings.php:209
+msgid "Password changed."
+msgstr "Kennwort geändert."
+
+#: ../../mod/settings.php:211
+msgid "Password update failed. Please try again."
+msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
+
+#: ../../mod/settings.php:225
+msgid "Not valid email."
+msgstr "Keine gültige E-Mail Adresse."
+
+#: ../../mod/settings.php:228
+msgid "Protected email address. Cannot change to that email."
+msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
+
+#: ../../mod/settings.php:237
+msgid "System failure storing new email. Please try again."
+msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
+
+#: ../../mod/settings.php:441
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:574
+msgid "Add application"
+msgstr "Anwendung hinzufügen"
+
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+msgid "Name"
+msgstr "Name"
+
+#: ../../mod/settings.php:515
+msgid "Name of application"
+msgstr "Name der Anwendung"
+
+#: ../../mod/settings.php:516 ../../mod/settings.php:542
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:516 ../../mod/settings.php:517
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
+
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Redirect"
+msgstr "Umleitung"
+
+#: ../../mod/settings.php:518
 msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS."
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit"
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
-msgstr "Kann Tabelle nicht erstellen."
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Icon url"
+msgstr "Symbol-URL"
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
-msgstr "Die Datenbank deiner Seite wurde installiert."
+#: ../../mod/settings.php:519
+msgid "Optional"
+msgstr "Optional"
+
+#: ../../mod/settings.php:530
+msgid "You can't edit this application."
+msgstr "Diese Anwendung kann nicht bearbeitet werden."
+
+#: ../../mod/settings.php:573
+msgid "Connected Apps"
+msgstr "Verbundene Apps"
+
+#: ../../mod/settings.php:577
+msgid "Client key starts with"
+msgstr "Client key beginnt mit"
+
+#: ../../mod/settings.php:578
+msgid "No name"
+msgstr "Kein Name"
+
+#: ../../mod/settings.php:579
+msgid "Remove authorization"
+msgstr "Authorisierung aufheben"
 
-#: ../../mod/setup.php:187
-msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
-msgstr "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren."
+#: ../../mod/settings.php:590
+msgid "No feature settings configured"
+msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:606
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Lies die Datei \"install/INSTALL.txt\"."
+#: ../../mod/settings.php:598
+msgid "Feature Settings"
+msgstr "Funktions-Einstellungen"
 
-#: ../../mod/setup.php:254
-msgid "System check"
-msgstr "Systemprüfung"
+#: ../../mod/settings.php:621
+msgid "Account Settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../mod/setup.php:259
-msgid "Check again"
-msgstr "Bitte nochmal prüfen"
+#: ../../mod/settings.php:622
+msgid "Password Settings"
+msgstr "Kennwort-Einstellungen"
 
-#: ../../mod/setup.php:281
-msgid "Database connection"
-msgstr "Datenbank Verbindung"
+#: ../../mod/settings.php:623
+msgid "New Password:"
+msgstr "Neues Passwort:"
 
-#: ../../mod/setup.php:282
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
-msgstr "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können."
+#: ../../mod/settings.php:624
+msgid "Confirm:"
+msgstr "Bestätigen:"
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest."
+#: ../../mod/settings.php:624
+msgid "Leave password fields blank unless changing"
+msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
 
-#: ../../mod/setup.php:284
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst."
+#: ../../mod/settings.php:626 ../../mod/settings.php:921
+msgid "Email Address:"
+msgstr "Email Adresse:"
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
-msgstr "Datenbank-Servername"
+#: ../../mod/settings.php:627
+msgid "Remove Account"
+msgstr "Konto entfernen"
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
-msgstr "Standard ist localhost"
+#: ../../mod/settings.php:628
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden."
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
-msgstr "Datenbank-Port"
+#: ../../mod/settings.php:644
+msgid "Off"
+msgstr "Aus"
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
-msgstr "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:"
+#: ../../mod/settings.php:644
+msgid "On"
+msgstr "An"
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
-msgstr "Datenbank-Benutzername"
+#: ../../mod/settings.php:651
+msgid "Additional Features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
-msgstr "Datenbank-Kennwort"
+#: ../../mod/settings.php:676
+msgid "Connector Settings"
+msgstr "Connector-Einstellungen"
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
-msgstr "Datenbank-Name"
+#: ../../mod/settings.php:706 ../../mod/admin.php:379
+msgid "No special theme for mobile devices"
+msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
-msgstr "E-Mail Adresse des Seiten-Administrators"
+#: ../../mod/settings.php:746
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst."
+#: ../../mod/settings.php:752
+msgid "Display Theme:"
+msgstr "Anzeige Theme:"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
-msgstr "Webseiten URL"
+#: ../../mod/settings.php:753
+msgid "Mobile Theme:"
+msgstr "Mobile Theme:"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
-msgstr "Nutze wenn möglich eine SSL-URL (https)."
+#: ../../mod/settings.php:754
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
-msgstr "Standard-Zeitzone für deine Website"
+#: ../../mod/settings.php:754
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimum von 10 Sekunden, kein Maximum"
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
-msgstr "Seiteneinstellungen"
+#: ../../mod/settings.php:755
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
 
-#: ../../mod/setup.php:381
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden."
+#: ../../mod/settings.php:755
+msgid "Maximum of 100 items"
+msgstr "Maximum von 100 Beiträgen"
 
-#: ../../mod/setup.php:382
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen."
+#: ../../mod/settings.php:756
+msgid "Don't show emoticons"
+msgstr "Emoticons nicht zeigen"
 
-#: ../../mod/setup.php:386
-msgid "PHP executable path"
-msgstr "PHP Pfad zu ausführbarer Datei"
+#: ../../mod/settings.php:792
+msgid "Nobody except yourself"
+msgstr "Niemand außer du selbst"
 
-#: ../../mod/setup.php:386
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren."
+#: ../../mod/settings.php:793
+msgid "Only those you specifically allow"
+msgstr "Nur die, denen du es explizit erlaubst"
 
-#: ../../mod/setup.php:391
-msgid "Command line PHP"
-msgstr "PHP Befehlszeile"
+#: ../../mod/settings.php:794
+msgid "Anybody in your address book"
+msgstr "Jeder aus Ihrem Adressbuch"
 
-#: ../../mod/setup.php:400
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."
+#: ../../mod/settings.php:795
+msgid "Anybody on this website"
+msgstr "Jeder auf dieser Website"
 
-#: ../../mod/setup.php:401
-msgid "This is required for message delivery to work."
-msgstr "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
+#: ../../mod/settings.php:796
+msgid "Anybody in this network"
+msgstr "Jeder in diesem Netzwerk"
 
-#: ../../mod/setup.php:403
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/settings.php:797
+msgid "Anybody on the internet"
+msgstr "Jeder im Internet"
 
-#: ../../mod/setup.php:424
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen."
+#: ../../mod/settings.php:874
+msgid "Publish your default profile in the network directory"
+msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
 
-#: ../../mod/setup.php:425
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung."
+#: ../../mod/settings.php:879
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/setup.php:427
-msgid "Generate encryption keys"
-msgstr "Verschlüsselungsschlüssel  generieren"
+#: ../../mod/settings.php:883 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "oder"
 
-#: ../../mod/setup.php:434
-msgid "libCurl PHP module"
-msgstr "libCurl PHP Modul"
+#: ../../mod/settings.php:888
+msgid "Your channel address is"
+msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../mod/setup.php:435
-msgid "GD graphics PHP module"
-msgstr "GD Graphik PHP Modul"
+#: ../../mod/settings.php:910
+msgid "Channel Settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../mod/setup.php:436
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP Modul"
+#: ../../mod/settings.php:919
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
 
-#: ../../mod/setup.php:437
-msgid "mysqli PHP module"
-msgstr "mysqli PHP Modul"
+#: ../../mod/settings.php:922
+msgid "Your Timezone:"
+msgstr "Ihre Zeitzone:"
 
-#: ../../mod/setup.php:438
-msgid "mb_string PHP module"
-msgstr "mb_string PHP Modul"
+#: ../../mod/settings.php:923
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
 
-#: ../../mod/setup.php:439
-msgid "mcrypt PHP module"
-msgstr "mcrypt PHP Modul"
+#: ../../mod/settings.php:924
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/setup.php:444 ../../mod/setup.php:446
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite Modul"
+#: ../../mod/settings.php:926
+msgid "Adult Content"
+msgstr "Nicht Jugendfreie-Inhalte"
 
-#: ../../mod/setup.php:444
+#: ../../mod/settings.php:926
 msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert."
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../mod/setup.php:450 ../../mod/setup.php:453
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/settings.php:928
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../mod/setup.php:450
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+#: ../../mod/settings.php:930
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../mod/setup.php:458
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert."
+#: ../../mod/settings.php:930
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Verhindert die Anzeige deines Online-Status in deinem Profil"
+
+#: ../../mod/settings.php:932
+msgid "Simple Privacy Settings:"
+msgstr "Einfache Privatsphären-Einstellungen"
 
-#: ../../mod/setup.php:462
+#: ../../mod/settings.php:933
 msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert."
+"Very Public - extremely permissive (should be used with caution)"
+msgstr ""
 
-#: ../../mod/setup.php:466
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:934
+msgid ""
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
+msgstr ""
 
-#: ../../mod/setup.php:470
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:935
+msgid "Private - default private, never open or public"
+msgstr ""
 
-#: ../../mod/setup.php:474
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:936
+msgid "Blocked - default blocked to/from everybody"
+msgstr ""
 
-#: ../../mod/setup.php:478
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:939
+msgid "Advanced Privacy Settings"
+msgstr ""
 
-#: ../../mod/setup.php:494
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht."
+#: ../../mod/settings.php:941
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Kontaktanfragen pro Tag:"
+
+#: ../../mod/settings.php:941
+msgid "May reduce spam activity"
+msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../mod/setup.php:495
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst."
+#: ../../mod/settings.php:942
+msgid "Default Post Permissions"
+msgstr "Beitragszugriffrechte Standardeinstellungen"
 
-#: ../../mod/setup.php:496
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern."
+#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
 
-#: ../../mod/setup.php:497
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
+#: ../../mod/settings.php:954
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../mod/setup.php:500
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php ist beschreibbar"
+#: ../../mod/settings.php:954
+msgid "Useful to reduce spamming"
+msgstr "Nützlich um Spam zu verringern"
 
-#: ../../mod/setup.php:510
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen."
+#: ../../mod/settings.php:957
+msgid "Notification Settings"
+msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../mod/setup.php:511
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
-msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben."
+#: ../../mod/settings.php:958
+msgid "By default post a status message when:"
+msgstr "Sende standardmäßig Status-Nachrichten wenn:"
 
-#: ../../mod/setup.php:512 ../../mod/setup.php:530
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat."
+#: ../../mod/settings.php:959
+msgid "accepting a friend request"
+msgstr "einer Kontaktanfrage stattgegeben wurde"
 
-#: ../../mod/setup.php:513
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen."
+#: ../../mod/settings.php:960
+msgid "joining a forum/community"
+msgstr "ein Forum beigetreten wurde"
 
-#: ../../mod/setup.php:516
-msgid "view/tpl/smarty3 is writable"
-msgstr "view/tpl/smarty3 ist beschreibbar"
+#: ../../mod/settings.php:961
+msgid "making an interesting profile change"
+msgstr "eine interessante Änderung am Profil vorgenommen wurde"
 
-#: ../../mod/setup.php:529
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis."
+#: ../../mod/settings.php:962
+msgid "Send a notification email when:"
+msgstr "Eine Email Benachrichtigung senden wenn:"
 
-#: ../../mod/setup.php:533
-msgid "store is writable"
-msgstr "store ist schreibbar"
+#: ../../mod/settings.php:963
+msgid "You receive an introduction"
+msgstr "Du eine Vorstellung erhältst"
 
-#: ../../mod/setup.php:548
-msgid "SSL certificate validation"
-msgstr "SSL Zertifikatverifizierung"
+#: ../../mod/settings.php:964
+msgid "Your introductions are confirmed"
+msgstr "Deine Vorstellung bestätigt wurde."
 
-#: ../../mod/setup.php:548
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen."
+#: ../../mod/settings.php:965
+msgid "Someone writes on your profile wall"
+msgstr "Jemand auf deine Pinnwand schreibt"
 
-#: ../../mod/setup.php:555
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration."
+#: ../../mod/settings.php:966
+msgid "Someone writes a followup comment"
+msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../mod/setup.php:557
-msgid "Url rewrite is working"
-msgstr "Url rewrite funktioniert"
+#: ../../mod/settings.php:967
+msgid "You receive a private message"
+msgstr "Du eine private Nachricht erhältst"
 
-#: ../../mod/setup.php:567
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
+#: ../../mod/settings.php:968
+msgid "You receive a friend suggestion"
+msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../mod/setup.php:591
-msgid "Errors encountered creating database tables."
-msgstr "Fehler während des Anlegens der Datenbank Tabellen aufgetreten."
+#: ../../mod/settings.php:969
+msgid "You are tagged in a post"
+msgstr "Du wurdest in einem Beitrag getaggt"
 
-#: ../../mod/setup.php:604
-msgid "
                                                                                              What next
                                                                                              "
-msgstr "
                                                                                              Was als Nächstes
                                                                                              "
+#: ../../mod/settings.php:970
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
 
-#: ../../mod/setup.php:605
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
+#: ../../mod/settings.php:973
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Account / Seiten Arten Einstellungen"
 
-#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
+#: ../../mod/settings.php:974
+msgid "Change the behaviour of this account for special situations"
+msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
 #: ../../mod/subthread.php:105
 #, php-format
@@ -4108,6 +4006,11 @@ msgstr "%1$s folgt nun %2$s's %3$s"
 msgid "[Embedded content - reload page to view]"
 msgstr "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]"
 
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:35
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
+
 #: ../../mod/chanview.php:93
 msgid "toggle full screen mode"
 msgstr "auf Vollbildmodus umschalten"
@@ -4117,9 +4020,39 @@ msgstr "auf Vollbildmodus umschalten"
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s hat %2$s's %3$s mit %4$s getaggt"
 
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
+
+#: ../../mod/chat.php:120
+msgid "Leave Room"
+msgstr "Raum verlassen"
+
+#: ../../mod/chat.php:121
+msgid "I am away right now"
+msgstr "Ich bin gerade nicht da"
+
+#: ../../mod/chat.php:122
+msgid "I am online"
+msgstr "Ich bin online"
+
+#: ../../mod/chat.php:146 ../../mod/chat.php:166
+msgid "New Chatroom"
+msgstr "Neuen Chatraum"
+
+#: ../../mod/chat.php:147
+msgid "Chatroom Name"
+msgstr "Chatraum Name"
+
+#: ../../mod/chat.php:162
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$s's Chat-Räume"
+
 #: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/photos.php:442 ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/directory.php:15 ../../mod/display.php:9
 #: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:442
 msgid "Public access denied."
 msgstr "Öffentlicher Zugang verweigert."
 
@@ -4148,7 +4081,7 @@ msgstr "Schlagwort des Beitrags entfernen"
 msgid "Select a tag to remove: "
 msgstr "Schlagwort zum entfernen auswählen:"
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
 msgid "Remove"
 msgstr "Entferne"
 
@@ -4218,76 +4151,197 @@ msgstr "Vorhandene Seitenmanager"
 msgid "Existing Page Delegates"
 msgstr "Vorhandene Bevollmächtigte für die Seite"
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr "Potentielle Bevollmächtigte"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potentielle Bevollmächtigte"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Keine Einträge."
+
+#: ../../mod/chatsvc.php:102
+msgid "Away"
+msgstr "Abwesend"
+
+#: ../../mod/chatsvc.php:106
+msgid "Online"
+msgstr "Online"
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Element nicht verfügbar."
+
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr "Menü-Element aktualisiert."
+
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
+
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr "Menü-Bestandteil hinzugefügt."
+
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
+
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr "Menü-Bestandteile verwalten"
+
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
+
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
+
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr "Bestandteil löschen"
+
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr "Neues Bestandteil"
+
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
+
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
+
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
+
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
+
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr "Neues Menü-Bestandteil"
+
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr "Menü-Element Zugriffsrechte"
+
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr "Link Text"
+
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr "URL des Links"
+
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr "Verwende Red Magic-Auth wenn verfügbar"
+
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
+
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
+
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
+
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
+
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
+
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
 
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Sammlung erstellt."
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr "Keine Einträge."
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Sammlung kann nicht erstellt werden."
 
-#: ../../mod/sources.php:28
-msgid "Failed to create source. No channel selected."
-msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Sammlung aktualisiert."
 
-#: ../../mod/sources.php:41
-msgid "Source created."
-msgstr "Quelle erstellt."
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Erstelle eine Sammlung von Kanälen."
 
-#: ../../mod/sources.php:53
-msgid "Source updated."
-msgstr "Quelle aktualisiert."
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
+msgstr "Name der Sammlung:"
 
-#: ../../mod/sources.php:82
-msgid "Manage remote sources of content for your channel."
-msgstr "Entfernte Quellen von Inhalten deines Kanals verwalten."
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
+msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../mod/sources.php:83 ../../mod/sources.php:93
-msgid "New Source"
-msgstr "Neue Quelle"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Sammlung gelöscht."
 
-#: ../../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 "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Löschen der Sammlung nicht möglich."
 
-#: ../../mod/sources.php:95 ../../mod/sources.php:127
-msgid "Only import content with these words (one per line)"
-msgstr "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
+msgstr "Sammlung-Editor"
 
-#: ../../mod/sources.php:95 ../../mod/sources.php:127
-msgid "Leave blank to import all public content"
-msgstr "Leer lassen um alle öffentlichen Beiträge zu importieren"
+#: ../../mod/group.php:196
+msgid "Members"
+msgstr "Mitglieder"
 
-#: ../../mod/sources.php:96 ../../mod/sources.php:130
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
-msgstr "Name des Kanals"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
+msgstr "Alle verbundenen Kanäle"
 
-#: ../../mod/sources.php:116 ../../mod/sources.php:143
-msgid "Source not found."
-msgstr "Quelle nicht gefunden."
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
+msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../mod/sources.php:123
-msgid "Edit Source"
-msgstr "Quelle bearbeiten"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil Identifikator"
 
-#: ../../mod/sources.php:124
-msgid "Delete Source"
-msgstr "Quelle löschen"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits Editor"
 
-#: ../../mod/sources.php:151
-msgid "Source removed"
-msgstr "Quelle gelöscht"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Wähle einen Kontakt zum Hinzufügen oder Löschen aus."
 
-#: ../../mod/sources.php:153
-msgid "Unable to remove source."
-msgstr "Konnte die Quelle nicht löschen."
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Sichtbar für"
+
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Alle Verbindungen"
 
 #: ../../mod/admin.php:48
 msgid "Theme settings updated."
@@ -4363,10 +4417,6 @@ msgstr "Aktive Plug-Ins"
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:379 ../../mod/settings.php:702
-msgid "No special theme for mobile devices"
-msgstr "Keine spezielle Theme für mobile Geräte"
-
 #: ../../mod/admin.php:381
 msgid "No special theme for accessibility"
 msgstr "Kein spezielles Accessibility Theme vorhanden"
@@ -4722,6 +4772,16 @@ msgstr "Genehmigen"
 msgid "Deny"
 msgstr "Verweigern"
 
+#: ../../mod/admin.php:746 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
+msgstr "Blockieren"
+
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
+msgstr "Freigeben"
+
 #: ../../mod/admin.php:750
 msgid "Register date"
 msgstr "Registrierungs-Datum"
@@ -4821,502 +4881,382 @@ msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichn
 msgid "Log level"
 msgstr "Protokollstufe"
 
-#: ../../mod/mitem.php:14 ../../mod/menu.php:87
-msgid "Menu not found."
-msgstr "Menü nicht gefunden"
-
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
-msgstr "Menü-Element aktualisiert."
-
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
-
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
-msgstr "Menü-Bestandteil hinzugefügt."
-
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
-
-#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:181
-msgid "Not found."
-msgstr "Nicht gefunden."
-
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
-msgstr "Menü-Bestandteile verwalten"
-
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
-
-#: ../../mod/mitem.php:102
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
-
-#: ../../mod/mitem.php:103
-msgid "Drop element"
-msgstr "Bestandteil löschen"
-
-#: ../../mod/mitem.php:104
-msgid "New element"
-msgstr "Neues Bestandteil"
-
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
-
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
-
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
-
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
-
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
-msgstr "Neues Menü-Bestandteil"
-
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
-msgstr "Menü-Element Zugriffsrechte"
-
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:937
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
-
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
-msgstr "Link Text"
-
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
-msgstr "URL des Links"
-
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
-msgstr "Verwende Red Magic-Auth wenn verfügbar"
-
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
-
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
-
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
-
-#: ../../mod/mitem.php:142 ../../mod/menu.php:79 ../../mod/new_channel.php:117
-msgid "Create"
-msgstr "Erstelle"
-
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
-
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
-
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
-
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
-
-#: ../../mod/mitem.php:186 ../../mod/menu.php:107
-msgid "Modify"
-msgstr "Ändern"
-
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Sammlung erstellt."
-
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Sammlung kann nicht erstellt werden."
-
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Sammlung aktualisiert."
-
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Erstelle eine Sammlung von Kanälen."
-
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr "Name der Sammlung:"
+#: ../../mod/filer.php:35
+msgid "- select -"
+msgstr "-auswählen-"
 
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr "Mitglieder sind sichtbar für andere Kanäle"
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
 
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Sammlung gelöscht."
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
+msgstr "Element nicht gefunden"
 
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Löschen der Sammlung nicht möglich."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr "Sammlung-Editor"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr "Eintrag löschen?"
 
-#: ../../mod/group.php:196
-msgid "Members"
-msgstr "Mitglieder"
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
+msgstr "YouTube-Video einfügen"
 
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
-msgstr "Alle verbundenen Kanäle"
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis [.ogg]-Video einfügen"
 
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
-msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis [.ogg]-Audio einfügen"
 
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
-msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werden."
+#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
+msgstr "Alter:"
 
-#: ../../mod/photos.php:97
-msgid "Album not found."
-msgstr "Album nicht gefunden."
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
+msgid "Gender: "
+msgstr "Geschlecht:"
 
-#: ../../mod/photos.php:119 ../../mod/photos.php:668
-msgid "Delete Album"
-msgstr "Album löschen"
+#: ../../mod/directory.php:207
+msgid "Finding:"
+msgstr "Ergebnisse:"
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:934
-msgid "Delete Photo"
-msgstr "Foto löschen"
+#: ../../mod/directory.php:215
+msgid "next page"
+msgstr "nächste Seite"
 
-#: ../../mod/photos.php:452
-msgid "No photos selected"
-msgstr "Keine Fotos ausgewählt"
+#: ../../mod/directory.php:215
+msgid "previous page"
+msgstr "vorige Seite"
 
-#: ../../mod/photos.php:499
-msgid "Access to this item is restricted."
-msgstr "Zugriff auf dieses Foto wurde eingeschränkt."
+#: ../../mod/directory.php:222
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../mod/photos.php:573
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers."
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
+msgstr "Konnte auf den Kontakteintrag nicht zugreifen."
 
-#: ../../mod/photos.php:576
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr "Du verwendets %1$.2f MBytes deines Foto-Speichers."
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
+msgstr "Konnte das gewählte Profil nicht finden."
 
-#: ../../mod/photos.php:595
-msgid "Upload Photos"
-msgstr "Fotos hochladen"
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
+msgstr "Verbindung aktualisiert."
 
-#: ../../mod/photos.php:599 ../../mod/photos.php:663
-msgid "New album name: "
-msgstr "Name des neuen Albums:"
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
+msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../mod/photos.php:600
-msgid "or existing album name: "
-msgstr "oder bestehenden Album Namen:"
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
+msgstr "Konnte nicht auf den Eintrag im Adressbuch zugreifen."
 
-#: ../../mod/photos.php:601
-msgid "Do not show a status post for this upload"
-msgstr "Keine Statusnachricht für diesen Upload senden"
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../mod/photos.php:603 ../../mod/photos.php:929
-#: ../../mod/filestorage.php:124
-msgid "Permissions"
-msgstr "Berechtigungen"
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
+msgstr "Kanal nicht mehr blockiert"
 
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1105
-#: ../../mod/photos.php:1120
-msgid "Contact Photos"
-msgstr "Kontakt Bilder"
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
+msgstr "Kanal blockiert"
 
-#: ../../mod/photos.php:678
-msgid "Edit Album"
-msgstr "Album bearbeiten"
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
+msgstr "Konnte die Adressbuch Parameter nicht setzen."
 
-#: ../../mod/photos.php:684
-msgid "Show Newest First"
-msgstr "Zeige neueste zuerst"
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
+msgstr "Kanal wird nicht mehr ignoriert"
 
-#: ../../mod/photos.php:686
-msgid "Show Oldest First"
-msgstr "Zeige älteste zuerst"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
+msgstr "Kanal wird ignoriert"
 
-#: ../../mod/photos.php:729 ../../mod/photos.php:1152
-msgid "View Photo"
-msgstr "Foto ansehen"
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
+msgstr "Kanal wurde aus dem Archiv zurück geholt"
 
-#: ../../mod/photos.php:775
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
+msgstr "Kanal wurde archiviert"
 
-#: ../../mod/photos.php:777
-msgid "Photo not available"
-msgstr "Foto nicht verfügbar"
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
+msgstr "Kanal wird nicht mehr versteckt"
 
-#: ../../mod/photos.php:837
-msgid "Use as profile photo"
-msgstr "Als Profilfoto verwenden"
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
+msgstr "Kanal wurde versteckt"
 
-#: ../../mod/photos.php:861
-msgid "View Full Size"
-msgstr "In voller Größe anzeigen"
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
+msgstr "Kanal wurde zugelassen"
 
-#: ../../mod/photos.php:917
-msgid "Edit photo"
-msgstr "Foto bearbeiten"
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
+msgstr "Zulassung des Kanals entfernt"
 
-#: ../../mod/photos.php:919
-msgid "Rotate CW (right)"
-msgstr "Drehen US (rechts)"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
+msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/photos.php:920
-msgid "Rotate CCW (left)"
-msgstr "Drehen EUS (links)"
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
+msgstr "%s's Profil ansehen"
 
-#: ../../mod/photos.php:922
-msgid "New album name"
-msgstr "Name des neuen Albums:"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
+msgstr "Zugriffsrechte auffrischen"
 
-#: ../../mod/photos.php:925
-msgid "Caption"
-msgstr "Bildunterschrift"
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
+msgstr "Aktualisierte Zugriffsrechte abfragen"
 
-#: ../../mod/photos.php:927
-msgid "Add a Tag"
-msgstr "Schlagwort hinzufügen"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
+msgstr "Kürzliche Aktivitäten"
 
-#: ../../mod/photos.php:931
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
+msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../mod/photos.php:1158
-msgid "View Album"
-msgstr "Album ansehen"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
+msgstr "Verbindung blockieren oder frei geben"
 
-#: ../../mod/photos.php:1167
-msgid "Recent Photos"
-msgstr "Neueste Fotos"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
+msgstr "Nicht ignorieren"
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorieren"
 
-#: ../../mod/chat.php:130
-msgid "New Chatroom"
-msgstr "Neuen Chatraum"
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
+msgstr "Verbindung ignorieren oder wieder beachten"
 
-#: ../../mod/chat.php:131
-msgid "Chatroom Name"
-msgstr "Chatraum Name"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/filer.php:35
-msgid "- select -"
-msgstr "-auswählen-"
+#: ../../mod/connedit.php:346
+msgid "Archive"
+msgstr "Archivieren"
 
-#: ../../mod/menu.php:17
-msgid "Menu updated."
-msgstr "Menü aktualisiert."
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
+msgstr "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück"
 
-#: ../../mod/menu.php:21
-msgid "Unable to update menu."
-msgstr "Kann Menü nicht aktualisieren."
+#: ../../mod/connedit.php:352
+msgid "Unhide"
+msgstr "aufdecken"
 
-#: ../../mod/menu.php:26
-msgid "Menu created."
-msgstr "Menü erstellt."
+#: ../../mod/connedit.php:352
+msgid "Hide"
+msgstr "Verbergen"
 
-#: ../../mod/menu.php:30
-msgid "Unable to create menu."
-msgstr "Kann Menü nicht erstellen."
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
+msgstr "Diese Verbindung verstecken oder aufdecken"
 
-#: ../../mod/menu.php:53
-msgid "Manage Menus"
-msgstr "Menüs verwalten"
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
+msgstr "Verbindung löschen"
 
-#: ../../mod/menu.php:56
-msgid "Drop"
-msgstr "Löschen"
+#: ../../mod/connedit.php:395
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../../mod/menu.php:58
-msgid "Create a new menu"
-msgstr "Neues Menü erstellen"
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
+msgstr "Verbindung genehmigen"
 
-#: ../../mod/menu.php:59
-msgid "Delete this menu"
-msgstr "Lösche dieses Menü"
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
+msgstr "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen"
 
-#: ../../mod/menu.php:60 ../../mod/menu.php:104
-msgid "Edit menu contents"
-msgstr "Bearbeite Menü Inhalte"
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
+msgstr "Automatische Berechtigungs-Einstellungen"
 
-#: ../../mod/menu.php:61
-msgid "Edit this menu"
-msgstr "Dieses Menü bearbeiten"
+#: ../../mod/connedit.php:421
+#, php-format
+msgid "Connections: settings for %s"
+msgstr "Verbindungseinstellungen für %s"
 
-#: ../../mod/menu.php:76
-msgid "New Menu"
-msgstr "Neues Menü"
+#: ../../mod/connedit.php:425
+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 "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest."
 
-#: ../../mod/menu.php:77 ../../mod/menu.php:105
-msgid "Menu name"
-msgstr "Menü Name"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
+msgstr "Schieben um den Grad der Freundschaft zu wählen"
 
-#: ../../mod/menu.php:77 ../../mod/menu.php:105
-msgid "Must be unique, only seen by you"
-msgstr "Muss unverwechselbar sein, nur für dich sichtbar"
+#: ../../mod/connedit.php:433
+msgid "inherited"
+msgstr "Geerbt"
 
-#: ../../mod/menu.php:78 ../../mod/menu.php:106
-msgid "Menu title"
-msgstr "Menü Titel"
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
+msgstr "Diese Verbindung hat keine individuellen Zugriffseinstellungen."
 
-#: ../../mod/menu.php:78 ../../mod/menu.php:106
-msgid "Menu title as seen by others"
-msgstr "Menü Titel wie er von anderen gesehen wird"
+#: ../../mod/connedit.php:436
+msgid ""
+"This may be appropriate based on your privacy "
+"settings, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Abhängig von deinen Privatsphären Einstellungen könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen."
 
-#: ../../mod/menu.php:93
-msgid "Menu deleted."
-msgstr "Menü gelöscht."
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
+msgstr "Sichtbarkeit des Profils"
 
-#: ../../mod/menu.php:95
-msgid "Menu could not be deleted."
-msgstr "Menü konnte nicht gelöscht werden."
+#: ../../mod/connedit.php:439
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../mod/menu.php:101
-msgid "Edit Menu"
-msgstr "Menü bearbeiten"
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
+msgstr "Kontaktinformationen / Notizen"
 
-#: ../../mod/menu.php:103
-msgid "Add or remove entries to this menu"
-msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
+msgstr "Kontaktnotizen editieren"
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
+msgstr "Deren Einstellungen"
 
-#: ../../mod/directory.php:143 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
-msgstr "Alter:"
+#: ../../mod/connedit.php:444
+msgid "My Settings"
+msgstr "Meine Einstellungen"
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
-msgid "Gender: "
-msgstr "Geschlecht:"
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
+msgstr "Forum Mitglieder"
 
-#: ../../mod/directory.php:207
-msgid "Finding:"
-msgstr "Ergebnisse:"
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
+msgstr "Marktschreier"
 
-#: ../../mod/directory.php:215
-msgid "next page"
-msgstr "nächste Seite"
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
+msgstr ""
 
-#: ../../mod/directory.php:215
-msgid "previous page"
-msgstr "vorige Seite"
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
+msgstr ""
 
-#: ../../mod/directory.php:222
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
+msgstr "Nur Folgen"
 
-#: ../../mod/connections.php:189 ../../mod/connections.php:261
-msgid "Blocked"
-msgstr "Blockiert"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
+msgstr "Individuelle Zugriffseinstellungen"
 
-#: ../../mod/connections.php:194 ../../mod/connections.php:268
-msgid "Ignored"
-msgstr "Ignoriert"
+#: ../../mod/connedit.php:452
+msgid ""
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
+"individual settings. Changing those inherited settings on this page will "
+"have no effect."
+msgstr ""
 
-#: ../../mod/connections.php:199 ../../mod/connections.php:282
-msgid "Hidden"
-msgstr "Versteckt"
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
+msgstr "Erweiterte Zugriffsrechte"
 
-#: ../../mod/connections.php:204 ../../mod/connections.php:275
-msgid "Archived"
-msgstr "Archiviert"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
+msgstr ""
 
-#: ../../mod/connections.php:215
-msgid "All"
-msgstr "Alle"
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "%s's Profil besuchen - %s"
 
-#: ../../mod/connections.php:239
-msgid "Suggest new connections"
-msgstr "Neue Verbindungen vorschlagen"
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
+msgstr "Geblockt Status ein- / ausschalten"
 
-#: ../../mod/connections.php:245
-msgid "Show pending (new) connections"
-msgstr "Zeige schwebende (neue) Verbindungen"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
+msgstr "Kontakt ignorieren"
 
-#: ../../mod/connections.php:248 ../../mod/profperm.php:134
-msgid "All Connections"
-msgstr "Alle Verbindungen"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
+msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/connections.php:251
-msgid "Show all connections"
-msgstr "Zeige alle Verbindungen"
+#: ../../mod/connedit.php:462
+msgid "View conversations"
+msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/connections.php:254
-msgid "Unblocked"
-msgstr "Freigegeben"
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
+msgstr "Kontakt löschen"
 
-#: ../../mod/connections.php:257
-msgid "Only show unblocked connections"
-msgstr "Zeige nur freigegebene Verbindungen"
+#: ../../mod/connedit.php:467
+msgid "Last update:"
+msgstr "Letzte Aktualisierung:"
 
-#: ../../mod/connections.php:264
-msgid "Only show blocked connections"
-msgstr "Zeige nur blockierte Verbindungen"
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
+msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/connections.php:271
-msgid "Only show ignored connections"
-msgstr "Zeige nur ignorierte Verbindungen"
+#: ../../mod/connedit.php:471
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
 
-#: ../../mod/connections.php:278
-msgid "Only show archived connections"
-msgstr "Zeige nur archivierte Verbindungen"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
+msgstr "Derzeit blockiert"
 
-#: ../../mod/connections.php:285
-msgid "Only show hidden connections"
-msgstr "Zeige nur versteckte Verbindungen"
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
 
-#: ../../mod/connections.php:329
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr "%1$s [%2$s]"
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
+msgstr "Derzeit archiviert"
 
-#: ../../mod/connections.php:330
-msgid "Edit contact"
-msgstr "Kontakt bearbeiten"
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
+msgstr "Derzeit anstehend"
 
-#: ../../mod/connections.php:353
-msgid "Search your connections"
-msgstr "Verbindungen durchsuchen"
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
+msgstr "Diese Verbindung vor den anderen verbergen."
 
-#: ../../mod/connections.php:354
-msgid "Finding: "
-msgstr "Ergebnisse:"
+#: ../../mod/connedit.php:481
+msgid ""
+"Replies/likes to your public posts may still be visible"
+msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"
 
 #: ../../mod/layouts.php:52
 msgid "Layout Help"
@@ -5338,6 +5278,11 @@ msgstr "Hilfe:"
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
+
 #: ../../mod/rmagic.php:56
 msgid "Remote Authentication"
 msgstr "Entfernte Authentifizierung"
@@ -5350,6 +5295,10 @@ msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
 msgid "Authenticate"
 msgstr "Authentifizieren"
 
+#: ../../mod/page.php:35
+msgid "Invalid item."
+msgstr "Ungültiges Element."
+
 #: ../../mod/network.php:79
 msgid "No such group"
 msgstr "Gruppe existiert nicht"
@@ -5358,99 +5307,21 @@ msgstr "Gruppe existiert nicht"
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
-msgstr "Sammlung ist leer"
-
-#: ../../mod/network.php:180
-msgid "Collection: "
-msgstr "Sammlung:"
-
-#: ../../mod/network.php:193
-msgid "Connection: "
-msgstr "Verbindung:"
-
-#: ../../mod/network.php:196
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
-
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
-
-#: ../../mod/post.php:226
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut."
-
-#: ../../mod/post.php:256
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
-
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Diese Website ist kein Verzeichnis-Server"
-
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr "Version %s"
-
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:94
-msgid "Red"
-msgstr "Red"
-
-#: ../../mod/siteinfo.php:95
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
-
-#: ../../mod/siteinfo.php:98
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
-
-#: ../../mod/siteinfo.php:99
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
-
-#: ../../mod/siteinfo.php:100
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
-
-#: ../../mod/siteinfo.php:103
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
-"librelist - dot com"
-msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-
-#: ../../mod/siteinfo.php:104
-msgid "Site Administrators"
-msgstr "Administratoren"
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "Sammlung ist leer"
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
-msgstr "Entfernte Privatsphären Einstellungen sind nicht verfügbar."
+#: ../../mod/network.php:180
+msgid "Collection: "
+msgstr "Sammlung:"
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Sichtbar für:"
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr "Verbindung:"
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
-msgstr "Server nicht gefunden."
+#: ../../mod/network.php:196
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:138
 #: ../../mod/profiles.php:168 ../../mod/profiles.php:463
@@ -5700,665 +5571,728 @@ msgstr "Profil-Dinge hinzufügen"
 msgid "Include desirable objects in your profile"
 msgstr "binde begehrenswerte Dinge in dein Profil ein"
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
-msgstr "Kanal hinzufügen"
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
 
-#: ../../mod/new_channel.php:108
+#: ../../mod/post.php:226
 msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt."
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut."
 
-#: ../../mod/new_channel.php:111
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+#: ../../mod/post.php:256
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznahmen"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Diese Website ist kein Verzeichnis-Server"
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
 
-#: ../../mod/new_channel.php:114
-msgid "Or import an existing channel from another location"
-msgstr "Oder importiere einen bestehenden Kanal von einem anderen Ort"
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Quelle erstellt."
 
-#: ../../mod/filestorage.php:68
-msgid "Permission Denied."
-msgstr "Zugriff verweigert."
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Quelle aktualisiert."
 
-#: ../../mod/filestorage.php:85
-msgid "File not found."
-msgstr "Datei nicht gefunden"
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
 
-#: ../../mod/filestorage.php:119
-msgid "Edit file permissions"
-msgstr "Dateiberechtigungen bearbeiten"
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Entfernte Quellen von Inhalten deines Kanals verwalten."
 
-#: ../../mod/filestorage.php:126
-msgid "Include all files and sub folders"
-msgstr "Alle Dateien und Unterverzeichnisse einbinden"
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Neue Quelle"
 
-#: ../../mod/filestorage.php:127
-msgid "Return to file list"
-msgstr "Zurück zur Dateiliste"
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
-#: ../../mod/filestorage.php:129
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../mod/filestorage.php:130
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Leer lassen um alle öffentlichen Beiträge zu importieren"
 
-#: ../../mod/filestorage.php:167
-msgid "Download"
-msgstr "Download"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
+msgstr "Name des Kanals"
 
-#: ../../mod/filestorage.php:173
-msgid "Used: "
-msgstr "Verwendet:"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Quelle nicht gefunden."
 
-#: ../../mod/filestorage.php:174
-msgid "[directory]"
-msgstr "[Verzeichnis]"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Quelle bearbeiten"
 
-#: ../../mod/filestorage.php:176
-msgid "Limit: "
-msgstr "Limit:"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Quelle löschen"
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Kein gültiges Konto gefunden."
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Quelle gelöscht"
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab."
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Konnte die Quelle nicht löschen."
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Seiten Mitglied (%s)"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
+msgstr "Entfernte Privatsphären Einstellungen sind nicht verfügbar."
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Passwort Rücksetzung auf %s angefordert"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Sichtbar für:"
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen."
+#: ../../mod/magic.php:70
+msgid "Hub not found."
+msgstr "Server nicht gefunden."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1431
-msgid "Password Reset"
-msgstr "Zurücksetzen des Kennworts"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
+msgstr "Red Matrix Server - Installation"
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie angefordert neu erstellt."
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
+msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
-msgstr "Dein neues Passwort lautet"
+#: ../../mod/setup.php:171
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS."
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere dein neues Passwort - und dann"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
+msgstr "Kann Tabelle nicht erstellen."
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
-msgstr "Klicke hier, um dich anzumelden"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
+msgstr "Die Datenbank deiner Seite wurde installiert."
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/setup.php:187
 msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
-msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
+msgstr "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren."
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Auf %s wurde dein Passwort geändert"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr "Kennwort vergessen?"
+#: ../../mod/setup.php:254
+msgid "System check"
+msgstr "Systemprüfung"
 
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
+#: ../../mod/setup.php:259
+msgid "Check again"
+msgstr "Bitte nochmal prüfen"
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
-msgstr "E-Mail Adresse"
+#: ../../mod/setup.php:281
+msgid "Database connection"
+msgstr "Datenbank Verbindung"
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
+msgstr "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können."
 
-#: ../../mod/import.php:36
-msgid "Nothing to import."
-msgstr "Nichts zu importieren."
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest."
 
-#: ../../mod/import.php:58
-msgid "Unable to download data from old server"
-msgstr "Daten können vom alten Server nicht heruntergeladen werden"
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst."
 
-#: ../../mod/import.php:64
-msgid "Imported file is empty."
-msgstr "Die importierte Datei ist leer."
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
+msgstr "Datenbank-Servername"
 
-#: ../../mod/import.php:88
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kann auf diesem System keinen duplizierten Kanal-Identifikator erzeugen. Import fehlgeschlagen."
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
+msgstr "Standard ist localhost"
+
+#: ../../mod/setup.php:289
+msgid "Database Port"
+msgstr "Datenbank-Port"
 
-#: ../../mod/import.php:106
-msgid "Channel clone failed. Import failed."
-msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
+msgstr "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:"
 
-#: ../../mod/import.php:116
-msgid "Cloned channel not found. Import failed."
-msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
+msgstr "Datenbank-Benutzername"
 
-#: ../../mod/import.php:358
-msgid "Import completed."
-msgstr "Import abgeschlossen."
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
+msgstr "Datenbank-Kennwort"
 
-#: ../../mod/import.php:371
-msgid "You must be logged in to use this feature."
-msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
+#: ../../mod/setup.php:292
+msgid "Database Name"
+msgstr "Datenbank-Name"
 
-#: ../../mod/import.php:376
-msgid "Import Channel"
-msgstr "Kanal importieren"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
+msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../mod/import.php:377
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
 msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file. Only identity and connections/relationships will "
-"be imported. Importation of content is not yet available."
-msgstr "Verwende dieses Formular um einen existierenden Kanal von einem anderen Server/Hub zu importieren. Du kannst die Kanal-Identität vom alten Server/Hub über das Netzwerk erhalten oder über eine exportierte Sicherungskopie. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich."
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst."
 
-#: ../../mod/import.php:378
-msgid "File to Upload"
-msgstr "Hochzuladende Datei:"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
+msgstr "Webseiten URL"
 
-#: ../../mod/import.php:379
-msgid "Or provide the old server/hub details"
-msgstr "Oder gib die Deteils deines alten Server/Hubs an"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
+msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../mod/import.php:380
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Die alte Adresse der Identität (xyz@example.com)"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
+msgstr "Standard-Zeitzone für deine Website"
 
-#: ../../mod/import.php:381
-msgid "Your old login email address"
-msgstr "Ihre alte Login E-Mail Adresse"
+#: ../../mod/setup.php:325
+msgid "Site settings"
+msgstr "Seiteneinstellungen"
 
-#: ../../mod/import.php:382
-msgid "Your old login password"
-msgstr "Ihr altes Login Kennwort"
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden."
 
-#: ../../mod/import.php:383
+#: ../../mod/setup.php:385
 msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue primäre Adresse sein soll oder ob dein alter Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Orten aus neue Dinge posten, aber nur einer kann die primäre Adresse deiner Dateien, Fotos und anderen Mediendaten sein."
-
-#: ../../mod/import.php:384
-msgid "Make this hub my primary location"
-msgstr "Dieser Hub ist mein primärer Server."
-
-#: ../../mod/manage.php:63
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet."
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen."
 
-#: ../../mod/manage.php:71
-msgid "Create a new channel"
-msgstr "Erzeuge neues Kanal"
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
+msgstr "PHP Pfad zu ausführbarer Datei"
 
-#: ../../mod/manage.php:76
-msgid "Channel Manager"
-msgstr "Kanal-Manager"
+#: ../../mod/setup.php:389
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren."
 
-#: ../../mod/manage.php:77
-msgid "Current Channel"
-msgstr "Aktueller Kanal"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
+msgstr "PHP Befehlszeile"
 
-#: ../../mod/manage.php:79
-msgid "Attach to one of your channels by selecting it."
-msgstr "Wähle einen deiner Kanäle aus um ihn zu verwenden."
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."
 
-#: ../../mod/manage.php:80
-msgid "Default Channel"
-msgstr "Standard Kanal"
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
+msgstr "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../mod/manage.php:81
-msgid "Make Default"
-msgstr "Zum Standard machen"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/vote.php:97
-msgid "Total votes"
-msgstr "Stimmen gesamt"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../mod/vote.php:98
-msgid "Average Rating"
-msgstr "durchschnittliche Bewertung"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung."
 
-#: ../../mod/match.php:16
-msgid "Profile Match"
-msgstr "Profil-Übereinstimmungen"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
+msgstr "Verschlüsselungsschlüssel  generieren"
 
-#: ../../mod/match.php:24
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselbegriffe für den Abgleich gefunden. Bitte füge Schlüsselbegriffe zu deinem Standardprofil hinzu."
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
+msgstr "libCurl PHP Modul"
 
-#: ../../mod/match.php:61
-msgid "is interested in:"
-msgstr "interessiert sich für:"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
+msgstr "GD Graphik PHP Modul"
 
-#: ../../mod/match.php:69
-msgid "No matches"
-msgstr "Keine Übereinstimmungen"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL PHP Modul"
 
-#: ../../mod/zfinger.php:23
-msgid "invalid target signature"
-msgstr "Ungültige Signatur des Ziels"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
+msgstr "mysqli PHP Modul"
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
-msgstr "Name wird benötigt"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
+msgstr "mb_string PHP Modul"
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
-msgstr "Schlüssel und Geheimnis werden benötigt"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
+msgstr "mcrypt PHP Modul"
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:535
-msgid "Update"
-msgstr "Update"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite Modul"
 
-#: ../../mod/settings.php:192
-msgid "Passwords do not match. Password unchanged."
-msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:196
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../mod/settings.php:209
-msgid "Password changed."
-msgstr "Kennwort geändert."
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../mod/settings.php:211
-msgid "Password update failed. Please try again."
-msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:225
-msgid "Not valid email."
-msgstr "Keine gültige E-Mail Adresse."
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:228
-msgid "Protected email address. Cannot change to that email."
-msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:237
-msgid "System failure storing new email. Please try again."
-msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:437
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:508 ../../mod/settings.php:534
-#: ../../mod/settings.php:570
-msgid "Add application"
-msgstr "Anwendung hinzufügen"
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert."
 
-#: ../../mod/settings.php:511 ../../mod/settings.php:537
-msgid "Name"
-msgstr "Name"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht."
 
-#: ../../mod/settings.php:511
-msgid "Name of application"
-msgstr "Name der Anwendung"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst."
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
-msgid "Consumer Key"
-msgstr "Consumer Key"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern."
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:513
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../mod/settings.php:513 ../../mod/settings.php:539
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../mod/settings.php:514 ../../mod/settings.php:540
-msgid "Redirect"
-msgstr "Umleitung"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen."
 
-#: ../../mod/settings.php:514
+#: ../../mod/setup.php:514
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit"
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
+msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben."
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-msgid "Icon url"
-msgstr "Symbol-URL"
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat."
 
-#: ../../mod/settings.php:515
-msgid "Optional"
-msgstr "Optional"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen."
 
-#: ../../mod/settings.php:526
-msgid "You can't edit this application."
-msgstr "Diese Anwendung kann nicht bearbeitet werden."
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
+msgstr "view/tpl/smarty3 ist beschreibbar"
 
-#: ../../mod/settings.php:569
-msgid "Connected Apps"
-msgstr "Verbundene Apps"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis."
 
-#: ../../mod/settings.php:573
-msgid "Client key starts with"
-msgstr "Client key beginnt mit"
+#: ../../mod/setup.php:536
+msgid "store is writable"
+msgstr "store ist schreibbar"
 
-#: ../../mod/settings.php:574
-msgid "No name"
-msgstr "Kein Name"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
+msgstr "SSL Zertifikatverifizierung"
 
-#: ../../mod/settings.php:575
-msgid "Remove authorization"
-msgstr "Authorisierung aufheben"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen."
 
-#: ../../mod/settings.php:586
-msgid "No feature settings configured"
-msgstr "Keine Funktions-Einstellungen konfiguriert"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration."
 
-#: ../../mod/settings.php:594
-msgid "Feature Settings"
-msgstr "Funktions-Einstellungen"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
+msgstr "Url rewrite funktioniert"
 
-#: ../../mod/settings.php:617
-msgid "Account Settings"
-msgstr "Konto-Einstellungen"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../mod/settings.php:618
-msgid "Password Settings"
-msgstr "Kennwort-Einstellungen"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
+msgstr "Fehler während des Anlegens der Datenbank Tabellen aufgetreten."
 
-#: ../../mod/settings.php:619
-msgid "New Password:"
-msgstr "Neues Passwort:"
+#: ../../mod/setup.php:607
+msgid "
                                                                                              What next
                                                                                              "
+msgstr "
                                                                                              Was als Nächstes
                                                                                              "
 
-#: ../../mod/settings.php:620
-msgid "Confirm:"
-msgstr "Bestätigen:"
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
 
-#: ../../mod/settings.php:620
-msgid "Leave password fields blank unless changing"
-msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
 
-#: ../../mod/settings.php:622 ../../mod/settings.php:917
-msgid "Email Address:"
-msgstr "Email Adresse:"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
 
-#: ../../mod/settings.php:623
-msgid "Remove Account"
-msgstr "Konto entfernen"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
 
-#: ../../mod/settings.php:624
-msgid "Warning: This action is permanent and cannot be reversed."
-msgstr "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden."
+#: ../../mod/siteinfo.php:109
+msgid "Red"
+msgstr "Red"
 
-#: ../../mod/settings.php:640
-msgid "Off"
-msgstr "Aus"
+#: ../../mod/siteinfo.php:110
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
 
-#: ../../mod/settings.php:640
-msgid "On"
-msgstr "An"
+#: ../../mod/siteinfo.php:113
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
 
-#: ../../mod/settings.php:647
-msgid "Additional Features"
-msgstr "Zusätzliche Funktionen"
+#: ../../mod/siteinfo.php:114
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
 
-#: ../../mod/settings.php:672
-msgid "Connector Settings"
-msgstr "Connector-Einstellungen"
+#: ../../mod/siteinfo.php:115
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
-#: ../../mod/settings.php:742
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../mod/siteinfo.php:118
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
 
-#: ../../mod/settings.php:748
-msgid "Display Theme:"
-msgstr "Anzeige Theme:"
+#: ../../mod/siteinfo.php:120
+msgid "Site Administrators"
+msgstr "Administratoren"
 
-#: ../../mod/settings.php:749
-msgid "Mobile Theme:"
-msgstr "Mobile Theme:"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr "Kanal hinzufügen"
 
-#: ../../mod/settings.php:750
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt."
 
-#: ../../mod/settings.php:750
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimum von 10 Sekunden, kein Maximum"
+#: ../../mod/new_channel.php:111
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
 
-#: ../../mod/settings.php:751
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr "Wähle einen kurzen Spitznahmen"
 
-#: ../../mod/settings.php:751
-msgid "Maximum of 100 items"
-msgstr "Maximum von 100 Beiträgen"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
 
-#: ../../mod/settings.php:752
-msgid "Don't show emoticons"
-msgstr "Emoticons nicht zeigen"
+#: ../../mod/new_channel.php:114
+msgid "Or import an existing channel from another location"
+msgstr "Oder importiere einen bestehenden Kanal von einem anderen Ort"
 
-#: ../../mod/settings.php:788
-msgid "Nobody except yourself"
-msgstr "Niemand außer du selbst"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Kein gültiges Konto gefunden."
 
-#: ../../mod/settings.php:789
-msgid "Only those you specifically allow"
-msgstr "Nur die, denen du es explizit erlaubst"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab."
 
-#: ../../mod/settings.php:790
-msgid "Anybody in your address book"
-msgstr "Jeder aus Ihrem Adressbuch"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Seiten Mitglied (%s)"
 
-#: ../../mod/settings.php:791
-msgid "Anybody on this website"
-msgstr "Jeder auf dieser Website"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Passwort Rücksetzung auf %s angefordert"
 
-#: ../../mod/settings.php:792
-msgid "Anybody in this network"
-msgstr "Jeder in diesem Netzwerk"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen."
 
-#: ../../mod/settings.php:793
-msgid "Anybody on the internet"
-msgstr "Jeder im Internet"
+#: ../../mod/lostpass.php:85 ../../boot.php:1434
+msgid "Password Reset"
+msgstr "Zurücksetzen des Kennworts"
 
-#: ../../mod/settings.php:870
-msgid "Publish your default profile in the network directory"
-msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie angefordert neu erstellt."
 
-#: ../../mod/settings.php:875
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/settings.php:879 ../../mod/profile_photo.php:288
-msgid "or"
-msgstr "oder"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere dein neues Passwort - und dann"
 
-#: ../../mod/settings.php:884
-msgid "Your channel address is"
-msgstr "Deine Kanal-Adresse lautet"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
+msgstr "Klicke hier, um dich anzumelden"
 
-#: ../../mod/settings.php:906
-msgid "Channel Settings"
-msgstr "Kanal-Einstellungen"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
+msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
 
-#: ../../mod/settings.php:915
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Auf %s wurde dein Passwort geändert"
 
-#: ../../mod/settings.php:918
-msgid "Your Timezone:"
-msgstr "Ihre Zeitzone:"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Kennwort vergessen?"
 
-#: ../../mod/settings.php:919
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
 
-#: ../../mod/settings.php:920
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr "E-Mail Adresse"
 
-#: ../../mod/settings.php:922
-msgid "Adult Content"
-msgstr "Nicht Jugendfreie-Inhalte"
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Zurücksetzen"
 
-#: ../../mod/settings.php:922
-msgid "This channel publishes adult content."
-msgstr "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte"
+#: ../../mod/import.php:36
+msgid "Nothing to import."
+msgstr "Nichts zu importieren."
 
-#: ../../mod/settings.php:924
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Datenschutz-Einstellungen"
+#: ../../mod/import.php:58
+msgid "Unable to download data from old server"
+msgstr "Daten können vom alten Server nicht heruntergeladen werden"
 
-#: ../../mod/settings.php:926
-msgid "Hide my online presence"
-msgstr "Meine Online-Präsenz verbergen"
+#: ../../mod/import.php:64
+msgid "Imported file is empty."
+msgstr "Die importierte Datei ist leer."
 
-#: ../../mod/settings.php:926
-msgid "Prevents showing if you are available for chat"
-msgstr "Verhindert es als für Chats verfügbar angezeigt zu werden"
+#: ../../mod/import.php:88
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kann auf diesem System keinen duplizierten Kanal-Identifikator erzeugen. Import fehlgeschlagen."
 
-#: ../../mod/settings.php:928
-msgid "Quick Privacy Settings:"
-msgstr "Schnelle Datenschutz-Einstellungen:"
+#: ../../mod/import.php:106
+msgid "Channel clone failed. Import failed."
+msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
 
-#: ../../mod/settings.php:929
-msgid "Very Public - extremely permissive"
-msgstr "Sehr offen - extrem freizügig"
+#: ../../mod/import.php:116
+msgid "Cloned channel not found. Import failed."
+msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
 
-#: ../../mod/settings.php:930
-msgid "Typical - default public, privacy when desired"
-msgstr "Typisch - Standard öffentlich, Privatheit wenn gewünscht"
+#: ../../mod/import.php:358
+msgid "Import completed."
+msgstr "Import abgeschlossen."
 
-#: ../../mod/settings.php:931
-msgid "Private - default private, rarely open or public"
-msgstr "Privat - Standard privat, selten offen oder öffentlich"
+#: ../../mod/import.php:371
+msgid "You must be logged in to use this feature."
+msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
 
-#: ../../mod/settings.php:932
-msgid "Blocked - default blocked to/from everybody"
-msgstr "Geschlossen - Standard zu und von jedem geblockt"
+#: ../../mod/import.php:376
+msgid "Import Channel"
+msgstr "Kanal importieren"
 
-#: ../../mod/settings.php:935
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Kontaktanfragen pro Tag:"
+#: ../../mod/import.php:377
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file. Only identity and connections/relationships will "
+"be imported. Importation of content is not yet available."
+msgstr "Verwende dieses Formular um einen existierenden Kanal von einem anderen Server/Hub zu importieren. Du kannst die Kanal-Identität vom alten Server/Hub über das Netzwerk erhalten oder über eine exportierte Sicherungskopie. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich."
 
-#: ../../mod/settings.php:935
-msgid "May reduce spam activity"
-msgstr "Kann die Spam-Aktivität verringern"
+#: ../../mod/import.php:378
+msgid "File to Upload"
+msgstr "Hochzuladende Datei:"
 
-#: ../../mod/settings.php:936
-msgid "Default Post Permissions"
-msgstr "Beitragszugriffrechte Standardeinstellungen"
+#: ../../mod/import.php:379
+msgid "Or provide the old server/hub details"
+msgstr "Oder gib die Deteils deines alten Server/Hubs an"
 
-#: ../../mod/settings.php:948
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
+#: ../../mod/import.php:380
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Die alte Adresse der Identität (xyz@example.com)"
 
-#: ../../mod/settings.php:948
-msgid "Useful to reduce spamming"
-msgstr "Nützlich um Spam zu verringern"
+#: ../../mod/import.php:381
+msgid "Your old login email address"
+msgstr "Ihre alte Login E-Mail Adresse"
 
-#: ../../mod/settings.php:951
-msgid "Notification Settings"
-msgstr "Benachrichtigungs-Einstellungen"
+#: ../../mod/import.php:382
+msgid "Your old login password"
+msgstr "Ihr altes Login Kennwort"
 
-#: ../../mod/settings.php:952
-msgid "By default post a status message when:"
-msgstr "Sende standardmäßig Status-Nachrichten wenn:"
+#: ../../mod/import.php:383
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue primäre Adresse sein soll oder ob dein alter Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Orten aus neue Dinge posten, aber nur einer kann die primäre Adresse deiner Dateien, Fotos und anderen Mediendaten sein."
 
-#: ../../mod/settings.php:953
-msgid "accepting a friend request"
-msgstr "einer Kontaktanfrage stattgegeben wurde"
+#: ../../mod/import.php:384
+msgid "Make this hub my primary location"
+msgstr "Dieser Hub ist mein primärer Server."
 
-#: ../../mod/settings.php:954
-msgid "joining a forum/community"
-msgstr "ein Forum beigetreten wurde"
+#: ../../mod/manage.php:63
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../mod/settings.php:955
-msgid "making an interesting profile change"
-msgstr "eine interessante Änderung am Profil vorgenommen wurde"
+#: ../../mod/manage.php:71
+msgid "Create a new channel"
+msgstr "Erzeuge neues Kanal"
 
-#: ../../mod/settings.php:956
-msgid "Send a notification email when:"
-msgstr "Eine Email Benachrichtigung senden wenn:"
+#: ../../mod/manage.php:76
+msgid "Channel Manager"
+msgstr "Kanal-Manager"
 
-#: ../../mod/settings.php:957
-msgid "You receive an introduction"
-msgstr "Du eine Vorstellung erhältst"
+#: ../../mod/manage.php:77
+msgid "Current Channel"
+msgstr "Aktueller Kanal"
 
-#: ../../mod/settings.php:958
-msgid "Your introductions are confirmed"
-msgstr "Deine Vorstellung bestätigt wurde."
+#: ../../mod/manage.php:79
+msgid "Attach to one of your channels by selecting it."
+msgstr "Wähle einen deiner Kanäle aus um ihn zu verwenden."
 
-#: ../../mod/settings.php:959
-msgid "Someone writes on your profile wall"
-msgstr "Jemand auf deine Pinnwand schreibt"
+#: ../../mod/manage.php:80
+msgid "Default Channel"
+msgstr "Standard Kanal"
 
-#: ../../mod/settings.php:960
-msgid "Someone writes a followup comment"
-msgstr "Jemand einen Beitrag kommentiert"
+#: ../../mod/manage.php:81
+msgid "Make Default"
+msgstr "Zum Standard machen"
 
-#: ../../mod/settings.php:961
-msgid "You receive a private message"
-msgstr "Du eine private Nachricht erhältst"
+#: ../../mod/vote.php:97
+msgid "Total votes"
+msgstr "Stimmen gesamt"
 
-#: ../../mod/settings.php:962
-msgid "You receive a friend suggestion"
-msgstr "Du einen Kontaktvorschlag erhältst"
+#: ../../mod/vote.php:98
+msgid "Average Rating"
+msgstr "durchschnittliche Bewertung"
 
-#: ../../mod/settings.php:963
-msgid "You are tagged in a post"
-msgstr "Du wurdest in einem Beitrag getaggt"
+#: ../../mod/match.php:16
+msgid "Profile Match"
+msgstr "Profil-Übereinstimmungen"
 
-#: ../../mod/settings.php:964
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Keine Schlüsselbegriffe für den Abgleich gefunden. Bitte füge Schlüsselbegriffe zu deinem Standardprofil hinzu."
 
-#: ../../mod/settings.php:967
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Account / Seiten Arten Einstellungen"
+#: ../../mod/match.php:61
+msgid "is interested in:"
+msgstr "interessiert sich für:"
 
-#: ../../mod/settings.php:968
-msgid "Change the behaviour of this account for special situations"
-msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
+#: ../../mod/match.php:69
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
+
+#: ../../mod/zfinger.php:23
+msgid "invalid target signature"
+msgstr "Ungültige Signatur des Ziels"
 
 #: ../../mod/mail.php:33
 msgid "Unable to lookup recipient."
@@ -6434,11 +6368,6 @@ msgstr "Keine sichere Kommunikation verfügbar. Eventuell kanns
 msgid "Send Reply"
 msgstr "Antwort senden"
 
-#: ../../mod/editlayout.php:36 ../../mod/editpost.php:20
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
-msgstr "Element nicht gefunden"
-
 #: ../../mod/editlayout.php:72
 msgid "Edit Layout"
 msgstr "Layout bearbeiten"
@@ -6447,21 +6376,6 @@ msgstr "Layout bearbeiten"
 msgid "Delete layout?"
 msgstr "Layout löschen?"
 
-#: ../../mod/editlayout.php:110 ../../mod/editpost.php:107
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
-msgstr "YouTube-Video einfügen"
-
-#: ../../mod/editlayout.php:111 ../../mod/editpost.php:108
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis [.ogg]-Video einfügen"
-
-#: ../../mod/editlayout.php:112 ../../mod/editpost.php:109
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis [.ogg]-Audio einfügen"
-
 #: ../../mod/editlayout.php:147
 msgid "Delete Layout"
 msgstr "Layout löschen"
@@ -6542,13 +6456,78 @@ msgstr "Hochladen des Bilds fehlgeschlagen."
 msgid "Image size reduction [%s] failed."
 msgstr "Reduzierung der Bildgröße [%s] fehlgeschlagen."
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
+#: ../../mod/connections.php:191 ../../mod/connections.php:263
+msgid "Blocked"
+msgstr "Blockiert"
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Eintrag löschen?"
+#: ../../mod/connections.php:196 ../../mod/connections.php:270
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#: ../../mod/connections.php:201 ../../mod/connections.php:284
+msgid "Hidden"
+msgstr "Versteckt"
+
+#: ../../mod/connections.php:206 ../../mod/connections.php:277
+msgid "Archived"
+msgstr "Archiviert"
+
+#: ../../mod/connections.php:217
+msgid "All"
+msgstr "Alle"
+
+#: ../../mod/connections.php:241
+msgid "Suggest new connections"
+msgstr "Neue Verbindungen vorschlagen"
+
+#: ../../mod/connections.php:247
+msgid "Show pending (new) connections"
+msgstr "Zeige schwebende (neue) Verbindungen"
+
+#: ../../mod/connections.php:253
+msgid "Show all connections"
+msgstr "Zeige alle Verbindungen"
+
+#: ../../mod/connections.php:256
+msgid "Unblocked"
+msgstr "Freigegeben"
+
+#: ../../mod/connections.php:259
+msgid "Only show unblocked connections"
+msgstr "Zeige nur freigegebene Verbindungen"
+
+#: ../../mod/connections.php:266
+msgid "Only show blocked connections"
+msgstr "Zeige nur blockierte Verbindungen"
+
+#: ../../mod/connections.php:273
+msgid "Only show ignored connections"
+msgstr "Zeige nur ignorierte Verbindungen"
+
+#: ../../mod/connections.php:280
+msgid "Only show archived connections"
+msgstr "Zeige nur archivierte Verbindungen"
+
+#: ../../mod/connections.php:287
+msgid "Only show hidden connections"
+msgstr "Zeige nur versteckte Verbindungen"
+
+#: ../../mod/connections.php:331
+#, php-format
+msgid "%1$s [%2$s]"
+msgstr "%1$s [%2$s]"
+
+#: ../../mod/connections.php:332
+msgid "Edit contact"
+msgstr "Kontakt bearbeiten"
+
+#: ../../mod/connections.php:355
+msgid "Search your connections"
+msgstr "Verbindungen durchsuchen"
+
+#: ../../mod/connections.php:356
+msgid "Finding: "
+msgstr "Ergebnisse:"
 
 #: ../../mod/notifications.php:26
 msgid "Invalid request identifier."
@@ -6614,10 +6593,6 @@ msgstr "Wähle was du mit dem/r Empfänger/in tun willst"
 msgid "Make this post private"
 msgstr "Diesen Beitrag privat machen"
 
-#: ../../mod/wall_upload.php:41 ../../mod/item.php:1075
-msgid "Wall Photos"
-msgstr "Wall Fotos"
-
 #: ../../mod/channel.php:85
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
@@ -6663,21 +6638,78 @@ msgstr "Block löschen?"
 msgid "Delete Block"
 msgstr "Block löschen"
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil Identifikator"
+#: ../../mod/dirprofile.php:114
+msgid "Status: "
+msgstr "Status:"
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits Editor"
+#: ../../mod/dirprofile.php:115
+msgid "Sexual Preference: "
+msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
-msgstr "Wähle einen Kontakt zum Hinzufügen oder Löschen aus."
+#: ../../mod/dirprofile.php:117
+msgid "Homepage: "
+msgstr "Webseite:"
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
-msgstr "Sichtbar für"
+#: ../../mod/dirprofile.php:118
+msgid "Hometown: "
+msgstr "Wohnort:"
+
+#: ../../mod/dirprofile.php:120
+msgid "About: "
+msgstr "Über:"
+
+#: ../../mod/dirprofile.php:168
+msgid "Keywords: "
+msgstr "Schlüsselbegriffe:"
+
+#: ../../mod/filestorage.php:68
+msgid "Permission Denied."
+msgstr "Zugriff verweigert."
+
+#: ../../mod/filestorage.php:85
+msgid "File not found."
+msgstr "Datei nicht gefunden"
+
+#: ../../mod/filestorage.php:119
+msgid "Edit file permissions"
+msgstr "Dateiberechtigungen bearbeiten"
+
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
+#: ../../mod/photos.php:946
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: ../../mod/filestorage.php:126
+msgid "Include all files and sub folders"
+msgstr "Alle Dateien und Unterverzeichnisse einbinden"
+
+#: ../../mod/filestorage.php:127
+msgid "Return to file list"
+msgstr "Zurück zur Dateiliste"
+
+#: ../../mod/filestorage.php:129
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen"
+
+#: ../../mod/filestorage.php:130
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen"
+
+#: ../../mod/filestorage.php:167
+msgid "Download"
+msgstr "Download"
+
+#: ../../mod/filestorage.php:173
+msgid "Used: "
+msgstr "Verwendet:"
+
+#: ../../mod/filestorage.php:174
+msgid "[directory]"
+msgstr "[Verzeichnis]"
+
+#: ../../mod/filestorage.php:176
+msgid "Limit: "
+msgstr "Limit:"
 
 #: ../../mod/suggest.php:35
 msgid ""
@@ -6829,31 +6861,133 @@ msgstr "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Kl
 msgid "Remove Channel"
 msgstr "Kanal entfernen"
 
-#: ../../mod/item.php:145
-msgid "Unable to locate original post."
-msgstr "Originalbeitrag kann nicht gefunden werden."
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
+msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werden."
 
-#: ../../mod/item.php:346
-msgid "Empty post discarded."
-msgstr "Leerer Beitrag verworfen."
+#: ../../mod/photos.php:97
+msgid "Album not found."
+msgstr "Album nicht gefunden."
 
-#: ../../mod/item.php:388
-msgid "Executable content type not permitted to this channel."
-msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
+#: ../../mod/photos.php:119 ../../mod/photos.php:668
+msgid "Delete Album"
+msgstr "Album löschen"
 
-#: ../../mod/item.php:819
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag nicht gespeichert."
+#: ../../mod/photos.php:159 ../../mod/photos.php:951
+msgid "Delete Photo"
+msgstr "Foto löschen"
+
+#: ../../mod/photos.php:452
+msgid "No photos selected"
+msgstr "Keine Fotos ausgewählt"
+
+#: ../../mod/photos.php:499
+msgid "Access to this item is restricted."
+msgstr "Zugriff auf dieses Foto wurde eingeschränkt."
 
-#: ../../mod/item.php:1155
+#: ../../mod/photos.php:573
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers."
 
-#: ../../mod/item.php:1161
+#: ../../mod/photos.php:576
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr "Du verwendets %1$.2f MBytes deines Foto-Speichers."
+
+#: ../../mod/photos.php:595
+msgid "Upload Photos"
+msgstr "Fotos hochladen"
+
+#: ../../mod/photos.php:599 ../../mod/photos.php:663
+msgid "New album name: "
+msgstr "Name des neuen Albums:"
+
+#: ../../mod/photos.php:600
+msgid "or existing album name: "
+msgstr "oder bestehenden Album Namen:"
+
+#: ../../mod/photos.php:601
+msgid "Do not show a status post for this upload"
+msgstr "Keine Statusnachricht für diesen Upload senden"
+
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
+#: ../../mod/photos.php:1138
+msgid "Contact Photos"
+msgstr "Kontakt Bilder"
+
+#: ../../mod/photos.php:678
+msgid "Edit Album"
+msgstr "Album bearbeiten"
+
+#: ../../mod/photos.php:684
+msgid "Show Newest First"
+msgstr "Zeige neueste zuerst"
+
+#: ../../mod/photos.php:686
+msgid "Show Oldest First"
+msgstr "Zeige älteste zuerst"
+
+#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+msgid "View Photo"
+msgstr "Foto ansehen"
+
+#: ../../mod/photos.php:775
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
+
+#: ../../mod/photos.php:777
+msgid "Photo not available"
+msgstr "Foto nicht verfügbar"
+
+#: ../../mod/photos.php:837
+msgid "Use as profile photo"
+msgstr "Als Profilfoto verwenden"
+
+#: ../../mod/photos.php:861
+msgid "View Full Size"
+msgstr "In voller Größe anzeigen"
+
+#: ../../mod/photos.php:935
+msgid "Edit photo"
+msgstr "Foto bearbeiten"
+
+#: ../../mod/photos.php:937
+msgid "Rotate CW (right)"
+msgstr "Drehen US (rechts)"
+
+#: ../../mod/photos.php:938
+msgid "Rotate CCW (left)"
+msgstr "Drehen EUS (links)"
+
+#: ../../mod/photos.php:940
+msgid "New album name"
+msgstr "Name des neuen Albums:"
+
+#: ../../mod/photos.php:943
+msgid "Caption"
+msgstr "Bildunterschrift"
+
+#: ../../mod/photos.php:945
+msgid "Add a Tag"
+msgstr "Schlagwort hinzufügen"
+
+#: ../../mod/photos.php:948
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: ../../mod/photos.php:1101
+msgid "In This Photo:"
+msgstr "Auf diesem Foto:"
+
+#: ../../mod/photos.php:1176
+msgid "View Album"
+msgstr "Album ansehen"
+
+#: ../../mod/photos.php:1185
+msgid "Recent Photos"
+msgstr "Neueste Fotos"
 
 #: ../../mod/mood.php:138
 msgid "Mood"
@@ -6863,144 +6997,116 @@ msgstr "Laune"
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
 
-#: ../../mod/ping.php:186
+#: ../../mod/ping.php:192
 msgid "sent you a private message"
 msgstr "eine private Nachricht schicken"
 
-#: ../../mod/ping.php:244
+#: ../../mod/ping.php:250
 msgid "added your channel"
 msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../mod/ping.php:288
+#: ../../mod/ping.php:294
 msgid "posted an event"
 msgstr "hat eine Veranstaltung veröffentlicht"
 
-#: ../../mod/dirprofile.php:114
-msgid "Status: "
-msgstr "Status:"
-
-#: ../../mod/dirprofile.php:115
-msgid "Sexual Preference: "
-msgstr "Sexuelle Vorlieben:"
-
-#: ../../mod/dirprofile.php:117
-msgid "Homepage: "
-msgstr "Webseite:"
-
-#: ../../mod/dirprofile.php:118
-msgid "Hometown: "
-msgstr "Wohnort:"
-
-#: ../../mod/dirprofile.php:120
-msgid "About: "
-msgstr "Über:"
-
-#: ../../mod/dirprofile.php:168
-msgid "Keywords: "
-msgstr "Schlüsselbegriffe:"
-
-#: ../../view/theme/redbasic/php/config.php:74
+#: ../../view/theme/redbasic/php/config.php:76
 msgid "Scheme Default"
 msgstr "Standard-Schema"
 
-#: ../../view/theme/redbasic/php/config.php:75
-msgid "red"
-msgstr "Rot"
-
-#: ../../view/theme/redbasic/php/config.php:76
-msgid "black"
-msgstr "Schwarz"
-
-#: ../../view/theme/redbasic/php/config.php:77
+#: ../../view/theme/redbasic/php/config.php:87
 msgid "silver"
 msgstr "Silber"
 
-#: ../../view/theme/redbasic/php/config.php:88
+#: ../../view/theme/redbasic/php/config.php:98
 #: ../../view/theme/apw/php/config.php:234
 #: ../../view/theme/blogga/view/theme/blog/config.php:69
 #: ../../view/theme/blogga/php/config.php:69
 msgid "Theme settings"
 msgstr "Theme-Einstellungen"
 
-#: ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/apw/php/config.php:235
 msgid "Set scheme"
 msgstr "Schema"
 
-#: ../../view/theme/redbasic/php/config.php:90
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Navigation bar colour"
 msgstr "Farbe der Navigationsleiste"
 
-#: ../../view/theme/redbasic/php/config.php:91
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "link colour"
+msgstr "Farbe der Verweise"
+
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Set font-colour for banner"
 msgstr "Farbe des Banners"
 
-#: ../../view/theme/redbasic/php/config.php:92
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Set the background colour"
 msgstr "Hintergrundfarbe"
 
-#: ../../view/theme/redbasic/php/config.php:93
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Set the background image"
 msgstr "Hintergrundbild"
 
-#: ../../view/theme/redbasic/php/config.php:94
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Set the background colour of items"
 msgstr "Hintergrundfarbe von Beiträgen"
 
-#: ../../view/theme/redbasic/php/config.php:95
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Set the opacity of items"
 msgstr "Deckkraft von Beiträgen"
 
-#: ../../view/theme/redbasic/php/config.php:96
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Set the basic colour for item icons"
 msgstr "Basisfarbe der Beitrags-Icons"
 
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Set the hover colour for item icons"
 msgstr "Farbe für Beitrags-Icons unter dem Mauszeiger"
 
-#: ../../view/theme/redbasic/php/config.php:98
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Set font-size for the entire application"
 msgstr "Schriftgröße für die ganze Applikation"
 
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:110
 #: ../../view/theme/apw/php/config.php:236
 msgid "Set font-size for posts and comments"
 msgstr "Wähle die Schriftgröße für Beiträge und Kommentare"
 
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Set font-colour for posts and comments"
 msgstr "Schriftfarbe für Beiträge und Kommentare"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Set radius of corners"
 msgstr "Ecken-Radius"
 
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "Set shadow depth of photos"
 msgstr "Schattentiefe von Fotos"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set maximum width of conversation regions"
 msgstr "Maximalbreite der Konversationsbereiche"
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)"
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set size of conversation author photo"
 msgstr "Größe der Avatare von Themenstartern"
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set size of followup author photos"
 msgstr "Größe der Avatare von Kommentatoren"
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Sloppy photo albums"
 msgstr "Schräge Fotoalben"
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Are you a clean desk or a messy desk person?"
 msgstr "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
 
@@ -7144,41 +7250,41 @@ msgstr "Titelbild"
 msgid "Header image only on profile pages"
 msgstr "Titelbild nur auf Profil-Seiten anzeigen"
 
-#: ../../boot.php:1229
+#: ../../boot.php:1232
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../boot.php:1232
+#: ../../boot.php:1235
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../boot.php:1396
+#: ../../boot.php:1399
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können."
 
-#: ../../boot.php:1424
+#: ../../boot.php:1427
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1425
+#: ../../boot.php:1428
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1430
+#: ../../boot.php:1433
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1495
+#: ../../boot.php:1498
 msgid "permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../../boot.php:1496
+#: ../../boot.php:1499
 msgid "Got Zot?"
 msgstr "Haste schon Zot?"
 
-#: ../../boot.php:1892
+#: ../../boot.php:1899
 msgid "toggle mobile"
 msgstr "auf/von Mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index 3637c4bf5..00da85a02 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -19,9 +19,19 @@ $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltunge
 $a->strings["View Profile"] = "Profil ansehen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Edit Profiles"] = "Profile bearbeiten";
-$a->strings["Manage/Edit Profiles"] = "Verwalte/Bearbeite Profile";
+$a->strings["Manage/Edit profiles"] = "Profile verwalten";
 $a->strings["Photos"] = "Fotos";
 $a->strings["Your photos"] = "Deine Bilder";
+$a->strings["Files"] = "Dateien";
+$a->strings["Your files"] = "Deine Dateien";
+$a->strings["Chat"] = "Chat";
+$a->strings["Your chatrooms"] = "Deine Chat-Räume";
+$a->strings["Events"] = "Veranstaltungen";
+$a->strings["Your events"] = "Deine Veransctaltungen";
+$a->strings["Bookmarks"] = "Lesezeichen";
+$a->strings["Your bookmarks"] = "Deine Lesezeichen";
+$a->strings["Webpages"] = "Webseiten";
+$a->strings["Your webpages"] = "Deine Webseiten";
 $a->strings["Login"] = "Anmelden";
 $a->strings["Sign in"] = "Anmelden";
 $a->strings["%s - click to logout"] = "%s - Klick zum Abmelden";
@@ -56,7 +66,6 @@ $a->strings["Mark all private messages seen"] = "Markiere alle persönlichen Nac
 $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["New Message"] = "Neue Nachricht";
-$a->strings["Events"] = "Veranstaltungen";
 $a->strings["Event Calendar"] = "Veranstaltungskalender";
 $a->strings["See all events"] = "Alle Ereignisse ansehen";
 $a->strings["Mark all events seen"] = "Markiere alle Ereignisse als gesehen";
@@ -70,14 +79,179 @@ $a->strings["Admin"] = "Admin";
 $a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
 $a->strings["Nothing new here"] = "Nichts Neues hier";
 $a->strings["Please wait..."] = "Bitte warten...";
-$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
-$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
-$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
-$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
-$a->strings["Permission denied."] = "Zugang verweigert";
+$a->strings["prev"] = "vorherige";
+$a->strings["first"] = "erste";
+$a->strings["last"] = "letzte";
+$a->strings["next"] = "nächste";
+$a->strings["older"] = "älter";
+$a->strings["newer"] = "neuer";
+$a->strings["No connections"] = "Keine Verbindungen";
+$a->strings["%d Connection"] = array(
+	0 => "%d Verbindung",
+	1 => "%d Verbindungen",
+);
+$a->strings["View Connections"] = "Zeige Verbindungen";
+$a->strings["Save"] = "Speichern";
+$a->strings["poke"] = "anstupsen";
+$a->strings["poked"] = "stupste";
+$a->strings["ping"] = "anpingen";
+$a->strings["pinged"] = "pingte";
+$a->strings["prod"] = "knuffen";
+$a->strings["prodded"] = "knuffte";
+$a->strings["slap"] = "ohrfeigen";
+$a->strings["slapped"] = "ohrfeigte";
+$a->strings["finger"] = "befummeln";
+$a->strings["fingered"] = "befummelte";
+$a->strings["rebuff"] = "eine Abfuhr erteilen";
+$a->strings["rebuffed"] = "abfuhrerteilte";
+$a->strings["happy"] = "glücklich";
+$a->strings["sad"] = "traurig";
+$a->strings["mellow"] = "sanft";
+$a->strings["tired"] = "müde";
+$a->strings["perky"] = "frech";
+$a->strings["angry"] = "sauer";
+$a->strings["stupified"] = "verblüfft";
+$a->strings["puzzled"] = "verwirrt";
+$a->strings["interested"] = "interessiert";
+$a->strings["bitter"] = "verbittert";
+$a->strings["cheerful"] = "fröhlich";
+$a->strings["alive"] = "lebendig";
+$a->strings["annoyed"] = "verärgert";
+$a->strings["anxious"] = "unruhig";
+$a->strings["cranky"] = "schrullig";
+$a->strings["disturbed"] = "verstört";
+$a->strings["frustrated"] = "frustriert";
+$a->strings["motivated"] = "motiviert";
+$a->strings["relaxed"] = "entspannt";
+$a->strings["surprised"] = "überrascht";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["January"] = "Januar";
+$a->strings["February"] = "Februar";
+$a->strings["March"] = "März";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "Dezember";
+$a->strings["unknown.???"] = "unbekannt.???";
+$a->strings["bytes"] = "Bytes";
+$a->strings["remove category"] = "Kategorie entfernen";
+$a->strings["remove from file"] = "aus der Datei entfernen";
+$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
+$a->strings["link to source"] = "Link zum Originalbeitrag";
+$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
+$a->strings["default"] = "Standard";
+$a->strings["Page content type: "] = "Content-Typ der Seite";
+$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
+$a->strings["photo"] = "Foto";
+$a->strings["event"] = "Ereignis";
+$a->strings["status"] = "Status";
+$a->strings["comment"] = "Kommentar";
+$a->strings["activity"] = "Aktivität";
+$a->strings["Design"] = "Design";
+$a->strings["Blocks"] = "Blöcke";
+$a->strings["Menus"] = "Menüs";
+$a->strings["Layouts"] = "Layouts";
+$a->strings["Pages"] = "Seiten";
+$a->strings["Categories"] = "Kategorien";
 $a->strings["Connect"] = "Verbinden";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
+$a->strings["Suggestions"] = "Vorschläge";
+$a->strings["See more..."] = "Mehr anzeigen...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen.";
+$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
+$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
+$a->strings["Notes"] = "Notizen";
+$a->strings["Remove term"] = "Eintrag löschen";
+$a->strings["Saved Searches"] = "Gesicherte Suchanfragen";
+$a->strings["add"] = "hinzufügen";
+$a->strings["Saved Folders"] = "Gesicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Archives"] = "Archive";
+$a->strings["Refresh"] = "Aktualisieren";
+$a->strings["Me"] = "Ich";
+$a->strings["Best Friends"] = "Beste Freunde";
+$a->strings["Friends"] = "Freunde";
+$a->strings["Co-workers"] = "Kollegen";
+$a->strings["Former Friends"] = "ehem. Freunde";
+$a->strings["Acquaintances"] = "Bekanntschaften";
+$a->strings["Everybody"] = "Jeder";
+$a->strings["Account settings"] = "Konto-Einstellungen";
+$a->strings["Channel settings"] = "Kanal-Einstellungen";
+$a->strings["Additional features"] = "Zusätzliche Funktionen";
+$a->strings["Feature settings"] = "Funktions-Einstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Apps";
+$a->strings["Export channel"] = "Kanal exportieren";
+$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
+$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen";
+$a->strings["Channel Sources"] = "Kanal Quellen";
+$a->strings["Check Mail"] = "E-Mails abrufen";
+$a->strings["Chat Rooms"] = "Chaträume";
 $a->strings["New window"] = "Neues Fenster";
 $a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
+$a->strings["General Features"] = "Allgemeine Funktionen";
+$a->strings["Content Expiration"] = "Verfall von Inhalten";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
+$a->strings["Multiple Profiles"] = "Mehrfachprofile";
+$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
+$a->strings["Web Pages"] = "Webseiten";
+$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
+$a->strings["Private Notes"] = "private Notizen";
+$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
+$a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
+$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt.";
+$a->strings["Expert Mode"] = "Expertenmodus";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen";
+$a->strings["Premium Channel"] = "Premium-Kanal";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen";
+$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
+$a->strings["Richtext Editor"] = "Formatierungseditor";
+$a->strings["Enable richtext editor"] = "Aktiviere Formatierungseditor";
+$a->strings["Post Preview"] = "Voransicht";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds.";
+$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
+$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
+$a->strings["Search by Date"] = "Suche nach Datum";
+$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
+$a->strings["Collections Filter"] = "Filter für Sammlung";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen";
+$a->strings["Save search terms for re-use"] = "Gesicherte Suchbegriffe zur Wiederverwendung";
+$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast";
+$a->strings["Network New Tab"] = "Netzwerkreiter Neu";
+$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
+$a->strings["Affinity Tool"] = "Beziehungs-Tool";
+$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
+$a->strings["Suggest Channels"] = "Kanäle Vorschlagen";
+$a->strings["Show channel suggestions"] = "Kanal-Vorschläge anzeigen";
+$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
+$a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge";
+$a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden";
+$a->strings["Tagging"] = "Verschlagworten";
+$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten";
+$a->strings["Post Categories"] = "Beitrags-Kategorien";
+$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
+$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
+$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
+$a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare";
+$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
+$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
+$a->strings["Tag Cloud"] = "Tag Wolke";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen";
 $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
 $a->strings["Block immediately"] = "Sofort blockieren";
 $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller";
@@ -119,17 +293,18 @@ $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden";
-$a->strings["view full size"] = "In Vollbildansicht anschauen";
 $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i";
 $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
 $a->strings["Location:"] = "Ort:";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["QR code"] = "QR Code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-$a->strings["post"] = "Beitrag";
-$a->strings["$1 wrote:"] = "$1 schrieb:";
+$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente.";
+$a->strings["Default privacy group for new contacts"] = "Standard-Privatsphärengruppe für neue Kontakte";
+$a->strings["All Channels"] = "Alle Kanäle";
+$a->strings["edit"] = "Bearbeiten";
+$a->strings["Collections"] = "Sammlungen";
+$a->strings["Edit collection"] = "Bearbeite Sammlungen";
+$a->strings["Create a new collection"] = "Neue Sammlung erzeugen";
+$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind";
 $a->strings["Delete this item?"] = "Dieses Element löschen?";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["show more"] = "mehr zeigen";
@@ -161,502 +336,45 @@ $a->strings["[no subject]"] = "[no subject]";
 $a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
 $a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
 $a->strings["Profile Photos"] = "Profilfotos";
-$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
-$a->strings["Empty name"] = "Namensfeld leer";
-$a->strings["Name too long"] = "Name ist zu lang";
-$a->strings["No account identifier"] = "Keine Account-Kennung";
-$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
-$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
-$a->strings["Default Profile"] = "Standard-Profil";
-$a->strings["Friends"] = "Freunde";
-$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen.";
-$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
-$a->strings["Change profile photo"] = "Ändere das Profilfoto";
-$a->strings["Profiles"] = "Profile";
-$a->strings["Manage/edit profiles"] = "Verwalte/Bearbeite Profile";
-$a->strings["Create New Profile"] = "Neues Profil erstellen";
-$a->strings["Edit Profile"] = "Profile bearbeiten";
-$a->strings["Profile Image"] = "Profilfoto:";
-$a->strings["visible to everybody"] = "sichtbar für jeden";
-$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
-$a->strings["Gender:"] = "Geschlecht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["Online Now"] = "gerade online";
-$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r";
-$a->strings["F d"] = "d. F";
-$a->strings["[today]"] = "[Heute]";
-$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
-$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
-$a->strings["[No description]"] = "[Keine Beschreibung]";
-$a->strings["Event Reminders"] = "Veranstaltungs- Erinnerungen";
-$a->strings["Events this week:"] = "Veranstaltungen in dieser Woche:";
-$a->strings["Profile"] = "Profil";
-$a->strings["Full Name:"] = "Voller Name:";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Geburtstag:";
-$a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
-$a->strings["Hometown:"] = "Heimatstadt:";
-$a->strings["Tags:"] = "Schlagworte:";
-$a->strings["Political Views:"] = "Politische Ansichten:";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["About:"] = "Über:";
-$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-$a->strings["Likes:"] = "Gefällt-mir:";
-$a->strings["Dislikes:"] = "Gefällt-mir-nicht:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
-$a->strings["My other channels:"] = "Meine anderen Kanäle:";
-$a->strings["Musical interests:"] = "Musikalische Interessen:";
-$a->strings["Books, literature:"] = "Bücher, Literatur:";
-$a->strings["Television:"] = "Fernsehen:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
-$a->strings["Love/Romance:"] = "Liebe/Romantik:";
-$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
-$a->strings["School/education:"] = "Schule/Ausbildung:";
-$a->strings["Edit File properties"] = "Dateieigenschaften ändern";
-$a->strings["Embedded content"] = "Eingebetteter Inhalt";
-$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
-$a->strings["General Features"] = "Allgemeine Funktionen";
-$a->strings["Content Expiration"] = "Verfall von Inhalten";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
-$a->strings["Multiple Profiles"] = "Mehrfachprofile";
-$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
-$a->strings["Web Pages"] = "Webseiten";
-$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
-$a->strings["Private Notes"] = "private Notizen";
-$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
-$a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt.";
-$a->strings["Expert Mode"] = "Expertenmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen";
-$a->strings["Premium Channel"] = "Premium-Kanal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen";
-$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
-$a->strings["Richtext Editor"] = "Formatierungseditor";
-$a->strings["Enable richtext editor"] = "Aktiviere Formatierungseditor";
-$a->strings["Post Preview"] = "Voransicht";
-$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung";
-$a->strings["Channel Sources"] = "Kanal Quellen";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds.";
-$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
-$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
-$a->strings["Search by Date"] = "Suche nach Datum";
-$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
-$a->strings["Collections Filter"] = "Filter für Sammlung";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen";
-$a->strings["Saved Searches"] = "Gesicherte Suchanfragen";
-$a->strings["Save search terms for re-use"] = "Gesicherte Suchbegriffe zur Wiederverwendung";
-$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast";
-$a->strings["Network New Tab"] = "Netzwerkreiter Neu";
-$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
-$a->strings["Affinity Tool"] = "Beziehungs-Tool";
-$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
-$a->strings["Suggest Channels"] = "Kanäle Vorschlagen";
-$a->strings["Show channel suggestions"] = "Kanal-Vorschläge anzeigen";
-$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
-$a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge";
-$a->strings["Edit and correct posts and comments after sending"] = "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden";
-$a->strings["Tagging"] = "Verschlagworten";
-$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten";
-$a->strings["Post Categories"] = "Beitrags-Kategorien";
-$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
-$a->strings["Saved Folders"] = "Gesicherte Ordner";
-$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
-$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
-$a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare";
-$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
-$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
-$a->strings["Tag Cloud"] = "Tag Wolke";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen";
-$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zugangsregeln für Elemente könnten für diese Gruppe angewendet werden, sowie für alle zukünftigen Elemente.";
-$a->strings["Default privacy group for new contacts"] = "Standard-Privatsphärengruppe für neue Kontakte";
-$a->strings["All Channels"] = "Alle Kanäle";
-$a->strings["edit"] = "Bearbeiten";
-$a->strings["Collections"] = "Sammlungen";
-$a->strings["Edit collection"] = "Bearbeite Sammlungen";
-$a->strings["Create a new collection"] = "Neue Sammlung erzeugen";
-$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind";
-$a->strings["add"] = "hinzufügen";
-$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
-$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
-$a->strings["Image file is empty."] = "Bilddatei ist leer.";
-$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
-$a->strings["Photo storage failed."] = "Foto speichern schlug fehl";
-$a->strings["Photo Albums"] = "Fotoalben";
-$a->strings["Upload New Photos"] = "Lade neue Fotos hoch";
-$a->strings["Male"] = "Männlich";
-$a->strings["Female"] = "Weiblich";
-$a->strings["Currently Male"] = "Momentan männlich";
-$a->strings["Currently Female"] = "Momentan weiblich";
-$a->strings["Mostly Male"] = "Größtenteils männlich";
-$a->strings["Mostly Female"] = "Größtenteils weiblich";
-$a->strings["Transgender"] = "Transsexuell";
-$a->strings["Intersex"] = "Zwischengeschlechtlich";
-$a->strings["Transsexual"] = "Transsexuell";
-$a->strings["Hermaphrodite"] = "Zwitter";
-$a->strings["Neuter"] = "Geschlechtslos";
-$a->strings["Non-specific"] = "unklar";
-$a->strings["Other"] = "Anders";
-$a->strings["Undecided"] = "Unentschieden";
-$a->strings["Males"] = "Männer";
-$a->strings["Females"] = "Frauen";
-$a->strings["Gay"] = "Schwul";
-$a->strings["Lesbian"] = "Lesbisch";
-$a->strings["No Preference"] = "Keine Bevorzugung";
-$a->strings["Bisexual"] = "Bisexuell";
-$a->strings["Autosexual"] = "Autosexuell";
-$a->strings["Abstinent"] = "Enthaltsam";
-$a->strings["Virgin"] = "Jungfräulich";
-$a->strings["Deviant"] = "Abweichend";
-$a->strings["Fetish"] = "Fetisch";
-$a->strings["Oodles"] = "Unmengen";
-$a->strings["Nonsexual"] = "Sexlos";
-$a->strings["Single"] = "Single";
-$a->strings["Lonely"] = "Einsam";
-$a->strings["Available"] = "Verfügbar";
-$a->strings["Unavailable"] = "Nicht verfügbar";
-$a->strings["Has crush"] = "Verguckt";
-$a->strings["Infatuated"] = "Verknallt";
-$a->strings["Dating"] = "Lerne gerade jemanden kennen";
-$a->strings["Unfaithful"] = "Treulos";
-$a->strings["Sex Addict"] = "Sexabhängig";
-$a->strings["Friends/Benefits"] = "Freunde/Begünstigte";
-$a->strings["Casual"] = "Lose";
-$a->strings["Engaged"] = "Verlobt";
-$a->strings["Married"] = "Verheiratet";
-$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet";
-$a->strings["Partners"] = "Partner";
-$a->strings["Cohabiting"] = "Lebensgemeinschaft";
-$a->strings["Common law"] = "Informelle Ehe";
-$a->strings["Happy"] = "Glücklich";
-$a->strings["Not looking"] = "Nicht Ausschau haltend";
-$a->strings["Swinger"] = "Swinger";
-$a->strings["Betrayed"] = "Betrogen";
-$a->strings["Separated"] = "Getrennt";
-$a->strings["Unstable"] = "Labil";
-$a->strings["Divorced"] = "Geschieden";
-$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
-$a->strings["Widowed"] = "Verwitwet";
-$a->strings["Uncertain"] = "Ungewiss";
-$a->strings["It's complicated"] = "Es ist kompliziert";
-$a->strings["Don't care"] = "Interessiert mich nicht";
-$a->strings["Ask me"] = "Frag mich mal";
-$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
-$a->strings["No source file."] = "Keine Quelldatei.";
-$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
-$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
-$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
-$a->strings["Path not available."] = "Pfad nicht verfügbar.";
-$a->strings["Empty pathname"] = "leere Pfadangabe";
-$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
-$a->strings["Path not found."] = "Pfad nicht gefunden.";
-$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
-$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-$a->strings["Tags"] = "Tags";
-$a->strings["Keywords"] = "Schlüsselbegriffe";
-$a->strings["have"] = "habe";
-$a->strings["has"] = "hat";
-$a->strings["want"] = "will";
-$a->strings["wants"] = "will";
-$a->strings["like"] = "Gefällt-mir";
-$a->strings["likes"] = "Gefällt-mir";
-$a->strings["dislike"] = "Gefällt-mir-nicht";
-$a->strings["dislikes"] = "Gefällt-mir-nicht";
-$a->strings["Logged out."] = "Ausgeloggt.";
-$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
-$a->strings["Login failed."] = "Login fehlgeschlagen.";
-$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind";
-$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
-$a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
-$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
-$a->strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
-$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
-$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
-$a->strings["Administrator"] = "Administrator";
-$a->strings["your registration password"] = "dein Registrierungspasswort";
-$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
-$a->strings["Account approved."] = "Account bestätigt.";
-$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
-$a->strings["Sort Options"] = "Sortieroptionen";
-$a->strings["Alphabetic"] = "alphabetisch";
-$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
-$a->strings["Newest to Oldest"] = "Neueste zuerst";
-$a->strings["Enable Safe Search"] = "Sichere Suche einschalten";
-$a->strings["Disable Safe Search"] = "Sichere Suche ausschalten";
-$a->strings["Safe Mode"] = "Sicherer Modus";
-$a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung";
-$a->strings["redmatrix"] = "redmatrix";
-$a->strings["Thank You,"] = "Danke.";
-$a->strings["%s Administrator"] = "%s Administrator";
-$a->strings["%s "] = "%s ";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Red Notify] Neue Mail auf %s empfangen";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat dir eine private Nachricht auf %3\$s gesendet.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat dir %2\$s geschickt.";
-$a->strings["a private message"] = "eine private Nachricht";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen %4\$s[/zrl] kommentiert";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat ein Thema kommentiert, dem du folgst.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf deine Pinnwand auf %3\$s geschrieben";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]deine Pinnwand[/zrl] geschrieben";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat dich getaggt";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat dich erwähnt[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat dich angestupst[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getaggt";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat deinen Beitrag auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen Beitrag[/zrl] getaggt";
-$a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten";
-$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
-$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
-$a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
-$a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du hast einen Freundschaftsvorschlag von „%2\$s“ auf %3\$s erhalten";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du hast [zrl=%2\$s]einen Freundschaftvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
-$a->strings["Name:"] = "Name:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
-$a->strings["Categories"] = "Kategorien";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
-$a->strings["Suggestions"] = "Vorschläge";
-$a->strings["See more..."] = "Mehr anzeigen...";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen.";
-$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
-$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
-$a->strings["Notes"] = "Notizen";
-$a->strings["Save"] = "Speichern";
-$a->strings["Remove term"] = "Eintrag löschen";
-$a->strings["Everything"] = "Alles";
-$a->strings["Archives"] = "Archive";
-$a->strings["Refresh"] = "Aktualisieren";
-$a->strings["Me"] = "Ich";
-$a->strings["Best Friends"] = "Beste Freunde";
-$a->strings["Co-workers"] = "Kollegen";
-$a->strings["Former Friends"] = "ehem. Freunde";
-$a->strings["Acquaintances"] = "Bekanntschaften";
-$a->strings["Everybody"] = "Jeder";
-$a->strings["Account settings"] = "Konto-Einstellungen";
-$a->strings["Channel settings"] = "Kanal-Einstellungen";
-$a->strings["Additional features"] = "Zusätzliche Funktionen";
-$a->strings["Feature settings"] = "Funktions-Einstellungen";
-$a->strings["Display settings"] = "Anzeige-Einstellungen";
-$a->strings["Connected apps"] = "Verbundene Apps";
-$a->strings["Export channel"] = "Kanal exportieren";
-$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
-$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen";
-$a->strings["Check Mail"] = "E-Mails abrufen";
-$a->strings["Chat Rooms"] = "Chaträume";
-$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
-$a->strings["%d invitation available"] = array(
-	0 => "%d Einladung verfügbar",
-	1 => "%d Einladungen verfügbar",
-);
-$a->strings["Find Channels"] = "Finde Kanäle";
-$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
-$a->strings["Connect/Follow"] = "Verbinden/Folgen";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
-$a->strings["Find"] = "Finde";
-$a->strings["Channel Suggestions"] = "Kanal-Vorschläge";
-$a->strings["Random Profile"] = "Zufallsprofil";
-$a->strings["Invite Friends"] = "Lade Freunde ein";
-$a->strings["%d connection in common"] = array(
-	0 => "%d gemeinsame Verbindung",
-	1 => "%d gemeinsame Verbindungen",
-);
-$a->strings["New Page"] = "Neue Seite";
-$a->strings["Edit"] = "Bearbeiten";
-$a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
-$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
-$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
-$a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
-$a->strings["Channel discovery failed. Website may be down or misconfigured."] = "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein.";
-$a->strings["Response from remote channel was not understood."] = "Antwort des entfernten Kanals war unverständlich.";
-$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
-$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
-$a->strings["Cannot connect to yourself."] = "Du kannst dich nicht mit dir selbst verbinden.";
-$a->strings["Can view my \"public\" stream and posts"] = "Kann meinen öffentlichen Stream und Beiträge sehen";
-$a->strings["Can view my \"public\" channel profile"] = "Kann meinen öffentliches Kanal-Profil sehen";
-$a->strings["Can view my \"public\" photo albums"] = "Kann meine öffentlichen Fotoalben sehen";
-$a->strings["Can view my \"public\" address book"] = "Kann mein öffentliches Adressbuch sehen";
-$a->strings["Can view my \"public\" file storage"] = "Kann meinen öffentlichen Dateiordner sehen";
-$a->strings["Can view my \"public\" pages"] = "Kann meine öffentlichen Seiten sehen";
-$a->strings["Can send me their channel stream and posts"] = "Können mir den Stream und die Beiträge aus ihrem Kanal schicken";
-$a->strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
-$a->strings["Can comment on my posts"] = "Kann meine Beiträge kommentieren";
-$a->strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
-$a->strings["Can post photos to my photo albums"] = "Kann Fotos in meinen Fotoalben veröffentlichen";
-$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
-$a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
-$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
-$a->strings["Requires compatible chat plugin"] = "Benötigt ein kompatibles Chat-Plugin";
-$a->strings["Can write to my \"public\" file storage"] = "Kann in meinen öffentlichen Dateiordner schreiben";
-$a->strings["Can edit my \"public\" pages"] = "Kann meine öffentlichen Seiten bearbeiten";
-$a->strings["Can source my \"public\" posts in derived channels"] = "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften.";
-$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst";
-$a->strings["Default"] = "Standard";
-$a->strings["Permission denied"] = "Keine Berechtigung";
-$a->strings["Item not found."] = "Element nicht gefunden.";
-$a->strings["Collection not found."] = "Sammlung nicht gefunden";
-$a->strings["Collection is empty."] = "Sammlung ist leer.";
-$a->strings["Collection: %s"] = "Sammlung: %s";
-$a->strings["Connection: %s"] = "Verbindung: %s";
-$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
-$a->strings["prev"] = "vorherige";
-$a->strings["first"] = "erste";
-$a->strings["last"] = "letzte";
-$a->strings["next"] = "nächste";
-$a->strings["older"] = "älter";
-$a->strings["newer"] = "neuer";
-$a->strings["No connections"] = "Keine Verbindungen";
-$a->strings["%d Connection"] = array(
-	0 => "%d Verbindung",
-	1 => "%d Verbindungen",
-);
-$a->strings["View Connections"] = "Zeige Verbindungen";
-$a->strings["poke"] = "anstupsen";
-$a->strings["poked"] = "stupste";
-$a->strings["ping"] = "anpingen";
-$a->strings["pinged"] = "pingte";
-$a->strings["prod"] = "knuffen";
-$a->strings["prodded"] = "knuffte";
-$a->strings["slap"] = "ohrfeigen";
-$a->strings["slapped"] = "ohrfeigte";
-$a->strings["finger"] = "befummeln";
-$a->strings["fingered"] = "befummelte";
-$a->strings["rebuff"] = "eine Abfuhr erteilen";
-$a->strings["rebuffed"] = "abfuhrerteilte";
-$a->strings["happy"] = "glücklich";
-$a->strings["sad"] = "traurig";
-$a->strings["mellow"] = "sanft";
-$a->strings["tired"] = "müde";
-$a->strings["perky"] = "frech";
-$a->strings["angry"] = "sauer";
-$a->strings["stupified"] = "verblüfft";
-$a->strings["puzzled"] = "verwirrt";
-$a->strings["interested"] = "interessiert";
-$a->strings["bitter"] = "verbittert";
-$a->strings["cheerful"] = "fröhlich";
-$a->strings["alive"] = "lebendig";
-$a->strings["annoyed"] = "verärgert";
-$a->strings["anxious"] = "unruhig";
-$a->strings["cranky"] = "schrullig";
-$a->strings["disturbed"] = "verstört";
-$a->strings["frustrated"] = "frustriert";
-$a->strings["motivated"] = "motiviert";
-$a->strings["relaxed"] = "entspannt";
-$a->strings["surprised"] = "überrascht";
-$a->strings["Monday"] = "Montag";
-$a->strings["Tuesday"] = "Dienstag";
-$a->strings["Wednesday"] = "Mittwoch";
-$a->strings["Thursday"] = "Donnerstag";
-$a->strings["Friday"] = "Freitag";
-$a->strings["Saturday"] = "Samstag";
-$a->strings["Sunday"] = "Sonntag";
-$a->strings["January"] = "Januar";
-$a->strings["February"] = "Februar";
-$a->strings["March"] = "März";
-$a->strings["April"] = "April";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juni";
-$a->strings["July"] = "Juli";
-$a->strings["August"] = "August";
-$a->strings["September"] = "September";
-$a->strings["October"] = "Oktober";
-$a->strings["November"] = "November";
-$a->strings["December"] = "Dezember";
-$a->strings["unknown.???"] = "unbekannt.???";
-$a->strings["bytes"] = "Bytes";
-$a->strings["remove category"] = "Kategorie entfernen";
-$a->strings["remove from file"] = "aus der Datei entfernen";
-$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
-$a->strings["link to source"] = "Link zum Originalbeitrag";
-$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
-$a->strings["default"] = "Standard";
-$a->strings["Page content type: "] = "Content-Typ der Seite";
-$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
-$a->strings["photo"] = "Foto";
-$a->strings["event"] = "Ereignis";
-$a->strings["status"] = "Status";
-$a->strings["comment"] = "Kommentar";
-$a->strings["activity"] = "Aktivität";
-$a->strings["Design"] = "Design";
-$a->strings["Blocks"] = "Blöcke";
-$a->strings["Menus"] = "Menüs";
-$a->strings["Layouts"] = "Layouts";
-$a->strings["Pages"] = "Seiten";
-$a->strings["Private Message"] = "Private Nachricht";
-$a->strings["Delete"] = "Löschen";
-$a->strings["Select"] = "Auswählen";
-$a->strings["save to folder"] = "In Ordner speichern";
-$a->strings["add star"] = "markieren";
-$a->strings["remove star"] = "Markierung entfernen";
-$a->strings["toggle star status"] = "Stern-Status umschalten";
-$a->strings["starred"] = "markiert";
-$a->strings["Message is verified"] = "Nachricht überprüft";
-$a->strings["add tag"] = "Schlagwort hinzufügen";
-$a->strings["I like this (toggle)"] = "Ich mag das (Umschalter)";
-$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (Umschalter)";
-$a->strings["Share this"] = "Teile dies";
-$a->strings["share"] = "Teilen";
-$a->strings["View %s's profile - %s"] = "Schaue dir %s's Profil an - %s";
-$a->strings["to"] = "zu";
-$a->strings["via"] = "via";
-$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
-$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings[" from %s"] = "von %s";
-$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s";
-$a->strings["Expires: %s"] = "Verfällt: %s";
-$a->strings["Please wait"] = "Bitte warten";
-$a->strings["%d comment"] = array(
-	0 => "%d Kommentar",
-	1 => "%d Kommentare",
-);
-$a->strings["This is you"] = "Das bist du";
-$a->strings["Submit"] = "Bestätigen";
-$a->strings["Bold"] = "Fett";
-$a->strings["Italic"] = "Kursiv";
-$a->strings["Underline"] = "Unterstrichen";
-$a->strings["Quote"] = "Zitat";
-$a->strings["Code"] = "Code";
-$a->strings["Image"] = "Bild";
-$a->strings["Link"] = "Link";
-$a->strings["Video"] = "Video";
-$a->strings["Preview"] = "Vorschau";
-$a->strings["Encrypt text"] = "Text verschlüsseln";
+$a->strings["Permission denied."] = "Zugang verweigert";
+$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
+$a->strings["No source file."] = "Keine Quelldatei.";
+$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
+$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
+$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
+$a->strings["Path not available."] = "Pfad nicht verfügbar.";
+$a->strings["Empty pathname"] = "leere Pfadangabe";
+$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
+$a->strings["Path not found."] = "Pfad nicht gefunden.";
+$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
+$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["QR code"] = "QR Code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+$a->strings["post"] = "Beitrag";
+$a->strings["$1 wrote:"] = "$1 schrieb:";
+$a->strings["%1\$s's bookmarks"] = "%1\$s's Lesezeichen";
 $a->strings["channel"] = "Kanal";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
 $a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
+$a->strings["Select"] = "Auswählen";
+$a->strings["Delete"] = "Löschen";
+$a->strings["Message is verified"] = "Nachricht überprüft";
 $a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an.";
 $a->strings["Categories:"] = "Kategorien:";
 $a->strings["Filed under:"] = "Gespeichert unter:";
+$a->strings[" from %s"] = "von %s";
+$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s";
+$a->strings["Expires: %s"] = "Verfällt: %s";
 $a->strings["View in context"] = "Im Zusammenhang anschauen";
+$a->strings["Please wait"] = "Bitte warten";
 $a->strings["remove"] = "lösche";
 $a->strings["Loading..."] = "Lädt ...";
 $a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente";
@@ -693,6 +411,7 @@ $a->strings["Tag term:"] = "Schlagwort:";
 $a->strings["Save to Folder:"] = "Speichern in Ordner:";
 $a->strings["Where are you right now?"] = "Wo bist du jetzt grade?";
 $a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
+$a->strings["Preview"] = "Vorschau";
 $a->strings["Share"] = "Teilen";
 $a->strings["Page link title"] = "Seitentitel-Link";
 $a->strings["Upload photo"] = "Foto hochladen";
@@ -716,6 +435,7 @@ $a->strings["permissions"] = "Berechtigungen";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
 $a->strings["Set expiration date"] = "Verfallsdatum";
+$a->strings["Encrypt text"] = "Text verschlüsseln";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Abbrechen";
 $a->strings["Commented Order"] = "Neueste Kommentare";
@@ -734,11 +454,303 @@ $a->strings["Channel"] = "Kanal";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["About"] = "Über";
 $a->strings["Profile Details"] = "Profil-Details";
-$a->strings["Files"] = "Dateien";
+$a->strings["Photo Albums"] = "Fotoalben";
 $a->strings["Files and Storage"] = "Dateien und Speicher";
+$a->strings["Chatrooms"] = "Chat-Räume";
 $a->strings["Events and Calendar"] = "Veranstaltungen und Kalender";
-$a->strings["Webpages"] = "Webseiten";
+$a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
 $a->strings["Manage Webpages"] = "Webseiten verwalten";
+$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
+$a->strings["Empty name"] = "Namensfeld leer";
+$a->strings["Name too long"] = "Name ist zu lang";
+$a->strings["No account identifier"] = "Keine Account-Kennung";
+$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
+$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
+$a->strings["Default Profile"] = "Standard-Profil";
+$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen.";
+$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
+$a->strings["Change profile photo"] = "Ändere das Profilfoto";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Manage/edit profiles"] = "Verwalte/Bearbeite Profile";
+$a->strings["Create New Profile"] = "Neues Profil erstellen";
+$a->strings["Edit Profile"] = "Profile bearbeiten";
+$a->strings["Profile Image"] = "Profilfoto:";
+$a->strings["visible to everybody"] = "sichtbar für jeden";
+$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["Online Now"] = "gerade online";
+$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r";
+$a->strings["F d"] = "d. F";
+$a->strings["[today]"] = "[Heute]";
+$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
+$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
+$a->strings["[No description]"] = "[Keine Beschreibung]";
+$a->strings["Event Reminders"] = "Veranstaltungs- Erinnerungen";
+$a->strings["Events this week:"] = "Veranstaltungen in dieser Woche:";
+$a->strings["Profile"] = "Profil";
+$a->strings["Full Name:"] = "Voller Name:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Geburtstag:";
+$a->strings["Age:"] = "Alter:";
+$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
+$a->strings["Hometown:"] = "Heimatstadt:";
+$a->strings["Tags:"] = "Schlagworte:";
+$a->strings["Political Views:"] = "Politische Ansichten:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["About:"] = "Über:";
+$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
+$a->strings["Likes:"] = "Gefällt-mir:";
+$a->strings["Dislikes:"] = "Gefällt-mir-nicht:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
+$a->strings["My other channels:"] = "Meine anderen Kanäle:";
+$a->strings["Musical interests:"] = "Musikalische Interessen:";
+$a->strings["Books, literature:"] = "Bücher, Literatur:";
+$a->strings["Television:"] = "Fernsehen:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
+$a->strings["Love/Romance:"] = "Liebe/Romantik:";
+$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
+$a->strings["School/education:"] = "Schule/Ausbildung:";
+$a->strings["Private Message"] = "Private Nachricht";
+$a->strings["Edit"] = "Bearbeiten";
+$a->strings["save to folder"] = "In Ordner speichern";
+$a->strings["add star"] = "markieren";
+$a->strings["remove star"] = "Markierung entfernen";
+$a->strings["toggle star status"] = "Stern-Status umschalten";
+$a->strings["starred"] = "markiert";
+$a->strings["add tag"] = "Schlagwort hinzufügen";
+$a->strings["I like this (toggle)"] = "Ich mag das (Umschalter)";
+$a->strings["like"] = "Gefällt-mir";
+$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (Umschalter)";
+$a->strings["dislike"] = "Gefällt-mir-nicht";
+$a->strings["Share this"] = "Teile dies";
+$a->strings["share"] = "Teilen";
+$a->strings["View %s's profile - %s"] = "Schaue dir %s's Profil an - %s";
+$a->strings["to"] = "zu";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
+$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["Bookmark Links"] = "Setze Lesezeichen für die Verweise";
+$a->strings["%d comment"] = array(
+	0 => "%d Kommentar",
+	1 => "%d Kommentare",
+);
+$a->strings["This is you"] = "Das bist du";
+$a->strings["Submit"] = "Bestätigen";
+$a->strings["Bold"] = "Fett";
+$a->strings["Italic"] = "Kursiv";
+$a->strings["Underline"] = "Unterstrichen";
+$a->strings["Quote"] = "Zitat";
+$a->strings["Code"] = "Code";
+$a->strings["Image"] = "Bild";
+$a->strings["Link"] = "Link";
+$a->strings["Video"] = "Video";
+$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
+$a->strings["view full size"] = "In Vollbildansicht anschauen";
+$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
+$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
+$a->strings["Male"] = "Männlich";
+$a->strings["Female"] = "Weiblich";
+$a->strings["Currently Male"] = "Momentan männlich";
+$a->strings["Currently Female"] = "Momentan weiblich";
+$a->strings["Mostly Male"] = "Größtenteils männlich";
+$a->strings["Mostly Female"] = "Größtenteils weiblich";
+$a->strings["Transgender"] = "Transsexuell";
+$a->strings["Intersex"] = "Zwischengeschlechtlich";
+$a->strings["Transsexual"] = "Transsexuell";
+$a->strings["Hermaphrodite"] = "Zwitter";
+$a->strings["Neuter"] = "Geschlechtslos";
+$a->strings["Non-specific"] = "unklar";
+$a->strings["Other"] = "Anders";
+$a->strings["Undecided"] = "Unentschieden";
+$a->strings["Males"] = "Männer";
+$a->strings["Females"] = "Frauen";
+$a->strings["Gay"] = "Schwul";
+$a->strings["Lesbian"] = "Lesbisch";
+$a->strings["No Preference"] = "Keine Bevorzugung";
+$a->strings["Bisexual"] = "Bisexuell";
+$a->strings["Autosexual"] = "Autosexuell";
+$a->strings["Abstinent"] = "Enthaltsam";
+$a->strings["Virgin"] = "Jungfräulich";
+$a->strings["Deviant"] = "Abweichend";
+$a->strings["Fetish"] = "Fetisch";
+$a->strings["Oodles"] = "Unmengen";
+$a->strings["Nonsexual"] = "Sexlos";
+$a->strings["Single"] = "Single";
+$a->strings["Lonely"] = "Einsam";
+$a->strings["Available"] = "Verfügbar";
+$a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Has crush"] = "Verguckt";
+$a->strings["Infatuated"] = "Verknallt";
+$a->strings["Dating"] = "Lerne gerade jemanden kennen";
+$a->strings["Unfaithful"] = "Treulos";
+$a->strings["Sex Addict"] = "Sexabhängig";
+$a->strings["Friends/Benefits"] = "Freunde/Begünstigte";
+$a->strings["Casual"] = "Lose";
+$a->strings["Engaged"] = "Verlobt";
+$a->strings["Married"] = "Verheiratet";
+$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet";
+$a->strings["Partners"] = "Partner";
+$a->strings["Cohabiting"] = "Lebensgemeinschaft";
+$a->strings["Common law"] = "Informelle Ehe";
+$a->strings["Happy"] = "Glücklich";
+$a->strings["Not looking"] = "Nicht Ausschau haltend";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Betrogen";
+$a->strings["Separated"] = "Getrennt";
+$a->strings["Unstable"] = "Labil";
+$a->strings["Divorced"] = "Geschieden";
+$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
+$a->strings["Widowed"] = "Verwitwet";
+$a->strings["Uncertain"] = "Ungewiss";
+$a->strings["It's complicated"] = "Es ist kompliziert";
+$a->strings["Don't care"] = "Interessiert mich nicht";
+$a->strings["Ask me"] = "Frag mich mal";
+$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
+$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
+$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
+$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
+$a->strings["Room is full"] = "Der Raum ist voll";
+$a->strings["Tags"] = "Tags";
+$a->strings["Keywords"] = "Schlüsselbegriffe";
+$a->strings["have"] = "habe";
+$a->strings["has"] = "hat";
+$a->strings["want"] = "will";
+$a->strings["wants"] = "will";
+$a->strings["likes"] = "Gefällt-mir";
+$a->strings["dislikes"] = "Gefällt-mir-nicht";
+$a->strings["Logged out."] = "Ausgeloggt.";
+$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
+$a->strings["Login failed."] = "Login fehlgeschlagen.";
+$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
+$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind";
+$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
+$a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
+$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
+$a->strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
+$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
+$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
+$a->strings["Administrator"] = "Administrator";
+$a->strings["your registration password"] = "dein Registrierungspasswort";
+$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
+$a->strings["Account approved."] = "Account bestätigt.";
+$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
+$a->strings["Sort Options"] = "Sortieroptionen";
+$a->strings["Alphabetic"] = "alphabetisch";
+$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
+$a->strings["Newest to Oldest"] = "Neueste zuerst";
+$a->strings["Enable Safe Search"] = "Sichere Suche einschalten";
+$a->strings["Disable Safe Search"] = "Sichere Suche ausschalten";
+$a->strings["Safe Mode"] = "Sicherer Modus";
+$a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung";
+$a->strings["redmatrix"] = "redmatrix";
+$a->strings["Thank You,"] = "Danke.";
+$a->strings["%s Administrator"] = "%s Administrator";
+$a->strings["%s "] = "%s ";
+$a->strings["[Red:Notify] New mail received at %s"] = "[Red Notify] Neue Mail auf %s empfangen";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat dir eine private Nachricht auf %3\$s gesendet.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat dir %2\$s geschickt.";
+$a->strings["a private message"] = "eine private Nachricht";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen %4\$s[/zrl] kommentiert";
+$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat ein Thema kommentiert, dem du folgst.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
+$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf deine Pinnwand auf %3\$s geschrieben";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]deine Pinnwand[/zrl] geschrieben";
+$a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat dich getaggt";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s getaggt";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat dich erwähnt[/zrl].";
+$a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat dich angestupst[/zrl].";
+$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getaggt";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat deinen Beitrag auf %3\$s getaggt";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen Beitrag[/zrl] getaggt";
+$a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
+$a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen.";
+$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du hast einen Freundschaftsvorschlag von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du hast [zrl=%2\$s]einen Freundschaftvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
+$a->strings["Name:"] = "Name:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
+$a->strings["Image file is empty."] = "Bilddatei ist leer.";
+$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
+$a->strings["Photo storage failed."] = "Foto speichern schlug fehl";
+$a->strings["Upload New Photos"] = "Lade neue Fotos hoch";
+$a->strings["Edit File properties"] = "Dateieigenschaften ändern";
+$a->strings["%d invitation available"] = array(
+	0 => "%d Einladung verfügbar",
+	1 => "%d Einladungen verfügbar",
+);
+$a->strings["Find Channels"] = "Finde Kanäle";
+$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
+$a->strings["Connect/Follow"] = "Verbinden/Folgen";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
+$a->strings["Find"] = "Finde";
+$a->strings["Channel Suggestions"] = "Kanal-Vorschläge";
+$a->strings["Random Profile"] = "Zufallsprofil";
+$a->strings["Invite Friends"] = "Lade Freunde ein";
+$a->strings["%d connection in common"] = array(
+	0 => "%d gemeinsame Verbindung",
+	1 => "%d gemeinsame Verbindungen",
+);
+$a->strings["New Page"] = "Neue Seite";
+$a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
+$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
+$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
+$a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
+$a->strings["Channel discovery failed. Website may be down or misconfigured."] = "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein.";
+$a->strings["Response from remote channel was not understood."] = "Antwort des entfernten Kanals war unverständlich.";
+$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
+$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
+$a->strings["Cannot connect to yourself."] = "Du kannst dich nicht mit dir selbst verbinden.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+$a->strings["Default"] = "Standard";
+$a->strings["Embedded content"] = "Eingebetteter Inhalt";
+$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
+$a->strings["Can view my \"public\" stream and posts"] = "Kann meinen öffentlichen Stream und Beiträge sehen";
+$a->strings["Can view my \"public\" channel profile"] = "Kann meinen öffentliches Kanal-Profil sehen";
+$a->strings["Can view my \"public\" photo albums"] = "Kann meine öffentlichen Fotoalben sehen";
+$a->strings["Can view my \"public\" address book"] = "Kann mein öffentliches Adressbuch sehen";
+$a->strings["Can view my \"public\" file storage"] = "Kann meinen öffentlichen Dateiordner sehen";
+$a->strings["Can view my \"public\" pages"] = "Kann meine öffentlichen Seiten sehen";
+$a->strings["Can send me their channel stream and posts"] = "Können mir den Stream und die Beiträge aus ihrem Kanal schicken";
+$a->strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
+$a->strings["Can comment on my posts"] = "Kann meine Beiträge kommentieren";
+$a->strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
+$a->strings["Can post photos to my photo albums"] = "Kann Fotos in meinen Fotoalben veröffentlichen";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
+$a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
+$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
+$a->strings["Can write to my \"public\" file storage"] = "Kann in meinen öffentlichen Dateiordner schreiben";
+$a->strings["Can edit my \"public\" pages"] = "Kann meine öffentlichen Seiten bearbeiten";
+$a->strings["Can source my \"public\" posts in derived channels"] = "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften.";
+$a->strings["Can send me bookmarks"] = "Darf mir Lesezeichen senden";
+$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst";
+$a->strings["Permission denied"] = "Keine Berechtigung";
+$a->strings["Item not found."] = "Element nicht gefunden.";
+$a->strings["Collection not found."] = "Sammlung nicht gefunden";
+$a->strings["Collection is empty."] = "Sammlung ist leer.";
+$a->strings["Collection: %s"] = "Sammlung: %s";
+$a->strings["Connection: %s"] = "Verbindung: %s";
+$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
 $a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
 $a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
 $a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
@@ -794,83 +806,38 @@ $a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf";
 $a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:";
 $a->strings["Click the [Register] link on the following page to join."] = "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden.";
 $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++";
-$a->strings["Could not access contact record."] = "Konnte auf den Kontakteintrag nicht zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das gewählte Profil nicht finden.";
-$a->strings["Connection updated."] = "Verbindung aktualisiert.";
-$a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
-$a->strings["Could not access address book record."] = "Konnte nicht auf den Eintrag im Adressbuch zugreifen.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
-$a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
-$a->strings["Channel has been blocked"] = "Kanal blockiert";
-$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch Parameter nicht setzen.";
-$a->strings["Channel has been unignored"] = "Kanal wird nicht mehr ignoriert";
-$a->strings["Channel has been ignored"] = "Kanal wird ignoriert";
-$a->strings["Channel has been unarchived"] = "Kanal wurde aus dem Archiv zurück geholt";
-$a->strings["Channel has been archived"] = "Kanal wurde archiviert";
-$a->strings["Channel has been unhidden"] = "Kanal wird nicht mehr versteckt";
-$a->strings["Channel has been hidden"] = "Kanal wurde versteckt";
-$a->strings["Channel has been approved"] = "Kanal wurde zugelassen";
-$a->strings["Channel has been unapproved"] = "Zulassung des Kanals entfernt";
-$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
-$a->strings["View %s's profile"] = "%s's Profil ansehen";
-$a->strings["Refresh Permissions"] = "Zugriffsrechte auffrischen";
-$a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
-$a->strings["Recent Activity"] = "Kürzliche Aktivitäten";
-$a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
-$a->strings["Unblock"] = "Freigeben";
-$a->strings["Block"] = "Blockieren";
-$a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder frei geben";
-$a->strings["Unignore"] = "Nicht ignorieren";
-$a->strings["Ignore"] = "Ignorieren";
-$a->strings["Ignore or Unignore this connection"] = "Verbindung ignorieren oder wieder beachten";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Archive or Unarchive this connection"] = "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück";
-$a->strings["Unhide"] = "aufdecken";
-$a->strings["Hide"] = "Verbergen";
-$a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder aufdecken";
-$a->strings["Delete this connection"] = "Verbindung löschen";
-$a->strings["Unknown"] = "Unbekannt";
-$a->strings["Approve this connection"] = "Verbindung genehmigen";
-$a->strings["Accept connection to allow communication"] = "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen";
-$a->strings["Automatic Permissions Settings"] = "Automatische Berechtigungs-Einstellungen";
-$a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
-$a->strings["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."] = "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest.";
-$a->strings["Slide to adjust your degree of friendship"] = "Schieben um den Grad der Freundschaft zu wählen";
-$a->strings["inherited"] = "Geerbt";
-$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffseinstellungen.";
-$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von deinen Privatsphären Einstellungen könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen.";
-$a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
-$a->strings["Contact Information / Notes"] = "Kontaktinformationen / Notizen";
-$a->strings["Edit contact notes"] = "Kontaktnotizen editieren";
-$a->strings["Their Settings"] = "Deren Einstellungen";
-$a->strings["My Settings"] = "Meine Einstellungen";
-$a->strings["Forum Members"] = "Forum Mitglieder";
-$a->strings["Soapbox"] = "Marktschreier";
-$a->strings["Full Sharing"] = "Volles Teilen";
-$a->strings["Cautious Sharing"] = "Vorsichtiges Teilen";
-$a->strings["Follow Only"] = "Nur Folgen";
-$a->strings["Individual Permissions"] = "Individuelle Zugriffseinstellungen";
-$a->strings["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."] = "Einige Genehmigungen können von deinen Sicherheits- und Datenschutz-Einstellungen geerbt sein (siehe Kennzeichnung), da diese eine höhere Priorität haben. Wenn du solche Genehmigungen hier änderst, hat das keine Auswirkungen.";
-$a->strings["Advanced Permissions"] = "Erweiterte Zugriffsrechte";
-$a->strings["Quick Links"] = "Quick Links";
-$a->strings["Visit %s's profile - %s"] = "%s's Profil besuchen - %s";
-$a->strings["Block/Unblock contact"] = "Geblockt Status ein- / ausschalten";
-$a->strings["Ignore contact"] = "Kontakt ignorieren";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
-$a->strings["View conversations"] = "Unterhaltungen anzeigen";
-$a->strings["Delete contact"] = "Kontakt löschen";
-$a->strings["Last update:"] = "Letzte Aktualisierung:";
-$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Update now"] = "Jetzt aktualisieren";
-$a->strings["Currently blocked"] = "Derzeit blockiert";
-$a->strings["Currently ignored"] = "Derzeit ignoriert";
-$a->strings["Currently archived"] = "Derzeit archiviert";
-$a->strings["Currently pending"] = "Derzeit anstehend";
-$a->strings["Hide this contact from others"] = "Diese Verbindung vor den anderen verbergen.";
-$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein";
+$a->strings["Unable to locate original post."] = "Originalbeitrag kann nicht gefunden werden.";
+$a->strings["Empty post discarded."] = "Leerer Beitrag verworfen.";
+$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
+$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+$a->strings["Wall Photos"] = "Wall Fotos";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
+$a->strings["Menu updated."] = "Menü aktualisiert.";
+$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
+$a->strings["Menu created."] = "Menü erstellt.";
+$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
+$a->strings["Manage Menus"] = "Menüs verwalten";
+$a->strings["Drop"] = "Löschen";
+$a->strings["Create a new menu"] = "Neues Menü erstellen";
+$a->strings["Delete this menu"] = "Lösche dieses Menü";
+$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
+$a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
+$a->strings["New Menu"] = "Neues Menü";
+$a->strings["Menu name"] = "Menü Name";
+$a->strings["Must be unique, only seen by you"] = "Muss unverwechselbar sein, nur für dich sichtbar";
+$a->strings["Menu title"] = "Menü Titel";
+$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
+$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen";
+$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
+$a->strings["Create"] = "Erstelle";
+$a->strings["Menu not found."] = "Menü nicht gefunden";
+$a->strings["Menu deleted."] = "Menü gelöscht.";
+$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
+$a->strings["Edit Menu"] = "Menü bearbeiten";
+$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
+$a->strings["Modify"] = "Ändern";
+$a->strings["Not found."] = "Nicht gefunden.";
 $a->strings["View"] = "Ansicht";
 $a->strings["Authorize application connection"] = "Zugriff der Anwendung authorizieren";
 $a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode bei der Anwendung ein:";
@@ -880,88 +847,120 @@ $a->strings["Yes"] = "Ja";
 $a->strings["No"] = "Nein";
 $a->strings["No installed applications."] = "Keine installierten Applikationen";
 $a->strings["Applications"] = "Anwendungen";
-$a->strings["Invalid item."] = "Ungültiges Element.";
-$a->strings["Channel not found."] = "Kanal nicht gefunden.";
-$a->strings["Page not found."] = "Seite nicht gefunden.";
-$a->strings["Item not available."] = "Element nicht verfügbar.";
-$a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation";
-$a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS.";
-$a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
-$a->strings["Your site database has been installed."] = "Die Datenbank deiner Seite wurde installiert.";
-$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
-$a->strings["System check"] = "Systemprüfung";
-$a->strings["Check again"] = "Bitte nochmal prüfen";
-$a->strings["Database connection"] = "Datenbank Verbindung";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst.";
-$a->strings["Database Server Name"] = "Datenbank-Servername";
-$a->strings["Default is localhost"] = "Standard ist localhost";
-$a->strings["Database Port"] = "Datenbank-Port";
-$a->strings["Communication port number - use 0 for default"] = "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:";
-$a->strings["Database Login Name"] = "Datenbank-Benutzername";
-$a->strings["Database Login Password"] = "Datenbank-Kennwort";
-$a->strings["Database Name"] = "Datenbank-Name";
-$a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst.";
-$a->strings["Website URL"] = "Webseiten URL";
-$a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
-$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für deine Website";
-$a->strings["Site settings"] = "Seiteneinstellungen";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen.";
-$a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren.";
-$a->strings["Command line PHP"] = "PHP Befehlszeile";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen.";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung.";
-$a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel  generieren";
-$a->strings["libCurl PHP module"] = "libCurl PHP Modul";
-$a->strings["GD graphics PHP module"] = "GD Graphik PHP Modul";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP Modul";
-$a->strings["mysqli PHP module"] = "mysqli PHP Modul";
-$a->strings["mb_string PHP module"] = "mb_string PHP Modul";
-$a->strings["mcrypt PHP module"] = "mcrypt PHP Modul";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite Modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert.";
-$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen.";
-$a->strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 ist beschreibbar";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis.";
-$a->strings["store is writable"] = "store ist schreibbar";
-$a->strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen.";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration.";
-$a->strings["Url rewrite is working"] = "Url rewrite funktioniert";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
-$a->strings["Errors encountered creating database tables."] = "Fehler während des Anlegens der Datenbank Tabellen aufgetreten.";
-$a->strings["
                                                                                              What next
                                                                                              "] = "
                                                                                              Was als Nächstes
                                                                                              ";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten.";
 $a->strings["Edit post"] = "Bearbeite Beitrag";
+$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++";
+$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
+$a->strings["My Bookmarks"] = "Meine Lesezeichen";
+$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
+$a->strings["Name is required"] = "Name wird benötigt";
+$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
+$a->strings["Update"] = "Update";
+$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
+$a->strings["Password changed."] = "Kennwort geändert.";
+$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
+$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
+$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
+$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Add application"] = "Anwendung hinzufügen";
+$a->strings["Name"] = "Name";
+$a->strings["Name of application"] = "Name der Anwendung";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Umleitung";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit";
+$a->strings["Icon url"] = "Symbol-URL";
+$a->strings["Optional"] = "Optional";
+$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
+$a->strings["Connected Apps"] = "Verbundene Apps";
+$a->strings["Client key starts with"] = "Client key beginnt mit";
+$a->strings["No name"] = "Kein Name";
+$a->strings["Remove authorization"] = "Authorisierung aufheben";
+$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
+$a->strings["Feature Settings"] = "Funktions-Einstellungen";
+$a->strings["Account Settings"] = "Konto-Einstellungen";
+$a->strings["Password Settings"] = "Kennwort-Einstellungen";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
+$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern";
+$a->strings["Email Address:"] = "Email Adresse:";
+$a->strings["Remove Account"] = "Konto entfernen";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden.";
+$a->strings["Off"] = "Aus";
+$a->strings["On"] = "An";
+$a->strings["Additional Features"] = "Zusätzliche Funktionen";
+$a->strings["Connector Settings"] = "Connector-Einstellungen";
+$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
+$a->strings["Display Theme:"] = "Anzeige Theme:";
+$a->strings["Mobile Theme:"] = "Mobile Theme:";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum von 10 Sekunden, kein Maximum";
+$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:";
+$a->strings["Maximum of 100 items"] = "Maximum von 100 Beiträgen";
+$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
+$a->strings["Nobody except yourself"] = "Niemand außer du selbst";
+$a->strings["Only those you specifically allow"] = "Nur die, denen du es explizit erlaubst";
+$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
+$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
+$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
+$a->strings["Anybody on the internet"] = "Jeder im Internet";
+$a->strings["Publish your default profile in the network directory"] = "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+$a->strings["or"] = "oder";
+$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
+$a->strings["Channel Settings"] = "Kanal-Einstellungen";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
+$a->strings["Default Post Location:"] = "Standardstandort:";
+$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
+$a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
+$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige deines Online-Status in deinem Profil";
+$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphären-Einstellungen";
+$a->strings["Very Public - extremely permissive (should be used with caution)"] = "";
+$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "";
+$a->strings["Private - default private, never open or public"] = "";
+$a->strings["Blocked - default blocked to/from everybody"] = "";
+$a->strings["Advanced Privacy Settings"] = "";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
+$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
+$a->strings["Default Post Permissions"] = "Beitragszugriffrechte Standardeinstellungen";
+$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
+$a->strings["Useful to reduce spamming"] = "Nützlich um Spam zu verringern";
+$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
+$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten wenn:";
+$a->strings["accepting a friend request"] = "einer Kontaktanfrage stattgegeben wurde";
+$a->strings["joining a forum/community"] = "ein Forum beigetreten wurde";
+$a->strings["making an interesting profile change"] = "eine interessante Änderung am Profil vorgenommen wurde";
+$a->strings["Send a notification email when:"] = "Eine Email Benachrichtigung senden wenn:";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
+$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
+$a->strings["Someone writes on your profile wall"] = "Jemand auf deine Pinnwand schreibt";
+$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
+$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag getaggt";
+$a->strings["You are poked/prodded/etc. in a post"] = "Du in einer Nachricht angestupst/geknufft/o.ä. wirst";
+$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account / Seiten Arten Einstellungen";
+$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$s's %3\$s";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]";
+$a->strings["Channel not found."] = "Kanal nicht gefunden.";
 $a->strings["toggle full screen mode"] = "auf Vollbildmodus umschalten";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$s's %3\$s mit %4\$s getaggt";
+$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
+$a->strings["Leave Room"] = "Raum verlassen";
+$a->strings["I am away right now"] = "Ich bin gerade nicht da";
+$a->strings["I am online"] = "Ich bin online";
+$a->strings["New Chatroom"] = "Neuen Chatraum";
+$a->strings["Chatroom Name"] = "Chatraum Name";
+$a->strings["%1\$s's Chatrooms"] = "%1\$s's Chat-Räume";
 $a->strings["Public access denied."] = "Öffentlicher Zugang verweigert.";
 $a->strings["No connections."] = "Keine Verbindungen.";
 $a->strings["Visit %s's profile [%s]"] = "Besuche %s's Profil [%s]";
@@ -987,20 +986,51 @@ $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die S
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
 $a->strings["Add"] = "Hinzufügen";
 $a->strings["No entries."] = "Keine Einträge.";
-$a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
-$a->strings["Source created."] = "Quelle erstellt.";
-$a->strings["Source updated."] = "Quelle aktualisiert.";
-$a->strings["Manage remote sources of content for your channel."] = "Entfernte Quellen von Inhalten deines Kanals verwalten.";
-$a->strings["New Source"] = "Neue Quelle";
-$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
-$a->strings["Only import content with these words (one per line)"] = "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
-$a->strings["Leave blank to import all public content"] = "Leer lassen um alle öffentlichen Beiträge zu importieren";
-$a->strings["Channel Name"] = "Name des Kanals";
-$a->strings["Source not found."] = "Quelle nicht gefunden.";
-$a->strings["Edit Source"] = "Quelle bearbeiten";
-$a->strings["Delete Source"] = "Quelle löschen";
-$a->strings["Source removed"] = "Quelle gelöscht";
-$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+$a->strings["Away"] = "Abwesend";
+$a->strings["Online"] = "Online";
+$a->strings["Item not available."] = "Element nicht verfügbar.";
+$a->strings["Menu element updated."] = "Menü-Element aktualisiert.";
+$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
+$a->strings["Menu element added."] = "Menü-Bestandteil hinzugefügt.";
+$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
+$a->strings["Manage Menu Elements"] = "Menü-Bestandteile verwalten";
+$a->strings["Edit menu"] = "Menü bearbeiten";
+$a->strings["Edit element"] = "Bestandteil bearbeiten";
+$a->strings["Drop element"] = "Bestandteil löschen";
+$a->strings["New element"] = "Neues Bestandteil";
+$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
+$a->strings["Add menu element"] = "Menüelement hinzufügen";
+$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
+$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
+$a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
+$a->strings["Menu Item Permissions"] = "Menü-Element Zugriffsrechte";
+$a->strings["Link text"] = "Link Text";
+$a->strings["URL of link"] = "URL des Links";
+$a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar";
+$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
+$a->strings["Order in list"] = "Reihenfolge in der Liste";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
+$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
+$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
+$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
+$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
+$a->strings["Collection created."] = "Sammlung erstellt.";
+$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
+$a->strings["Collection updated."] = "Sammlung aktualisiert.";
+$a->strings["Create a collection of channels."] = "Erstelle eine Sammlung von Kanälen.";
+$a->strings["Collection Name: "] = "Name der Sammlung:";
+$a->strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle";
+$a->strings["Collection removed."] = "Sammlung gelöscht.";
+$a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich.";
+$a->strings["Collection Editor"] = "Sammlung-Editor";
+$a->strings["Members"] = "Mitglieder";
+$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle";
+$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
+$a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator";
+$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor";
+$a->strings["Click on a contact to add or remove."] = "Wähle einen Kontakt zum Hinzufügen oder Löschen aus.";
+$a->strings["Visible To"] = "Sichtbar für";
+$a->strings["All Connections"] = "Alle Verbindungen";
 $a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Benutzer";
@@ -1019,7 +1049,6 @@ $a->strings["Pending registrations"] = "Ausstehende Registrierungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plug-Ins";
 $a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
-$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
 $a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility Theme vorhanden";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Genehmigung erforderlich";
@@ -1105,6 +1134,8 @@ $a->strings["Request date"] = "Antragsdatum";
 $a->strings["No registrations."] = "Keine Registrierungen.";
 $a->strings["Approve"] = "Genehmigen";
 $a->strings["Deny"] = "Verweigern";
+$a->strings["Block"] = "Blockieren";
+$a->strings["Unblock"] = "Freigeben";
 $a->strings["Register date"] = "Registrierungs-Datum";
 $a->strings["Last login"] = "Letzte Anmeldung";
 $a->strings["Expires"] = "Verfällt";
@@ -1116,158 +1147,278 @@ $a->strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
 $a->strings["Disable"] = "Deaktivieren";
 $a->strings["Enable"] = "Aktivieren";
 $a->strings["Toggle"] = "Umschalten";
-$a->strings["Author: "] = "Autor: ";
-$a->strings["Maintainer: "] = "Betreuer:";
-$a->strings["No themes found."] = "Keine Theme gefunden.";
-$a->strings["Screenshot"] = "Bildschirmfoto";
-$a->strings["[Experimental]"] = "[Experimentell]";
-$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
-$a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
-$a->strings["Clear"] = "Leeren";
-$a->strings["Debugging"] = "Debugging";
-$a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis.";
-$a->strings["Log level"] = "Protokollstufe";
-$a->strings["Menu not found."] = "Menü nicht gefunden";
-$a->strings["Menu element updated."] = "Menü-Element aktualisiert.";
-$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
-$a->strings["Menu element added."] = "Menü-Bestandteil hinzugefügt.";
-$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
-$a->strings["Not found."] = "Nicht gefunden.";
-$a->strings["Manage Menu Elements"] = "Menü-Bestandteile verwalten";
-$a->strings["Edit menu"] = "Menü bearbeiten";
-$a->strings["Edit element"] = "Bestandteil bearbeiten";
-$a->strings["Drop element"] = "Bestandteil löschen";
-$a->strings["New element"] = "Neues Bestandteil";
-$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
-$a->strings["Add menu element"] = "Menüelement hinzufügen";
-$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
-$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
-$a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
-$a->strings["Menu Item Permissions"] = "Menü-Element Zugriffsrechte";
-$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
-$a->strings["Link text"] = "Link Text";
-$a->strings["URL of link"] = "URL des Links";
-$a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar";
-$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
-$a->strings["Order in list"] = "Reihenfolge in der Liste";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
-$a->strings["Create"] = "Erstelle";
-$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
-$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
-$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
-$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
-$a->strings["Modify"] = "Ändern";
-$a->strings["Collection created."] = "Sammlung erstellt.";
-$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
-$a->strings["Collection updated."] = "Sammlung aktualisiert.";
-$a->strings["Create a collection of channels."] = "Erstelle eine Sammlung von Kanälen.";
-$a->strings["Collection Name: "] = "Name der Sammlung:";
-$a->strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle";
-$a->strings["Collection removed."] = "Sammlung gelöscht.";
-$a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich.";
-$a->strings["Collection Editor"] = "Sammlung-Editor";
-$a->strings["Members"] = "Mitglieder";
-$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle";
-$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
-$a->strings["Page owner information could not be retrieved."] = "Informationen über den Betreiber der Seite konnten nicht gefunden werden.";
-$a->strings["Album not found."] = "Album nicht gefunden.";
-$a->strings["Delete Album"] = "Album löschen";
-$a->strings["Delete Photo"] = "Foto löschen";
-$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
-$a->strings["Access to this item is restricted."] = "Zugriff auf dieses Foto wurde eingeschränkt.";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers.";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendets %1$.2f MBytes deines Foto-Speichers.";
-$a->strings["Upload Photos"] = "Fotos hochladen";
-$a->strings["New album name: "] = "Name des neuen Albums:";
-$a->strings["or existing album name: "] = "oder bestehenden Album Namen:";
-$a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload senden";
-$a->strings["Permissions"] = "Berechtigungen";
-$a->strings["Contact Photos"] = "Kontakt Bilder";
-$a->strings["Edit Album"] = "Album bearbeiten";
-$a->strings["Show Newest First"] = "Zeige neueste zuerst";
-$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
-$a->strings["View Photo"] = "Foto ansehen";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
-$a->strings["Photo not available"] = "Foto nicht verfügbar";
-$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
-$a->strings["View Full Size"] = "In voller Größe anzeigen";
-$a->strings["Edit photo"] = "Foto bearbeiten";
-$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
-$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
-$a->strings["New album name"] = "Name des neuen Albums:";
-$a->strings["Caption"] = "Bildunterschrift";
-$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
-$a->strings["View Album"] = "Album ansehen";
-$a->strings["Recent Photos"] = "Neueste Fotos";
-$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
-$a->strings["New Chatroom"] = "Neuen Chatraum";
-$a->strings["Chatroom Name"] = "Chatraum Name";
-$a->strings["- select -"] = "-auswählen-";
-$a->strings["Menu updated."] = "Menü aktualisiert.";
-$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
-$a->strings["Menu created."] = "Menü erstellt.";
-$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
-$a->strings["Manage Menus"] = "Menüs verwalten";
-$a->strings["Drop"] = "Löschen";
-$a->strings["Create a new menu"] = "Neues Menü erstellen";
-$a->strings["Delete this menu"] = "Lösche dieses Menü";
-$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
-$a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
-$a->strings["New Menu"] = "Neues Menü";
-$a->strings["Menu name"] = "Menü Name";
-$a->strings["Must be unique, only seen by you"] = "Muss unverwechselbar sein, nur für dich sichtbar";
-$a->strings["Menu title"] = "Menü Titel";
-$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
-$a->strings["Menu deleted."] = "Menü gelöscht.";
-$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
-$a->strings["Edit Menu"] = "Menü bearbeiten";
-$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
+$a->strings["Author: "] = "Autor: ";
+$a->strings["Maintainer: "] = "Betreuer:";
+$a->strings["No themes found."] = "Keine Theme gefunden.";
+$a->strings["Screenshot"] = "Bildschirmfoto";
+$a->strings["[Experimental]"] = "[Experimentell]";
+$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
+$a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
+$a->strings["Clear"] = "Leeren";
+$a->strings["Debugging"] = "Debugging";
+$a->strings["Log file"] = "Protokolldatei";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis.";
+$a->strings["Log level"] = "Protokollstufe";
+$a->strings["- select -"] = "-auswählen-";
 $a->strings["Welcome to %s"] = "Willkommen auf %s";
+$a->strings["Item not found"] = "Element nicht gefunden";
+$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
+$a->strings["Delete item?"] = "Eintrag löschen?";
+$a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
+$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
 $a->strings["Age: "] = "Alter:";
 $a->strings["Gender: "] = "Geschlecht:";
 $a->strings["Finding:"] = "Ergebnisse:";
 $a->strings["next page"] = "nächste Seite";
 $a->strings["previous page"] = "vorige Seite";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
-$a->strings["Blocked"] = "Blockiert";
-$a->strings["Ignored"] = "Ignoriert";
-$a->strings["Hidden"] = "Versteckt";
-$a->strings["Archived"] = "Archiviert";
-$a->strings["All"] = "Alle";
-$a->strings["Suggest new connections"] = "Neue Verbindungen vorschlagen";
-$a->strings["Show pending (new) connections"] = "Zeige schwebende (neue) Verbindungen";
-$a->strings["All Connections"] = "Alle Verbindungen";
-$a->strings["Show all connections"] = "Zeige alle Verbindungen";
-$a->strings["Unblocked"] = "Freigegeben";
-$a->strings["Only show unblocked connections"] = "Zeige nur freigegebene Verbindungen";
-$a->strings["Only show blocked connections"] = "Zeige nur blockierte Verbindungen";
-$a->strings["Only show ignored connections"] = "Zeige nur ignorierte Verbindungen";
-$a->strings["Only show archived connections"] = "Zeige nur archivierte Verbindungen";
-$a->strings["Only show hidden connections"] = "Zeige nur versteckte Verbindungen";
-$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
-$a->strings["Edit contact"] = "Kontakt bearbeiten";
-$a->strings["Search your connections"] = "Verbindungen durchsuchen";
-$a->strings["Finding: "] = "Ergebnisse:";
+$a->strings["Could not access contact record."] = "Konnte auf den Kontakteintrag nicht zugreifen.";
+$a->strings["Could not locate selected profile."] = "Konnte das gewählte Profil nicht finden.";
+$a->strings["Connection updated."] = "Verbindung aktualisiert.";
+$a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
+$a->strings["Could not access address book record."] = "Konnte nicht auf den Eintrag im Adressbuch zugreifen.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
+$a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
+$a->strings["Channel has been blocked"] = "Kanal blockiert";
+$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch Parameter nicht setzen.";
+$a->strings["Channel has been unignored"] = "Kanal wird nicht mehr ignoriert";
+$a->strings["Channel has been ignored"] = "Kanal wird ignoriert";
+$a->strings["Channel has been unarchived"] = "Kanal wurde aus dem Archiv zurück geholt";
+$a->strings["Channel has been archived"] = "Kanal wurde archiviert";
+$a->strings["Channel has been unhidden"] = "Kanal wird nicht mehr versteckt";
+$a->strings["Channel has been hidden"] = "Kanal wurde versteckt";
+$a->strings["Channel has been approved"] = "Kanal wurde zugelassen";
+$a->strings["Channel has been unapproved"] = "Zulassung des Kanals entfernt";
+$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
+$a->strings["View %s's profile"] = "%s's Profil ansehen";
+$a->strings["Refresh Permissions"] = "Zugriffsrechte auffrischen";
+$a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
+$a->strings["Recent Activity"] = "Kürzliche Aktivitäten";
+$a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
+$a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder frei geben";
+$a->strings["Unignore"] = "Nicht ignorieren";
+$a->strings["Ignore"] = "Ignorieren";
+$a->strings["Ignore or Unignore this connection"] = "Verbindung ignorieren oder wieder beachten";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Archive or Unarchive this connection"] = "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück";
+$a->strings["Unhide"] = "aufdecken";
+$a->strings["Hide"] = "Verbergen";
+$a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder aufdecken";
+$a->strings["Delete this connection"] = "Verbindung löschen";
+$a->strings["Unknown"] = "Unbekannt";
+$a->strings["Approve this connection"] = "Verbindung genehmigen";
+$a->strings["Accept connection to allow communication"] = "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen";
+$a->strings["Automatic Permissions Settings"] = "Automatische Berechtigungs-Einstellungen";
+$a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
+$a->strings["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."] = "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest.";
+$a->strings["Slide to adjust your degree of friendship"] = "Schieben um den Grad der Freundschaft zu wählen";
+$a->strings["inherited"] = "Geerbt";
+$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffseinstellungen.";
+$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von deinen Privatsphären Einstellungen könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen.";
+$a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
+$a->strings["Contact Information / Notes"] = "Kontaktinformationen / Notizen";
+$a->strings["Edit contact notes"] = "Kontaktnotizen editieren";
+$a->strings["Their Settings"] = "Deren Einstellungen";
+$a->strings["My Settings"] = "Meine Einstellungen";
+$a->strings["Forum Members"] = "Forum Mitglieder";
+$a->strings["Soapbox"] = "Marktschreier";
+$a->strings["Full Sharing (typical social network permissions)"] = "";
+$a->strings["Cautious Sharing "] = "";
+$a->strings["Follow Only"] = "Nur Folgen";
+$a->strings["Individual Permissions"] = "Individuelle Zugriffseinstellungen";
+$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "";
+$a->strings["Advanced Permissions"] = "Erweiterte Zugriffsrechte";
+$a->strings["Simple Permissions (select one and submit)"] = "";
+$a->strings["Visit %s's profile - %s"] = "%s's Profil besuchen - %s";
+$a->strings["Block/Unblock contact"] = "Geblockt Status ein- / ausschalten";
+$a->strings["Ignore contact"] = "Kontakt ignorieren";
+$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["View conversations"] = "Unterhaltungen anzeigen";
+$a->strings["Delete contact"] = "Kontakt löschen";
+$a->strings["Last update:"] = "Letzte Aktualisierung:";
+$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Currently blocked"] = "Derzeit blockiert";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Currently archived"] = "Derzeit archiviert";
+$a->strings["Currently pending"] = "Derzeit anstehend";
+$a->strings["Hide this contact from others"] = "Diese Verbindung vor den anderen verbergen.";
+$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein";
 $a->strings["Layout Help"] = "Layout Hilfe";
 $a->strings["Help with this feature"] = "Hilfe zu diesem Feature";
 $a->strings["Layout Name"] = "Layout Name";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
+$a->strings["Page not found."] = "Seite nicht gefunden.";
 $a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
 $a->strings["Authenticate"] = "Authentifizieren";
+$a->strings["Invalid item."] = "Ungültiges Element.";
 $a->strings["No such group"] = "Gruppe existiert nicht";
 $a->strings["Search Results For:"] = "Suchergebnisse für:";
 $a->strings["Collection is empty"] = "Sammlung ist leer";
 $a->strings["Collection: "] = "Sammlung:";
 $a->strings["Connection: "] = "Verbindung:";
 $a->strings["Invalid connection."] = "Ungültige Verbindung.";
+$a->strings["Profile not found."] = "Profil nicht gefunden.";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil erstellt.";
+$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
+$a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
+$a->strings["Marital Status"] = "Familienstand";
+$a->strings["Romantic Partner"] = "Romantische Partner";
+$a->strings["Likes"] = "Gefällt-mir";
+$a->strings["Dislikes"] = "Gefällt-mir-nicht";
+$a->strings["Work/Employment"] = "Arbeit/Anstellung";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politische Anscihten";
+$a->strings["Gender"] = "Geschlecht";
+$a->strings["Sexual Preference"] = "Sexuelle Orientierung";
+$a->strings["Homepage"] = "Webseite";
+$a->strings["Interests"] = "Hobbys/Interessen";
+$a->strings["Address"] = "Adresse";
+$a->strings["Location"] = "Ort";
+$a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils";
+$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
+$a->strings["View this profile"] = "Dieses Profil ansehen";
+$a->strings["Change Profile Photo"] = "Profilfoto ändern";
+$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
+$a->strings["Clone this profile"] = "Dieses Profil klonen";
+$a->strings["Delete this profile"] = "Dieses Profil löschen";
+$a->strings["Profile Name:"] = "Profilname:";
+$a->strings["Your Full Name:"] = "Dein voller Name:";
+$a->strings["Title/Description:"] = "Titel/Beschreibung:";
+$a->strings["Your Gender:"] = "Dein Geschlecht:";
+$a->strings["Birthday (%s):"] = "Geburtstag (%s):";
+$a->strings["Street Address:"] = "Straße und Hausnummer:";
+$a->strings["Locality/City:"] = "Wohnort:";
+$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
+$a->strings["Country:"] = "Land:";
+$a->strings["Region/State:"] = "Region/Bundesstaat";
+$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:";
+$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Seit [Datum]:";
+$a->strings["Homepage URL:"] = "Homepage URL:";
+$a->strings["Religious Views:"] = "Religiöse Ansichten:";
+$a->strings["Keywords:"] = "Schlüsselwörter:";
+$a->strings["Example: fishing photography software"] = "Beispiel: fischen Fotografie Software";
+$a->strings["Used in directory listings"] = "Wird in Verzeichnis Auflistungen verwendet";
+$a->strings["Tell us about yourself..."] = "Erzähl uns ein wenig von Dir...";
+$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
+$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
+$a->strings["My other channels"] = "Meine anderen Kanäle";
+$a->strings["Musical interests"] = "Musikalische Interessen";
+$a->strings["Books, literature"] = "Bücher, Literatur";
+$a->strings["Television"] = "Fernsehen";
+$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
+$a->strings["Love/romance"] = "Liebe/Romantik";
+$a->strings["Work/employment"] = "Arbeit/Anstellung";
+$a->strings["School/education"] = "Schule/Ausbildung";
+$a->strings["This is your public profile.
                                                                                              It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
                                                                                              Es könnte für jeden im Internet sichtbar sein.";
+$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
+$a->strings["Add profile things"] = "Profil-Dinge hinzufügen";
+$a->strings["Include desirable objects in your profile"] = "binde begehrenswerte Dinge in dein Profil ein";
 $a->strings["Channel added."] = "Kanal hinzugefügt.";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
 $a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
+$a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
+$a->strings["Source created."] = "Quelle erstellt.";
+$a->strings["Source updated."] = "Quelle aktualisiert.";
+$a->strings["*"] = "*";
+$a->strings["Manage remote sources of content for your channel."] = "Entfernte Quellen von Inhalten deines Kanals verwalten.";
+$a->strings["New Source"] = "Neue Quelle";
+$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
+$a->strings["Only import content with these words (one per line)"] = "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
+$a->strings["Leave blank to import all public content"] = "Leer lassen um alle öffentlichen Beiträge zu importieren";
+$a->strings["Channel Name"] = "Name des Kanals";
+$a->strings["Source not found."] = "Quelle nicht gefunden.";
+$a->strings["Edit Source"] = "Quelle bearbeiten";
+$a->strings["Delete Source"] = "Quelle löschen";
+$a->strings["Source removed"] = "Quelle gelöscht";
+$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+$a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
+$a->strings["Visible to:"] = "Sichtbar für:";
+$a->strings["Hub not found."] = "Server nicht gefunden.";
+$a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation";
+$a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS.";
+$a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
+$a->strings["Your site database has been installed."] = "Die Datenbank deiner Seite wurde installiert.";
+$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
+$a->strings["System check"] = "Systemprüfung";
+$a->strings["Check again"] = "Bitte nochmal prüfen";
+$a->strings["Database connection"] = "Datenbank Verbindung";
+$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst.";
+$a->strings["Database Server Name"] = "Datenbank-Servername";
+$a->strings["Default is localhost"] = "Standard ist localhost";
+$a->strings["Database Port"] = "Datenbank-Port";
+$a->strings["Communication port number - use 0 for default"] = "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:";
+$a->strings["Database Login Name"] = "Datenbank-Benutzername";
+$a->strings["Database Login Password"] = "Datenbank-Kennwort";
+$a->strings["Database Name"] = "Datenbank-Name";
+$a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst.";
+$a->strings["Website URL"] = "Webseiten URL";
+$a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
+$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für deine Website";
+$a->strings["Site settings"] = "Seiteneinstellungen";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen.";
+$a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren.";
+$a->strings["Command line PHP"] = "PHP Befehlszeile";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung.";
+$a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel  generieren";
+$a->strings["libCurl PHP module"] = "libCurl PHP Modul";
+$a->strings["GD graphics PHP module"] = "GD Graphik PHP Modul";
+$a->strings["OpenSSL PHP module"] = "OpenSSL PHP Modul";
+$a->strings["mysqli PHP module"] = "mysqli PHP Modul";
+$a->strings["mb_string PHP module"] = "mb_string PHP Modul";
+$a->strings["mcrypt PHP module"] = "mcrypt PHP Modul";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite Modul";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen.";
+$a->strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 ist beschreibbar";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis.";
+$a->strings["store is writable"] = "store ist schreibbar";
+$a->strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen.";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration.";
+$a->strings["Url rewrite is working"] = "Url rewrite funktioniert";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
+$a->strings["Errors encountered creating database tables."] = "Fehler während des Anlegens der Datenbank Tabellen aufgetreten.";
+$a->strings["
                                                                                              What next
                                                                                              "] = "
                                                                                              Was als Nächstes
                                                                                              ";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten.";
 $a->strings["Version %s"] = "Version %s";
 $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
@@ -1276,89 +1427,14 @@ $a->strings["This is a hub of the Red Matrix - a global cooperative network of d
 $a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
 $a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com um mehr über die Red Matrix zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
+$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
 $a->strings["Site Administrators"] = "Administratoren";
-$a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
-$a->strings["Visible to:"] = "Sichtbar für:";
-$a->strings["Hub not found."] = "Server nicht gefunden.";
-$a->strings["Profile not found."] = "Profil nicht gefunden.";
-$a->strings["Profile deleted."] = "Profil gelöscht.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Neues Profil erstellt.";
-$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
-$a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
-$a->strings["Marital Status"] = "Familienstand";
-$a->strings["Romantic Partner"] = "Romantische Partner";
-$a->strings["Likes"] = "Gefällt-mir";
-$a->strings["Dislikes"] = "Gefällt-mir-nicht";
-$a->strings["Work/Employment"] = "Arbeit/Anstellung";
-$a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politische Anscihten";
-$a->strings["Gender"] = "Geschlecht";
-$a->strings["Sexual Preference"] = "Sexuelle Orientierung";
-$a->strings["Homepage"] = "Webseite";
-$a->strings["Interests"] = "Hobbys/Interessen";
-$a->strings["Address"] = "Adresse";
-$a->strings["Location"] = "Ort";
-$a->strings["Profile updated."] = "Profil aktualisiert.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils";
-$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
-$a->strings["View this profile"] = "Dieses Profil ansehen";
-$a->strings["Change Profile Photo"] = "Profilfoto ändern";
-$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
-$a->strings["Clone this profile"] = "Dieses Profil klonen";
-$a->strings["Delete this profile"] = "Dieses Profil löschen";
-$a->strings["Profile Name:"] = "Profilname:";
-$a->strings["Your Full Name:"] = "Dein voller Name:";
-$a->strings["Title/Description:"] = "Titel/Beschreibung:";
-$a->strings["Your Gender:"] = "Dein Geschlecht:";
-$a->strings["Birthday (%s):"] = "Geburtstag (%s):";
-$a->strings["Street Address:"] = "Straße und Hausnummer:";
-$a->strings["Locality/City:"] = "Wohnort:";
-$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
-$a->strings["Country:"] = "Land:";
-$a->strings["Region/State:"] = "Region/Bundesstaat";
-$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:";
-$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
-$a->strings["Since [date]:"] = "Seit [Datum]:";
-$a->strings["Homepage URL:"] = "Homepage URL:";
-$a->strings["Religious Views:"] = "Religiöse Ansichten:";
-$a->strings["Keywords:"] = "Schlüsselwörter:";
-$a->strings["Example: fishing photography software"] = "Beispiel: fischen Fotografie Software";
-$a->strings["Used in directory listings"] = "Wird in Verzeichnis Auflistungen verwendet";
-$a->strings["Tell us about yourself..."] = "Erzähl uns ein wenig von Dir...";
-$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
-$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
-$a->strings["My other channels"] = "Meine anderen Kanäle";
-$a->strings["Musical interests"] = "Musikalische Interessen";
-$a->strings["Books, literature"] = "Bücher, Literatur";
-$a->strings["Television"] = "Fernsehen";
-$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
-$a->strings["Love/romance"] = "Liebe/Romantik";
-$a->strings["Work/employment"] = "Arbeit/Anstellung";
-$a->strings["School/education"] = "Schule/Ausbildung";
-$a->strings["This is your public profile.
                                                                                              It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
                                                                                              Es könnte für jeden im Internet sichtbar sein.";
-$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
-$a->strings["Add profile things"] = "Profil-Dinge hinzufügen";
-$a->strings["Include desirable objects in your profile"] = "binde begehrenswerte Dinge in dein Profil ein";
 $a->strings["Add a Channel"] = "Kanal hinzufügen";
 $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt.";
 $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" ";
 $a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznahmen";
 $a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
 $a->strings["Or import an existing channel from another location"] = "Oder importiere einen bestehenden Kanal von einem anderen Ort";
-$a->strings["Permission Denied."] = "Zugriff verweigert.";
-$a->strings["File not found."] = "Datei nicht gefunden";
-$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
-$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
-$a->strings["Return to file list"] = "Zurück zur Dateiliste";
-$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen";
-$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen";
-$a->strings["Download"] = "Download";
-$a->strings["Used: "] = "Verwendet:";
-$a->strings["[directory]"] = "[Verzeichnis]";
-$a->strings["Limit: "] = "Limit:";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab.";
 $a->strings["Site Member (%s)"] = "Seiten Mitglied (%s)";
@@ -1406,100 +1482,6 @@ $a->strings["No keywords to match. Please add keywords to your default profile."
 $a->strings["is interested in:"] = "interessiert sich für:";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["invalid target signature"] = "Ungültige Signatur des Ziels";
-$a->strings["Name is required"] = "Name wird benötigt";
-$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
-$a->strings["Update"] = "Update";
-$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
-$a->strings["Password changed."] = "Kennwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
-$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
-$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
-$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Add application"] = "Anwendung hinzufügen";
-$a->strings["Name"] = "Name";
-$a->strings["Name of application"] = "Name der Anwendung";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Umleitung";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit";
-$a->strings["Icon url"] = "Symbol-URL";
-$a->strings["Optional"] = "Optional";
-$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
-$a->strings["Connected Apps"] = "Verbundene Apps";
-$a->strings["Client key starts with"] = "Client key beginnt mit";
-$a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Authorisierung aufheben";
-$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
-$a->strings["Feature Settings"] = "Funktions-Einstellungen";
-$a->strings["Account Settings"] = "Konto-Einstellungen";
-$a->strings["Password Settings"] = "Kennwort-Einstellungen";
-$a->strings["New Password:"] = "Neues Passwort:";
-$a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern";
-$a->strings["Email Address:"] = "Email Adresse:";
-$a->strings["Remove Account"] = "Konto entfernen";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden.";
-$a->strings["Off"] = "Aus";
-$a->strings["On"] = "An";
-$a->strings["Additional Features"] = "Zusätzliche Funktionen";
-$a->strings["Connector Settings"] = "Connector-Einstellungen";
-$a->strings["Display Settings"] = "Anzeige-Einstellungen";
-$a->strings["Display Theme:"] = "Anzeige Theme:";
-$a->strings["Mobile Theme:"] = "Mobile Theme:";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum von 10 Sekunden, kein Maximum";
-$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:";
-$a->strings["Maximum of 100 items"] = "Maximum von 100 Beiträgen";
-$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
-$a->strings["Nobody except yourself"] = "Niemand außer du selbst";
-$a->strings["Only those you specifically allow"] = "Nur die, denen du es explizit erlaubst";
-$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
-$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
-$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
-$a->strings["Anybody on the internet"] = "Jeder im Internet";
-$a->strings["Publish your default profile in the network directory"] = "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-$a->strings["or"] = "oder";
-$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
-$a->strings["Channel Settings"] = "Kanal-Einstellungen";
-$a->strings["Basic Settings"] = "Grundeinstellungen";
-$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
-$a->strings["Default Post Location:"] = "Standardstandort:";
-$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
-$a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
-$a->strings["This channel publishes adult content."] = "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte";
-$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
-$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
-$a->strings["Prevents showing if you are available for chat"] = "Verhindert es als für Chats verfügbar angezeigt zu werden";
-$a->strings["Quick Privacy Settings:"] = "Schnelle Datenschutz-Einstellungen:";
-$a->strings["Very Public - extremely permissive"] = "Sehr offen - extrem freizügig";
-$a->strings["Typical - default public, privacy when desired"] = "Typisch - Standard öffentlich, Privatheit wenn gewünscht";
-$a->strings["Private - default private, rarely open or public"] = "Privat - Standard privat, selten offen oder öffentlich";
-$a->strings["Blocked - default blocked to/from everybody"] = "Geschlossen - Standard zu und von jedem geblockt";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
-$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
-$a->strings["Default Post Permissions"] = "Beitragszugriffrechte Standardeinstellungen";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
-$a->strings["Useful to reduce spamming"] = "Nützlich um Spam zu verringern";
-$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
-$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten wenn:";
-$a->strings["accepting a friend request"] = "einer Kontaktanfrage stattgegeben wurde";
-$a->strings["joining a forum/community"] = "ein Forum beigetreten wurde";
-$a->strings["making an interesting profile change"] = "eine interessante Änderung am Profil vorgenommen wurde";
-$a->strings["Send a notification email when:"] = "Eine Email Benachrichtigung senden wenn:";
-$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
-$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
-$a->strings["Someone writes on your profile wall"] = "Jemand auf deine Pinnwand schreibt";
-$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
-$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
-$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag getaggt";
-$a->strings["You are poked/prodded/etc. in a post"] = "Du in einer Nachricht angestupst/geknufft/o.ä. wirst";
-$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account / Seiten Arten Einstellungen";
-$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
 $a->strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
 $a->strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
 $a->strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
@@ -1518,12 +1500,8 @@ $a->strings["Private Conversation"] = "Private Unterhaltung";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. Eventuell kannst du von der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
-$a->strings["Item not found"] = "Element nicht gefunden";
 $a->strings["Edit Layout"] = "Layout bearbeiten";
 $a->strings["Delete layout?"] = "Layout löschen?";
-$a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
-$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
 $a->strings["Delete Layout"] = "Layout löschen";
 $a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das zurecht schneiden schlug fehl.";
 $a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
@@ -1543,8 +1521,24 @@ $a->strings["Done Editing"] = "Bearbeitung fertigstellen";
 $a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
 $a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
 $a->strings["Image size reduction [%s] failed."] = "Reduzierung der Bildgröße [%s] fehlgeschlagen.";
-$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-$a->strings["Delete item?"] = "Eintrag löschen?";
+$a->strings["Blocked"] = "Blockiert";
+$a->strings["Ignored"] = "Ignoriert";
+$a->strings["Hidden"] = "Versteckt";
+$a->strings["Archived"] = "Archiviert";
+$a->strings["All"] = "Alle";
+$a->strings["Suggest new connections"] = "Neue Verbindungen vorschlagen";
+$a->strings["Show pending (new) connections"] = "Zeige schwebende (neue) Verbindungen";
+$a->strings["Show all connections"] = "Zeige alle Verbindungen";
+$a->strings["Unblocked"] = "Freigegeben";
+$a->strings["Only show unblocked connections"] = "Zeige nur freigegebene Verbindungen";
+$a->strings["Only show blocked connections"] = "Zeige nur blockierte Verbindungen";
+$a->strings["Only show ignored connections"] = "Zeige nur ignorierte Verbindungen";
+$a->strings["Only show archived connections"] = "Zeige nur archivierte Verbindungen";
+$a->strings["Only show hidden connections"] = "Zeige nur versteckte Verbindungen";
+$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
+$a->strings["Edit contact"] = "Kontakt bearbeiten";
+$a->strings["Search your connections"] = "Verbindungen durchsuchen";
+$a->strings["Finding: "] = "Ergebnisse:";
 $a->strings["Invalid request identifier."] = "Ungültige Anfrage Identifikator.";
 $a->strings["Discard"] = "Verwerfen";
 $a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
@@ -1561,7 +1555,6 @@ $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder
 $a->strings["Recipient"] = "Empfänger";
 $a->strings["Choose what you wish to do to recipient"] = "Wähle was du mit dem/r Empfänger/in tun willst";
 $a->strings["Make this post private"] = "Diesen Beitrag privat machen";
-$a->strings["Wall Photos"] = "Wall Fotos";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
 $a->strings["Not available."] = "Nicht verfügbar.";
 $a->strings["Community"] = "Gemeinschaft";
@@ -1573,10 +1566,24 @@ $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
 $a->strings["Edit Block"] = "Block bearbeiten";
 $a->strings["Delete block?"] = "Block löschen?";
 $a->strings["Delete Block"] = "Block löschen";
-$a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator";
-$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor";
-$a->strings["Click on a contact to add or remove."] = "Wähle einen Kontakt zum Hinzufügen oder Löschen aus.";
-$a->strings["Visible To"] = "Sichtbar für";
+$a->strings["Status: "] = "Status:";
+$a->strings["Sexual Preference: "] = "Sexuelle Vorlieben:";
+$a->strings["Homepage: "] = "Webseite:";
+$a->strings["Hometown: "] = "Wohnort:";
+$a->strings["About: "] = "Über:";
+$a->strings["Keywords: "] = "Schlüsselbegriffe:";
+$a->strings["Permission Denied."] = "Zugriff verweigert.";
+$a->strings["File not found."] = "Datei nicht gefunden";
+$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
+$a->strings["Permissions"] = "Berechtigungen";
+$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
+$a->strings["Return to file list"] = "Zurück zur Dateiliste";
+$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen";
+$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen";
+$a->strings["Download"] = "Download";
+$a->strings["Used: "] = "Verwendet:";
+$a->strings["[directory]"] = "[Verzeichnis]";
+$a->strings["Limit: "] = "Limit:";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
 $a->strings["No messages."] = "Keine Nachrichten.";
@@ -1610,30 +1617,48 @@ $a->strings["Please enter your password for verification:"] = "Bitte gib zur Bes
 $a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
 $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk";
 $a->strings["Remove Channel"] = "Kanal entfernen";
-$a->strings["Unable to locate original post."] = "Originalbeitrag kann nicht gefunden werden.";
-$a->strings["Empty post discarded."] = "Leerer Beitrag verworfen.";
-$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
-$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
+$a->strings["Page owner information could not be retrieved."] = "Informationen über den Betreiber der Seite konnten nicht gefunden werden.";
+$a->strings["Album not found."] = "Album nicht gefunden.";
+$a->strings["Delete Album"] = "Album löschen";
+$a->strings["Delete Photo"] = "Foto löschen";
+$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
+$a->strings["Access to this item is restricted."] = "Zugriff auf dieses Foto wurde eingeschränkt.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendets %1$.2f MBytes deines Foto-Speichers.";
+$a->strings["Upload Photos"] = "Fotos hochladen";
+$a->strings["New album name: "] = "Name des neuen Albums:";
+$a->strings["or existing album name: "] = "oder bestehenden Album Namen:";
+$a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload senden";
+$a->strings["Contact Photos"] = "Kontakt Bilder";
+$a->strings["Edit Album"] = "Album bearbeiten";
+$a->strings["Show Newest First"] = "Zeige neueste zuerst";
+$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
+$a->strings["View Photo"] = "Foto ansehen";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
+$a->strings["Photo not available"] = "Foto nicht verfügbar";
+$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
+$a->strings["View Full Size"] = "In voller Größe anzeigen";
+$a->strings["Edit photo"] = "Foto bearbeiten";
+$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
+$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
+$a->strings["New album name"] = "Name des neuen Albums:";
+$a->strings["Caption"] = "Bildunterschrift";
+$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["In This Photo:"] = "Auf diesem Foto:";
+$a->strings["View Album"] = "Album ansehen";
+$a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Mood"] = "Laune";
 $a->strings["Set your current mood and tell your friends"] = "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden";
 $a->strings["sent you a private message"] = "eine private Nachricht schicken";
 $a->strings["added your channel"] = "hat deinen Kanal hinzugefügt";
 $a->strings["posted an event"] = "hat eine Veranstaltung veröffentlicht";
-$a->strings["Status: "] = "Status:";
-$a->strings["Sexual Preference: "] = "Sexuelle Vorlieben:";
-$a->strings["Homepage: "] = "Webseite:";
-$a->strings["Hometown: "] = "Wohnort:";
-$a->strings["About: "] = "Über:";
-$a->strings["Keywords: "] = "Schlüsselbegriffe:";
 $a->strings["Scheme Default"] = "Standard-Schema";
-$a->strings["red"] = "Rot";
-$a->strings["black"] = "Schwarz";
 $a->strings["silver"] = "Silber";
 $a->strings["Theme settings"] = "Theme-Einstellungen";
 $a->strings["Set scheme"] = "Schema";
 $a->strings["Navigation bar colour"] = "Farbe der Navigationsleiste";
+$a->strings["link colour"] = "Farbe der Verweise";
 $a->strings["Set font-colour for banner"] = "Farbe des Banners";
 $a->strings["Set the background colour"] = "Hintergrundfarbe";
 $a->strings["Set the background image"] = "Hintergrundbild";
-- 
cgit v1.2.3


From 13a3dcf47ffa3b32fef7e8e9bae4726cb998d292 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 00:04:35 -0800
Subject: dav issue when listing protected contents from OS interface

---
 include/reddav.php | 33 ++++++++++++++++++++++++++-------
 version.inc        |  2 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/include/reddav.php b/include/reddav.php
index 7fcd81d61..5ffffdab2 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -30,8 +30,19 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 
 	}
 
+
+	function log() {
+		logger('RedDirectory::log() ext_path ' . $this->ext_path, LOGGER_DATA);
+		logger('RedDirectory::log() os_path ' . $this->os_path, LOGGER_DATA);
+		logger('RedDirectory::log() red_path ' . $this->red_path, LOGGER_DATA);
+	}
+
 	function getChildren() {
 
+		logger('RedDirectory::getChildren() called for ' . $this->ext_path, LOGGER_DATA);
+
+		$this->log();
+
 		if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 			return;
@@ -239,7 +250,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			return;
 
 
-		logger('getDir(): path: ' . print_r($path_arr,true));
+		logger('getDir(): path: ' . print_r($path_arr,true), LOGGER_DEBUG);
 
 		$channel_name = $path_arr[0];
 
@@ -519,6 +530,7 @@ function RedChannelList(&$auth) {
 	if($r) {
 		foreach($r as $rr) {
 			if(perm_is_allowed($rr['channel_id'],$auth->observer,'view_storage')) {
+				logger('RedChannelList: ' . '/cloud/' . $rr['channel_address'], LOGGER_DATA);
 				$ret[] = new RedDirectory('/cloud/' . $rr['channel_address'],$auth);
 			}
 		}
@@ -568,6 +580,7 @@ function RedCollectionData($file,&$auth) {
 	$permission_error = false;
 
 	for($x = 1; $x < count($path_arr); $x ++) {		
+
 		$r = q("select id, hash, filename, flags from attach where folder = '%s' and filename = '%s' and (flags & %d) $perms limit 1",
 			dbesc($folder),
 			dbesc($path_arr[$x]),
@@ -619,6 +632,8 @@ function RedCollectionData($file,&$auth) {
 	);
 
 	foreach($r as $rr) {
+		logger('RedCollectionData: filename: ' . $rr['filename'], LOGGER_DATA);
+
 		if($rr['flags'] & ATTACH_FLAG_DIR)
 			$ret[] = new RedDirectory('/cloud' . $path . '/' . $rr['filename'],$auth);
 		else
@@ -775,6 +790,8 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 				$this->channel_name = $r[0]['channel_address'];
 				$this->channel_id = $r[0]['channel_id'];
 				$this->channel_hash = $this->observer = $r[0]['channel_hash'];
+				$_SESSION['uid'] = $r[0]['channel_id'];
+				$_SESSION['authenticated'] = true;
 				return true;
 			}
 		}
@@ -794,6 +811,8 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 						$this->channel_name = $r[0]['channel_address'];
 						$this->channel_id = $r[0]['channel_id'];
 						$this->channel_hash = $this->observer = $r[0]['channel_hash'];
+						$_SESSION['uid'] = $r[0]['channel_id'];
+						$_SESSION['authenticated'] = true;
             			return true;
         			}
     			}
@@ -813,12 +832,12 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 		
 
 	function log() {
-		logger('dav: auth: channel_name ' . $this->channel_name);
-		logger('dav: auth: channel_id ' . $this->channel_id);
-		logger('dav: auth: channel_hash ' . $this->channel_hash);
-		logger('dav: auth: observer ' . $this->observer);
-		logger('dav: auth: owner_id ' . $this->owner_id);
-		logger('dav: auth: owner_nick ' . $this->owner_nick);
+		logger('dav: auth: channel_name ' . $this->channel_name, LOGGER_DATA);
+		logger('dav: auth: channel_id ' . $this->channel_id, LOGGER_DATA);
+		logger('dav: auth: channel_hash ' . $this->channel_hash, LOGGER_DATA);
+		logger('dav: auth: observer ' . $this->observer, LOGGER_DATA);
+		logger('dav: auth: owner_id ' . $this->owner_id, LOGGER_DATA);
+		logger('dav: auth: owner_nick ' . $this->owner_nick, LOGGER_DATA);
 	}
 
 
diff --git a/version.inc b/version.inc
index 8b63ff8da..c496e0bbe 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-11.585
+2014-02-12.586
-- 
cgit v1.2.3


From ba360b434714311baacf9b692f838e1d9490925c Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 03:05:55 -0800
Subject: ui improvements on the manage page

---
 view/css/mod_manage.css | 17 ++++++++++++-----
 view/tpl/channel.tpl    |  4 ++--
 view/tpl/channels.tpl   |  5 +++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 58f9d3159..4780820ba 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -1,8 +1,7 @@
 #channels-selected {
 	color: #666666;
-	font-size: 1.2em;
-	width: 120px;
-	margin: 20px auto 10px auto;
+	font-size: 0.8em;
+
 }
 
 #channels-desc {
@@ -12,9 +11,16 @@
 	margin-bottom: 20px;
 }
 
+.channels-break {
+	margin-bottom: 15px;
+}
 #selected-channel {
-	width: 200px;
-	margin: 0px auto 0px auto;
+	float: left;
+	margin-left: 0;
+}
+
+.channels-end.selected {
+	clear: both;
 }
 
 #selected-channel .channel-selection {
@@ -31,6 +37,7 @@
 #all-channels .channel-selection {
 	width: 120px;
 	float: left;
+	margin-bottom: 15px;
 }
 .channels-end {
 	clear: both;
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index d6462d1e4..1ed2fbd2c 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,9 +1,9 @@
 
                                                                                              
 {{if $channel.default_links}}
 {{if $channel.default}}
-
                                                                                              {{$msg_default}}
                                                                                              
+
                                                                                               {{$msg_default}}
                                                                                              
 {{else}}
-
                                                                                              {{$msg_make_default}}
                                                                                              
+
                                                                                              
 {{/if}}
 {{/if}}
 {{$channel.channel_name}}
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index af6b36b1d..2c31cb498 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -6,6 +6,7 @@
 {{$l.2}}
 {{/foreach}}
 {{/if}} 
+
                                                                                              
 
 {{if $channel_usage_message}}
 
                                                                                              
@@ -16,10 +17,10 @@
 
                                                                                              
 
                                                                                              {{$msg_selected}}
                                                                                              
 {{include file="channel.tpl" channel=$selected}}
-
                                                                                              
 
                                                                                              
+
                                                                                              
 {{/if}}
-
+
                                                                                              
 
                                                                                              {{$desc}}
                                                                                              
 
 
                                                                                              
-- 
cgit v1.2.3


From e47035f85a680344f2d5f58971ca2629c70c7838 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 11:42:33 -0800
Subject: bbcode element of where you are on a site. perhaps this is less than
 generally useful but I plan to use it in a demo video where there is no other
 way to accomplish this

---
 include/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 9cd5ad58c..c6ec060af 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -373,7 +373,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		}
     }
 
-	$Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$Text);
+	$Text = str_replace(array('[baseurl]','[sitename]','[sitepath]'),array(z_root(),get_config('system','sitename'),$_SESSION['return_url']),$Text);
 
 	
 	// Replace any html brackets with HTML Entities to prevent executing HTML or script
-- 
cgit v1.2.3


From e06d9e97c56d119c35c59ba65c7437a28115e4a0 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 12 Feb 2014 21:31:11 +0100
Subject: make chatrooms in /chat/channel visible to observers aswell

---
 include/chat.php    | 6 ++++--
 include/widgets.php | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/chat.php b/include/chat.php
index fb1d4fe65..5a17230e0 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -173,10 +173,12 @@ function chatroom_leave($observer_xchan,$room_id,$client) {
 
 
 function chatroom_list($uid) {
+	require_once('include/security.php');
+	$sql_extra = permissions_sql($uid);
 
-	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d  group by cr_name order by cr_name",
+	$r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name order by cr_name",
 		intval($uid)
 	);
 
 	return $r;
-}
\ No newline at end of file
+}
diff --git a/include/widgets.php b/include/widgets.php
index 0151f7c27..7c316410e 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -578,13 +578,16 @@ function widget_menu_preview($arr) {
 }
 
 function widget_chatroom_list($arr) {
+
+	$a = get_app();
+
 	require_once("include/chat.php");
-	$r = chatroom_list(local_user());
-	$channel = get_app()->get_channel();
+	$r = chatroom_list($a->profile['profile_uid']);
+
 	return replace_macros(get_markup_template('chatroomlist.tpl'),array(
 		'$header' => t('Chat Rooms'),
 		'$baseurl' => z_root(),
-		'$nickname' => $channel['channel_address'],
+		'$nickname' => $a->profile['channel_address'],
 		'$items' => $r,
 	));
 }
-- 
cgit v1.2.3


From 18b2ff9c24d2384f57009d86cab9a3a82d3dc7b8 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 12 Feb 2014 21:36:20 +0100
Subject: whitespace

---
 include/widgets.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/widgets.php b/include/widgets.php
index 7c316410e..3c2333323 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -578,12 +578,9 @@ function widget_menu_preview($arr) {
 }
 
 function widget_chatroom_list($arr) {
-
 	$a = get_app();
-
 	require_once("include/chat.php");
 	$r = chatroom_list($a->profile['profile_uid']);
-
 	return replace_macros(get_markup_template('chatroomlist.tpl'),array(
 		'$header' => t('Chat Rooms'),
 		'$baseurl' => z_root(),
-- 
cgit v1.2.3


From 7c0101899da879dc52008bd9c0445d4a24ab9fcb Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 13:45:11 -0800
Subject: another bbcode addition for the demo, however this one is potentially
 useful for other purposes

---
 include/bbcode.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/include/bbcode.php b/include/bbcode.php
index c6ec060af..630be0b89 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -373,6 +373,20 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		}
     }
 
+	$channel = $a->get_channel();
+	if (strpos($Text,'[/channel]') !== false) {
+		if ($channel) {
+			$Text = preg_replace("/\[channel\=1\](.*?)\[\/channel\]/ism", '$1', $Text);
+			$Text = preg_replace("/\[channel\=0\].*?\[\/channel\]/ism", '', $Text);
+		} else {
+			$Text = preg_replace("/\[channel\=1\].*?\[\/channel\]/ism", '', $Text);
+			$Text = preg_replace("/\[channel\=0\](.*?)\[\/channel\]/ism", '$1', $Text);
+		}
+    }
+
+
+
+
 	$Text = str_replace(array('[baseurl]','[sitename]','[sitepath]'),array(z_root(),get_config('system','sitename'),$_SESSION['return_url']),$Text);
 
 	
-- 
cgit v1.2.3


From 8e68ecc68bb84f9fa1f69ff4584982a7dc810462 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 12 Feb 2014 23:41:08 +0100
Subject: dont show onlinestatus if block_public is on

---
 include/identity.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/identity.php b/include/identity.php
index 0e01b4a0d..12eeb47ac 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1154,6 +1154,9 @@ function is_member($s) {
 
 function get_online_status($nick) {
 
+	if(get_config('system','block_public') && ! local_user() && ! remote_user())
+		return;
+
 	$ret = array('result' => false);
 
 	$r = q("select channel_id, channel_hash from channel where channel_address = '%s' limit 1",
-- 
cgit v1.2.3


From 2c1b366fdf18929e255a223bc88474b446eaafa8 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 14:44:27 -0800
Subject: make activities optional for profile things, clean up the forms

---
 mod/thing.php            | 93 +++++++++++++++++++++++++-----------------------
 view/css/mod_thing.css   | 14 +++-----
 view/tpl/thing_edit.tpl  |  4 +++
 view/tpl/thing_input.tpl |  5 +++
 4 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/mod/thing.php b/mod/thing.php
index 2620d660e..cbf83fdf8 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -19,6 +19,7 @@ function thing_init(&$a) {
 
 	$name = escape_tags($_REQUEST['term']);
 	$verb = escape_tags($_REQUEST['verb']);
+	$activity = intval($_REQUEST['activity']);
 	$profile_guid = escape_tags($_REQUEST['profile_assign']);
 	$url = $_REQUEST['link'];
 	$photo = $_REQUEST['img'];
@@ -160,60 +161,62 @@ function thing_init(&$a) {
 
 	info( t('Thing added'));
 
-	$arr = array();
-	$links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $term['url']));
-	if($local_photo)
-		$links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo);
 
+	if($activity) {
+		$arr = array();
+		$links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $term['url']));
+		if($local_photo)
+			$links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo);
 
-	$objtype = ACTIVITY_OBJ_THING;
-
-	$obj = json_encode(array(
-		'type'    => $objtype,
-		'id'      => $term['url'],
-		'link'    => $links,
-		'title'   => $term['term'],
-		'content' => $term['term']
-	));
-
-	$bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s'));
-
-	$arr['owner_xchan']  = $channel['channel_hash'];
-	$arr['author_xchan'] = $channel['channel_hash'];
 
+		$objtype = ACTIVITY_OBJ_THING;
 
-	$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
-	
-	$ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
-	$plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]';
+		$obj = json_encode(array(
+			'type'    => $objtype,
+			'id'      => $term['url'],
+			'link'    => $links,
+			'title'   => $term['term'],
+			'content' => $term['term']
+		));
 
-	$arr['body'] =  sprintf( $bodyverb, $ulink, $translated_verb, $plink );
+		$bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s'));
 
-	if($local_photo)
-		$arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]";
+		$arr['owner_xchan']  = $channel['channel_hash'];
+		$arr['author_xchan'] = $channel['channel_hash'];
 
-	$arr['verb'] = $verb;
-	$arr['obj_type'] = $objtype;
-	$arr['object'] = $obj;
 
-	if(! $profile['is_default']) {
-		$arr['item_private'] = true;
-		$str = '';
-		$r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
-			intval(local_user()),
-			dbesc($profile_guid)
-		);
-		if($r) {
-			$arr['allow_cid'] = '';
-			foreach($r as $rr)
-				$arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
-		}
-		else
-			$arr['allow_cid'] = '<' . get_observer_hash() . '>';
-	}
+		$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
 	
-	$ret = post_activity_item($arr);
+		$ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
+		$plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]';
+
+		$arr['body'] =  sprintf( $bodyverb, $ulink, $translated_verb, $plink );
+
+		if($local_photo)
+			$arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]";
+
+		$arr['verb'] = $verb;
+		$arr['obj_type'] = $objtype;
+		$arr['object'] = $obj;
+
+		if(! $profile['is_default']) {
+			$arr['item_private'] = true;
+			$str = '';
+			$r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
+				intval(local_user()),
+				dbesc($profile_guid)
+			);
+			if($r) {
+				$arr['allow_cid'] = '';
+				foreach($r as $rr)
+					$arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
+			}
+			else
+				$arr['allow_cid'] = '<' . get_observer_hash() . '>';
+		}
 	
+		$ret = post_activity_item($arr);
+	}
 }
 
 
@@ -269,6 +272,7 @@ function thing_content(&$a) {
 			'$profile_select' => contact_profile_assign($r[0]['obj_page']),
 			'$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'),
 			'$verb_select' => obj_verb_selector($r[0]['obj_verb']),
+			'$activity' => array('activity',t('Post an activity'),true,t('Only sends to viewers of the applicable profile')),
 			'$thing_hash' => $thing_hash,
 			'$thing_lbl' => t('Name of thing e.g. something'),
 			'$thething' => $r[0]['term'],
@@ -314,6 +318,7 @@ function thing_content(&$a) {
 		'$profile_lbl' => t('Select a profile'),
 		'$profile_select' => contact_profile_assign(''),
 		'$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'),
+		'$activity' => array('activity',t('Post an activity'),true,t('Only sends to viewers of the applicable profile')),
 		'$verb_select' => obj_verb_selector(),
 		'$thing_lbl' => t('Name of thing e.g. something'),
 		'$url_lbl' => t('URL of thing (optional)'),
diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css
index 2a2ba7c92..125230b38 100644
--- a/view/css/mod_thing.css
+++ b/view/css/mod_thing.css
@@ -4,22 +4,16 @@
 	margin-left: 0;
 }
 
-.thing-verb-label {
-	margin-top: 15px;
-}
-
-.thing-verb {
-	margin-bottom: 15px;
-}
 
-.thing-label {
+.thing-label, .field label, .thing-verb-label, .thing-profile-label{
 	float: left;
-	width: 250px;
+	width: 350px;
 }
 
-.thing-input {
+.thing-input, .thing-verb, .thing-profile{
 	float: left;
 	margin-bottom: 15px;
+	width: 400px;
 }
 
 .thing-field-end {
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
index 8379c15ae..b170f152c 100644
--- a/view/tpl/thing_edit.tpl
+++ b/view/tpl/thing_edit.tpl
@@ -6,11 +6,13 @@
 
                                                                                              {{$profile_lbl}}
                                                                                              
 
 
                                                                                              {{$profile_select}}
                                                                                              
+
                                                                                              
 {{/if}}
 
 
                                                                                              {{$verb_lbl}}
                                                                                              
 
 
                                                                                              {{$verb_select}}
                                                                                              
+
                                                                                              
 
 
 
@@ -23,6 +25,8 @@
 
 
                                                                                              
 
+{{include file="field_checkbox.tpl" field=$activity}}
+
 
                                                                                               
 
 
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
index 06cbfe917..e93a1aa65 100644
--- a/view/tpl/thing_input.tpl
+++ b/view/tpl/thing_input.tpl
@@ -5,11 +5,14 @@
 
                                                                                              {{$profile_lbl}}
                                                                                              
 
 
                                                                                              {{$profile_select}}
                                                                                              
+
                                                                                              
 {{/if}}
 
+
 
                                                                                              {{$verb_lbl}}
                                                                                              
 
 
                                                                                              {{$verb_select}}
                                                                                              
+
                                                                                              
 
 
 
@@ -22,6 +25,8 @@
 
 
                                                                                              
 
+{{include file="field_checkbox.tpl" field=$activity}}
+
 
                                                                                               
 
 
-- 
cgit v1.2.3


From c7dda0c4c161b347c41f11bc8c6af266f08a89a3 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 15:12:42 -0800
Subject: return the expected array

---
 include/identity.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 12eeb47ac..627e808ea 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1154,11 +1154,11 @@ function is_member($s) {
 
 function get_online_status($nick) {
 
-	if(get_config('system','block_public') && ! local_user() && ! remote_user())
-		return;
-
 	$ret = array('result' => false);
 
+	if(get_config('system','block_public') && ! local_user() && ! remote_user())
+		return $ret;
+
 	$r = q("select channel_id, channel_hash from channel where channel_address = '%s' limit 1",
 		dbesc(argv(1))
 	);
-- 
cgit v1.2.3


From bff92e7a219341e69e2078e6b989ee58ba149ee3 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 19:57:22 -0800
Subject: remove some obsolete bbcode tags

---
 include/bbcode.php | 95 +++++++++++++++++-------------------------------------
 1 file changed, 30 insertions(+), 65 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 630be0b89..9d50cade2 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -320,15 +320,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	$a = get_app();
 
-	// Extract the private images which use data url's since preg has issues with
-	// large data sizes. Stash them away while we do bbcode conversion, and then put them back
-	// in after we've done all the regex matching. We cannot use any preg functions to do this.
-
-	$extracted = bb_extract_images($Text);
-	$Text = $extracted['body'];
-	$saved_image = $extracted['images'];
-
-
 	// Move all spaces out of the tags
 	$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
 	$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
@@ -385,9 +376,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
     }
 
 
-
-
-	$Text = str_replace(array('[baseurl]','[sitename]','[sitepath]'),array(z_root(),get_config('system','sitename'),$_SESSION['return_url']),$Text);
+	$Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$Text);
 
 	
 	// Replace any html brackets with HTML Entities to prevent executing HTML or script
@@ -697,37 +686,35 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		}
 	}
 	// Youtube extensions
-	if (strpos($Text,'[youtube]') !== false) {
-		if ($tryoembed) {
-			$Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
-			$Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
-			$Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
-		}
-			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-			$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
-
-		if ($tryoembed)
-			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text);
-		else 
-			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
-	}
-	if (strpos($Text,'[vimeo]') !== false) {
-		if ($tryoembed) {
-			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
-			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
-		}
-
-		$Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); 
-		$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
-
-		if ($tryoembed)
-			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text);
-		else
-			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
-	}
-//	$Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '', $Text);
-
+//	if (strpos($Text,'[youtube]') !== false) {
+//		if ($tryoembed) {
+//			$Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
+//			$Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
+//			$Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
+//		}
+//			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+//			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+//			$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
+
+//		if ($tryoembed)
+//			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text);
+//		else 
+//			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
+//	}
+//	if (strpos($Text,'[vimeo]') !== false) {
+//		if ($tryoembed) {
+//			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
+//			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
+//		}
+
+//		$Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); 
+//		$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
+
+//		if ($tryoembed)
+//			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text);
+//		else
+//			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
+//	}
 
 	// oembed tag
 	$Text = oembed_bbcode2html($Text);
@@ -770,28 +757,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	$Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
 
-	if($saved_image)
-		$Text = bb_replace_images($Text, $saved_image);
-
-	// Clean up the HTML by loading and saving the HTML with the DOM
-	// Only do it when it has to be done - for performance reasons
-//	if (!$tryoembed) {//
-//		$doc = new DOMDocument();
-//		$doc->preserveWhiteSpace = false;
-
-//		$Text = mb_convert_encoding($Text, 'HTML-ENTITIES', "UTF-8");
-
-//		$doctype = '';
-//		@$doc->loadHTML($doctype."".$Text."");
-
-//		$Text = $doc->saveHTML();
-//		$Text = str_replace(array("", "", $doctype), array("", "", ""), $Text);
-
-//		$Text = str_replace('
                                                                                              ','', $Text);
-
-//		$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
-//	}
-
 	call_hooks('bbcode',$Text);
 
 	return $Text;
-- 
cgit v1.2.3


From d4d44f9878b9eb0532c574d7d93229e7cb9920d9 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 12 Feb 2014 19:59:24 -0800
Subject: oops - still using the !@#$ youtube bbcodes

---
 include/bbcode.php | 58 +++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 9d50cade2..1969f8444 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -686,35 +686,35 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		}
 	}
 	// Youtube extensions
-//	if (strpos($Text,'[youtube]') !== false) {
-//		if ($tryoembed) {
-//			$Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
-//			$Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
-//			$Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
-//		}
-//			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-//			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
-//			$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
-
-//		if ($tryoembed)
-//			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text);
-//		else 
-//			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
-//	}
-//	if (strpos($Text,'[vimeo]') !== false) {
-//		if ($tryoembed) {
-//			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
-//			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
-//		}
-
-//		$Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); 
-//		$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
-
-//		if ($tryoembed)
-//			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text);
-//		else
-//			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
-//	}
+	if (strpos($Text,'[youtube]') !== false) {
+		if ($tryoembed) {
+			$Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
+			$Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);		
+			$Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); 
+		}
+			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+			$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); 
+			$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
+
+		if ($tryoembed)
+			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text);
+		else 
+			$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
+	}
+	if (strpos($Text,'[vimeo]') !== false) {
+		if ($tryoembed) {
+			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
+			$Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); 
+		}
+
+		$Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); 
+		$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
+
+		if ($tryoembed)
+			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text);
+		else
+			$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
+	}
 
 	// oembed tag
 	$Text = oembed_bbcode2html($Text);
-- 
cgit v1.2.3


From ec99cac9e8abdb85c1a8355b7617556f238d4c91 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 13 Feb 2014 00:52:54 -0800
Subject: very simple scheme

---
 version.inc                           | 2 +-
 view/theme/redbasic/schema/notred.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 view/theme/redbasic/schema/notred.php

diff --git a/version.inc b/version.inc
index c496e0bbe..9aeb9dda6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-12.586
+2014-02-13.587
diff --git a/view/theme/redbasic/schema/notred.php b/view/theme/redbasic/schema/notred.php
new file mode 100644
index 000000000..5a6dda336
--- /dev/null
+++ b/view/theme/redbasic/schema/notred.php
@@ -0,0 +1,5 @@
+
Date: Thu, 13 Feb 2014 02:55:16 -0800
Subject: don't fix the height of the archive widget - fix the maximum height

---
 view/css/widgets.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/css/widgets.css b/view/css/widgets.css
index a34508961..7ad6d79e5 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -68,7 +68,7 @@
 #datebrowse-sidebar select {
 	width: 190px;
 	max-width: 190px;
-	height: 150px;
+	max-height: 150px;
 }
 
 /* categories */
-- 
cgit v1.2.3


From 5cedc324eb290e32f547e23799ec3e09fc30c496 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 13 Feb 2014 03:06:48 -0800
Subject: reddav - disable assets

---
 include/reddav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/reddav.php b/include/reddav.php
index 5ffffdab2..94ff48d21 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -851,7 +851,7 @@ class RedBrowser extends DAV\Browser\Plugin {
 	function __construct(&$auth) {
 
 		$this->auth = $auth;
-
+		$this->enableAssets = false;
 
 	}
 
-- 
cgit v1.2.3


From 213c03c6068639b67f90e8a5ceb4a70dc502c993 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 13 Feb 2014 03:52:16 -0800
Subject: more debugging dav in windows, windows never forgets your dav
 credentials even if you get them wrong and even if you remove them from the
 credential vault. This makes it very difficult to manage two or more channels
 with file resources.

---
 include/reddav.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/reddav.php b/include/reddav.php
index 94ff48d21..a8d6739f0 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -773,6 +773,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 
     protected function validateUserPass($username, $password) {
 
+
 		if(trim($password) === '+++') {
 			logger('reddav: validateUserPass: guest ' . $username);
 			return true;
-- 
cgit v1.2.3


From d7546c7a638214f53219d342300ef659668a4975 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Thu, 13 Feb 2014 19:29:06 +0100
Subject: This makes advanced privacy settings adjustable in expert mode only.
 Also they are hidden behind a button. This is a design hotfix should probably
 come up with something better someday...

---
 mod/settings.php                   |  2 ++
 view/css/mod_settings.css          | 15 ++++++---------
 view/tpl/field_select_disabled.tpl |  7 +++++++
 view/tpl/settings.tpl              | 34 +++++++++++++++++++++++-----------
 4 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 view/tpl/field_select_disabled.tpl

diff --git a/mod/settings.php b/mod/settings.php
index 506141a1f..ec758bc90 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -977,6 +977,8 @@ function settings_content(&$a) {
 			'$h_advn' => t('Advanced Account/Page Type Settings'),
 			'$h_descadvn' => t('Change the behaviour of this account for special situations'),
 			'$pagetype' => $pagetype,
+			'$expert' => feature_enabled(local_user(),'expert'),
+			'$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'),
 		
 		));
 
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 2049d9bc6..0d3dd36fe 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,20 +1,19 @@
-#settings-permissions-wrapper, #settings-perm-advanced {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
+#settings-permissions-wrapper {
+	margin-top: 15px;
 }
 
-#settings-permissions-wrapper:hover, #settings-perm-advanced:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+#settings-perm-advanced {
+	margin-top: 15px;
 }
 
-#settings-perm-advanced {
+.settings-common-perms {
 	margin-top: 15px;
 }
 
 #settings-permissions-wrapper .field {
 	margin-bottom: 10px;
 }
+
 #settings-permissions-wrapper .field label{
 	width: 350px;
 }
@@ -28,8 +27,6 @@
 	margin-bottom: 45px;
 }
 
-
-
 #settings-notifications label {
 	margin-left: 20px;
 }
diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl
new file mode 100644
index 000000000..f0090cf98
--- /dev/null
+++ b/view/tpl/field_select_disabled.tpl
@@ -0,0 +1,7 @@
+	
                                                                                              
+		
+		
+		{{$field.3}}
+	
                                                                                              
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index c4b89a543..808078413 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -16,7 +16,7 @@
 {{include file="field_checkbox.tpl" field=$adult}}
 
 
                                                                                              
-
+
 
                                                                                              
 
 
@@ -34,20 +34,31 @@
 
                                                                                            
 
 
-
                                                                                            {{$lbl_p2macro}}
                                                                                            
+
+
+
+
+
                                                                                            
+{{if !$expert}}
+	
                                                                                            {{$hint}}
                                                                                            
+{{/if}}
 
-
                                                                                            
 {{foreach $permiss_arr as $permit}}
-{{include file="field_select.tpl" field=$permit}}
+	{{if $expert}}
+		{{include file="field_select.tpl" field=$permit}}
+	{{else}}
+		{{include file="field_select_disabled.tpl" field=$permit}}
+	{{/if}}
 {{/foreach}}
-
                                                                                            
 
+{{if $expert}}
+	
                                                                                            
+	
+	
                                                                                            
+{{/if}}
 
-
                                                                                            
-
 
                                                                                            
-
-
+
                                                                                            
 {{$profile_in_dir}}
 
 {{$suggestme}}
@@ -55,6 +66,7 @@
 {{include file="field_input.tpl" field=$maxreq}}
 
 {{include file="field_input.tpl" field=$cntunkmail}}
+
                                                                                            
 
 
                                                                                            
 	{{$permissions}} {{$permdesc}}
@@ -77,7 +89,7 @@
 
 
 
                                                                                            
-
+
 
                                                                                            
 
 
@@ -108,7 +120,7 @@
 
                                                                                            
 
 
                                                                                            
-
+
 
                                                                                            
 
 
                                                                                            
-- 
cgit v1.2.3


From b00f24ad75e9cf0c4fdd7d044bcadc5b4b6b1633 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 13 Feb 2014 14:20:23 -0800
Subject: fix tag delivery default permissions (use channel_allow_cid rather
 than allow_cid etc.)

---
 include/items.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/items.php b/include/items.php
index 97994854a..3c10b8f5c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2269,7 +2269,7 @@ function tag_deliver($uid,$item_id) {
 		logger('check_item_source returns true');
 
 
-	// This might be a followup by the original post author to a tagged forum
+	// This might be a followup (e.g. comment) by the original post author to a tagged forum
 	// If so setup a second delivery chain
 
 	$r = null;
@@ -2288,7 +2288,7 @@ function tag_deliver($uid,$item_id) {
 			// now change this copy of the post to a forum head message and deliver to all the tgroup members
 			// also reset all the privacy bits to the forum default permissions
 
-			$private = (($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0);
+			$private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0);
 
 			$flag_bits = ITEM_WALL|ITEM_ORIGIN;
 
@@ -2304,10 +2304,10 @@ function tag_deliver($uid,$item_id) {
 				deny_cid = '%s', deny_gid = '%s', item_private = %d  where id = %d limit 1",
 				intval($flag_bits),
 				dbesc($u[0]['channel_hash']),
-				dbesc($u[0]['allow_cid']),
-				dbesc($u[0]['allow_gid']),
-				dbesc($u[0]['deny_cid']),
-				dbesc($u[0]['deny_gid']),
+				dbesc($u[0]['channel_allow_cid']),
+				dbesc($u[0]['channel_allow_gid']),
+				dbesc($u[0]['channel_deny_cid']),
+				dbesc($u[0]['channel_deny_gid']),
 				intval($private),
 				intval($item_id)
 			);
@@ -2410,7 +2410,7 @@ function tag_deliver($uid,$item_id) {
 	// now change this copy of the post to a forum head message and deliver to all the tgroup members
 	// also reset all the privacy bits to the forum default permissions
 
-	$private = (($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0);
+	$private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0);
 
 	$flag_bits = ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK;
 
@@ -2424,10 +2424,10 @@ function tag_deliver($uid,$item_id) {
 		deny_cid = '%s', deny_gid = '%s', item_private = %d  where id = %d limit 1",
 		intval($flag_bits),
 		dbesc($u[0]['channel_hash']),
-		dbesc($u[0]['allow_cid']),
-		dbesc($u[0]['allow_gid']),
-		dbesc($u[0]['deny_cid']),
-		dbesc($u[0]['deny_gid']),
+		dbesc($u[0]['channel_allow_cid']),
+		dbesc($u[0]['channel_allow_gid']),
+		dbesc($u[0]['channel_deny_cid']),
+		dbesc($u[0]['channel_deny_gid']),
 		intval($private),
 		intval($item_id)
 	);
-- 
cgit v1.2.3


From 7a6fcd9ea42ffc5877721589d315d3dbd71560ff Mon Sep 17 00:00:00 2001
From: zottel 
Date: Fri, 14 Feb 2014 11:08:05 +0100
Subject: make sure the user can't inadvertently send a post with @!-tags to an
 unintended audience because he had browsed the Matrix by collection or by
 contact

---
 mod/item.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mod/item.php b/mod/item.php
index 173198f4a..54c9f128a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -495,6 +495,7 @@ function item_post(&$a) {
 		$private_forum = false;
 
 		if(count($tags)) {
+			$first_access_tag = true;
 			foreach($tags as $tag) {
 
 				// If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
@@ -514,6 +515,11 @@ function item_post(&$a) {
 				logger('handle_tag: ' . print_r($success,tue), LOGGER_DEBUG);
 				if(($access_tag) && (! $parent_item)) {
 					logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DEBUG);
+					if ($first_access_tag) {
+						$str_contact_allow = '';
+						$str_group_allow = '';
+						$first_access_tag = false;
+					}
 					if(strpos($access_tag,'cid:') === 0) {
 						$str_contact_allow .= '<' . substr($access_tag,4) . '>';
 						$access_tag = '';	
-- 
cgit v1.2.3


From 064962ff82701d9d415a351a91354a0cdf949bd5 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 14 Feb 2014 12:25:27 -0800
Subject: doc and assets update. There is what seems to be a controversial
 powerpoint in this checkin. The powerpoint is of course *open source* even if
 powerpoint itself is not. The source file is available for your examination
 and revision.

---
 assets/theRedMatrix.pptx                           | Bin 0 -> 686353 bytes
 doc/html/apw_2php_2style_8php.html                 |   2 +-
 doc/html/bbcode_8php.html                          |   2 +-
 doc/html/boot_8php.html                            |  36 +++----
 doc/html/classRedBasicAuth-members.html            |   7 +-
 doc/html/classRedBasicAuth.html                    |  17 ++++
 doc/html/classRedBasicAuth.js                      |   1 +
 doc/html/classRedDirectory-members.html            |   1 +
 doc/html/classRedDirectory.html                    |  19 ++++
 doc/html/classRedDirectory.js                      |   1 +
 doc/html/crypto_8php.html                          |   2 +-
 doc/html/datetime_8php.html                        |   4 +-
 doc/html/dba__driver_8php.html                     |   4 +-
 doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html |   2 +
 doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js   |   3 +-
 doc/html/dir__fns_8php.html                        |  31 ++++--
 doc/html/dir__fns_8php.js                          |   2 +-
 doc/html/files.html                                |   3 +-
 doc/html/functions_0x6c.html                       |   4 +
 doc/html/functions_func_0x6c.html                  |   4 +
 doc/html/globals_0x6c.html                         |   3 +
 doc/html/globals_0x6d.html                         |   2 +-
 doc/html/globals_0x72.html                         |   9 ++
 doc/html/globals_0x73.html                         |   3 -
 doc/html/globals_0x7a.html                         |   2 +-
 doc/html/globals_func_0x6c.html                    |   3 +
 doc/html/globals_func_0x6d.html                    |   2 +-
 doc/html/globals_func_0x72.html                    |   9 ++
 doc/html/globals_func_0x73.html                    |   3 -
 doc/html/globals_func_0x7a.html                    |   2 +-
 doc/html/identity_8php.html                        |   2 +-
 doc/html/include_2config_8php.html                 |   2 +-
 doc/html/include_2menu_8php.html                   |  18 +++-
 doc/html/include_2menu_8php.js                     |   2 +-
 doc/html/include_2network_8php.html                |   6 +-
 doc/html/item_8php.html                            |   2 +-
 doc/html/items_8php.html                           |  54 ++++++++++
 doc/html/items_8php.js                             |   3 +
 doc/html/namespacefriendica-to-smarty-tpl.html     |   2 -
 doc/html/navtree.js                                |  12 +--
 doc/html/navtreeindex2.js                          |  40 ++++----
 doc/html/navtreeindex3.js                          |  10 +-
 doc/html/navtreeindex4.js                          |  10 +-
 doc/html/navtreeindex5.js                          |  30 +++---
 doc/html/navtreeindex6.js                          |  14 +--
 doc/html/navtreeindex7.js                          |  14 +--
 doc/html/navtreeindex8.js                          |   8 +-
 doc/html/notred_8php.html                          | 112 +++++++++++++++++++++
 doc/html/permissions_8php.html                     |   4 +-
 doc/html/php2po_8php.html                          |   2 +-
 doc/html/php_2theme__init_8php.html                |   2 +-
 doc/html/plugin_8php.html                          |   2 +-
 doc/html/post_8php.html                            |   4 +-
 doc/html/search/all_6c.js                          |   2 +
 doc/html/search/all_6d.js                          |   2 +-
 doc/html/search/all_6e.js                          |   1 +
 doc/html/search/all_72.js                          |   3 +
 doc/html/search/all_73.js                          |   1 -
 doc/html/search/all_7a.js                          |   2 +-
 doc/html/search/files_6e.js                        |   3 +-
 doc/html/search/functions_6c.js                    |   2 +
 doc/html/search/functions_6d.js                    |   2 +-
 doc/html/search/functions_72.js                    |   3 +
 doc/html/search/functions_73.js                    |   1 -
 doc/html/search/functions_7a.js                    |   2 +-
 doc/html/security_8php.html                        |   2 +-
 doc/html/text_8php.html                            |   6 +-
 doc/html/typo_8php.html                            |   2 +-
 doc/html/zot_8php.html                             |  34 ++++---
 doc/html/zot_8php.js                               |   2 +-
 70 files changed, 444 insertions(+), 164 deletions(-)
 create mode 100644 assets/theRedMatrix.pptx
 create mode 100644 doc/html/notred_8php.html

diff --git a/assets/theRedMatrix.pptx b/assets/theRedMatrix.pptx
new file mode 100644
index 000000000..b6b6a2680
Binary files /dev/null and b/assets/theRedMatrix.pptx differ
diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html
index 1d605f028..ec85f5804 100644
--- a/doc/html/apw_2php_2style_8php.html
+++ b/doc/html/apw_2php_2style_8php.html
@@ -128,7 +128,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), syncdirs(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
                                      
+
                                      Referenced by admin_page_users(), admin_page_users_post(), all_friends(), build_sync_packet(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), current_theme_url(), del_pconfig(), delete_imported_item(), drop_items(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_expire(), item_post(), item_store_update(), items_fetch(), load_contact_links(), load_pconfig(), local_dir_update(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_date_widget(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_tagcloud(), and zot_feed().
                                      
 
 
                                      
 
                                      
diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html
index 35da04d33..f5e172576 100644
--- a/doc/html/bbcode_8php.html
+++ b/doc/html/bbcode_8php.html
@@ -299,7 +299,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by bb2diaspora(), chatsvc_content(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), menu_render(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), siteinfo_content(), and tagrm_content().
                                      
+
                                      Referenced by bb2diaspora(), chatsvc_content(), construct_activity_object(), construct_activity_target(), dirprofile_init(), events_content(), format_event_html(), format_notification(), get_events(), help_content(), mail_content(), menu_render(), message_content(), notification(), notifications_content(), notify_content(), ping_init(), siteinfo_content(), and tagrm_content().
                                      
 
 
                                      
 
                                      
diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html
index f0e6b6c99..08a4dca62 100644
--- a/doc/html/boot_8php.html
+++ b/doc/html/boot_8php.html
@@ -202,7 +202,7 @@ Variables
  
 const ZOT_REVISION 1
  
-const DB_UPDATE_VERSION 1096
+const DB_UPDATE_VERSION 1097
  
 const EOL '<br />' . "\r\n"
  
@@ -958,7 +958,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_statuses_user_timeline(), 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(), dir_tagblock(), drop_item(), editpost_content(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), 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(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), RedBrowser\htmlActionsPanel(), 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(), photos_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(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), 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_statuses_user_timeline(), 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(), dir_tagblock(), drop_item(), editpost_content(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), 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(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), RedBrowser\htmlActionsPanel(), 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(), local_dir_update(), 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(), photos_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(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().
                                      
 
 
                                      
 
@@ -1089,7 +1089,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_post(), community_content(), connections_post(), connedit_content(), connedit_post(), directory_content(), dirprofile_init(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), 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(), bookmarks_init(), community_content(), connections_post(), connedit_content(), connedit_post(), directory_content(), dirprofile_init(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), 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().
                                      
 
 
                                      
 
@@ -1192,7 +1192,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), 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_content(), dirprofile_init(), 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(), filestorage_post(), 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(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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().
                                      
+
                                      Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), 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_content(), dirprofile_init(), 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(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), 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(), 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().
                                      
 
 
                                      
 
@@ -1244,7 +1244,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by achievements_content(), 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(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), 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(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
                                      
+
                                      Referenced by achievements_content(), 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(), bookmarks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), 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(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), 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(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), 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_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().
                                      
 
 
                                      
 
@@ -1266,7 +1266,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_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(), mail_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(), 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(), mail_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(), zid_init(), and zot_refresh().
                                      
 
 
 
@@ -1283,7 +1283,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by channel_content(), community_content(), directory_content(), dirprofile_init(), display_content(), drop_items(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().
                                      
+
                                      Referenced by channel_content(), community_content(), directory_content(), dirprofile_init(), display_content(), drop_items(), get_online_status(), item_content(), item_permissions_sql(), item_post(), nav(), navbar_complete(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), poco_init(), post_init(), profile_content(), profile_create_sidebar(), profile_sidebar(), rpost_content(), search_content(), share_init(), subthread_content(), tagger_content(), viewconnections_content(), viewconnections_init(), widget_fullprofile(), widget_profile(), zid_init(), and zotfeed_init().
                                      
 
 
                                      
 
@@ -1449,7 +1449,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), connedit_content(), connedit_post(), get_all_perms(), group_content(), group_get_members(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().
                                      
+
                                      Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), connedit_content(), connedit_post(), get_all_perms(), group_content(), group_get_members(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().
                                      
 
 
                                      
 
@@ -1463,7 +1463,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by abook_connections(), abook_self(), acl_init(), Conversation\add_thread(), api_get_user(), channel_remove(), collect_recipients(), connections_content(), connections_post(), connedit_content(), connedit_post(), contact_remove(), contact_select(), contactgroup_content(), create_identity(), get_all_perms(), group_content(), group_get_members(), item_post(), load_contact_links(), new_contact(), notifier_run(), perm_is_allowed(), ping_init(), poco_init(), widget_follow(), widget_settings_menu(), and zot_refresh().
                                      
+
                                      Referenced by abook_connections(), abook_self(), acl_init(), Conversation\add_thread(), api_get_user(), channel_remove(), collect_recipients(), connections_content(), connections_post(), connedit_content(), connedit_post(), contact_remove(), contact_select(), contactgroup_content(), create_identity(), get_all_perms(), item_post(), load_contact_links(), new_contact(), notifier_run(), perm_is_allowed(), ping_init(), poco_init(), widget_follow(), widget_settings_menu(), and zot_refresh().
                                      
 
 
                                      
 
@@ -2127,7 +2127,7 @@ Variables
 
                                      
       
-          
+          
                                      
         
                                      const DB_UPDATE_VERSION 1096const DB_UPDATE_VERSION 1097
         
                                      
       
                                      
 
                                      
@@ -2308,7 +2308,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by create_identity(), import_author_zot(), import_post(), import_xchan(), rconnect_url(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), and zot_refresh().
                                      
+
                                      Referenced by create_identity(), import_author_zot(), import_post(), import_xchan(), rconnect_url(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), and zot_refresh().
                                      
 
 
                                      
 
@@ -2812,7 +2812,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by RedFile\__construct(), admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), detect_language(), directory_content(), dirprofile_init(), fix_private_photos(), RedDirectory\getChild(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), onepoll_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().
                                      
+
                                      Referenced by RedFile\__construct(), admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), detect_language(), directory_content(), dirprofile_init(), fix_private_photos(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), onepoll_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), RedChannelList(), RedCollectionData(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().
                                      
 
 
                                      
 
@@ -2826,7 +2826,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by RedDirectory\__construct(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), delete_imported_item(), deliver_run(), directory_content(), directory_run(), dirprofile_init(), expire_run(), fix_private_photos(), RedFile\get(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), 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(), RedFile\put(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().
                                      
+
                                      Referenced by RedDirectory\__construct(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), delete_imported_item(), deliver_run(), directory_content(), directory_run(), dirprofile_init(), expire_run(), fix_private_photos(), RedFile\get(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), 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(), local_dir_update(), 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(), RedFile\put(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().
                                      
 
 
                                      
 
@@ -2994,7 +2994,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by menu_render(), mitem_content(), and mitem_post().
                                      
+
                                      Referenced by menu_render(), mitem_content(), and mitem_post().
                                      
 
 
                                      
 
@@ -3008,7 +3008,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by bookmark_add(), menu_render(), mitem_content(), and mitem_post().
                                      
+
                                      Referenced by bookmark_add(), menu_render(), mitem_content(), and mitem_post().
                                      
 
 
                                      
 
@@ -3842,7 +3842,7 @@ Variables
 
                                      
 
                                      Permissions 
                                      
 
-
                                      Referenced by follow_init(), get_perms(), onepoll_run(), and zot_refresh().
                                      
+
                                      Referenced by follow_init(), get_perms(), onepoll_run(), and zot_refresh().
                                      
 
 
                                      
 
@@ -4536,7 +4536,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by acl_init(), channel_remove(), connections_content(), dirsearch_content(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().
                                      
+
                                      Referenced by acl_init(), channel_remove(), connections_content(), dirsearch_content(), group_content(), group_get_members(), remove_all_xchan_resources(), suggestion_query(), and viewconnections_content().
                                      
 
 
                                      
 
@@ -4550,7 +4550,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by dirsearch_content(), import_xchan(), suggestion_query(), syncdirs(), viewconnections_content(), and zfinger_init().
                                      
+
                                      Referenced by dirsearch_content(), import_xchan(), local_dir_update(), suggestion_query(), viewconnections_content(), and zfinger_init().
                                      
 
 
                                      
 
diff --git a/doc/html/classRedBasicAuth-members.html b/doc/html/classRedBasicAuth-members.html
index 9c9134b08..ab4dd9f76 100644
--- a/doc/html/classRedBasicAuth-members.html
+++ b/doc/html/classRedBasicAuth-members.html
@@ -120,9 +120,10 @@ $(document).ready(function(){initNavTree('classRedBasicAuth.html','');});
   $owner_idRedBasicAuth
   $owner_nickRedBasicAuth
   $timezoneRedBasicAuth
-  setBrowserPlugin($browser)RedBasicAuth
-  setCurrentUser($name)RedBasicAuth
-  validateUserPass($username, $password)RedBasicAuthprotected
+  log()RedBasicAuth
+  setBrowserPlugin($browser)RedBasicAuth
+  setCurrentUser($name)RedBasicAuth
+  validateUserPass($username, $password)RedBasicAuthprotected
 
 
 
diff --git a/doc/html/classRedBasicAuth.html b/doc/html/classRedBasicAuth.html
index 3436c85fa..a5da94f90 100644
--- a/doc/html/classRedBasicAuth.html
+++ b/doc/html/classRedBasicAuth.html
@@ -129,6 +129,8 @@ Public Member Functions
  
  setBrowserPlugin ($browser)
  
+ log ()
+ 
 
@@ -155,6 +157,21 @@ Protected Member Functions
                                      
 
                                      
 Public Attributes
                                      
 
                                       
                                      
 
                                      
 
                                      Member Function Documentation
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+        
+      
                                      RedBasicAuth::log ()
                                      
+
                                      
+
+
                                      
+
                                      
 
 
                                      
 
                                      
diff --git a/doc/html/classRedBasicAuth.js b/doc/html/classRedBasicAuth.js
index ac33c155a..ab8a752b6 100644
--- a/doc/html/classRedBasicAuth.js
+++ b/doc/html/classRedBasicAuth.js
@@ -1,5 +1,6 @@
 var classRedBasicAuth =
 [
+    [ "log", "classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0", null ],
     [ "setBrowserPlugin", "classRedBasicAuth.html#a358ddad4abb5aa8c1382cf49a907adbc", null ],
     [ "setCurrentUser", "classRedBasicAuth.html#a072e8244a9a7f191b32d3db5ac94f857", null ],
     [ "validateUserPass", "classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b", null ],
diff --git a/doc/html/classRedDirectory-members.html b/doc/html/classRedDirectory-members.html
index cb01d9724..81295f977 100644
--- a/doc/html/classRedDirectory-members.html
+++ b/doc/html/classRedDirectory-members.html
@@ -128,6 +128,7 @@ $(document).ready(function(){initNavTree('classRedDirectory.html','');});
   getLastModified()RedDirectory
   getName()RedDirectory
   getQuotaInfo()RedDirectory
+  log()RedDirectory
 
                                      
 
                                      
 
diff --git a/doc/html/classRedDirectory.html b/doc/html/classRedDirectory.html
index 878dbba76..03de4b3ca 100644
--- a/doc/html/classRedDirectory.html
+++ b/doc/html/classRedDirectory.html
@@ -126,6 +126,8 @@ Inheritance diagram for RedDirectory:
 Public Member Functions
  __construct ($ext_path, &$auth_plugin)
  
+ log ()
+ 
  getChildren ()
  
  getChild ($name)
@@ -337,6 +339,23 @@ Private Attributes
       
 
                                      
 
+
                                      
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+        
+      
                                      RedDirectory::log ()
                                      
+
                                      
+
+
                                      Referenced by getChildren().
                                      
+
 
                                      
 
                                      
 
                                      Member Data Documentation
                                      
diff --git a/doc/html/classRedDirectory.js b/doc/html/classRedDirectory.js
index b626b9e5c..7ff86f78a 100644
--- a/doc/html/classRedDirectory.js
+++ b/doc/html/classRedDirectory.js
@@ -10,6 +10,7 @@ var classRedDirectory =
     [ "getLastModified", "classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc", null ],
     [ "getName", "classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583", null ],
     [ "getQuotaInfo", "classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375", null ],
+    [ "log", "classRedDirectory.html#a11376aed1963b4471eb1592c13c63976", null ],
     [ "$auth", "classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44", null ],
     [ "$ext_path", "classRedDirectory.html#a0f113244cd85c17848df991001d024f4", null ],
     [ "$folder_hash", "classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b", null ],
diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html
index 981ec06dd..f2c686711 100644
--- a/doc/html/crypto_8php.html
+++ b/doc/html/crypto_8php.html
@@ -318,7 +318,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), mail_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().
                                      
+
                                      Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), mail_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().
                                      
 
 
                                      
 
diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html
index eb7ac5c40..62bef946e 100644
--- a/doc/html/datetime_8php.html
+++ b/doc/html/datetime_8php.html
@@ -172,7 +172,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by advanced_profile(), directory_content(), dirprofile_init(), profiles_content(), syncdirs(), and zfinger_init().
                                      
+
                                      Referenced by advanced_profile(), directory_content(), dirprofile_init(), local_dir_update(), profiles_content(), and zfinger_init().
                                      
 
 
                                      
 
@@ -334,7 +334,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().
                                      
+
                                      Referenced by account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().
                                      
 
 
                                      
 
diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html
index ea87c5b78..13b1374ea 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), menu_list(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), local_dir_update(), 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(), menu_list(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().
                                      
 
 
                                      
 
@@ -318,7 +318,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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), 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(), chat_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().
                                      
+
                                      Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), 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(), chat_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html
index 52e50c910..f72ee630b 100644
--- a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html
+++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html
@@ -106,6 +106,8 @@ $(document).ready(function(){initNavTree('dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.h
 Files
 file  dark.php
  
+file  notred.php
+ 
 
 
 
diff --git a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js
index 7889bb4f4..b2d60994e 100644
--- a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js
+++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js
@@ -1,4 +1,5 @@
 var dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb =
 [
-    [ "dark.php", "dark_8php.html", null ]
+    [ "dark.php", "dark_8php.html", null ],
+    [ "notred.php", "notred_8php.html", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/dir__fns_8php.html b/doc/html/dir__fns_8php.html
index a5b8f1cee..bc7ff4367 100644
--- a/doc/html/dir__fns_8php.html
+++ b/doc/html/dir__fns_8php.html
@@ -122,8 +122,8 @@ Functions
  
  update_directory_entry ($ud)
  
- syncdirs ($uid)
- 
+ local_dir_update ($uid, $force)
+ 
 
 
                                      Function Documentation
                                      
 
@@ -178,39 +178,50 @@ Functions
 
 
 
-
+
 
                                      
 
                                      
       
-          
+          
-          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
                                      
         
                                      sync_directories local_dir_update 
           (
            $dirmode)$uid, 
                                       $force 
                                      
           )
         
                                      
       
                                      
 
                                      
+
                                      local_dir_update($uid,$force) push local channel updates to a local directory server 
                                      
 
-
                                      Referenced by poller_run().
                                      
+
                                      Referenced by directory_run().
                                      
 
 
                                      
 
                                      
-
+
 
                                      
 
                                      
       
-          
+          
-          
+          
                                      
         
                                      syncdirs sync_directories 
           (
            $uid)$dirmode)
           
         
                                      
       
                                      
 
                                      
 
-
                                      Referenced by directory_run().
                                      
+
                                      Referenced by poller_run().
                                      
 
 
                                      
 
                                      
diff --git a/doc/html/dir__fns_8php.js b/doc/html/dir__fns_8php.js
index 5531700f4..9c745ff6f 100644
--- a/doc/html/dir__fns_8php.js
+++ b/doc/html/dir__fns_8php.js
@@ -3,7 +3,7 @@ var dir__fns_8php =
     [ "dir_safe_mode", "dir__fns_8php.html#acf621621e929d49441da30aad76a58cf", null ],
     [ "dir_sort_links", "dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774", null ],
     [ "find_upstream_directory", "dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d", null ],
+    [ "local_dir_update", "dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e", null ],
     [ "sync_directories", "dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6", null ],
-    [ "syncdirs", "dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a", null ],
     [ "update_directory_entry", "dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/files.html b/doc/html/files.html
index 0aa37853e..9c12a3e82 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -385,7 +385,8 @@ $(document).ready(function(){initNavTree('files.html','');});
 |  |o*theme.php
 |  |\*theme_init.php
 |  \+schema
-|   \*dark.php
+|   o*dark.php
+|   \*notred.php
 \*boot.php
 
 
diff --git a/doc/html/functions_0x6c.html b/doc/html/functions_0x6c.html
index 4f3e0deb8..54e6a4e07 100644
--- a/doc/html/functions_0x6c.html
+++ b/doc/html/functions_0x6c.html
@@ -144,6 +144,10 @@ $(document).ready(function(){initNavTree('functions_0x6c.html','');});
 , photo_gd
 , photo_imagick
 
+
                                    • log()
+: RedDirectory
+, RedBasicAuth
+
                                      • 
 
                                    • loginUser()
 : FKOAuth1
 
                                      • 
diff --git a/doc/html/functions_func_0x6c.html b/doc/html/functions_func_0x6c.html
index 7eade1b08..796b98e59 100644
--- a/doc/html/functions_func_0x6c.html
+++ b/doc/html/functions_func_0x6c.html
@@ -143,6 +143,10 @@ $(document).ready(function(){initNavTree('functions_func_0x6c.html','');});
 , photo_gd
 , photo_imagick
 
+
                                    • log()
+: RedDirectory
+, RedBasicAuth
+
                                      • 
 
                                    • loginUser()
 : FKOAuth1
 
                                      • 
diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html
index 08820eb43..b4b05d4d3 100644
--- a/doc/html/globals_0x6c.html
+++ b/doc/html/globals_0x6c.html
@@ -207,6 +207,9 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
 
                                    • load_xconfig()
 : config.php
 
                                      • 
+
                                    • local_dir_update()
+: dir_fns.php
+
                                      • 
 
                                    • local_user()
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html
index 61e3aa333..28c06d13a 100644
--- a/doc/html/globals_0x6d.html
+++ b/doc/html/globals_0x6d.html
@@ -250,7 +250,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
 : menu.php
 
 
                                    • menu_render()
-: menu.php
+: menu.php
 
                                      • 
 
                                    • MENU_SYSTEM
 : boot.php
diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html
index 015a6a582..ba8858b00 100644
--- a/doc/html/globals_0x72.html
+++ b/doc/html/globals_0x72.html
@@ -168,9 +168,18 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
 
                                    • red_comment()
 : post_to_red.php
 
                                      • 
+
                                    • red_escape_codeblock()
+: items.php
+
                                      • 
+
                                    • red_escape_zrl_callback()
+: items.php
+
                                      • 
 
                                    • RED_PLATFORM
 : boot.php
 
                                      • 
+
                                    • red_unescape_codeblock()
+: items.php
+
                                      • 
 
                                    • RED_VERSION
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index 1235e571b..b8ea35e57 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -333,9 +333,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 
                                    • sync_directories()
 : dir_fns.php
 
                                      • 
-
                                    • syncdirs()
-: dir_fns.php
-
                                      • 
 
                                    • system_down()
 : system_unavailable.php
 
                                      • 
diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html
index 4b52df618..96043b279 100644
--- a/doc/html/globals_0x7a.html
+++ b/doc/html/globals_0x7a.html
@@ -217,7 +217,7 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
 : zot.php
 
 
                                    • zot_refresh()
-: zot.php
+: zot.php
 
                                      • 
 
                                    • zot_register_hub()
 : zot.php
diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html
index 650b6ea8c..d7e6d917a 100644
--- a/doc/html/globals_func_0x6c.html
+++ b/doc/html/globals_func_0x6c.html
@@ -200,6 +200,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
 
                                    • load_xconfig()
 : config.php
 
                                      • 
+
                                    • local_dir_update()
+: dir_fns.php
+
                                      • 
 
                                    • local_user()
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html
index c3826c5b3..5073bad22 100644
--- a/doc/html/globals_func_0x6d.html
+++ b/doc/html/globals_func_0x6d.html
@@ -216,7 +216,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
 : menu.php
 
 
                                    • menu_render()
-: menu.php
+: menu.php
 
                                      • 
 
                                    • message_content()
 : message.php
diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html
index a51f073e6..8f621003b 100644
--- a/doc/html/globals_func_0x72.html
+++ b/doc/html/globals_func_0x72.html
@@ -161,6 +161,15 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
 
                                    • red_comment()
 : post_to_red.php
 
                                      • 
+
                                    • red_escape_codeblock()
+: items.php
+
                                      • 
+
                                    • red_escape_zrl_callback()
+: items.php
+
                                      • 
+
                                    • red_unescape_codeblock()
+: items.php
+
                                      • 
 
                                    • red_xmlrpc_methods()
 : post_to_red.php
 
                                      • 
diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html
index 6e0a9015c..6a2a71b69 100644
--- a/doc/html/globals_func_0x73.html
+++ b/doc/html/globals_func_0x73.html
@@ -320,9 +320,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
 
                                    • sync_directories()
 : dir_fns.php
 
                                      • 
-
                                    • syncdirs()
-: dir_fns.php
-
                                      • 
 
                                    • system_down()
 : system_unavailable.php
 
                                      • 
diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html
index e64c265ec..6b484536f 100644
--- a/doc/html/globals_func_0x7a.html
+++ b/doc/html/globals_func_0x7a.html
@@ -213,7 +213,7 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
 : zot.php
 
 
                                    • zot_refresh()
-: zot.php
+: zot.php
 
                                      • 
 
                                    • zot_register_hub()
 : zot.php
diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html
index f6af0a794..d8522de84 100644
--- a/doc/html/identity_8php.html
+++ b/doc/html/identity_8php.html
@@ -717,7 +717,7 @@ Functions
 
                                      Returns
                                      string
                                      
 
                                      'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else 
                                      
 
-
                                      Referenced by chanview_content(), chatsvc_content(), conversation(), dirprofile_init(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), oembed_fetch_url(), tryzrlaudio(), tryzrlvideo(), and viewconnections_content().
                                      
+
                                      Referenced by chanview_content(), chatsvc_content(), conversation(), dirprofile_init(), format_categories(), get_plink(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), oembed_fetch_url(), tryzrlaudio(), tryzrlvideo(), and viewconnections_content().
                                      
 
 
 
diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html
index 0ba29be14..ebf980a79 100644
--- a/doc/html/include_2config_8php.html
+++ b/doc/html/include_2config_8php.html
@@ -256,7 +256,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), 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 account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), get_online_status(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), 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().
                                      
 
 
                                      
 
diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html
index b3096e224..2fb579197 100644
--- a/doc/html/include_2menu_8php.html
+++ b/doc/html/include_2menu_8php.html
@@ -114,8 +114,8 @@ $(document).ready(function(){initNavTree('include_2menu_8php.html','');});
 Functions
  menu_fetch ($name, $uid, $observer_xchan)
  
- menu_render ($menu)
- 
+ menu_render ($menu, $edit=false)
+ 
  menu_fetch_id ($menu_id, $channel_id)
  
  menu_create ($arr)
@@ -425,7 +425,7 @@ Functions
 
 
 
-
+
 
                                      
 
                                      
       
@@ -433,8 +433,18 @@ Functions
-          
+          
+        
+        
+          
+          
+          
+        
+        
+          
+          
+          
                                      
           
                                      menu_render 
           (
            $menu)$menu, 
                                      
            $edit = false 
                                      )
         
                                      
       
                                      
 
                                      
diff --git a/doc/html/include_2menu_8php.js b/doc/html/include_2menu_8php.js
index 4ddf8be33..e449b7920 100644
--- a/doc/html/include_2menu_8php.js
+++ b/doc/html/include_2menu_8php.js
@@ -10,5 +10,5 @@ var include_2menu_8php =
     [ "menu_fetch", "include_2menu_8php.html#a68ebbf492470c930f652013656f9071d", null ],
     [ "menu_fetch_id", "include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7", null ],
     [ "menu_list", "include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d", null ],
-    [ "menu_render", "include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e", null ]
+    [ "menu_render", "include_2menu_8php.html#a4d7123b0577fa994770199f9b831da11", null ]
 ];
\ No newline at end of file
diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html
index 81ee1ed1f..97bb9b2fe 100644
--- a/doc/html/include_2network_8php.html
+++ b/doc/html/include_2network_8php.html
@@ -385,7 +385,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), chatsvc_content(), chatsvc_init(), chatsvc_post(), dirsearch_content(), new_channel_init(), notes_init(), oexchange_content(), online_init(), post_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().
                                      
+
                                      Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), chat_content(), chatsvc_content(), chatsvc_init(), chatsvc_post(), dirsearch_content(), new_channel_init(), notes_init(), oexchange_content(), online_init(), post_init(), post_post(), register_init(), zfinger_init(), and zotfeed_init().
                                      
 
 
                                      
 
                                      
@@ -651,7 +651,7 @@ Functions
 
 
                                      Returns
                                      array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content 
                                      
 
-
                                      Referenced by check_htaccess(), directory_content(), dirprofile_init(), import_post(), import_profile_photo(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().
                                      
+
                                      Referenced by check_htaccess(), directory_content(), dirprofile_init(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().
                                      
 
 
 
@@ -691,7 +691,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by oexchange_content(), share_init(), zot_finger(), zot_refresh(), and zot_zot().
                                      
+
                                      Referenced by oexchange_content(), share_init(), zot_finger(), zot_refresh(), and zot_zot().
                                      
 
 
                                      
 
diff --git a/doc/html/item_8php.html b/doc/html/item_8php.html
index 87ae6f190..d3e24125f 100644
--- a/doc/html/item_8php.html
+++ b/doc/html/item_8php.html
@@ -365,7 +365,7 @@ Functions
 
                                      
 
                                      This is the POST destination for most all locally posted text stuff. This function handles status, wall-to-wall status, local comments, and remote coments that are posted on this site (as opposed to being delivered in a feed). Also processed here are posts and comments coming through the statusnet/twitter API. All of these become an "item" which is our basic unit of information. Posts that originate externally or do not fall into the above posting categories go through item_store() instead of this function. 
                                      
 
                                      Is this a reply to something?
                                      
-
                                      fix naked links by passing through a callback to see if this is a red site (already known to us) which will get a zrl, otherwise link with url
                                      
+
                                      fix naked links by passing through a callback to see if this is a red site (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both. First wrap any url which is part of link anchor text already in quotes so we don't double link it. e.g. [url=http://foobar.com]something with http://elsewhere.com in it[/url] becomes [url=http://foobar.com]something with "http://elsewhere.com" in it[/url] otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
                                      
 
                                      When a photo was uploaded into the message using the (profile wall) ajax uploader, The permissions are initially set to disallow anybody but the owner from seeing it. This is because the permissions may not yet have been set for the post. If it's private, the photo permissions should be set appropriately. But we didn't know the final permissions on the post until now. So now we'll look for links of uploaded photos and attachments that are in the post and set them to the same permissions as the post itself.
                                      
 
                                      If the post was end-to-end encrypted we can't find images and attachments in the body, use our media_str input instead which only contains these elements - but only do this when encrypted content exists because the photo/attachment may have been removed from the post and we should keep it private. If it's encrypted we have no way of knowing so we'll set the permissions regardless and realise that the media may not be referenced in the post.
                                      
 
                                      Fold multi-line [code] sequences
                                      
diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html
index 13aecfbec..dbe9f62b0 100644
--- a/doc/html/items_8php.html
+++ b/doc/html/items_8php.html
@@ -118,6 +118,12 @@ Functions
  
  red_zrl_callback ($matches)
  
+ red_escape_zrl_callback ($matches)
+ 
+ red_escape_codeblock ($m)
+ 
+ red_unescape_codeblock ($m)
+ 
  post_activity_item ($arr)
  
  get_public_feed ($channel, $params)
@@ -1412,6 +1418,54 @@ Functions
 
 
                                      Referenced by posted_date_widget(), and widget_archive().
                                      
 
+
                                      
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      red_escape_codeblock ( $m)
                                      
+
                                      
+
+
                                      
+
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      red_escape_zrl_callback ( $matches)
                                      
+
                                      
+
+
                                      
+
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      red_unescape_codeblock ( $m)
                                      
+
                                      
+
 
                                      
 
                                      
 
diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js
index 1ea725f92..e624f38e6 100644
--- a/doc/html/items_8php.js
+++ b/doc/html/items_8php.js
@@ -47,6 +47,9 @@ var items_8php =
     [ "post_activity_item", "items_8php.html#a410f9c743877c125ca06312373346903", null ],
     [ "posted_date_widget", "items_8php.html#abe695dd89e1e10ed042c26b80114f0ed", null ],
     [ "posted_dates", "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0", null ],
+    [ "red_escape_codeblock", "items_8php.html#a49905ea75adfe8a2d110be344d18d6a6", null ],
+    [ "red_escape_zrl_callback", "items_8php.html#a83a349062945d585edb4b3c5d763ab6e", null ],
+    [ "red_unescape_codeblock", "items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a", null ],
     [ "red_zrl_callback", "items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b", null ],
     [ "send_status_notifications", "items_8php.html#aab9e0c58247427126de0699c729c3b6c", null ],
     [ "tag_deliver", "items_8php.html#ab1bce4261bcf75ad62753b498a144d17", null ],
diff --git a/doc/html/namespacefriendica-to-smarty-tpl.html b/doc/html/namespacefriendica-to-smarty-tpl.html
index 5f42c69ba..dc2d9796a 100644
--- a/doc/html/namespacefriendica-to-smarty-tpl.html
+++ b/doc/html/namespacefriendica-to-smarty-tpl.html
@@ -228,8 +228,6 @@ Variables
       
 
                                      
 
-
                                      Referenced by siteinfo_content().
                                      
-
 
                                      
 
 
                                      Variable Documentation
                                      
diff --git a/doc/html/navtree.js b/doc/html/navtree.js
index 179b7f3c9..3b2138fc3 100644
--- a/doc/html/navtree.js
+++ b/doc/html/navtree.js
@@ -38,12 +38,12 @@ var NAVTREEINDEX =
 "BaseObject_8php.html",
 "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8",
 "classConversation.html#a66f121ca4026246f86a732e5faa0682c",
-"cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b",
-"functions_0x6c.html",
-"include_2follow_8php.html",
-"namespaceutil.html",
-"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76",
-"widgets_8php.html#a08035db02ff6a23260146b4c64153422"
+"classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393",
+"functions_0x68.html",
+"include_2directory_8php.html",
+"namespacemembers_vars.html",
+"setup_8php.html#a267555abd17290e659b4bf44b885e4e0",
+"webpages_8php.html"
 ];
 
 var SYNCONMSG = 'click to disable panel synchronisation';
diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index 5b151823a..c7d24977c 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -89,17 +89,18 @@ var NAVTREEINDEX2 =
 "classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181":[4,0,22,5],
 "classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b":[4,0,22,3],
 "classRedBasicAuth.html":[4,0,23],
-"classRedBasicAuth.html#a072e8244a9a7f191b32d3db5ac94f857":[4,0,23,1],
-"classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7":[4,0,23,8],
-"classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47":[4,0,23,10],
-"classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354":[4,0,23,5],
-"classRedBasicAuth.html#a358ddad4abb5aa8c1382cf49a907adbc":[4,0,23,0],
-"classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac":[4,0,23,6],
-"classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7":[4,0,23,9],
-"classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b":[4,0,23,2],
-"classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1":[4,0,23,7],
-"classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef":[4,0,23,4],
-"classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e":[4,0,23,3],
+"classRedBasicAuth.html#a072e8244a9a7f191b32d3db5ac94f857":[4,0,23,2],
+"classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7":[4,0,23,9],
+"classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0":[4,0,23,0],
+"classRedBasicAuth.html#a2d0246ed446fd5e55c17938b4ce6ac47":[4,0,23,11],
+"classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354":[4,0,23,6],
+"classRedBasicAuth.html#a358ddad4abb5aa8c1382cf49a907adbc":[4,0,23,1],
+"classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac":[4,0,23,7],
+"classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7":[4,0,23,10],
+"classRedBasicAuth.html#a8dfd9a0953f8884723b421b7c1acf79b":[4,0,23,3],
+"classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1":[4,0,23,8],
+"classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef":[4,0,23,5],
+"classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e":[4,0,23,4],
 "classRedBrowser.html":[4,0,24],
 "classRedBrowser.html#a1f7daf50bb9bfcde7345b3b1908dbd7e":[4,0,24,1],
 "classRedBrowser.html#a40fdbb9d9fe6c1243bbf135dd5b0a06f":[4,0,24,3],
@@ -107,21 +108,22 @@ var NAVTREEINDEX2 =
 "classRedBrowser.html#a7f6bf0bda07833f4c647557bd172e349":[4,0,24,2],
 "classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35":[4,0,24,4],
 "classRedDirectory.html":[4,0,25],
-"classRedDirectory.html#a0f113244cd85c17848df991001d024f4":[4,0,25,11],
+"classRedDirectory.html#a0f113244cd85c17848df991001d024f4":[4,0,25,12],
+"classRedDirectory.html#a11376aed1963b4471eb1592c13c63976":[4,0,25,10],
 "classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180":[4,0,25,0],
 "classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0":[4,0,25,3],
 "classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375":[4,0,25,9],
-"classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021":[4,0,25,13],
+"classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021":[4,0,25,14],
 "classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec":[4,0,25,1],
 "classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc":[4,0,25,7],
 "classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4":[4,0,25,6],
-"classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44":[4,0,25,10],
+"classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44":[4,0,25,11],
 "classRedDirectory.html#a986936910f0216887a25e28916c166c7":[4,0,25,2],
-"classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b":[4,0,25,12],
+"classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b":[4,0,25,13],
 "classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a":[4,0,25,5],
 "classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569":[4,0,25,4],
-"classRedDirectory.html#acb32b8df27538c57772824a745e751d7":[4,0,25,14],
-"classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4":[4,0,25,15],
+"classRedDirectory.html#acb32b8df27538c57772824a745e751d7":[4,0,25,15],
+"classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4":[4,0,25,16],
 "classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583":[4,0,25,8],
 "classRedFile.html":[4,0,26],
 "classRedFile.html#a0c961c5f49544d2502420361fa526437":[4,0,26,6],
@@ -247,7 +249,5 @@ var NAVTREEINDEX2 =
 "classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc":[4,0,21,5],
 "classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4":[4,0,21,4],
 "classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb":[4,0,21,9],
-"classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207":[4,0,21,1],
-"classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393":[4,0,21,3],
-"cli__startup_8php.html":[5,0,0,15]
+"classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207":[4,0,21,1]
 };
diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index 8f82938d8..e62ec8c6e 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,5 +1,7 @@
 var NAVTREEINDEX3 =
 {
+"classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393":[4,0,21,3],
+"cli__startup_8php.html":[5,0,0,15],
 "cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,15,0],
 "cli__suggest_8php.html":[5,0,0,16],
 "cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,16,0],
@@ -137,9 +139,9 @@ var NAVTREEINDEX3 =
 "dir_92d6b429199666aa3765c8a934db5e14.html":[5,0,3,2,1,1],
 "dir__fns_8php.html":[5,0,0,28],
 "dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[5,0,0,28,5],
-"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,28,4],
 "dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,28,2],
-"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,28,3],
+"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,28,4],
+"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[5,0,0,28,3],
 "dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[5,0,0,28,0],
 "dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[5,0,0,28,1],
 "dir_a8a0005c2b8590c535262d232c22afab.html":[5,0,3,2,1,1,0,0],
@@ -247,7 +249,5 @@ var NAVTREEINDEX3 =
 "functions_0x64.html":[4,3,0,5],
 "functions_0x65.html":[4,3,0,6],
 "functions_0x66.html":[4,3,0,7],
-"functions_0x67.html":[4,3,0,8],
-"functions_0x68.html":[4,3,0,9],
-"functions_0x69.html":[4,3,0,10]
+"functions_0x67.html":[4,3,0,8]
 };
diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index cc26043ab..b75aae4bb 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,7 @@
 var NAVTREEINDEX4 =
 {
+"functions_0x68.html":[4,3,0,9],
+"functions_0x69.html":[4,3,0,10],
 "functions_0x6c.html":[4,3,0,11],
 "functions_0x6e.html":[4,3,0,12],
 "functions_0x6f.html":[4,3,0,13],
@@ -30,8 +32,8 @@ var NAVTREEINDEX4 =
 "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],
 "globals.html":[5,1,0,0],
+"globals.html":[5,1,0],
 "globals_0x5f.html":[5,1,0,1],
 "globals_0x61.html":[5,1,0,2],
 "globals_0x62.html":[5,1,0,3],
@@ -58,8 +60,8 @@ var NAVTREEINDEX4 =
 "globals_0x77.html":[5,1,0,24],
 "globals_0x78.html":[5,1,0,25],
 "globals_0x7a.html":[5,1,0,26],
-"globals_func.html":[5,1,1],
 "globals_func.html":[5,1,1,0],
+"globals_func.html":[5,1,1],
 "globals_func_0x61.html":[5,1,1,1],
 "globals_func_0x62.html":[5,1,1,2],
 "globals_func_0x63.html":[5,1,1,3],
@@ -247,7 +249,5 @@ var NAVTREEINDEX4 =
 "include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,18,10],
 "include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,18,3],
 "include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,18,4],
-"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,18,12],
-"include_2directory_8php.html":[5,0,0,29],
-"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,29,0]
+"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,18,12]
 };
diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js
index 2ac89bcc6..e23ba560c 100644
--- a/doc/html/navtreeindex5.js
+++ b/doc/html/navtreeindex5.js
@@ -1,5 +1,7 @@
 var NAVTREEINDEX5 =
 {
+"include_2directory_8php.html":[5,0,0,29],
+"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,29,0],
 "include_2follow_8php.html":[5,0,0,34],
 "include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,34,0],
 "include_2group_8php.html":[5,0,0,37],
@@ -20,9 +22,9 @@ var NAVTREEINDEX5 =
 "include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d":[5,0,0,45,9],
 "include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,45,3],
 "include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,45,8],
+"include_2menu_8php.html#a4d7123b0577fa994770199f9b831da11":[5,0,0,45,10],
 "include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,45,7],
 "include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,45,5],
-"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,45,10],
 "include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,45,2],
 "include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,45,6],
 "include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,45,4],
@@ -89,7 +91,7 @@ var NAVTREEINDEX5 =
 "item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,44,1],
 "item_8php.html#aa22feef4de326e1d7078dedd892e615c":[5,0,1,44,2],
 "items_8php.html":[5,0,0,43],
-"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,43,54],
+"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,43,57],
 "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,43,2],
 "items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,43,6],
 "items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,43,27],
@@ -102,11 +104,12 @@ var NAVTREEINDEX5 =
 "items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,43,38],
 "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,43,3],
 "items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,43,13],
-"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,43,53],
+"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,43,56],
 "items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,43,20],
 "items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,43,0],
 "items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,43,44],
-"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,43,47],
+"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[5,0,0,43,47],
+"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,43,50],
 "items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,43,29],
 "items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,43,19],
 "items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,43,12],
@@ -118,19 +121,20 @@ var NAVTREEINDEX5 =
 "items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,43,33],
 "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,43,42],
 "items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,43,16],
+"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[5,0,0,43,48],
 "items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,43,11],
 "items_8php.html#a87ac9e359591721a824ecd23bbb56296":[5,0,0,43,5],
-"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,43,51],
+"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,43,54],
 "items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,43,26],
 "items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,43,10],
 "items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,43,30],
-"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,43,52],
+"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,43,55],
 "items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,43,9],
 "items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,43,21],
 "items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,43,8],
 "items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,43,28],
-"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,43,48],
-"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,43,49],
+"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,43,51],
+"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,43,52],
 "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,43,25],
 "items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,43,45],
 "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,43,1],
@@ -138,7 +142,8 @@ var NAVTREEINDEX5 =
 "items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,43,18],
 "items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,43,39],
 "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,43,46],
-"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,43,50],
+"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,43,53],
+"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[5,0,0,43,49],
 "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,43,23],
 "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,43,34],
 "items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,43,41],
@@ -244,10 +249,5 @@ var NAVTREEINDEX5 =
 "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],
-"namespaces.html":[3,0],
-"namespaceupdatetpl.html":[4,0,3],
-"namespaceupdatetpl.html":[3,0,3],
-"namespaceutil.html":[4,0,4]
+"namespacemembers_func.html":[3,1,1]
 };
diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index cba20f8a2..0905f396b 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -1,5 +1,10 @@
 var NAVTREEINDEX6 =
 {
+"namespacemembers_vars.html":[3,1,2],
+"namespaces.html":[3,0],
+"namespaceupdatetpl.html":[3,0,3],
+"namespaceupdatetpl.html":[4,0,3],
+"namespaceutil.html":[4,0,4],
 "namespaceutil.html":[3,0,4],
 "nav_8php.html":[5,0,0,47],
 "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,47,0],
@@ -16,6 +21,7 @@ var NAVTREEINDEX6 =
 "notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,62,0],
 "notifier_8php.html":[5,0,0,49],
 "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,49,0],
+"notred_8php.html":[5,0,3,2,2,1,1],
 "oauth_8php.html":[5,0,0,51],
 "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,51,3],
 "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,51,2],
@@ -243,11 +249,5 @@ var NAVTREEINDEX6 =
 "setup_8php.html":[5,0,1,94],
 "setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,94,2],
 "setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,94,14],
-"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,94,5],
-"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,94,13],
-"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,94,10],
-"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,94,3],
-"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,94,1],
-"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,94,8],
-"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,94,12]
+"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,94,5]
 };
diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js
index c543f6f9f..f5f0b60f1 100644
--- a/doc/html/navtreeindex7.js
+++ b/doc/html/navtreeindex7.js
@@ -1,5 +1,11 @@
 var NAVTREEINDEX7 =
 {
+"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,94,13],
+"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,94,10],
+"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,94,3],
+"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,94,1],
+"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,94,8],
+"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,94,12],
 "setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,94,4],
 "setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,94,7],
 "setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,94,11],
@@ -243,11 +249,5 @@ var NAVTREEINDEX7 =
 "wall__upload_8php.html":[5,0,1,120],
 "wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,120,0],
 "webfinger_8php.html":[5,0,1,121],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,121,0],
-"webpages_8php.html":[5,0,1,122],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,122,0],
-"wfinger_8php.html":[5,0,1,123],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,123,0],
-"widedarkness_8php.html":[5,0,3,2,0,1,10],
-"widgets_8php.html":[5,0,0,73]
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,121,0]
 };
diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js
index 3716dd834..eacf68c68 100644
--- a/doc/html/navtreeindex8.js
+++ b/doc/html/navtreeindex8.js
@@ -1,5 +1,11 @@
 var NAVTREEINDEX8 =
 {
+"webpages_8php.html":[5,0,1,122],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,122,0],
+"wfinger_8php.html":[5,0,1,123],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,123,0],
+"widedarkness_8php.html":[5,0,3,2,0,1,10],
+"widgets_8php.html":[5,0,0,73],
 "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,73,8],
 "widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,73,20],
 "widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[5,0,0,73,5],
@@ -44,7 +50,7 @@ var NAVTREEINDEX8 =
 "zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,74,26],
 "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,74,18],
 "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,74,0],
-"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,74,25],
+"zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c":[5,0,0,74,25],
 "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,74,3],
 "zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,74,24],
 "zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,74,19],
diff --git a/doc/html/notred_8php.html b/doc/html/notred_8php.html
new file mode 100644
index 000000000..551b63e02
--- /dev/null
+++ b/doc/html/notred_8php.html
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+The Red Matrix: view/theme/redbasic/schema/notred.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                      
+
                                      
+
+ 
+ 
+  
+  
+ 
+ 
+
                                      
+   
                                      The Red Matrix
+   
                                      
+  
                                      
+
                                      
+
+
+
+  
+  
+
                                      
+
                                      
+  
+  
                                      
+  
                                      
+
                                      
+
+
                                      
+
+
+
+
+
                                      
+
+
                                      
+
+
                                      
+  
                                      
+
                                      notred.php File Reference
                                        
                                      
+
                                      
+
                                      
+
                                      
+
                                      
+
diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html
index 0ef2b0014..6ee9ca058 100644
--- a/doc/html/permissions_8php.html
+++ b/doc/html/permissions_8php.html
@@ -214,7 +214,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by connedit_content(), create_identity(), get_all_perms(), mail_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().
                                      
+
                                      Referenced by connedit_content(), create_identity(), get_all_perms(), mail_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().
                                      
 
 
                                      
 
@@ -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(), chat_content(), chatsvc_init(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\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(), RedChannelList(), Conversation\set_mode(), RedBrowser\set_writeable(), RedFile\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), widget_photo_albums(), 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(), chat_content(), chatsvc_init(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), 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(), RedChannelList(), Conversation\set_mode(), RedBrowser\set_writeable(), RedFile\setName(), subthread_content(), 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 345b5c4fa..3c04c4679 100644
--- a/doc/html/php2po_8php.html
+++ b/doc/html/php2po_8php.html
@@ -168,7 +168,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), mail_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(), sslify_init(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().
                                      
+
                                      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_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(), sslify_init(), startup(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().
                                      
 
 
                                      
 
diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html
index 4df6f635b..2842fa0b7 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(), bookmark_add(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_chatroom_list(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().
                                      
+
                                      Referenced by api_call(), api_user(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), 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(), filestorage_content(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), handle_tag(), home_init(), RedBrowser\htmlActionsPanel(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), 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(), profperm_init(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), update_remote_id(), 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 1f7f705ee..2a382269b 100644
--- a/doc/html/plugin_8php.html
+++ b/doc/html/plugin_8php.html
@@ -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(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), chat_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(), dirprofile_init(), 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(), mail_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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), 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(), chat_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(), dirprofile_init(), 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(), mail_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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().
                                      
 
 
                                      
 
diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html
index ca5ac2fb3..0c0745a3a 100644
--- a/doc/html/post_8php.html
+++ b/doc/html/post_8php.html
@@ -162,8 +162,8 @@ Functions
 
                                      post_post(&$a) zot communications and messaging
                                      
 
                                      Sender HTTP posts to this endpoint ($site/post typically) with 'data' parameter set to json zot message packet. This packet is optionally encrypted, which we will discover if the json has an 'iv' element. $contents => array( 'alg' => 'aes256cbc', 'iv' => initialisation vector, 'key' => decryption key, 'data' => encrypted data); $contents->iv and $contents->key are random strings encrypted with this site's RSA public key and then base64url encoded. Currently only 'aes256cbc' is used, but this is extensible should that algorithm prove inadequate.
                                      
 
                                      Once decrypted, one will find the normal json_encoded zot message packet.
                                      
-
                                      Defined packet types are: notify, purge, refresh, auth_check, ping, and pickup
                                      
-
                                      Standard packet: (used by notify, purge, refresh, and auth_check)
                                      
+
                                      Defined packet types are: notify, purge, refresh, force_refresh, auth_check, ping, and pickup
                                      
+
                                      Standard packet: (used by notify, purge, refresh, force_refresh, and auth_check)
                                      
 
                                      { "type": "notify", "sender":{ "guid":"kgVFf_1...", "guid_sig":"PT9-TApzp...", "url":"http:\/\/podunk.edu", "url_sig":"T8Bp7j5...", }, "recipients": { optional recipient array }, "callback":"\/post", "version":1, "secret":"1eaa...", "secret_sig": "df89025470fac8..." }
                                      
 
                                      Signature fields are all signed with the sender channel private key and base64url encoded. Recipients are arrays of guid and guid_sig, which were previously signed with the recipients private key and base64url encoded and later obtained via channel discovery. Absence of recipients indicates a public message or visible to all potential listeners on this site.
                                      
 
                                      "pickup" packet: The pickup packet is sent in response to a notify packet from another site
                                      
diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js
index 1760a1eca..fbe37ea4b 100644
--- a/doc/html/search/all_6c.js
+++ b/doc/html/search/all_6c.js
@@ -26,10 +26,12 @@ var searchData=
   ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
   ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
   ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33',1,'config.php']]],
+  ['local_5fdir_5fupdate',['local_dir_update',['../dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e',1,'dir_fns.php']]],
   ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
   ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
   ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]],
   ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
+  ['log',['log',['../classRedDirectory.html#a11376aed1963b4471eb1592c13c63976',1,'RedDirectory\log()'],['../classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0',1,'RedBasicAuth\log()']]],
   ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]],
   ['logger_5fall',['LOGGER_ALL',['../boot_8php.html#afe63ae69ba55299f813766e54df06ede',1,'boot.php']]],
   ['logger_5fdata',['LOGGER_DATA',['../boot_8php.html#a6969947145a139ec374ce098224d8e81',1,'boot.php']]],
diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js
index 653217ff9..3502afdef 100644
--- a/doc/html/search/all_6d.js
+++ b/doc/html/search/all_6d.js
@@ -41,7 +41,7 @@ var searchData=
   ['menu_5fitem_5fzid',['MENU_ITEM_ZID',['../boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53',1,'boot.php']]],
   ['menu_5flist',['menu_list',['../include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d',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']]],
+  ['menu_5frender',['menu_render',['../include_2menu_8php.html#a4d7123b0577fa994770199f9b831da11',1,'menu.php']]],
   ['menu_5fsystem',['MENU_SYSTEM',['../boot_8php.html#a718a801b0be6cbaef5e519516da12721',1,'boot.php']]],
   ['message_2ephp',['message.php',['../include_2message_8php.html',1,'']]],
   ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]],
diff --git a/doc/html/search/all_6e.js b/doc/html/search/all_6e.js
index 70b96f018..08c6e406a 100644
--- a/doc/html/search/all_6e.js
+++ b/doc/html/search/all_6e.js
@@ -80,5 +80,6 @@ var searchData=
   ['notify_5ftagself',['NOTIFY_TAGSELF',['../boot_8php.html#ab724491497ab2618b23a01d5da60aec0',1,'boot.php']]],
   ['notify_5ftagshare',['NOTIFY_TAGSHARE',['../boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461',1,'boot.php']]],
   ['notify_5fwall',['NOTIFY_WALL',['../boot_8php.html#a505410c7edc5f5bb5fa227b98359793e',1,'boot.php']]],
+  ['notred_2ephp',['notred.php',['../notred_8php.html',1,'']]],
   ['nuke_5fsession',['nuke_session',['../auth_8php.html#a2add3a1129ffa4d5515442a9d52a9b1a',1,'auth.php']]]
 ];
diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js
index f34f62728..376618126 100644
--- a/doc/html/search/all_72.js
+++ b/doc/html/search/all_72.js
@@ -12,7 +12,10 @@ var searchData=
   ['readme_2emd',['README.md',['../blogga_2php_2README_8md.html',1,'']]],
   ['rebuild_5ftheme_5ftable',['rebuild_theme_table',['../admin_8php.html#ae46311a3fefc21abc838a26e91789de6',1,'admin.php']]],
   ['red_5fcomment',['red_comment',['../post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823',1,'post_to_red.php']]],
+  ['red_5fescape_5fcodeblock',['red_escape_codeblock',['../items_8php.html#a49905ea75adfe8a2d110be344d18d6a6',1,'items.php']]],
+  ['red_5fescape_5fzrl_5fcallback',['red_escape_zrl_callback',['../items_8php.html#a83a349062945d585edb4b3c5d763ab6e',1,'items.php']]],
   ['red_5fplatform',['RED_PLATFORM',['../boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4',1,'boot.php']]],
+  ['red_5funescape_5fcodeblock',['red_unescape_codeblock',['../items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a',1,'items.php']]],
   ['red_5fversion',['RED_VERSION',['../boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3',1,'boot.php']]],
   ['red_5fxmlrpc_5fmethods',['red_xmlrpc_methods',['../post__to__red_8php.html#a3a2af6ad845239f26e86fccabf8639e1',1,'post_to_red.php']]],
   ['red_5fzrl_5fcallback',['red_zrl_callback',['../items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b',1,'items.php']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 667adaca0..e646c70de 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -116,7 +116,6 @@ var searchData=
   ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]],
   ['supportedtypes',['supportedTypes',['../classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da',1,'photo_driver\supportedTypes()'],['../classphoto__gd.html#a16f3dd7d3559f715aa2fe3f7880836dd',1,'photo_gd\supportedTypes()'],['../classphoto__imagick.html#a27596faca6108d9d563674d1b654a0b7',1,'photo_imagick\supportedTypes()']]],
   ['sync_5fdirectories',['sync_directories',['../dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6',1,'dir_fns.php']]],
-  ['syncdirs',['syncdirs',['../dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a',1,'dir_fns.php']]],
   ['system_5fdown',['system_down',['../system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa',1,'system_unavailable.php']]],
   ['system_5funavailable',['system_unavailable',['../boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0',1,'boot.php']]],
   ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]]
diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js
index a5c681623..b003d4edf 100644
--- a/doc/html/search/all_7a.js
+++ b/doc/html/search/all_7a.js
@@ -26,7 +26,7 @@ var searchData=
   ['zot_5fimport',['zot_import',['../zot_8php.html#aeea071f17e306fe3d0c488551906bfab',1,'zot.php']]],
   ['zot_5fnew_5fuid',['zot_new_uid',['../zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7',1,'zot.php']]],
   ['zot_5fprocess_5fresponse',['zot_process_response',['../zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03',1,'zot.php']]],
-  ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d',1,'zot.php']]],
+  ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c',1,'zot.php']]],
   ['zot_5fregister_5fhub',['zot_register_hub',['../zot_8php.html#a5bcdfef419b16075a0eca990956223dc',1,'zot.php']]],
   ['zot_5frevision',['ZOT_REVISION',['../boot_8php.html#a36b31575f992a10b5927b76efba9362e',1,'boot.php']]],
   ['zot_5fzot',['zot_zot',['../zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142',1,'zot.php']]],
diff --git a/doc/html/search/files_6e.js b/doc/html/search/files_6e.js
index 2722d4f7d..a1f47a39a 100644
--- a/doc/html/search/files_6e.js
+++ b/doc/html/search/files_6e.js
@@ -8,6 +8,7 @@ var searchData=
   ['notes_2ephp',['notes.php',['../notes_8php.html',1,'']]],
   ['notifications_2ephp',['notifications.php',['../notifications_8php.html',1,'']]],
   ['notifier_2ephp',['notifier.php',['../notifier_8php.html',1,'']]],
+  ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]],
   ['notify_2ephp',['notify.php',['../include_2notify_8php.html',1,'']]],
-  ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]]
+  ['notred_2ephp',['notred.php',['../notred_8php.html',1,'']]]
 ];
diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js
index 0353cfc34..c3f8d4cf8 100644
--- a/doc/html/search/functions_6c.js
+++ b/doc/html/search/functions_6c.js
@@ -20,9 +20,11 @@ var searchData=
   ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
   ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
   ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33',1,'config.php']]],
+  ['local_5fdir_5fupdate',['local_dir_update',['../dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e',1,'dir_fns.php']]],
   ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
   ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
   ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
+  ['log',['log',['../classRedDirectory.html#a11376aed1963b4471eb1592c13c63976',1,'RedDirectory\log()'],['../classRedBasicAuth.html#a2cc8b1eac9c5a799bfb53ea7f287f3f0',1,'RedBasicAuth\log()']]],
   ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]],
   ['login',['login',['../boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4',1,'boot.php']]],
   ['login_5fcontent',['login_content',['../login_8php.html#a1d69ca88eb9005a7026e128b9a645904',1,'login.php']]],
diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js
index afef9b387..a8909656c 100644
--- a/doc/html/search/functions_6d.js
+++ b/doc/html/search/functions_6d.js
@@ -24,7 +24,7 @@ var searchData=
   ['menu_5ffetch_5fid',['menu_fetch_id',['../include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7',1,'menu.php']]],
   ['menu_5flist',['menu_list',['../include_2menu_8php.html#a32701c4245e78ba9106eef52c08bf33d',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']]],
+  ['menu_5frender',['menu_render',['../include_2menu_8php.html#a4d7123b0577fa994770199f9b831da11',1,'menu.php']]],
   ['message_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]],
   ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]],
   ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]],
diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js
index 308939021..96cc1c6c3 100644
--- a/doc/html/search/functions_72.js
+++ b/doc/html/search/functions_72.js
@@ -6,6 +6,9 @@ var searchData=
   ['rconnect_5furl',['rconnect_url',['../Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91',1,'Contact.php']]],
   ['rebuild_5ftheme_5ftable',['rebuild_theme_table',['../admin_8php.html#ae46311a3fefc21abc838a26e91789de6',1,'admin.php']]],
   ['red_5fcomment',['red_comment',['../post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823',1,'post_to_red.php']]],
+  ['red_5fescape_5fcodeblock',['red_escape_codeblock',['../items_8php.html#a49905ea75adfe8a2d110be344d18d6a6',1,'items.php']]],
+  ['red_5fescape_5fzrl_5fcallback',['red_escape_zrl_callback',['../items_8php.html#a83a349062945d585edb4b3c5d763ab6e',1,'items.php']]],
+  ['red_5funescape_5fcodeblock',['red_unescape_codeblock',['../items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a',1,'items.php']]],
   ['red_5fxmlrpc_5fmethods',['red_xmlrpc_methods',['../post__to__red_8php.html#a3a2af6ad845239f26e86fccabf8639e1',1,'post_to_red.php']]],
   ['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']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index 145812409..21a1be476 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -93,7 +93,6 @@ var searchData=
   ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]],
   ['supportedtypes',['supportedTypes',['../classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da',1,'photo_driver\supportedTypes()'],['../classphoto__gd.html#a16f3dd7d3559f715aa2fe3f7880836dd',1,'photo_gd\supportedTypes()'],['../classphoto__imagick.html#a27596faca6108d9d563674d1b654a0b7',1,'photo_imagick\supportedTypes()']]],
   ['sync_5fdirectories',['sync_directories',['../dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6',1,'dir_fns.php']]],
-  ['syncdirs',['syncdirs',['../dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a',1,'dir_fns.php']]],
   ['system_5fdown',['system_down',['../system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa',1,'system_unavailable.php']]],
   ['system_5funavailable',['system_unavailable',['../boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0',1,'boot.php']]]
 ];
diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js
index ed0141186..13a4cefe7 100644
--- a/doc/html/search/functions_7a.js
+++ b/doc/html/search/functions_7a.js
@@ -23,7 +23,7 @@ var searchData=
   ['zot_5fimport',['zot_import',['../zot_8php.html#aeea071f17e306fe3d0c488551906bfab',1,'zot.php']]],
   ['zot_5fnew_5fuid',['zot_new_uid',['../zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7',1,'zot.php']]],
   ['zot_5fprocess_5fresponse',['zot_process_response',['../zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03',1,'zot.php']]],
-  ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d',1,'zot.php']]],
+  ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c',1,'zot.php']]],
   ['zot_5fregister_5fhub',['zot_register_hub',['../zot_8php.html#a5bcdfef419b16075a0eca990956223dc',1,'zot.php']]],
   ['zot_5fzot',['zot_zot',['../zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142',1,'zot.php']]],
   ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]],
diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html
index a1df31b11..260e30623 100644
--- a/doc/html/security_8php.html
+++ b/doc/html/security_8php.html
@@ -399,7 +399,7 @@ Functions
 
                                      Profile owner - everything is visible
                                      
 
                                      Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.
                                      
 
-
                                      Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), chatroom_enter(), chatsvc_content(), chatsvc_post(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedCollectionData(), RedFileData(), and z_readdir().
                                      
+
                                      Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), chat_content(), chatroom_enter(), chatroom_list(), chatsvc_content(), chatsvc_post(), menu_fetch(), photo_init(), photos_albums_list(), photos_content(), photos_list_photos(), RedCollectionData(), RedFileData(), and z_readdir().
                                      
 
 
 
diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html
index 09aed0ecb..3ba8cecd8 100644
--- a/doc/html/text_8php.html
+++ b/doc/html/text_8php.html
@@ -1270,7 +1270,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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_post(), mail_store(), menu_edit(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), 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 RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedChannelList(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), 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().
                                      
 
 
                                      
 
@@ -1674,7 +1674,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedDirectory\createFile(), directory_run(), event_store(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().
                                      
+
                                      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), RedDirectory\createFile(), directory_run(), event_store(), fsuggest_post(), group_add(), import_directory_profile(), import_xchan(), item_message_id(), item_store(), local_dir_update(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), notification(), notifier_run(), prepare_body(), profiles_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), and thing_init().
                                      
 
 
                                      
 
@@ -1739,7 +1739,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(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), chat_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(), dirprofile_init(), 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(), mail_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(), 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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), 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(), chat_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(), dirprofile_init(), 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(), mail_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(), 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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().
                                      
 
 
 
diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html
index 6bd46403f..cc608bdfb 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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), bb_sanitize_style(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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().
                                      
+
                                      Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), bb_sanitize_style(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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_chatroom_list(), 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/zot_8php.html b/doc/html/zot_8php.html
index e1b1e559b..129745ae5 100644
--- a/doc/html/zot_8php.html
+++ b/doc/html/zot_8php.html
@@ -122,8 +122,8 @@ Functions
  
  zot_finger ($webbie, $channel, $autofallback=true)
  
- zot_refresh ($them, $channel=null)
- 
+ zot_refresh ($them, $channel=null, $force=false)
+ 
  zot_gethub ($arr)
  
  zot_register_hub ($arr)
@@ -357,7 +357,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by import_xchan(), process_profile_delivery(), and syncdirs().
                                      
+
                                      Referenced by import_xchan(), local_dir_update(), and process_profile_delivery().
                                      
 
 
                                      
 
@@ -412,17 +412,17 @@ Functions
         
       
 
                                      
-
                                      import_xchan($arr,$ud_flags = 1) Takes an associative array of a fecthed discovery packet and updates all internal data structures which need to be updated as a result.
                                      
+
                                      import_xchan($arr,$ud_flags = 1) Takes an associative array of a fetched discovery packet and updates all internal data structures which need to be updated as a result.
                                      
 
                                      Parameters
                                      
   
-    
+    
                                      
     
                                      array$arr=> json_decoded discovery packet 
                                      int$ud_flagsDetermines whether to create a directory update record if any changes occur, default 1 or true
                                      int$ud_flagsDetermines whether to create a directory update record if any changes occur, default 1 or true $ud_flags = (-1) indicates a forced refresh where we unconditionally create a directory update record this typically occurs once a month for each channel as part of a scheduled ping to notify the directory that the channel still exists
                                      
   
                                      
   
                                      
 
                                      
 
                                      Returns
                                      array => 'success' (boolean true or false) 'message' (optional error string only if success is false) 
                                      
 
-
                                      Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), update_directory_entry(), zot_refresh(), and zot_register_hub().
                                      
+
                                      Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), process_channel_sync_delivery(), update_directory_entry(), zot_refresh(), and zot_register_hub().
                                      
 
 
                                      
 
@@ -690,7 +690,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by import_directory_profile(), import_xchan(), and syncdirs().
                                      
+
                                      Referenced by import_directory_profile(), import_xchan(), and local_dir_update().
                                      
 
 
                                      
 
@@ -739,10 +739,10 @@ Functions
 
                                      Parameters
                                      
   
-    
+    
-    
+    
                                      
     
                                      array$channel=> sender channel structure 
                                      string$type=> packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'notify', 'auth_check' 
                                      string$type=> packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'force_refresh', 'notify', 'auth_check' 
                                      
     
                                      array$recipients=> envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts 
                                      
     
                                      string$remote_key=> optional public site key of target hub used to encrypt entire packet NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others 
                                      string$secret=> random string, required for packets which require verification/callback e.g. 'pickup', 'purge', 'notify', 'auth_check' — 'ping' and 'refresh' do not require verification
                                      string$secret=> random string, required for packets which require verification/callback e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification
                                      
   
                                      
   
                                      
 
                                      
@@ -823,7 +823,7 @@ which will be processed and delivered before this function ultimately returns.
 
 
                                      Returns
                                      : array => see z_post_url and mod/zfinger.php 
                                      
 
-
                                      Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), probe_content(), and update_directory_entry().
                                      
+
                                      Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), probe_content(), process_channel_sync_delivery(), and update_directory_entry().
                                      
 
 
 
@@ -849,7 +849,7 @@ which will be processed and delivered before this function ultimately returns.
 
 
                                      Only search for active hublocs - e.g. those that haven't been marked deleted 
                                      
 
-
                                      Referenced by zfinger_init().
                                      
+
                                      Referenced by process_channel_sync_delivery(), and zfinger_init().
                                      
 
 
 
@@ -992,7 +992,7 @@ which will be processed and delivered before this function ultimately returns.
 
 
 
-
+
 
                                      
 
                                      
       
@@ -1006,7 +1006,13 @@ which will be processed and delivered before this function ultimately returns.
           
-          
+          
+        
+        
+          
+          
+          
+          
@@ -1015,7 +1021,7 @@ which will be processed and delivered before this function ultimately returns.
         
                                      
           
            $channel = null $channel = null, 
                                       $force = false 
         
                                      
         
                                      
           
                                      
       
                                      
 
                                      
-
                                      : zot_refresh($them, $channel = null)
                                      
+
                                      : zot_refresh($them, $channel = null, $force = false)
                                      
 
                                      zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified to fetch new permissions via a finger/discovery operation. This may result in a new connection (abook entry) being added to a local channel and it may result in auto-permissions being granted.
                                      
 
                                      Friending in zot is accomplished by sending a refresh packet to a specific channel which indicates a permission change has been made by the sender which affects the target channel. The hub controlling the target channel does targetted discovery (a zot-finger request requesting permissions for the local channel). These are decoded here, and if necessary and abook structure (addressbook) is created to store the permissions assigned to this channel.
                                      
 
                                      Initially these abook structures are created with a 'pending' flag, so that no reverse permissions are implied until this is approved by the owner channel. A channel can also auto-populate permissions in return and send back a refresh packet of its own. This is used by forum and group communication channels so that friending and membership in the channel's "club" is automatic.
                                      
diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js
index dd70498b0..00d9e0322 100644
--- a/doc/html/zot_8php.js
+++ b/doc/html/zot_8php.js
@@ -25,7 +25,7 @@ var zot_8php =
     [ "zot_import", "zot_8php.html#aeea071f17e306fe3d0c488551906bfab", null ],
     [ "zot_new_uid", "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7", null ],
     [ "zot_process_response", "zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03", null ],
-    [ "zot_refresh", "zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d", null ],
+    [ "zot_refresh", "zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c", null ],
     [ "zot_register_hub", "zot_8php.html#a5bcdfef419b16075a0eca990956223dc", null ],
     [ "zot_zot", "zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142", null ]
 ];
\ No newline at end of file
-- 
cgit v1.2.3


From eadf5121d0f047ea297b04ce40ac51a9aa3d18dc Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 14 Feb 2014 12:39:15 -0800
Subject: rev update and a minor fix (missing param) to force_refresh

---
 mod/item.php     |    2 +-
 mod/post.php     |    2 +-
 util/messages.po | 3503 +++++++++++++++++++++++++++---------------------------
 version.inc      |    2 +-
 4 files changed, 1774 insertions(+), 1735 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 173198f4a..48f85f692 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -44,7 +44,7 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_REQUEST);
 
-	// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+//	 logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
 
diff --git a/mod/post.php b/mod/post.php
index 919f09a35..6c57bfa0d 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -828,7 +828,7 @@ function post_post(&$a) {
 				'xchan_guid'     => $sender['guid'], 
 				'xchan_guid_sig' => $sender['guid_sig'],
 				'hubloc_url'     => $sender['url']
-			),null);
+			),null,(($msgtype === 'force_refresh') ? true : false));
 		}
 		$ret['success'] = true;
 		json_return_and_die($ret);
diff --git a/util/messages.po b/util/messages.po
index aef3c3dc4..5b8249a48 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-02-07.581\n"
+"Project-Id-Version: 2014-02-14.588\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 00:03-0800\n"
+"POT-Creation-Date: 2014-02-14 00:02-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -17,6 +17,172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr ""
+
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:184 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr ""
+
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr ""
+
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
+msgstr ""
+
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr ""
+
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr ""
+
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr ""
+
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr ""
+
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr ""
+
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr ""
+
+#: ../../include/widgets.php:173 ../../include/text.php:754
+#: ../../include/text.php:768 ../../mod/filer.php:36
+msgid "Save"
+msgstr ""
+
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr ""
+
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
+msgstr ""
+
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr ""
+
+#: ../../include/widgets.php:318 ../../include/items.php:3636
+msgid "Archives"
+msgstr ""
+
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr ""
+
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
+msgstr ""
+
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
+msgstr ""
+
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
+msgid "Friends"
+msgstr ""
+
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr ""
+
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
+msgstr ""
+
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr ""
+
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr ""
+
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr ""
+
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr ""
+
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr ""
+
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr ""
+
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr ""
+
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr ""
+
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr ""
+
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr ""
+
+#: ../../include/widgets.php:487 ../../include/nav.php:181
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Settings"
+msgstr ""
+
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr ""
+
+#: ../../include/widgets.php:509 ../../include/nav.php:172
+msgid "New Message"
+msgstr ""
+
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr ""
+
 #: ../../include/acl_selectors.php:235
 msgid "Visible to everybody"
 msgstr ""
@@ -190,7 +356,7 @@ msgstr ""
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:142 ../../mod/directory.php:210
+#: ../../include/nav.php:142 ../../mod/directory.php:211
 msgid "Directory"
 msgstr ""
 
@@ -270,10 +436,6 @@ msgstr ""
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:172 ../../include/widgets.php:509
-msgid "New Message"
-msgstr ""
-
 #: ../../include/nav.php:175
 msgid "Event Calendar"
 msgstr ""
@@ -294,11 +456,6 @@ msgstr ""
 msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/nav.php:181 ../../include/widgets.php:487
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
-msgid "Settings"
-msgstr ""
-
 #: ../../include/nav.php:181
 msgid "Account/Channel Settings"
 msgstr ""
@@ -366,11 +523,6 @@ msgstr[1] ""
 msgid "View Connections"
 msgstr ""
 
-#: ../../include/text.php:754 ../../include/text.php:768
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr ""
-
 #: ../../include/text.php:834
 msgid "poke"
 msgstr ""
@@ -659,214 +811,93 @@ msgstr ""
 msgid "Pages"
 msgstr ""
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
+#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
+#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
+#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
+#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
+#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
+#: ../../include/bbcode.php:633
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
-#: ../../mod/directory.php:183 ../../mod/match.php:62
-#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
-msgid "Connect"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
+#: ../../include/bbcode.php:170
+msgid "QR code"
 msgstr ""
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:238
-msgid "Suggestions"
+#: ../../include/bbcode.php:213
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:124
-msgid "See more..."
+#: ../../include/bbcode.php:215
+msgid "post"
 msgstr ""
 
-#: ../../include/widgets.php:146
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
+#: ../../include/Contact.php:120
+msgid "New window"
 msgstr ""
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
+#: ../../include/Contact.php:121
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/features.php:23
+msgid "General Features"
 msgstr ""
 
-#: ../../include/widgets.php:171
-msgid "Notes"
+#: ../../include/features.php:25
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/widgets.php:252 ../../include/features.php:52
-msgid "Saved Searches"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/widgets.php:253 ../../include/group.php:290
-msgid "add"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/widgets.php:283 ../../include/features.php:66
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
+#: ../../include/features.php:27
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
+#: ../../include/features.php:27
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/widgets.php:318 ../../include/items.php:3613
-msgid "Archives"
+#: ../../include/features.php:28
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/widgets.php:370
-msgid "Refresh"
+#: ../../include/features.php:28
+msgid "Enables a tool to store notes and reminders"
 msgstr ""
 
-#: ../../include/widgets.php:371 ../../mod/connedit.php:389
-msgid "Me"
+#: ../../include/features.php:33
+msgid "Extended Identity Sharing"
 msgstr ""
 
-#: ../../include/widgets.php:372 ../../mod/connedit.php:391
-msgid "Best Friends"
+#: ../../include/features.php:33
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
 msgstr ""
 
-#: ../../include/widgets.php:373 ../../include/identity.php:310
-#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
-msgid "Friends"
-msgstr ""
-
-#: ../../include/widgets.php:374
-msgid "Co-workers"
-msgstr ""
-
-#: ../../include/widgets.php:375 ../../mod/connedit.php:393
-msgid "Former Friends"
-msgstr ""
-
-#: ../../include/widgets.php:376 ../../mod/connedit.php:394
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr ""
-
-#: ../../include/widgets.php:409
-msgid "Account settings"
-msgstr ""
-
-#: ../../include/widgets.php:415
-msgid "Channel settings"
-msgstr ""
-
-#: ../../include/widgets.php:421
-msgid "Additional features"
-msgstr ""
-
-#: ../../include/widgets.php:427
-msgid "Feature settings"
-msgstr ""
-
-#: ../../include/widgets.php:433
-msgid "Display settings"
-msgstr ""
-
-#: ../../include/widgets.php:439
-msgid "Connected apps"
-msgstr ""
-
-#: ../../include/widgets.php:445
-msgid "Export channel"
-msgstr ""
-
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
-msgstr ""
-
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
-msgstr ""
-
-#: ../../include/widgets.php:476 ../../include/features.php:43
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr ""
-
-#: ../../include/widgets.php:504
-msgid "Check Mail"
-msgstr ""
-
-#: ../../include/widgets.php:585
-msgid "Chat Rooms"
-msgstr ""
-
-#: ../../include/Contact.php:120
-msgid "New window"
-msgstr ""
-
-#: ../../include/Contact.php:121
-msgid "Open the selected location in a different window or browser tab"
-msgstr ""
-
-#: ../../include/features.php:23
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Content Expiration"
-msgstr ""
-
-#: ../../include/features.php:25
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr ""
-
-#: ../../include/features.php:26
-msgid "Multiple Profiles"
-msgstr ""
-
-#: ../../include/features.php:26
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:27
-msgid "Web Pages"
-msgstr ""
-
-#: ../../include/features.php:27
-msgid "Provide managed web pages on your channel"
-msgstr ""
-
-#: ../../include/features.php:28
-msgid "Private Notes"
-msgstr ""
-
-#: ../../include/features.php:28
-msgid "Enables a tool to store notes and reminders"
-msgstr ""
-
-#: ../../include/features.php:33
-msgid "Extended Identity Sharing"
-msgstr ""
-
-#: ../../include/features.php:33
-msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
-msgstr ""
-
-#: ../../include/features.php:34
-msgid "Expert Mode"
+#: ../../include/features.php:34
+msgid "Expert Mode"
 msgstr ""
 
 #: ../../include/features.php:34
@@ -1209,7 +1240,7 @@ msgstr ""
 
 #: ../../include/event.php:40 ../../include/identity.php:679
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+#: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
 msgid "Location:"
 msgstr ""
 
@@ -1252,12 +1283,12 @@ msgstr ""
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
-#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:547
+#: ../../mod/photos.php:993 ../../mod/photos.php:1080
 msgid "Comment"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:281
 #: ../../include/contact_widgets.php:125
 msgid "show more"
 msgstr ""
@@ -1378,7 +1409,7 @@ msgstr ""
 #: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
 #: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
-#: ../../mod/photos.php:652 ../../mod/photos.php:674
+#: ../../mod/photos.php:656 ../../mod/photos.php:678
 msgid "Profile Photos"
 msgstr ""
 
@@ -1387,34 +1418,33 @@ msgstr ""
 #: ../../include/attach.php:233 ../../include/attach.php:247
 #: ../../include/attach.php:268 ../../include/attach.php:463
 #: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3492
-#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
-#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
+#: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
 #: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
 #: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
-#: ../../mod/chat.php:87 ../../mod/chat.php:92
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
-#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
-#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
-#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
+#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
+#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
+#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
+#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/achievements.php:27 ../../mod/settings.php:493
+#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/connections.php:169 ../../mod/notifications.php:66
+#: ../../mod/blocks.php:29 ../../mod/blocks.php:44
+#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
+#: ../../mod/poke.php:128 ../../mod/channel.php:88 ../../mod/channel.php:188
 #: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
 #: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
 #: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
 #: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:526
 #: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
 msgid "Permission denied."
 msgstr ""
@@ -1477,37 +1507,6 @@ msgstr ""
 msgid "database storage failed."
 msgstr ""
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
-#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
-#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
-#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
-#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
-#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
-#: ../../include/bbcode.php:626
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:170
-msgid "QR code"
-msgstr ""
-
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:215
-msgid "post"
-msgstr ""
-
-#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
-msgid "$1 wrote:"
-msgstr ""
-
 #: ../../include/bookmarks.php:31
 #, php-format
 msgid "%1$s's bookmarks"
@@ -1547,9 +1546,9 @@ msgid "Select"
 msgstr ""
 
 #: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
-#: ../../mod/admin.php:745 ../../mod/connedit.php:359
-#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
+#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
 msgid "Delete"
 msgstr ""
 
@@ -1590,10 +1589,10 @@ msgid "View in context"
 msgstr ""
 
 #: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
 #: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
-#: ../../mod/photos.php:971
+#: ../../mod/photos.php:975
 msgid "Please wait"
 msgstr ""
 
@@ -1720,14 +1719,14 @@ msgstr ""
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
 #: ../../mod/webpages.php:122 ../../mod/editpost.php:132
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
-#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+#: ../../mod/editblock.php:151 ../../mod/photos.php:995
 msgid "Preview"
 msgstr ""
 
-#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+#: ../../include/conversation.php:1097 ../../mod/photos.php:974
 msgid "Share"
 msgstr ""
 
@@ -1841,7 +1840,7 @@ msgstr ""
 msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
 #: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
 msgid "Encrypt text"
 msgstr ""
@@ -1850,10 +1849,10 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1150 ../../mod/settings.php:514
-#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr ""
 
@@ -1946,7 +1945,7 @@ msgstr ""
 msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/identity.php:29 ../../mod/item.php:1161
+#: ../../include/identity.php:29 ../../mod/item.php:1177
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
@@ -2027,17 +2026,17 @@ msgid "Edit visibility"
 msgstr ""
 
 #: ../../include/identity.php:681 ../../include/identity.php:908
-#: ../../mod/directory.php:158
+#: ../../mod/directory.php:159
 msgid "Gender:"
 msgstr ""
 
 #: ../../include/identity.php:682 ../../include/identity.php:928
-#: ../../mod/directory.php:160
+#: ../../mod/directory.php:161
 msgid "Status:"
 msgstr ""
 
 #: ../../include/identity.php:683 ../../include/identity.php:939
-#: ../../mod/directory.php:162
+#: ../../mod/directory.php:163
 msgid "Homepage:"
 msgstr ""
 
@@ -2084,7 +2083,7 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:906 ../../mod/settings.php:920
+#: ../../include/identity.php:906 ../../mod/settings.php:924
 msgid "Full Name:"
 msgstr ""
 
@@ -2129,7 +2128,7 @@ msgstr ""
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:949 ../../mod/directory.php:164
+#: ../../include/identity.php:949 ../../mod/directory.php:165
 msgid "About:"
 msgstr ""
 
@@ -2181,14 +2180,14 @@ msgstr ""
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:847
 msgid "Private Message"
 msgstr ""
 
 #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/settings.php:575 ../../mod/editpost.php:103
-#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
+#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
 #: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
 #: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
 msgid "Edit"
@@ -2218,7 +2217,7 @@ msgstr ""
 msgid "add tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:972
 msgid "I like this (toggle)"
 msgstr ""
 
@@ -2226,7 +2225,7 @@ msgstr ""
 msgid "like"
 msgstr ""
 
-#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:973
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -2263,37 +2262,37 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/ItemObject.php:249
+#: ../../include/ItemObject.php:250
 msgid "Bookmark Links"
 msgstr ""
 
-#: ../../include/ItemObject.php:279
+#: ../../include/ItemObject.php:280
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
-#: ../../mod/photos.php:1074
+#: ../../include/ItemObject.php:545 ../../mod/photos.php:991
+#: ../../mod/photos.php:1078
 msgid "This is you"
 msgstr ""
 
-#: ../../include/ItemObject.php:547 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/settings.php:513 ../../mod/settings.php:625
-#: ../../mod/settings.php:653 ../../mod/settings.php:677
-#: ../../mod/settings.php:748 ../../mod/settings.php:912
-#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+#: ../../include/ItemObject.php:548 ../../mod/events.php:469
+#: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
 #: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
 #: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
 #: ../../mod/connedit.php:437 ../../mod/profiles.php:506
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/settings.php:516
+#: ../../mod/settings.php:628 ../../mod/settings.php:656
+#: ../../mod/settings.php:680 ../../mod/settings.php:752
+#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
 #: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
-#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
-#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
-#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:566
+#: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
+#: ../../mod/photos.php:1081 ../../mod/mood.php:142
 #: ../../view/theme/redbasic/php/config.php:95
 #: ../../view/theme/apw/php/config.php:231
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2301,35 +2300,35 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: ../../include/ItemObject.php:548
+#: ../../include/ItemObject.php:549
 msgid "Bold"
 msgstr ""
 
-#: ../../include/ItemObject.php:549
+#: ../../include/ItemObject.php:550
 msgid "Italic"
 msgstr ""
 
-#: ../../include/ItemObject.php:550
+#: ../../include/ItemObject.php:551
 msgid "Underline"
 msgstr ""
 
-#: ../../include/ItemObject.php:551
+#: ../../include/ItemObject.php:552
 msgid "Quote"
 msgstr ""
 
-#: ../../include/ItemObject.php:552
+#: ../../include/ItemObject.php:553
 msgid "Code"
 msgstr ""
 
-#: ../../include/ItemObject.php:553
+#: ../../include/ItemObject.php:554
 msgid "Image"
 msgstr ""
 
-#: ../../include/ItemObject.php:554
+#: ../../include/ItemObject.php:555
 msgid "Link"
 msgstr ""
 
-#: ../../include/ItemObject.php:555
+#: ../../include/ItemObject.php:556
 msgid "Video"
 msgstr ""
 
@@ -2933,12 +2932,12 @@ msgstr ""
 msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1187
+#: ../../include/photos.php:306 ../../mod/photos.php:694
+#: ../../mod/photos.php:1191
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/reddav.php:1018
+#: ../../include/reddav.php:1061
 msgid "Edit File properties"
 msgstr ""
 
@@ -2965,8 +2964,8 @@ msgstr ""
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:357
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:207
+#: ../../mod/directory.php:212 ../../mod/connections.php:357
 msgid "Find"
 msgstr ""
 
@@ -3136,48 +3135,48 @@ msgstr ""
 msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:350
+#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../mod/group.php:68 ../../index.php:350
 msgid "Permission denied"
 msgstr ""
 
-#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
 #: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:3801
+#: ../../include/items.php:3824
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:3808
+#: ../../include/items.php:3831
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:3819
+#: ../../include/items.php:3842
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:3822
+#: ../../include/items.php:3845
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/zot.php:545
+#: ../../include/zot.php:548
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:555
+#: ../../include/zot.php:558
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:732
+#: ../../include/zot.php:735
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -3263,56 +3262,64 @@ msgstr ""
 msgid "Share this event"
 msgstr ""
 
-#: ../../mod/thing.php:94
+#: ../../mod/thing.php:98
 msgid "Thing updated"
 msgstr ""
 
-#: ../../mod/thing.php:153
+#: ../../mod/thing.php:158
 msgid "Object store: failed"
 msgstr ""
 
-#: ../../mod/thing.php:157
+#: ../../mod/thing.php:162
 msgid "Thing added"
 msgstr ""
 
-#: ../../mod/thing.php:175
+#: ../../mod/thing.php:182
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../mod/thing.php:228
+#: ../../mod/thing.php:234
 msgid "Show Thing"
 msgstr ""
 
-#: ../../mod/thing.php:235
+#: ../../mod/thing.php:241
 msgid "item not found."
 msgstr ""
 
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:269
 msgid "Edit Thing"
 msgstr ""
 
-#: ../../mod/thing.php:265 ../../mod/thing.php:311
+#: ../../mod/thing.php:271 ../../mod/thing.php:318
 msgid "Select a profile"
 msgstr ""
 
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:273 ../../mod/thing.php:320
 msgid "Select a category of stuff. e.g. I ______ something"
 msgstr ""
 
-#: ../../mod/thing.php:270 ../../mod/thing.php:315
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Post an activity"
+msgstr ""
+
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Only sends to viewers of the applicable profile"
+msgstr ""
+
+#: ../../mod/thing.php:277 ../../mod/thing.php:323
 msgid "Name of thing e.g. something"
 msgstr ""
 
-#: ../../mod/thing.php:272 ../../mod/thing.php:316
+#: ../../mod/thing.php:279 ../../mod/thing.php:324
 msgid "URL of thing (optional)"
 msgstr ""
 
-#: ../../mod/thing.php:274 ../../mod/thing.php:317
+#: ../../mod/thing.php:281 ../../mod/thing.php:325
 msgid "URL for photo of thing (optional)"
 msgstr ""
 
-#: ../../mod/thing.php:309
+#: ../../mod/thing.php:316
 msgid "Add Thing to your Profile"
 msgstr ""
 
@@ -3405,20 +3412,20 @@ msgstr ""
 msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/item.php:819
+#: ../../mod/item.php:835
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:1166
+#: ../../mod/item.php:1182
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/item.php:1172
+#: ../../mod/item.php:1188
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
@@ -3547,13 +3554,13 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:483
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:484
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
 msgid "No"
 msgstr ""
 
@@ -3585,2564 +3592,2596 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
+#: ../../mod/subthread.php:105
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
+#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
+#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
+#: ../../mod/update_community.php:18
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:539
-msgid "Update"
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:35
+msgid "Channel not found."
 msgstr ""
 
-#: ../../mod/settings.php:192
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/chanview.php:93
+msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../mod/settings.php:196
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/settings.php:209
-msgid "Password changed."
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../mod/settings.php:211
-msgid "Password update failed. Please try again."
+#: ../../mod/chat.php:163
+msgid "Leave Room"
 msgstr ""
 
-#: ../../mod/settings.php:225
-msgid "Not valid email."
+#: ../../mod/chat.php:164
+msgid "I am away right now"
 msgstr ""
 
-#: ../../mod/settings.php:228
-msgid "Protected email address. Cannot change to that email."
+#: ../../mod/chat.php:165
+msgid "I am online"
 msgstr ""
 
-#: ../../mod/settings.php:237
-msgid "System failure storing new email. Please try again."
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
+msgid "New Chatroom"
 msgstr ""
 
-#: ../../mod/settings.php:441
-msgid "Settings updated."
+#: ../../mod/chat.php:190
+msgid "Chatroom Name"
 msgstr ""
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
-#: ../../mod/settings.php:574
-msgid "Add application"
+#: ../../mod/chat.php:205
+#, php-format
+msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-msgid "Name"
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
+#: ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:443
+msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/settings.php:515
-msgid "Name of application"
+#: ../../mod/viewconnections.php:43
+msgid "No connections."
 msgstr ""
 
-#: ../../mod/settings.php:516 ../../mod/settings.php:542
-msgid "Consumer Key"
+#: ../../mod/viewconnections.php:55
+#, php-format
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/settings.php:516 ../../mod/settings.php:517
-msgid "Automatically generated - change if desired. Max length 20"
+#: ../../mod/viewconnections.php:70
+msgid "View Connnections"
 msgstr ""
 
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-msgid "Consumer Secret"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Redirect"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../mod/settings.php:518
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
-msgid "Icon url"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
+msgid "Remove"
 msgstr ""
 
-#: ../../mod/settings.php:519
-msgid "Optional"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
 msgstr ""
 
-#: ../../mod/settings.php:530
-msgid "You can't edit this application."
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../mod/settings.php:573
-msgid "Connected Apps"
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../mod/settings.php:577
-msgid "Client key starts with"
+#: ../../mod/connect.php:87
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../mod/settings.php:578
-msgid "No name"
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../mod/settings.php:579
-msgid "Remove authorization"
-msgstr ""
-
-#: ../../mod/settings.php:590
-msgid "No feature settings configured"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../mod/settings.php:598
-msgid "Feature Settings"
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../mod/settings.php:621
-msgid "Account Settings"
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../mod/settings.php:622
-msgid "Password Settings"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../mod/settings.php:623
-msgid "New Password:"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/settings.php:624
-msgid "Confirm:"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/settings.php:624
-msgid "Leave password fields blank unless changing"
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/settings.php:626 ../../mod/settings.php:921
-msgid "Email Address:"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/settings.php:627
-msgid "Remove Account"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/settings.php:628
-msgid "Warning: This action is permanent and cannot be reversed."
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
 msgstr ""
 
-#: ../../mod/settings.php:644
-msgid "Off"
+#: ../../mod/delegate.php:131
+msgid "Add"
 msgstr ""
 
-#: ../../mod/settings.php:644
-msgid "On"
+#: ../../mod/delegate.php:132
+msgid "No entries."
 msgstr ""
 
-#: ../../mod/settings.php:651
-msgid "Additional Features"
+#: ../../mod/chatsvc.php:102
+msgid "Away"
 msgstr ""
 
-#: ../../mod/settings.php:676
-msgid "Connector Settings"
+#: ../../mod/chatsvc.php:106
+msgid "Online"
 msgstr ""
 
-#: ../../mod/settings.php:706 ../../mod/admin.php:379
-msgid "No special theme for mobile devices"
+#: ../../mod/attach.php:9
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/settings.php:746
-msgid "Display Settings"
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
 msgstr ""
 
-#: ../../mod/settings.php:752
-msgid "Display Theme:"
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../mod/settings.php:753
-msgid "Mobile Theme:"
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
 msgstr ""
 
-#: ../../mod/settings.php:754
-msgid "Update browser every xx seconds"
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../mod/settings.php:754
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
 msgstr ""
 
-#: ../../mod/settings.php:755
-msgid "Maximum number of conversations to load at any time:"
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
 msgstr ""
 
-#: ../../mod/settings.php:755
-msgid "Maximum of 100 items"
+#: ../../mod/mitem.php:102
+msgid "Edit element"
 msgstr ""
 
-#: ../../mod/settings.php:756
-msgid "Don't show emoticons"
+#: ../../mod/mitem.php:103
+msgid "Drop element"
 msgstr ""
 
-#: ../../mod/settings.php:792
-msgid "Nobody except yourself"
+#: ../../mod/mitem.php:104
+msgid "New element"
 msgstr ""
 
-#: ../../mod/settings.php:793
-msgid "Only those you specifically allow"
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
 msgstr ""
 
-#: ../../mod/settings.php:794
-msgid "Anybody in your address book"
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
 msgstr ""
 
-#: ../../mod/settings.php:795
-msgid "Anybody on this website"
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
 msgstr ""
 
-#: ../../mod/settings.php:796
-msgid "Anybody in this network"
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
 msgstr ""
 
-#: ../../mod/settings.php:797
-msgid "Anybody on the internet"
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
 msgstr ""
 
-#: ../../mod/settings.php:874
-msgid "Publish your default profile in the network directory"
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:879
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:883 ../../mod/profile_photo.php:288
-msgid "or"
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
 msgstr ""
 
-#: ../../mod/settings.php:888
-msgid "Your channel address is"
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
 msgstr ""
 
-#: ../../mod/settings.php:910
-msgid "Channel Settings"
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
 msgstr ""
 
-#: ../../mod/settings.php:919
-msgid "Basic Settings"
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
 msgstr ""
 
-#: ../../mod/settings.php:922
-msgid "Your Timezone:"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
 msgstr ""
 
-#: ../../mod/settings.php:923
-msgid "Default Post Location:"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../mod/settings.php:924
-msgid "Use Browser Location:"
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
 msgstr ""
 
-#: ../../mod/settings.php:926
-msgid "Adult Content"
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
 msgstr ""
 
-#: ../../mod/settings.php:926
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../mod/settings.php:928
-msgid "Security and Privacy Settings"
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
 msgstr ""
 
-#: ../../mod/settings.php:930
-msgid "Hide my online presence"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/settings.php:930
-msgid "Prevents displaying in your profile that you are online"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/settings.php:932
-msgid "Simple Privacy Settings:"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/settings.php:933
-msgid ""
-"Very Public - extremely permissive (should be used with caution)"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/settings.php:934
-msgid ""
-"Typical - default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)"
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
 msgstr ""
 
-#: ../../mod/settings.php:935
-msgid "Private - default private, never open or public"
+#: ../../mod/group.php:20
+msgid "Collection created."
 msgstr ""
 
-#: ../../mod/settings.php:936
-msgid "Blocked - default blocked to/from everybody"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
 msgstr ""
 
-#: ../../mod/settings.php:939
-msgid "Advanced Privacy Settings"
+#: ../../mod/group.php:54
+msgid "Collection updated."
 msgstr ""
 
-#: ../../mod/settings.php:941
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
 msgstr ""
 
-#: ../../mod/settings.php:941
-msgid "May reduce spam activity"
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
 msgstr ""
 
-#: ../../mod/settings.php:942
-msgid "Default Post Permissions"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
-msgid "(click to open/close)"
+#: ../../mod/group.php:107
+msgid "Collection removed."
 msgstr ""
 
-#: ../../mod/settings.php:954
-msgid "Maximum private messages per day from unknown people:"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
 msgstr ""
 
-#: ../../mod/settings.php:954
-msgid "Useful to reduce spamming"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
 msgstr ""
 
-#: ../../mod/settings.php:957
-msgid "Notification Settings"
+#: ../../mod/group.php:196
+msgid "Members"
 msgstr ""
 
-#: ../../mod/settings.php:958
-msgid "By default post a status message when:"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../mod/settings.php:959
-msgid "accepting a friend request"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/settings.php:960
-msgid "joining a forum/community"
+#: ../../mod/admin.php:48
+msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:961
-msgid "making an interesting profile change"
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
+msgid "Site"
 msgstr ""
 
-#: ../../mod/settings.php:962
-msgid "Send a notification email when:"
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
+msgid "Users"
 msgstr ""
 
-#: ../../mod/settings.php:963
-msgid "You receive an introduction"
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
+msgid "Plugins"
 msgstr ""
 
-#: ../../mod/settings.php:964
-msgid "Your introductions are confirmed"
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
+msgid "Themes"
 msgstr ""
 
-#: ../../mod/settings.php:965
-msgid "Someone writes on your profile wall"
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
+msgid "Server"
 msgstr ""
 
-#: ../../mod/settings.php:966
-msgid "Someone writes a followup comment"
+#: ../../mod/admin.php:93
+msgid "DB updates"
 msgstr ""
 
-#: ../../mod/settings.php:967
-msgid "You receive a private message"
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
+msgid "Logs"
 msgstr ""
 
-#: ../../mod/settings.php:968
-msgid "You receive a friend suggestion"
+#: ../../mod/admin.php:113
+msgid "Plugin Features"
 msgstr ""
 
-#: ../../mod/settings.php:969
-msgid "You are tagged in a post"
+#: ../../mod/admin.php:115
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/settings.php:970
-msgid "You are poked/prodded/etc. in a post"
+#: ../../mod/admin.php:189
+msgid "Message queues"
 msgstr ""
 
-#: ../../mod/settings.php:973
-msgid "Advanced Account/Page Type Settings"
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
+msgid "Administration"
 msgstr ""
 
-#: ../../mod/settings.php:974
-msgid "Change the behaviour of this account for special situations"
+#: ../../mod/admin.php:195
+msgid "Summary"
 msgstr ""
 
-#: ../../mod/subthread.php:105
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../mod/admin.php:197
+msgid "Registered users"
 msgstr ""
 
-#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
-#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
-#: ../../mod/update_community.php:18
-msgid "[Embedded content - reload page to view]"
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
+#: ../../mod/admin.php:200
+msgid "Version"
 msgstr ""
 
-#: ../../mod/chanview.php:93
-msgid "toggle full screen mode"
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
+msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/tagger.php:98
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../mod/admin.php:350
+msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
+#: ../../mod/admin.php:379 ../../mod/settings.php:709
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/chat.php:120
-msgid "Leave Room"
+#: ../../mod/admin.php:381
+msgid "No special theme for accessibility"
 msgstr ""
 
-#: ../../mod/chat.php:121
-msgid "I am away right now"
+#: ../../mod/admin.php:409
+msgid "Closed"
 msgstr ""
 
-#: ../../mod/chat.php:122
-msgid "I am online"
+#: ../../mod/admin.php:410
+msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/chat.php:146 ../../mod/chat.php:166
-msgid "New Chatroom"
+#: ../../mod/admin.php:411
+msgid "Open"
 msgstr ""
 
-#: ../../mod/chat.php:147
-msgid "Chatroom Name"
+#: ../../mod/admin.php:416
+msgid "Private"
 msgstr ""
 
-#: ../../mod/chat.php:162
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../mod/admin.php:417
+msgid "Paid Access"
 msgstr ""
 
-#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/directory.php:15 ../../mod/display.php:9
-#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:442
-msgid "Public access denied."
+#: ../../mod/admin.php:418
+msgid "Free Access"
 msgstr ""
 
-#: ../../mod/viewconnections.php:43
-msgid "No connections."
+#: ../../mod/admin.php:419
+msgid "Tiered Access"
 msgstr ""
 
-#: ../../mod/viewconnections.php:55
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: ../../mod/admin.php:432 ../../mod/register.php:189
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/viewconnections.php:70
-msgid "View Connnections"
+#: ../../mod/admin.php:433
+msgid "File upload"
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../mod/admin.php:434
+msgid "Policies"
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../mod/admin.php:435
+msgid "Advanced"
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../mod/admin.php:439
+msgid "Site name"
 msgstr ""
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
-msgid "Remove"
+#: ../../mod/admin.php:440
+msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/connect.php:55 ../../mod/connect.php:103
-msgid "Continue"
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/connect.php:84
-msgid "Premium Channel Setup"
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
 
-#: ../../mod/connect.php:86
-msgid "Enable premium channel connection restrictions"
+#: ../../mod/admin.php:442
+msgid "System language"
 msgstr ""
 
-#: ../../mod/connect.php:87
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../mod/admin.php:443
+msgid "System theme"
 msgstr ""
 
-#: ../../mod/connect.php:89 ../../mod/connect.php:109
+#: ../../mod/admin.php:443
 msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+"Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr ""
 
-#: ../../mod/connect.php:90
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../mod/admin.php:444
+msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/connect.php:91 ../../mod/connect.php:112
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
+#: ../../mod/admin.php:444
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/connect.php:100
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../mod/admin.php:445
+msgid "Accessibility system theme"
 msgstr ""
 
-#: ../../mod/connect.php:108
-msgid "Restricted or Premium Channel"
+#: ../../mod/admin.php:445
+msgid "Accessibility theme"
 msgstr ""
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
+#: ../../mod/admin.php:446
+msgid "Channel to use for this website's static pages"
 msgstr ""
 
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
+#: ../../mod/admin.php:446
+msgid "Site Channel"
 msgstr ""
 
-#: ../../mod/delegate.php:123
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
+#: ../../mod/admin.php:448
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
+#: ../../mod/admin.php:448
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
+#: ../../mod/admin.php:449
+msgid "Register policy"
 msgstr ""
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
+#: ../../mod/admin.php:450
+msgid "Access policy"
 msgstr ""
 
-#: ../../mod/delegate.php:131
-msgid "Add"
+#: ../../mod/admin.php:451
+msgid "Register text"
 msgstr ""
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
+#: ../../mod/admin.php:451
+msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/chatsvc.php:102
-msgid "Away"
+#: ../../mod/admin.php:452
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/chatsvc.php:106
-msgid "Online"
+#: ../../mod/admin.php:452
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
+#: ../../mod/admin.php:453
+msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
+#: ../../mod/admin.php:453
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
+#: ../../mod/admin.php:454
+msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
+#: ../../mod/admin.php:454
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
 msgstr ""
 
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
+#: ../../mod/admin.php:455
+msgid "Block public"
 msgstr ""
 
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
+#: ../../mod/admin.php:455
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
+#: ../../mod/admin.php:456
+msgid "Force publish"
 msgstr ""
 
-#: ../../mod/mitem.php:102
-msgid "Edit element"
+#: ../../mod/admin.php:456
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/mitem.php:103
-msgid "Drop element"
+#: ../../mod/admin.php:457
+msgid "No login on Homepage"
 msgstr ""
 
-#: ../../mod/mitem.php:104
-msgid "New element"
+#: ../../mod/admin.php:457
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
 msgstr ""
 
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
+#: ../../mod/admin.php:459
+msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
+#: ../../mod/admin.php:460
+msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
+#: ../../mod/admin.php:461
+msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
+#: ../../mod/admin.php:461
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
+#: ../../mod/admin.php:462
+msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
+#: ../../mod/admin.php:462
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
 msgstr ""
 
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
+#: ../../mod/admin.php:463
+msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
+#: ../../mod/admin.php:463
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
+#: ../../mod/admin.php:464
+msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
+#: ../../mod/admin.php:464
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
+#: ../../mod/admin.php:520
+msgid "No server found"
 msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
+msgid "ID"
 msgstr ""
 
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
+#: ../../mod/admin.php:527
+msgid "for channel"
 msgstr ""
 
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
+#: ../../mod/admin.php:527
+msgid "on server"
 msgstr ""
 
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
+#: ../../mod/admin.php:527
+msgid "Status"
 msgstr ""
 
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
+#: ../../mod/admin.php:548
+msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/group.php:20
-msgid "Collection created."
+#: ../../mod/admin.php:558
+#, php-format
+msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/group.php:26
-msgid "Could not create collection."
+#: ../../mod/admin.php:561
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/group.php:54
-msgid "Collection updated."
+#: ../../mod/admin.php:565
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
+#: ../../mod/admin.php:568
+#, php-format
+msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
+#: ../../mod/admin.php:583
+msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
+#: ../../mod/admin.php:587
+msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/group.php:107
-msgid "Collection removed."
+#: ../../mod/admin.php:589
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
+#: ../../mod/admin.php:590
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr ""
+#: ../../mod/admin.php:616
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/group.php:196
-msgid "Members"
-msgstr ""
+#: ../../mod/admin.php:623
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
+#: ../../mod/admin.php:654
+msgid "Account not found"
 msgstr ""
 
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../mod/admin.php:665
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
+#: ../../mod/admin.php:739
+msgid "select all"
 msgstr ""
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
+#: ../../mod/admin.php:740
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
+#: ../../mod/admin.php:741
+msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:48
-msgid "Theme settings updated."
+#: ../../mod/admin.php:742
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:430
-msgid "Site"
+#: ../../mod/admin.php:743
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
-msgid "Users"
+#: ../../mod/admin.php:744
+msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
-msgid "Plugins"
+#: ../../mod/admin.php:746 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
 msgstr ""
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
-msgid "Themes"
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
 msgstr ""
 
-#: ../../mod/admin.php:92 ../../mod/admin.php:529
-msgid "Server"
+#: ../../mod/admin.php:750
+msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:93
-msgid "DB updates"
+#: ../../mod/admin.php:750
+msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
-msgid "Logs"
+#: ../../mod/admin.php:750
+msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:113
-msgid "Plugin Features"
+#: ../../mod/admin.php:750
+msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:115
-msgid "User registrations waiting for confirmation"
+#: ../../mod/admin.php:752
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:189
-msgid "Message queues"
+#: ../../mod/admin.php:753
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
-#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
-#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
-msgid "Administration"
+#: ../../mod/admin.php:794
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:195
-msgid "Summary"
+#: ../../mod/admin.php:798
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:197
-msgid "Registered users"
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
+msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:199 ../../mod/admin.php:532
-msgid "Pending registrations"
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
+msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:200
-msgid "Version"
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
+msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:202 ../../mod/admin.php:533
-msgid "Active plugins"
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
+msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:350
-msgid "Site settings updated."
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
+msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:381
-msgid "No special theme for accessibility"
+#: ../../mod/admin.php:974
+msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:409
-msgid "Closed"
+#: ../../mod/admin.php:1033
+msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:410
-msgid "Requires approval"
+#: ../../mod/admin.php:1081
+msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:411
-msgid "Open"
+#: ../../mod/admin.php:1082
+msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:416
-msgid "Private"
+#: ../../mod/admin.php:1109
+msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:417
-msgid "Paid Access"
+#: ../../mod/admin.php:1165
+msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:418
-msgid "Free Access"
+#: ../../mod/admin.php:1171
+msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:419
-msgid "Tiered Access"
+#: ../../mod/admin.php:1172
+msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:432 ../../mod/register.php:189
-msgid "Registration"
+#: ../../mod/admin.php:1172
+msgid ""
+"Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:433
-msgid "File upload"
+#: ../../mod/admin.php:1173
+msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:434
-msgid "Policies"
+#: ../../mod/filer.php:35
+msgid "- select -"
 msgstr ""
 
-#: ../../mod/admin.php:435
-msgid "Advanced"
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/admin.php:439
-msgid "Site name"
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/admin.php:440
-msgid "Banner/Logo"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../mod/admin.php:441
-msgid "Administrator Information"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
 msgstr ""
 
-#: ../../mod/admin.php:441
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/admin.php:442
-msgid "System language"
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/admin.php:443
-msgid "System theme"
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/admin.php:443
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/admin.php:444
-msgid "Mobile system theme"
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/admin.php:444
-msgid "Theme for mobile devices"
+#: ../../mod/directory.php:208
+msgid "Finding:"
 msgstr ""
 
-#: ../../mod/admin.php:445
-msgid "Accessibility system theme"
+#: ../../mod/directory.php:216
+msgid "next page"
 msgstr ""
 
-#: ../../mod/admin.php:445
-msgid "Accessibility theme"
+#: ../../mod/directory.php:216
+msgid "previous page"
 msgstr ""
 
-#: ../../mod/admin.php:446
-msgid "Channel to use for this website's static pages"
+#: ../../mod/directory.php:223
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/admin.php:446
-msgid "Site Channel"
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/admin.php:448
-msgid "Maximum image size"
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/admin.php:448
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/admin.php:449
-msgid "Register policy"
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/admin.php:450
-msgid "Access policy"
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/admin.php:451
-msgid "Register text"
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/admin.php:451
-msgid "Will be displayed prominently on the registration page."
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:452
-msgid "Accounts abandoned after x days"
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
 msgstr ""
 
-#: ../../mod/admin.php:452
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/admin.php:453
-msgid "Allowed friend domains"
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
 msgstr ""
 
-#: ../../mod/admin.php:453
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
 msgstr ""
 
-#: ../../mod/admin.php:454
-msgid "Allowed email domains"
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
 msgstr ""
 
-#: ../../mod/admin.php:454
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
 msgstr ""
 
-#: ../../mod/admin.php:455
-msgid "Block public"
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
 msgstr ""
 
-#: ../../mod/admin.php:455
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
 msgstr ""
 
-#: ../../mod/admin.php:456
-msgid "Force publish"
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
 msgstr ""
 
-#: ../../mod/admin.php:456
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
 msgstr ""
 
-#: ../../mod/admin.php:457
-msgid "No login on Homepage"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/admin.php:457
-msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/admin.php:459
-msgid "Proxy user"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/admin.php:460
-msgid "Proxy URL"
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/admin.php:461
-msgid "Network timeout"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/admin.php:461
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/admin.php:462
-msgid "Delivery interval"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
 msgstr ""
 
-#: ../../mod/admin.php:462
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
 msgstr ""
 
-#: ../../mod/admin.php:463
-msgid "Poll interval"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/admin.php:463
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid "Maximum Load Average"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: ../../mod/connedit.php:346
+msgid "Archive"
 msgstr ""
 
-#: ../../mod/admin.php:520
-msgid "No server found"
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
 msgstr ""
 
-#: ../../mod/admin.php:527 ../../mod/admin.php:750
-msgid "ID"
+#: ../../mod/connedit.php:352
+msgid "Unhide"
 msgstr ""
 
-#: ../../mod/admin.php:527
-msgid "for channel"
+#: ../../mod/connedit.php:352
+msgid "Hide"
 msgstr ""
 
-#: ../../mod/admin.php:527
-msgid "on server"
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
 msgstr ""
 
-#: ../../mod/admin.php:527
-msgid "Status"
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/admin.php:548
-msgid "Update has been marked successful"
+#: ../../mod/connedit.php:395
+msgid "Unknown"
 msgstr ""
 
-#: ../../mod/admin.php:558
-#, php-format
-msgid "Executing %s failed. Check system logs."
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/admin.php:561
-#, php-format
-msgid "Update %s was successfully applied."
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
 msgstr ""
 
-#: ../../mod/admin.php:568
+#: ../../mod/connedit.php:421
 #, php-format
-msgid "Update function %s could not be found."
+msgid "Connections: settings for %s"
 msgstr ""
 
-#: ../../mod/admin.php:583
-msgid "No failed updates."
+#: ../../mod/connedit.php:425
+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/admin.php:587
-msgid "Failed Updates"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/admin.php:589
-msgid "Mark success (if update was manually applied)"
+#: ../../mod/connedit.php:433
+msgid "inherited"
 msgstr ""
 
-#: ../../mod/admin.php:590
-msgid "Attempt to execute this update step automatically"
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
 msgstr ""
 
-#: ../../mod/admin.php:616
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/connedit.php:436
+msgid ""
+"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."
+msgstr ""
 
-#: ../../mod/admin.php:623
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
+msgstr ""
+
+#: ../../mod/connedit.php:439
 #, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
 
-#: ../../mod/admin.php:654
-msgid "Account not found"
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/admin.php:665
-#, php-format
-msgid "User '%s' deleted"
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' unblocked"
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' blocked"
+#: ../../mod/connedit.php:444
+msgid "My Settings"
 msgstr ""
 
-#: ../../mod/admin.php:739
-msgid "select all"
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
 msgstr ""
 
-#: ../../mod/admin.php:740
-msgid "User registrations waiting for confirm"
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
 msgstr ""
 
-#: ../../mod/admin.php:741
-msgid "Request date"
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
 msgstr ""
 
-#: ../../mod/admin.php:742
-msgid "No registrations."
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
 msgstr ""
 
-#: ../../mod/admin.php:743
-msgid "Approve"
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
 msgstr ""
 
-#: ../../mod/admin.php:744
-msgid "Deny"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/admin.php:746 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Block"
+#: ../../mod/connedit.php:452
+msgid ""
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than individual "
+"settings. Changing those inherited settings on this page will have no effect."
 msgstr ""
 
-#: ../../mod/admin.php:747 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Unblock"
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Register date"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Last login"
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Expires"
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Service Class"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/admin.php:752
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/admin.php:753
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../mod/connedit.php:462
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/admin.php:794
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/admin.php:798
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../mod/connedit.php:467
+msgid "Last update:"
 msgstr ""
 
-#: ../../mod/admin.php:808 ../../mod/admin.php:1010
-msgid "Disable"
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/admin.php:810 ../../mod/admin.php:1012
-msgid "Enable"
+#: ../../mod/connedit.php:471
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/admin.php:836 ../../mod/admin.php:1041
-msgid "Toggle"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/admin.php:844 ../../mod/admin.php:1051
-msgid "Author: "
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/admin.php:845 ../../mod/admin.php:1052
-msgid "Maintainer: "
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/admin.php:974
-msgid "No themes found."
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
 msgstr ""
 
-#: ../../mod/admin.php:1033
-msgid "Screenshot"
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/admin.php:1081
-msgid "[Experimental]"
+#: ../../mod/connedit.php:481
+msgid ""
+"Replies/likes to your public posts may still be visible"
 msgstr ""
 
-#: ../../mod/admin.php:1082
-msgid "[Unsupported]"
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
 msgstr ""
 
-#: ../../mod/admin.php:1109
-msgid "Log settings updated."
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
 msgstr ""
 
-#: ../../mod/admin.php:1165
-msgid "Clear"
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/admin.php:1171
-msgid "Debugging"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
 msgstr ""
 
-#: ../../mod/admin.php:1172
-msgid "Log file"
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/admin.php:1172
-msgid ""
-"Must be writable by web server. Relative to your Red top-level directory."
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
+msgstr ""
+
+#: ../../mod/rmagic.php:56
+msgid "Remote Authentication"
+msgstr ""
+
+#: ../../mod/rmagic.php:57
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr ""
+
+#: ../../mod/rmagic.php:58
+msgid "Authenticate"
+msgstr ""
+
+#: ../../mod/page.php:35
+msgid "Invalid item."
+msgstr ""
+
+#: ../../mod/network.php:79
+msgid "No such group"
+msgstr ""
+
+#: ../../mod/network.php:118
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr ""
+
+#: ../../mod/network.php:180
+msgid "Collection: "
 msgstr ""
 
-#: ../../mod/admin.php:1173
-msgid "Log level"
+#: ../../mod/network.php:193
+msgid "Connection: "
 msgstr ""
 
-#: ../../mod/filer.php:35
-msgid "- select -"
+#: ../../mod/network.php:196
+msgid "Invalid connection."
 msgstr ""
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/profiles.php:294
+msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/directory.php:143 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
+#: ../../mod/profiles.php:298
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
-msgid "Gender: "
+#: ../../mod/profiles.php:302
+msgid "Likes"
 msgstr ""
 
-#: ../../mod/directory.php:207
-msgid "Finding:"
+#: ../../mod/profiles.php:306
+msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/directory.php:215
-msgid "next page"
+#: ../../mod/profiles.php:310
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/directory.php:215
-msgid "previous page"
+#: ../../mod/profiles.php:313
+msgid "Religion"
 msgstr ""
 
-#: ../../mod/directory.php:222
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/profiles.php:317
+msgid "Political Views"
 msgstr ""
 
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
+#: ../../mod/profiles.php:321
+msgid "Gender"
 msgstr ""
 
-#: ../../mod/connedit.php:63 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
+#: ../../mod/profiles.php:325
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/connedit.php:107 ../../mod/connections.php:94
-msgid "Connection updated."
+#: ../../mod/profiles.php:329
+msgid "Homepage"
 msgstr ""
 
-#: ../../mod/connedit.php:109 ../../mod/connections.php:96
-msgid "Failed to update connection record."
+#: ../../mod/profiles.php:333
+msgid "Interests"
 msgstr ""
 
-#: ../../mod/connedit.php:204
-msgid "Could not access address book record."
+#: ../../mod/profiles.php:337
+msgid "Address"
 msgstr ""
 
-#: ../../mod/connedit.php:218
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
+msgid "Location"
 msgstr ""
 
-#: ../../mod/connedit.php:225
-msgid "Channel has been unblocked"
+#: ../../mod/profiles.php:427
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/connedit.php:226
-msgid "Channel has been blocked"
+#: ../../mod/profiles.php:482
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
-#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
-#: ../../mod/connedit.php:281
-msgid "Unable to set address book parameters."
+#: ../../mod/profiles.php:505
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/connedit.php:237
-msgid "Channel has been unignored"
+#: ../../mod/profiles.php:507
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/connedit.php:238
-msgid "Channel has been ignored"
+#: ../../mod/profiles.php:508
+msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/connedit.php:249
-msgid "Channel has been unarchived"
+#: ../../mod/profiles.php:509
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/connedit.php:250
-msgid "Channel has been archived"
+#: ../../mod/profiles.php:510
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/connedit.php:261
-msgid "Channel has been unhidden"
+#: ../../mod/profiles.php:511
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/connedit.php:262
-msgid "Channel has been hidden"
+#: ../../mod/profiles.php:512
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/connedit.php:276
-msgid "Channel has been approved"
+#: ../../mod/profiles.php:513
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/connedit.php:277
-msgid "Channel has been unapproved"
+#: ../../mod/profiles.php:514
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/connedit.php:295
-msgid "Contact has been removed."
+#: ../../mod/profiles.php:515
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/connedit.php:315
+#: ../../mod/profiles.php:516
 #, php-format
-msgid "View %s's profile"
-msgstr ""
-
-#: ../../mod/connedit.php:319
-msgid "Refresh Permissions"
+msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/connedit.php:322
-msgid "Fetch updated permissions"
+#: ../../mod/profiles.php:517
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/connedit.php:326
-msgid "Recent Activity"
+#: ../../mod/profiles.php:518
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/connedit.php:329
-msgid "View recent posts and comments"
+#: ../../mod/profiles.php:519
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/connedit.php:336
-msgid "Block or Unblock this connection"
+#: ../../mod/profiles.php:520
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-msgid "Unignore"
+#: ../../mod/profiles.php:521
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-#: ../../mod/notifications.php:51
-msgid "Ignore"
+#: ../../mod/profiles.php:522
+msgid "♥ Marital Status:"
 msgstr ""
 
-#: ../../mod/connedit.php:343
-msgid "Ignore or Unignore this connection"
+#: ../../mod/profiles.php:523
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/connedit.php:346
-msgid "Unarchive"
+#: ../../mod/profiles.php:524
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/connedit.php:346
-msgid "Archive"
+#: ../../mod/profiles.php:525
+msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/connedit.php:349
-msgid "Archive or Unarchive this connection"
+#: ../../mod/profiles.php:527
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/connedit.php:352
-msgid "Unhide"
+#: ../../mod/profiles.php:530
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/connedit.php:352
-msgid "Hide"
+#: ../../mod/profiles.php:531
+msgid "Keywords:"
 msgstr ""
 
-#: ../../mod/connedit.php:355
-msgid "Hide or Unhide this connection"
+#: ../../mod/profiles.php:534
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/connedit.php:362
-msgid "Delete this connection"
+#: ../../mod/profiles.php:535
+msgid "Used in directory listings"
 msgstr ""
 
-#: ../../mod/connedit.php:395
-msgid "Unknown"
+#: ../../mod/profiles.php:536
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
-msgid "Approve this connection"
+#: ../../mod/profiles.php:537
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/connedit.php:405
-msgid "Accept connection to allow communication"
+#: ../../mod/profiles.php:538
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/connedit.php:421
-msgid "Automatic Permissions Settings"
+#: ../../mod/profiles.php:539
+msgid "My other channels"
 msgstr ""
 
-#: ../../mod/connedit.php:421
-#, php-format
-msgid "Connections: settings for %s"
+#: ../../mod/profiles.php:540
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/connedit.php:425
-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."
+#: ../../mod/profiles.php:541
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/connedit.php:427
-msgid "Slide to adjust your degree of friendship"
+#: ../../mod/profiles.php:542
+msgid "Television"
 msgstr ""
 
-#: ../../mod/connedit.php:433
-msgid "inherited"
+#: ../../mod/profiles.php:543
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/connedit.php:435
-msgid "Connection has no individual permissions!"
+#: ../../mod/profiles.php:544
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/connedit.php:436
-msgid ""
-"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."
+#: ../../mod/profiles.php:545
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/connedit.php:438
-msgid "Profile Visibility"
+#: ../../mod/profiles.php:546
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/connedit.php:439
-#, php-format
+#: ../../mod/profiles.php:551
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"This is your public profile.
                                      It may "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/connedit.php:440
-msgid "Contact Information / Notes"
+#: ../../mod/profiles.php:600
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/connedit.php:441
-msgid "Edit contact notes"
+#: ../../mod/profiles.php:601
+msgid "Add profile things"
 msgstr ""
 
-#: ../../mod/connedit.php:443
-msgid "Their Settings"
+#: ../../mod/profiles.php:602
+msgid "Include desirable objects in your profile"
 msgstr ""
 
-#: ../../mod/connedit.php:444
-msgid "My Settings"
+#: ../../mod/follow.php:25
+msgid "Channel added."
 msgstr ""
 
-#: ../../mod/connedit.php:446
-msgid "Forum Members"
+#: ../../mod/post.php:226
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
 msgstr ""
 
-#: ../../mod/connedit.php:447
-msgid "Soapbox"
+#: ../../mod/post.php:256
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/connedit.php:448
-msgid "Full Sharing (typical social network permissions)"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../mod/connedit.php:449
-msgid "Cautious Sharing "
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../mod/connedit.php:450
-msgid "Follow Only"
+#: ../../mod/sources.php:45
+msgid "Source created."
 msgstr ""
 
-#: ../../mod/connedit.php:451
-msgid "Individual Permissions"
+#: ../../mod/sources.php:57
+msgid "Source updated."
 msgstr ""
 
-#: ../../mod/connedit.php:452
-msgid ""
-"Some permissions may be inherited from your channel                                       privacy settings, which have higher priority than individual "
-"settings. Changing those inherited settings on this page will have no effect."
+#: ../../mod/sources.php:82
+msgid "*"
 msgstr ""
 
-#: ../../mod/connedit.php:453
-msgid "Advanced Permissions"
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../mod/connedit.php:454
-msgid "Simple Permissions (select one and submit)"
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
 msgstr ""
 
-#: ../../mod/connedit.php:458
-#, php-format
-msgid "Visit %s's profile - %s"
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../mod/connedit.php:459
-msgid "Block/Unblock contact"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../mod/connedit.php:460
-msgid "Ignore contact"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../mod/connedit.php:461
-msgid "Repair URL settings"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
 msgstr ""
 
-#: ../../mod/connedit.php:462
-msgid "View conversations"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
 msgstr ""
 
-#: ../../mod/connedit.php:464
-msgid "Delete contact"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
 msgstr ""
 
-#: ../../mod/connedit.php:467
-msgid "Last update:"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
 msgstr ""
 
-#: ../../mod/connedit.php:469
-msgid "Update public posts"
+#: ../../mod/sources.php:158
+msgid "Source removed"
 msgstr ""
 
-#: ../../mod/connedit.php:471
-msgid "Update now"
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
 msgstr ""
 
-#: ../../mod/connedit.php:477
-msgid "Currently blocked"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/connedit.php:478
-msgid "Currently ignored"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/connedit.php:479
-msgid "Currently archived"
+#: ../../mod/magic.php:70
+msgid "Hub not found."
 msgstr ""
 
-#: ../../mod/connedit.php:480
-msgid "Currently pending"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
 msgstr ""
 
-#: ../../mod/connedit.php:481
-msgid "Hide this contact from others"
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/connedit.php:481
+#: ../../mod/setup.php:171
 msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr ""
-
-#: ../../mod/layouts.php:52
-msgid "Layout Help"
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../mod/layouts.php:55
-msgid "Help with this feature"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/layouts.php:74
-msgid "Layout Name"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
-msgid "Help:"
+#: ../../mod/setup.php:187
+msgid ""
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
 msgstr ""
 
-#: ../../mod/help.php:68 ../../index.php:223
-msgid "Not Found"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
+#: ../../mod/setup.php:254
+msgid "System check"
 msgstr ""
 
-#: ../../mod/rmagic.php:56
-msgid "Remote Authentication"
+#: ../../mod/setup.php:259
+msgid "Check again"
 msgstr ""
 
-#: ../../mod/rmagic.php:57
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../mod/setup.php:281
+msgid "Database connection"
 msgstr ""
 
-#: ../../mod/rmagic.php:58
-msgid "Authenticate"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/network.php:79
-msgid "No such group"
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
 msgstr ""
 
-#: ../../mod/network.php:180
-msgid "Collection: "
+#: ../../mod/setup.php:289
+msgid "Database Port"
 msgstr ""
 
-#: ../../mod/network.php:193
-msgid "Connection: "
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
-msgid "Profile not found."
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
+#: ../../mod/setup.php:292
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
 msgstr ""
 
-#: ../../mod/profiles.php:178
-msgid "Profile Name is required."
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../mod/profiles.php:294
-msgid "Marital Status"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/profiles.php:298
-msgid "Romantic Partner"
+#: ../../mod/setup.php:325
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/profiles.php:302
-msgid "Likes"
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/profiles.php:306
-msgid "Dislikes"
+#: ../../mod/setup.php:385
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../mod/profiles.php:310
-msgid "Work/Employment"
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/profiles.php:313
-msgid "Religion"
+#: ../../mod/setup.php:389
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../mod/profiles.php:317
-msgid "Political Views"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/profiles.php:321
-msgid "Gender"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/profiles.php:325
-msgid "Sexual Preference"
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/profiles.php:329
-msgid "Homepage"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/profiles.php:333
-msgid "Interests"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/profiles.php:337
-msgid "Address"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
-msgid "Location"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/profiles.php:427
-msgid "Profile updated."
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/profiles.php:482
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/profiles.php:505
-msgid "Edit Profile Details"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/profiles.php:507
-msgid "View this profile"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/profiles.php:508
-msgid "Change Profile Photo"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/profiles.php:509
-msgid "Create a new profile using these settings"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
 msgstr ""
 
-#: ../../mod/profiles.php:510
-msgid "Clone this profile"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/profiles.php:511
-msgid "Delete this profile"
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:512
-msgid "Profile Name:"
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
 msgstr ""
 
-#: ../../mod/profiles.php:513
-msgid "Your Full Name:"
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
 
-#: ../../mod/profiles.php:514
-msgid "Title/Description:"
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:515
-msgid "Your Gender:"
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:516
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:517
-msgid "Street Address:"
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:518
-msgid "Locality/City:"
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:519
-msgid "Postal/Zip Code:"
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:520
-msgid "Country:"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/profiles.php:521
-msgid "Region/State:"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/profiles.php:522
-msgid "♥ Marital Status:"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../mod/profiles.php:523
-msgid "Who: (if applicable)"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:524
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/profiles.php:525
-msgid "Since [date]:"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/profiles.php:527
-msgid "Homepage URL:"
+#: ../../mod/setup.php:514
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
 msgstr ""
 
-#: ../../mod/profiles.php:530
-msgid "Religious Views:"
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../mod/profiles.php:531
-msgid "Keywords:"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../mod/profiles.php:534
-msgid "Example: fishing photography software"
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
 msgstr ""
 
-#: ../../mod/profiles.php:535
-msgid "Used in directory listings"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to "
+"have write access to the store directory under the Red top level folder"
 msgstr ""
 
-#: ../../mod/profiles.php:536
-msgid "Tell us about yourself..."
+#: ../../mod/setup.php:536
+msgid "store is writable"
 msgstr ""
 
-#: ../../mod/profiles.php:537
-msgid "Hobbies/Interests"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../mod/profiles.php:538
-msgid "Contact information and Social Networks"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../mod/profiles.php:539
-msgid "My other channels"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: ../../mod/profiles.php:540
-msgid "Musical interests"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/profiles.php:541
-msgid "Books, literature"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/profiles.php:542
-msgid "Television"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/profiles.php:543
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
 msgstr ""
 
-#: ../../mod/profiles.php:544
-msgid "Love/romance"
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/profiles.php:545
-msgid "Work/employment"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
 msgstr ""
 
-#: ../../mod/profiles.php:546
-msgid "School/education"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/profiles.php:551
-msgid ""
-"This is your public profile.
                                      It may "
-"be visible to anybody using the internet."
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/profiles.php:600
-msgid "Edit/Manage Profiles"
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
 msgstr ""
 
-#: ../../mod/profiles.php:601
-msgid "Add profile things"
+#: ../../mod/siteinfo.php:94
+msgid ""
+"
                                      The Red Matrix is provided for you by volunteers working in their spare "
+"time. Your support will help us to build a better web. Select the following "
+"option for a one-time donation of your choosing
                                      "
 msgstr ""
 
-#: ../../mod/profiles.php:602
-msgid "Include desirable objects in your profile"
+#: ../../mod/siteinfo.php:95
+msgid "
                                      or
                                      "
 msgstr ""
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
 msgstr ""
 
-#: ../../mod/post.php:226
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+#: ../../mod/siteinfo.php:115
+msgid "Red"
 msgstr ""
 
-#: ../../mod/post.php:256
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
+#: ../../mod/siteinfo.php:116
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
 msgstr ""
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
+#: ../../mod/siteinfo.php:119
+msgid "Running at web location"
 msgstr ""
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
+#: ../../mod/siteinfo.php:120
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
 msgstr ""
 
-#: ../../mod/sources.php:45
-msgid "Source created."
+#: ../../mod/siteinfo.php:121
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/sources.php:57
-msgid "Source updated."
+#: ../../mod/siteinfo.php:124
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../mod/sources.php:82
-msgid "*"
+#: ../../mod/siteinfo.php:126
+msgid "Site Administrators"
 msgstr ""
 
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
 msgstr ""
 
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used "
+"to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
 msgstr ""
 
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
+#: ../../mod/new_channel.php:111
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\" "
 msgstr ""
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
 msgstr ""
 
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
+#: ../../mod/new_channel.php:114
+msgid ""
+"Or import an existing channel from another location"
 msgstr ""
 
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/sources.php:130
-msgid "Edit Source"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/sources.php:131
-msgid "Delete Source"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
+#: ../../mod/lostpass.php:85 ../../boot.php:1434
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/setup.php:171
+#: ../../mod/lostpass.php:90
 msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+"Your password may be changed from the Settings page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
 msgstr ""
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/setup.php:187
+#: ../../mod/lostpass.php:123
 msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
 msgstr ""
 
-#: ../../mod/setup.php:254
-msgid "System check"
+#: ../../mod/lostpass.php:125
+msgid "Reset"
 msgstr ""
 
-#: ../../mod/setup.php:259
-msgid "Check again"
+#: ../../mod/settings.php:71
+msgid "Name is required"
 msgstr ""
 
-#: ../../mod/setup.php:281
-msgid "Database connection"
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/setup.php:282
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
 msgstr ""
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/setup.php:284
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
+#: ../../mod/settings.php:212
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
+#: ../../mod/settings.php:228
+msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
+#: ../../mod/settings.php:240
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
+#: ../../mod/settings.php:444
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
 msgstr ""
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
 msgstr ""
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: ../../mod/settings.php:518
+msgid "Name of application"
 msgstr ""
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
 msgstr ""
 
-#: ../../mod/setup.php:384
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/setup.php:385
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/setup.php:389
-msgid "PHP executable path"
+#: ../../mod/settings.php:522
+msgid "Optional"
 msgstr ""
 
-#: ../../mod/setup.php:389
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/setup.php:394
-msgid "Command line PHP"
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/setup.php:403
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/setup.php:404
-msgid "This is required for message delivery to work."
+#: ../../mod/settings.php:581
+msgid "No name"
 msgstr ""
 
-#: ../../mod/setup.php:406
-msgid "PHP register_argc_argv"
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/setup.php:427
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/setup.php:428
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/setup.php:430
-msgid "Generate encryption keys"
+#: ../../mod/settings.php:624
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/setup.php:437
-msgid "libCurl PHP module"
+#: ../../mod/settings.php:625
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/setup.php:438
-msgid "GD graphics PHP module"
+#: ../../mod/settings.php:626
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/setup.php:439
-msgid "OpenSSL PHP module"
+#: ../../mod/settings.php:627
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/setup.php:440
-msgid "mysqli PHP module"
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/setup.php:441
-msgid "mb_string PHP module"
+#: ../../mod/settings.php:629 ../../mod/settings.php:925
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/setup.php:442
-msgid "mcrypt PHP module"
+#: ../../mod/settings.php:630
+msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/setup.php:447 ../../mod/setup.php:449
-msgid "Apache mod_rewrite module"
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/setup.php:447
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/settings.php:647
+msgid "Off"
+msgstr ""
+
+#: ../../mod/settings.php:647
+msgid "On"
 msgstr ""
 
-#: ../../mod/setup.php:453 ../../mod/setup.php:456
-msgid "proc_open"
+#: ../../mod/settings.php:654
+msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/setup.php:453
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/setup.php:461
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/settings.php:750
+msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/setup.php:465
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/setup.php:469
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/setup.php:473
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/setup.php:477
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/setup.php:481
-msgid "Error: mcrypt PHP module required but not installed."
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/setup.php:497
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/setup.php:498
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/setup.php:499
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
+#: ../../mod/settings.php:761
+msgid "View remote profiles as webpages"
 msgstr ""
 
-#: ../../mod/setup.php:500
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
 msgstr ""
 
-#: ../../mod/setup.php:503
-msgid ".htconfig.php is writable"
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/setup.php:513
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/setup.php:514
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
 msgstr ""
 
-#: ../../mod/setup.php:515 ../../mod/setup.php:533
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/setup.php:516
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/setup.php:519
-msgid "view/tpl/smarty3 is writable"
+#: ../../mod/settings.php:801
+msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/setup.php:532
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to "
-"have write access to the store directory under the Red top level folder"
+#: ../../mod/settings.php:878
+msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/setup.php:536
-msgid "store is writable"
+#: ../../mod/settings.php:883
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/setup.php:551
-msgid "SSL certificate validation"
+#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288
+msgid "or"
 msgstr ""
 
-#: ../../mod/setup.php:551
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../mod/settings.php:892
+msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/setup.php:558
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+#: ../../mod/settings.php:914
+msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/setup.php:560
-msgid "Url rewrite is working"
+#: ../../mod/settings.php:923
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/setup.php:570
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
+#: ../../mod/settings.php:926
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/setup.php:594
-msgid "Errors encountered creating database tables."
+#: ../../mod/settings.php:927
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/setup.php:607
-msgid "
                                      What next
                                      "
+#: ../../mod/settings.php:928
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/setup.php:608
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/settings.php:930
+msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
+#: ../../mod/settings.php:930
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
+#: ../../mod/settings.php:932
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
+#: ../../mod/settings.php:934
+msgid "Hide my online presence"
 msgstr ""
 
-#: ../../mod/siteinfo.php:109
-msgid "Red"
+#: ../../mod/settings.php:934
+msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../mod/siteinfo.php:110
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
+#: ../../mod/settings.php:936
+msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/siteinfo.php:113
-msgid "Running at web location"
+#: ../../mod/settings.php:937
+msgid ""
+"Very Public - extremely permissive (should be used with caution)"
 msgstr ""
 
-#: ../../mod/siteinfo.php:114
+#: ../../mod/settings.php:938
 msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
 msgstr ""
 
-#: ../../mod/siteinfo.php:115
-msgid "Bug reports and issues: please visit"
+#: ../../mod/settings.php:939
+msgid "Private - default private, never open or public"
 msgstr ""
 
-#: ../../mod/siteinfo.php:118
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+#: ../../mod/settings.php:940
+msgid "Blocked - default blocked to/from everybody"
 msgstr ""
 
-#: ../../mod/siteinfo.php:120
-msgid "Site Administrators"
+#: ../../mod/settings.php:943
+msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
+#: ../../mod/settings.php:945
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/new_channel.php:108
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used "
-"to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
+#: ../../mod/settings.php:945
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/new_channel.php:111
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\" "
+#: ../../mod/settings.php:946
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
+#: ../../mod/settings.php:958
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
+#: ../../mod/settings.php:958
+msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/new_channel.php:114
-msgid ""
-"Or import an existing channel from another location"
+#: ../../mod/settings.php:961
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
+#: ../../mod/settings.php:962
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
+#: ../../mod/settings.php:963
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
+#: ../../mod/settings.php:964
+msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/settings.php:965
+msgid "making an interesting profile change"
 msgstr ""
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../mod/settings.php:966
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1434
-msgid "Password Reset"
+#: ../../mod/settings.php:967
+msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
+#: ../../mod/settings.php:968
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
+#: ../../mod/settings.php:969
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
+#: ../../mod/settings.php:970
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
+#: ../../mod/settings.php:971
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/lostpass.php:90
-msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
+#: ../../mod/settings.php:972
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
+#: ../../mod/settings.php:973
+msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
+#: ../../mod/settings.php:974
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/settings.php:977
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
+#: ../../mod/settings.php:978
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
+#: ../../mod/settings.php:981
+msgid ""
+"Please enable expert mode (in Settings > Additional features) to adjust!"
 msgstr ""
 
 #: ../../mod/import.php:36
@@ -6659,8 +6698,8 @@ msgstr ""
 msgid "Edit file permissions"
 msgstr ""
 
-#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
-#: ../../mod/photos.php:946
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:607
+#: ../../mod/photos.php:950
 msgid "Permissions"
 msgstr ""
 
@@ -6853,122 +6892,122 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:119 ../../mod/photos.php:668
+#: ../../mod/photos.php:119 ../../mod/photos.php:672
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:951
+#: ../../mod/photos.php:159 ../../mod/photos.php:955
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:452
+#: ../../mod/photos.php:453
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:499
+#: ../../mod/photos.php:500
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:573
+#: ../../mod/photos.php:577
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:576
+#: ../../mod/photos.php:580
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:595
+#: ../../mod/photos.php:599
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:599 ../../mod/photos.php:663
+#: ../../mod/photos.php:603 ../../mod/photos.php:667
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:600
+#: ../../mod/photos.php:604
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:601
+#: ../../mod/photos.php:605
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
-#: ../../mod/photos.php:1138
+#: ../../mod/photos.php:656 ../../mod/photos.php:678 ../../mod/photos.php:1127
+#: ../../mod/photos.php:1142
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:678
+#: ../../mod/photos.php:682
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:684
+#: ../../mod/photos.php:688
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:686
+#: ../../mod/photos.php:690
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+#: ../../mod/photos.php:733 ../../mod/photos.php:1174
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:775
+#: ../../mod/photos.php:779
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:777
+#: ../../mod/photos.php:781
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:837
+#: ../../mod/photos.php:841
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:861
+#: ../../mod/photos.php:865
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:935
+#: ../../mod/photos.php:939
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:937
+#: ../../mod/photos.php:941
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:938
+#: ../../mod/photos.php:942
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:940
+#: ../../mod/photos.php:944
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:943
+#: ../../mod/photos.php:947
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:945
+#: ../../mod/photos.php:949
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:948
+#: ../../mod/photos.php:952
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1105
 msgid "In This Photo:"
 msgstr ""
 
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1180
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1189
 msgid "Recent Photos"
 msgstr ""
 
diff --git a/version.inc b/version.inc
index 9aeb9dda6..b73d1c3e6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-13.587
+2014-02-14.588
-- 
cgit v1.2.3


From d9e4f634665ec4da69b5af230f45f2a0e9688a1b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 14 Feb 2014 13:15:02 -0800
Subject: preserve attachments when editing a post

---
 mod/editpost.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mod/editpost.php b/mod/editpost.php
index 918a70d36..8c4117e7a 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -92,6 +92,15 @@ function editpost_content(&$a) {
 
 	}
 
+	if($itm[0]['attach']) {
+		$j = json_decode($itm[0]['attach'],true);
+		if($j) {
+			foreach($j as $jj) {
+				$itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
+			}
+		}
+	}
+
 	$cipher = get_pconfig(get_app()->profile['profile_uid'],'system','default_cipher');
 	if(! $cipher)
 		$cipher = 'aes256';
-- 
cgit v1.2.3


From 53d6d4c6556fe85a05ef6945d2ebc327e82cb3fb Mon Sep 17 00:00:00 2001
From: Klaus 
Date: Sat, 15 Feb 2014 21:48:40 +0100
Subject: Fix call to asset icons in RedBrowser.

RedBrowser was not displaying asset icons correctly, because the URL was wrong.
---
 include/reddav.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/reddav.php b/include/reddav.php
index a8d6739f0..cb2aa3bb9 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -1064,5 +1064,15 @@ class RedBrowser extends DAV\Browser\Plugin {
 
     }
 
+    /**
+     * This method takes a path/name of an asset and turns it into url
+     * suiteable for http access.
+     *
+     * @param string $assetName
+     * @return string
+     */
+    protected function getAssetUrl($assetName) {
+        return '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
+    }
 
 }
-- 
cgit v1.2.3


From 01f31c2f2060a925c22b3f92e841d4f951d1825c Mon Sep 17 00:00:00 2001
From: Klaus 
Date: Sat, 15 Feb 2014 22:25:14 +0100
Subject: Make asset icons work in subdir installs as well.

This should be the right way I guess, especially if red# is installed in a subdirectory. (untested)
---
 include/reddav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/reddav.php b/include/reddav.php
index cb2aa3bb9..6182aeacd 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -1072,7 +1072,7 @@ class RedBrowser extends DAV\Browser\Plugin {
      * @return string
      */
     protected function getAssetUrl($assetName) {
-        return '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
+        return z_root() .'/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
     }
 
 }
-- 
cgit v1.2.3


From 06680e504a0cf43da43b50cc14b752f11101a8c2 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff 
Date: Sun, 16 Feb 2014 08:18:43 +0100
Subject: DE: update to the strings

---
 view/de/messages.po | 4995 ++++++++++++++++++++++++++-------------------------
 view/de/strings.php |  941 +++++-----
 2 files changed, 2992 insertions(+), 2944 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 9116932b7..7acbdcdd2 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 00:03-0800\n"
-"PO-Revision-Date: 2014-02-12 07:57+0000\n"
+"POT-Creation-Date: 2014-02-14 00:02-0800\n"
+"PO-Revision-Date: 2014-02-16 07:16+0000\n"
 "Last-Translator: bavatar \n"
 "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,172 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr "Kategorien"
+
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:184 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr "Verbinden"
+
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
+
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
+msgstr "Vorschläge"
+
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr "Mehr anzeigen …"
+
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
+
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
+
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr "Adresse des Kanals eingeben"
+
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../../include/widgets.php:173 ../../include/text.php:754
+#: ../../include/text.php:768 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr "Eintrag löschen"
+
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
+msgstr "Gesicherte Suchanfragen"
+
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
+msgstr "hinzufügen"
+
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Gesicherte Ordner"
+
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/widgets.php:318 ../../include/items.php:3636
+msgid "Archives"
+msgstr "Archive"
+
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
+msgstr "Ich"
+
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
+msgstr "Beste Freunde"
+
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
+msgid "Friends"
+msgstr "Freunde"
+
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr "Kollegen"
+
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
+msgstr "ehem. Freunde"
+
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
+msgstr "Bekannte"
+
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr "Jeder"
+
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
+
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
+
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
+
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr "Funktions-Einstellungen"
+
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr "Verbundene Apps"
+
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr "Kanal exportieren"
+
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr "Automatische Berechtigungen (Erweitert)"
+
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
+
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanal-Quellen"
+
+#: ../../include/widgets.php:487 ../../include/nav.php:181
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr "E-Mails abrufen"
+
+#: ../../include/widgets.php:509 ../../include/nav.php:172
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Chaträume"
+
 #: ../../include/acl_selectors.php:235
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
@@ -121,7 +287,7 @@ msgstr "Chat"
 
 #: ../../include/nav.php:81
 msgid "Your chatrooms"
-msgstr "Deine Chat-Räume"
+msgstr "Deine Chaträume"
 
 #: ../../include/nav.php:82 ../../include/nav.php:175
 #: ../../include/conversation.php:1506 ../../mod/events.php:354
@@ -130,7 +296,7 @@ msgstr "Veranstaltungen"
 
 #: ../../include/nav.php:82
 msgid "Your events"
-msgstr "Deine Veransctaltungen"
+msgstr "Deine Veranstaltungen"
 
 #: ../../include/nav.php:83 ../../include/conversation.php:1514
 msgid "Bookmarks"
@@ -163,7 +329,7 @@ msgstr "%s - Klick zum Abmelden"
 
 #: ../../include/nav.php:111
 msgid "Click to authenticate to your home hub"
-msgstr "Klick zum Authentifizieren bei Deinem Heimat-Hub"
+msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
 
 #: ../../include/nav.php:125
 msgid "Home Page"
@@ -202,7 +368,7 @@ msgstr "Suche"
 msgid "Search site content"
 msgstr "Durchsuche Seiten-Inhalt"
 
-#: ../../include/nav.php:142 ../../mod/directory.php:210
+#: ../../include/nav.php:142 ../../mod/directory.php:211
 msgid "Directory"
 msgstr "Verzeichnis"
 
@@ -282,10 +448,6 @@ msgstr "Eingang"
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../../include/nav.php:172 ../../include/widgets.php:509
-msgid "New Message"
-msgstr "Neue Nachricht"
-
 #: ../../include/nav.php:175
 msgid "Event Calendar"
 msgstr "Veranstaltungskalender"
@@ -306,11 +468,6 @@ msgstr "Kanal-Auswahl"
 msgid "Manage Your Channels"
 msgstr "Verwalte Deine Kanäle"
 
-#: ../../include/nav.php:181 ../../include/widgets.php:487
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: ../../include/nav.php:181
 msgid "Account/Channel Settings"
 msgstr "Konto-/Kanal-Einstellungen"
@@ -321,7 +478,7 @@ msgstr "Verbindungen"
 
 #: ../../include/nav.php:183
 msgid "Manage/Edit Friends and Connections"
-msgstr "Verwalte/Bearbeite Freunde und Verbindungen"
+msgstr "Freunde und Verbindungen verwalten"
 
 #: ../../include/nav.php:190 ../../mod/admin.php:112
 msgid "Admin"
@@ -376,12 +533,7 @@ msgstr[1] "%d Verbindungen"
 
 #: ../../include/text.php:693
 msgid "View Connections"
-msgstr "Zeige Verbindungen"
-
-#: ../../include/text.php:754 ../../include/text.php:768
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Speichern"
+msgstr "Verbindungen anzeigen"
 
 #: ../../include/text.php:834
 msgid "poke"
@@ -613,7 +765,7 @@ msgstr "Link zum Originalbeitrag"
 
 #: ../../include/text.php:1436
 msgid "Select a page layout: "
-msgstr "Ein Seiten-Layout auswählen"
+msgstr "Ein Seiten-Layout auswählen:"
 
 #: ../../include/text.php:1439 ../../include/text.php:1504
 msgid "default"
@@ -621,7 +773,7 @@ msgstr "Standard"
 
 #: ../../include/text.php:1475
 msgid "Page content type: "
-msgstr "Content-Typ der Seite"
+msgstr "Content-Typ der Seite:"
 
 #: ../../include/text.php:1516
 msgid "Select an alternate language"
@@ -671,189 +823,68 @@ msgstr "Layouts"
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
-msgstr "Kategorien"
-
-#: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
-#: ../../mod/directory.php:183 ../../mod/match.php:62
-#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
-msgid "Connect"
-msgstr "Verbinden"
-
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
+#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
+#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
+#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
+#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
+#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
+#: ../../include/bbcode.php:633
+msgid "Image/photo"
+msgstr "Bild/Foto"
 
-#: ../../include/widgets.php:123 ../../mod/connections.php:238
-msgid "Suggestions"
-msgstr "Vorschläge"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/widgets.php:124
-msgid "See more..."
-msgstr "Mehr anzeigen..."
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR-Code"
 
-#: ../../include/widgets.php:146
+#: ../../include/bbcode.php:213
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "Beitrag"
 
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
-msgstr "Adresse des Kanals eingeben"
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
 
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+#: ../../include/Contact.php:120
+msgid "New window"
+msgstr "Neues Fenster"
 
-#: ../../include/widgets.php:171
-msgid "Notes"
-msgstr "Notizen"
+#: ../../include/Contact.php:121
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
 
-#: ../../include/widgets.php:243
-msgid "Remove term"
-msgstr "Eintrag löschen"
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr "Allgemeine Funktionen"
 
-#: ../../include/widgets.php:252 ../../include/features.php:52
-msgid "Saved Searches"
-msgstr "Gesicherte Suchanfragen"
+#: ../../include/features.php:25
+msgid "Content Expiration"
+msgstr "Verfall von Inhalten"
 
-#: ../../include/widgets.php:253 ../../include/group.php:290
-msgid "add"
-msgstr "hinzufügen"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
 
-#: ../../include/widgets.php:283 ../../include/features.php:66
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
-msgstr "Gesicherte Ordner"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
+msgstr "Mehrfachprofile"
 
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
-msgstr "Alles"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
+msgstr "Mehrfachprofile anlegen können"
 
-#: ../../include/widgets.php:318 ../../include/items.php:3613
-msgid "Archives"
-msgstr "Archive"
-
-#: ../../include/widgets.php:370
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-#: ../../include/widgets.php:371 ../../mod/connedit.php:389
-msgid "Me"
-msgstr "Ich"
-
-#: ../../include/widgets.php:372 ../../mod/connedit.php:391
-msgid "Best Friends"
-msgstr "Beste Freunde"
-
-#: ../../include/widgets.php:373 ../../include/identity.php:310
-#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
-msgid "Friends"
-msgstr "Freunde"
-
-#: ../../include/widgets.php:374
-msgid "Co-workers"
-msgstr "Kollegen"
-
-#: ../../include/widgets.php:375 ../../mod/connedit.php:393
-msgid "Former Friends"
-msgstr "ehem. Freunde"
-
-#: ../../include/widgets.php:376 ../../mod/connedit.php:394
-msgid "Acquaintances"
-msgstr "Bekanntschaften"
-
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr "Jeder"
-
-#: ../../include/widgets.php:409
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
-
-#: ../../include/widgets.php:415
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
-
-#: ../../include/widgets.php:421
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
-
-#: ../../include/widgets.php:427
-msgid "Feature settings"
-msgstr "Funktions-Einstellungen"
-
-#: ../../include/widgets.php:433
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../include/widgets.php:439
-msgid "Connected apps"
-msgstr "Verbundene Apps"
-
-#: ../../include/widgets.php:445
-msgid "Export channel"
-msgstr "Kanal exportieren"
-
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
-msgstr "Automatische Berechtigungen (Erweitert)"
-
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
-msgstr "Prämium-Kanal Einstellungen"
-
-#: ../../include/widgets.php:476 ../../include/features.php:43
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanal Quellen"
-
-#: ../../include/widgets.php:504
-msgid "Check Mail"
-msgstr "E-Mails abrufen"
-
-#: ../../include/widgets.php:585
-msgid "Chat Rooms"
-msgstr "Chaträume"
-
-#: ../../include/Contact.php:120
-msgid "New window"
-msgstr "Neues Fenster"
-
-#: ../../include/Contact.php:121
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
-
-#: ../../include/features.php:23
-msgid "General Features"
-msgstr "Allgemeine Funktionen"
-
-#: ../../include/features.php:25
-msgid "Content Expiration"
-msgstr "Verfall von Inhalten"
-
-#: ../../include/features.php:25
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
-
-#: ../../include/features.php:26
-msgid "Multiple Profiles"
-msgstr "Mehrfachprofile"
-
-#: ../../include/features.php:26
-msgid "Ability to create multiple profiles"
-msgstr "Mehrfachprofile anlegen können"
-
-#: ../../include/features.php:27
-msgid "Web Pages"
-msgstr "Webseiten"
+#: ../../include/features.php:27
+msgid "Web Pages"
+msgstr "Webseiten"
 
 #: ../../include/features.php:27
 msgid "Provide managed web pages on your channel"
@@ -861,7 +892,7 @@ msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
 
 #: ../../include/features.php:28
 msgid "Private Notes"
-msgstr "private Notizen"
+msgstr "Private Notizen"
 
 #: ../../include/features.php:28
 msgid "Enables a tool to store notes and reminders"
@@ -875,7 +906,7 @@ msgstr "Erweitertes Teilen von Identitäten"
 msgid ""
 "Share your identity with all websites on the internet. When disabled, "
 "identity is only shared with sites in the matrix."
-msgstr "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt."
+msgstr "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt."
 
 #: ../../include/features.php:34
 msgid "Expert Mode"
@@ -883,7 +914,7 @@ msgstr "Expertenmodus"
 
 #: ../../include/features.php:34
 msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen"
+msgstr "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren"
 
 #: ../../include/features.php:35
 msgid "Premium Channel"
@@ -893,7 +924,7 @@ msgstr "Premium-Kanal"
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
-msgstr "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen"
+msgstr "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals"
 
 #: ../../include/features.php:40
 msgid "Post Composition Features"
@@ -917,7 +948,7 @@ msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
 
 #: ../../include/features.php:43
 msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."
+msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds"
 
 #: ../../include/features.php:44
 msgid "Even More Encryption"
@@ -978,7 +1009,7 @@ msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
 
 #: ../../include/features.php:56
 msgid "Suggest Channels"
-msgstr "Kanäle Vorschlagen"
+msgstr "Kanäle vorschlagen"
 
 #: ../../include/features.php:56
 msgid "Show channel suggestions"
@@ -1022,7 +1053,7 @@ msgstr "Gefällt-mir-nicht Beiträge"
 
 #: ../../include/features.php:67
 msgid "Ability to dislike posts/comments"
-msgstr "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"
+msgstr "„Gefällt mir nicht“ ermöglichen"
 
 #: ../../include/features.php:68
 msgid "Star Posts"
@@ -1034,11 +1065,11 @@ msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
 
 #: ../../include/features.php:69
 msgid "Tag Cloud"
-msgstr "Tag Wolke"
+msgstr "Schlagwort-Wolke"
 
 #: ../../include/features.php:69
 msgid "Provide a personal tag cloud on your channel page"
-msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"
+msgstr "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen"
 
 #: ../../include/contact_selectors.php:30
 msgid "Unknown | Not categorised"
@@ -1205,7 +1236,7 @@ msgstr "vor %1$d %2$s"
 #: ../../include/dba/dba_driver.php:50
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"
+msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
 
 #: ../../include/event.php:11 ../../include/bb2diaspora.php:433
 msgid "l F d, Y \\@ g:i A"
@@ -1221,7 +1252,7 @@ msgstr "Endet:"
 
 #: ../../include/event.php:40 ../../include/identity.php:679
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+#: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
 msgid "Location:"
 msgstr "Ort:"
 
@@ -1264,12 +1295,12 @@ msgstr "Kanäle, die nicht in einer Sammlung sind"
 msgid "Delete this item?"
 msgstr "Dieses Element löschen?"
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
-#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:547
+#: ../../mod/photos.php:993 ../../mod/photos.php:1080
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:281
 #: ../../include/contact_widgets.php:125
 msgid "show more"
 msgstr "mehr zeigen"
@@ -1292,11 +1323,11 @@ msgstr "alle"
 
 #: ../../include/js_strings.php:12
 msgid "Secret Passphrase"
-msgstr "geheime Passwort-Phrase"
+msgstr "geheime Passphrase"
 
 #: ../../include/js_strings.php:13
 msgid "Passphrase hint"
-msgstr "Hinweis zur Phrase"
+msgstr "Hinweis zur Passphrase"
 
 #: ../../include/js_strings.php:15
 msgid "timeago.prefixAgo"
@@ -1390,7 +1421,7 @@ msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 #: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
 #: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
-#: ../../mod/photos.php:652 ../../mod/photos.php:674
+#: ../../mod/photos.php:656 ../../mod/photos.php:678
 msgid "Profile Photos"
 msgstr "Profilfotos"
 
@@ -1399,34 +1430,33 @@ msgstr "Profilfotos"
 #: ../../include/attach.php:233 ../../include/attach.php:247
 #: ../../include/attach.php:268 ../../include/attach.php:463
 #: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3492
-#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
-#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
+#: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
 #: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
 #: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
-#: ../../mod/chat.php:87 ../../mod/chat.php:92
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
-#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
-#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
-#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
+#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
+#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
+#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
+#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/achievements.php:27 ../../mod/settings.php:493
+#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/connections.php:169 ../../mod/notifications.php:66
+#: ../../mod/blocks.php:29 ../../mod/blocks.php:44
+#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
+#: ../../mod/poke.php:128 ../../mod/channel.php:88 ../../mod/channel.php:188
 #: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
 #: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
 #: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
 #: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:526
 #: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
 msgid "Permission denied."
 msgstr "Zugang verweigert"
@@ -1455,7 +1485,7 @@ msgstr "Datei überschreitet das Größen-Limit von %d"
 #: ../../include/attach.php:339
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht."
+msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
 
 #: ../../include/attach.php:423
 msgid "File upload failed. Possible system limit or action terminated."
@@ -1471,7 +1501,7 @@ msgstr "Pfad nicht verfügbar."
 
 #: ../../include/attach.php:546
 msgid "Empty pathname"
-msgstr "leere Pfadangabe"
+msgstr "Leere Pfadangabe"
 
 #: ../../include/attach.php:564
 msgid "duplicate filename or path"
@@ -1489,41 +1519,10 @@ msgstr "mkdir fehlgeschlagen."
 msgid "database storage failed."
 msgstr "Speichern in der Datenbank fehlgeschlagen."
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
-#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
-#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
-#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
-#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
-#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
-#: ../../include/bbcode.php:626
-msgid "Image/photo"
-msgstr "Bild/Foto"
-
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
-
-#: ../../include/bbcode.php:170
-msgid "QR code"
-msgstr "QR Code"
-
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
-
-#: ../../include/bbcode.php:215
-msgid "post"
-msgstr "Beitrag"
-
-#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
-
 #: ../../include/bookmarks.php:31
 #, php-format
 msgid "%1$s's bookmarks"
-msgstr "%1$s's Lesezeichen"
+msgstr "%1$ss Lesezeichen"
 
 #: ../../include/conversation.php:123
 msgid "channel"
@@ -1532,12 +1531,12 @@ msgstr "Kanal"
 #: ../../include/conversation.php:161 ../../mod/like.php:134
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s"
+msgstr "%1$s gefällt %2$ss %3$s"
 
 #: ../../include/conversation.php:164 ../../mod/like.php:136
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s nicht"
+msgstr "%1$s gefällt %2$ss %3$s nicht"
 
 #: ../../include/conversation.php:201
 #, php-format
@@ -1547,7 +1546,7 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
 #: ../../include/conversation.php:236
 #, php-format
 msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s"
+msgstr "%1$s stupste %2$s an"
 
 #: ../../include/conversation.php:258 ../../mod/mood.php:63
 #, php-format
@@ -1559,9 +1558,9 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
-#: ../../mod/admin.php:745 ../../mod/connedit.php:359
-#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
+#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1572,7 +1571,7 @@ msgstr "Nachricht überprüft"
 #: ../../include/conversation.php:662
 #, php-format
 msgid "View %s's profile @ %s"
-msgstr "Schaue Dir %s's Profil auf %s an."
+msgstr "%ss Profil auf %s ansehen"
 
 #: ../../include/conversation.php:676
 msgid "Categories:"
@@ -1602,10 +1601,10 @@ msgid "View in context"
 msgstr "Im Zusammenhang anschauen"
 
 #: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
 #: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
-#: ../../mod/photos.php:971
+#: ../../mod/photos.php:975
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -1639,7 +1638,7 @@ msgstr "Fotos ansehen"
 
 #: ../../include/conversation.php:935
 msgid "Matrix Activity"
-msgstr "Matrix Aktivität"
+msgstr "Matrix-Aktivität"
 
 #: ../../include/conversation.php:936
 msgid "Edit Contact"
@@ -1725,21 +1724,21 @@ msgstr "Speichern in Ordner:"
 
 #: ../../include/conversation.php:1072
 msgid "Where are you right now?"
-msgstr "Wo bist du jetzt grade?"
+msgstr "Wo bist Du jetzt grade?"
 
 #: ../../include/conversation.php:1073 ../../mod/editpost.php:52
 #: ../../mod/mail.php:172 ../../mod/mail.php:270
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
 #: ../../mod/webpages.php:122 ../../mod/editpost.php:132
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
-#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+#: ../../mod/editblock.php:151 ../../mod/photos.php:995
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+#: ../../include/conversation.php:1097 ../../mod/photos.php:974
 msgid "Share"
 msgstr "Teilen"
 
@@ -1853,19 +1852,19 @@ msgstr "Beispiel: bob@example.com, mary@example.com"
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
-#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
 #: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
 #: ../../include/conversation.php:1149 ../../mod/editpost.php:142
 msgid "OK"
-msgstr "OK"
+msgstr "Ok"
 
-#: ../../include/conversation.php:1150 ../../mod/settings.php:514
-#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1891,7 +1890,7 @@ msgstr "Persönlich"
 
 #: ../../include/conversation.php:1397
 msgid "Posts that mention or involve you"
-msgstr "Beiträge mit Beteiligung deinerseits"
+msgstr "Beiträge mit Beteiligung Deinerseits"
 
 #: ../../include/conversation.php:1400 ../../mod/menu.php:61
 #: ../../mod/connections.php:211
@@ -1900,7 +1899,7 @@ msgstr "Neu"
 
 #: ../../include/conversation.php:1403
 msgid "Activity Stream - by date"
-msgstr "Activity Stream - nach Datum sortiert"
+msgstr "Activity Stream – nach Datum sortiert"
 
 #: ../../include/conversation.php:1410
 msgid "Starred"
@@ -1908,7 +1907,7 @@ msgstr "Markiert"
 
 #: ../../include/conversation.php:1413
 msgid "Favourite Posts"
-msgstr "Beiträge mit Sternchen"
+msgstr "Markierte Beiträge"
 
 #: ../../include/conversation.php:1420
 msgid "Spam"
@@ -1916,7 +1915,7 @@ msgstr "Spam"
 
 #: ../../include/conversation.php:1423
 msgid "Posts flagged as SPAM"
-msgstr "Nachrichten die als SPAM markiert wurden"
+msgstr "Nachrichten, die als SPAM markiert wurden"
 
 #: ../../include/conversation.php:1454
 msgid "Channel"
@@ -1944,7 +1943,7 @@ msgstr "Dateien und Speicher"
 
 #: ../../include/conversation.php:1496 ../../include/conversation.php:1499
 msgid "Chatrooms"
-msgstr "Chat-Räume"
+msgstr "Chaträume"
 
 #: ../../include/conversation.php:1509
 msgid "Events and Calendar"
@@ -1958,7 +1957,7 @@ msgstr "Gespeicherte Lesezeichen"
 msgid "Manage Webpages"
 msgstr "Webseiten verwalten"
 
-#: ../../include/identity.php:29 ../../mod/item.php:1161
+#: ../../include/identity.php:29 ../../mod/item.php:1177
 msgid "Unable to obtain identity information from database"
 msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
@@ -1997,7 +1996,7 @@ msgstr "Angeforderte Kanal nicht verfügbar."
 
 #: ../../include/identity.php:489
 msgid " Sorry, you don't have the permission to view this profile. "
-msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
+msgstr "Entschuldigung, Du besitzt nicht die nötigen Rechte, um dieses Profil zu betrachten."
 
 #: ../../include/identity.php:524 ../../mod/webpages.php:8
 #: ../../mod/connect.php:13 ../../mod/layouts.php:8
@@ -2008,7 +2007,7 @@ msgstr "Erwünschte Profil ist nicht verfügbar."
 
 #: ../../include/identity.php:642 ../../mod/profiles.php:603
 msgid "Change profile photo"
-msgstr "Ändere das Profilfoto"
+msgstr "Profilfoto ändern"
 
 #: ../../include/identity.php:648
 msgid "Profiles"
@@ -2039,17 +2038,17 @@ msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
 #: ../../include/identity.php:681 ../../include/identity.php:908
-#: ../../mod/directory.php:158
+#: ../../mod/directory.php:159
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../include/identity.php:682 ../../include/identity.php:928
-#: ../../mod/directory.php:160
+#: ../../mod/directory.php:161
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../include/identity.php:683 ../../include/identity.php:939
-#: ../../mod/directory.php:162
+#: ../../mod/directory.php:163
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -2096,7 +2095,7 @@ msgstr "Veranstaltungen in dieser Woche:"
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../include/identity.php:906 ../../mod/settings.php:920
+#: ../../include/identity.php:906 ../../mod/settings.php:924
 msgid "Full Name:"
 msgstr "Voller Name:"
 
@@ -2119,7 +2118,7 @@ msgstr "Alter:"
 #: ../../include/identity.php:934
 #, php-format
 msgid "for %1$d %2$s"
-msgstr "für %1$d %2$s"
+msgstr "seit %1$d %2$s"
 
 #: ../../include/identity.php:937 ../../mod/profiles.php:526
 msgid "Sexual Preference:"
@@ -2141,7 +2140,7 @@ msgstr "Politische Ansichten:"
 msgid "Religion:"
 msgstr "Religion:"
 
-#: ../../include/identity.php:949 ../../mod/directory.php:164
+#: ../../include/identity.php:949 ../../mod/directory.php:165
 msgid "About:"
 msgstr "Über:"
 
@@ -2151,11 +2150,11 @@ msgstr "Hobbys/Interessen:"
 
 #: ../../include/identity.php:953 ../../mod/profiles.php:532
 msgid "Likes:"
-msgstr "Gefällt-mir:"
+msgstr "Gefällt:"
 
 #: ../../include/identity.php:955 ../../mod/profiles.php:533
 msgid "Dislikes:"
-msgstr "Gefällt-mir-nicht:"
+msgstr "Gefällt nicht:"
 
 #: ../../include/identity.php:958
 msgid "Contact information and Social Networks:"
@@ -2193,14 +2192,14 @@ msgstr "Arbeit/Anstellung:"
 msgid "School/education:"
 msgstr "Schule/Ausbildung:"
 
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:847
 msgid "Private Message"
 msgstr "Private Nachricht"
 
 #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/settings.php:575 ../../mod/editpost.php:103
-#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
+#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
 #: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
 #: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
 msgid "Edit"
@@ -2220,7 +2219,7 @@ msgstr "Markierung entfernen"
 
 #: ../../include/ItemObject.php:148
 msgid "toggle star status"
-msgstr "Stern-Status umschalten"
+msgstr "Markierung umschalten"
 
 #: ../../include/ItemObject.php:152
 msgid "starred"
@@ -2230,21 +2229,21 @@ msgstr "markiert"
 msgid "add tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:972
 msgid "I like this (toggle)"
-msgstr "Ich mag das (Umschalter)"
+msgstr "Mir gefällt das (Umschalter)"
 
 #: ../../include/ItemObject.php:184 ../../include/taxonomy.php:254
 msgid "like"
-msgstr "Gefällt-mir"
+msgstr "mag"
 
-#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:973
 msgid "I don't like this (toggle)"
-msgstr "Ich mag das nicht (Umschalter)"
+msgstr "Mir gefällt das nicht (Umschalter)"
 
 #: ../../include/ItemObject.php:185 ../../include/taxonomy.php:255
 msgid "dislike"
-msgstr "Gefällt-mir-nicht"
+msgstr "verurteile"
 
 #: ../../include/ItemObject.php:187
 msgid "Share this"
@@ -2257,11 +2256,11 @@ msgstr "Teilen"
 #: ../../include/ItemObject.php:211 ../../include/ItemObject.php:212
 #, php-format
 msgid "View %s's profile - %s"
-msgstr "Schaue dir %s's Profil an - %s"
+msgstr "Schaue Dir %ss Profil an – %s"
 
 #: ../../include/ItemObject.php:213
 msgid "to"
-msgstr "zu"
+msgstr "an"
 
 #: ../../include/ItemObject.php:214
 msgid "via"
@@ -2275,37 +2274,37 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../include/ItemObject.php:249
+#: ../../include/ItemObject.php:250
 msgid "Bookmark Links"
-msgstr "Setze Lesezeichen für die Verweise"
+msgstr "Setze Lesezeichen für die Links"
 
-#: ../../include/ItemObject.php:279
+#: ../../include/ItemObject.php:280
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
-#: ../../mod/photos.php:1074
+#: ../../include/ItemObject.php:545 ../../mod/photos.php:991
+#: ../../mod/photos.php:1078
 msgid "This is you"
-msgstr "Das bist du"
-
-#: ../../include/ItemObject.php:547 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/settings.php:513 ../../mod/settings.php:625
-#: ../../mod/settings.php:653 ../../mod/settings.php:677
-#: ../../mod/settings.php:748 ../../mod/settings.php:912
-#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+msgstr "Das bist Du"
+
+#: ../../include/ItemObject.php:548 ../../mod/events.php:469
+#: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
 #: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
 #: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
 #: ../../mod/connedit.php:437 ../../mod/profiles.php:506
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/settings.php:516
+#: ../../mod/settings.php:628 ../../mod/settings.php:656
+#: ../../mod/settings.php:680 ../../mod/settings.php:752
+#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
 #: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
-#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
-#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
-#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:566
+#: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
+#: ../../mod/photos.php:1081 ../../mod/mood.php:142
 #: ../../view/theme/redbasic/php/config.php:95
 #: ../../view/theme/apw/php/config.php:231
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2313,35 +2312,35 @@ msgstr "Das bist du"
 msgid "Submit"
 msgstr "Bestätigen"
 
-#: ../../include/ItemObject.php:548
+#: ../../include/ItemObject.php:549
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../include/ItemObject.php:549
+#: ../../include/ItemObject.php:550
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../include/ItemObject.php:550
+#: ../../include/ItemObject.php:551
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../include/ItemObject.php:551
+#: ../../include/ItemObject.php:552
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../include/ItemObject.php:552
+#: ../../include/ItemObject.php:553
 msgid "Code"
 msgstr "Code"
 
-#: ../../include/ItemObject.php:553
+#: ../../include/ItemObject.php:554
 msgid "Image"
 msgstr "Bild"
 
-#: ../../include/ItemObject.php:554
+#: ../../include/ItemObject.php:555
 msgid "Link"
 msgstr "Link"
 
-#: ../../include/ItemObject.php:555
+#: ../../include/ItemObject.php:556
 msgid "Video"
 msgstr "Video"
 
@@ -2612,11 +2611,11 @@ msgstr "Der Raum ist voll"
 
 #: ../../include/taxonomy.php:210
 msgid "Tags"
-msgstr "Tags"
+msgstr "Schlagwörter"
 
 #: ../../include/taxonomy.php:227
 msgid "Keywords"
-msgstr "Schlüsselbegriffe"
+msgstr "Schlüsselwörter"
 
 #: ../../include/taxonomy.php:252
 msgid "have"
@@ -2636,11 +2635,11 @@ msgstr "will"
 
 #: ../../include/taxonomy.php:254
 msgid "likes"
-msgstr "Gefällt-mir"
+msgstr "gefällt"
 
 #: ../../include/taxonomy.php:255
 msgid "dislikes"
-msgstr "Gefällt-mir-nicht"
+msgstr "missfällt"
 
 #: ../../include/auth.php:76
 msgid "Logged out."
@@ -2660,7 +2659,7 @@ msgstr "Ungültige E-Mail-Adresse"
 
 #: ../../include/account.php:25
 msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"
+msgstr "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt"
 
 #: ../../include/account.php:31
 msgid "Your email address is already registered at this site."
@@ -2694,7 +2693,7 @@ msgstr "Administrator"
 
 #: ../../include/account.php:297
 msgid "your registration password"
-msgstr "dein Registrierungspasswort"
+msgstr "Dein Registrierungspasswort"
 
 #: ../../include/account.php:300 ../../include/account.php:357
 #, php-format
@@ -2768,12 +2767,12 @@ msgstr "[Red Notify] Neue Mail auf %s empfangen"
 #: ../../include/enotify.php:86
 #, php-format
 msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
+msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
 
 #: ../../include/enotify.php:87
 #, php-format
 msgid "%1$s sent you %2$s."
-msgstr "%1$s hat dir %2$s geschickt."
+msgstr "%1$s hat Dir %2$s geschickt."
 
 #: ../../include/enotify.php:87
 msgid "a private message"
@@ -2797,7 +2796,7 @@ msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
 #: ../../include/enotify.php:159
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
 
 #: ../../include/enotify.php:170
 #, php-format
@@ -2807,14 +2806,14 @@ msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
 #: ../../include/enotify.php:171
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
+msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
 
 #: ../../include/enotify.php:174 ../../include/enotify.php:189
 #: ../../include/enotify.php:215 ../../include/enotify.php:234
 #: ../../include/enotify.php:248
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
+msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
 
 #: ../../include/enotify.php:180
 #, php-format
@@ -2824,57 +2823,57 @@ msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
 #: ../../include/enotify.php:182
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
+msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
 
 #: ../../include/enotify.php:184
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
 
 #: ../../include/enotify.php:208
 #, php-format
 msgid "[Red:Notify] %s tagged you"
-msgstr "[Red Notify] %s hat dich getaggt"
+msgstr "[Red Notify] %s hat Dich erwähnt"
 
 #: ../../include/enotify.php:209
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
+msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
 
 #: ../../include/enotify.php:210
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
 
 #: ../../include/enotify.php:223
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red Notify] %1$s hat dich angestupst"
+msgstr "[Red Notify] %1$s hat Dich angestupst"
 
 #: ../../include/enotify.php:224
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
+msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
 
 #: ../../include/enotify.php:225
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
 
 #: ../../include/enotify.php:241
 #, php-format
 msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Hinweis] %s hat Dich getaggt"
+msgstr "[Red:Hinweis] %s hat Deinen Beitrag verschlagwortet"
 
 #: ../../include/enotify.php:242
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
+msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
 
 #: ../../include/enotify.php:243
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
 
 #: ../../include/enotify.php:255
 msgid "[Red:Notify] Introduction received"
@@ -2883,12 +2882,12 @@ msgstr "[Red:Notify] Vorstellung erhalten"
 #: ../../include/enotify.php:256
 #, php-format
 msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
-msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
+msgstr "%1$s, Du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
 
 #: ../../include/enotify.php:257
 #, php-format
 msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
-msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
+msgstr "%1$s, Du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
 
 #: ../../include/enotify.php:261 ../../include/enotify.php:280
 #, php-format
@@ -2907,14 +2906,14 @@ msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
 #: ../../include/enotify.php:271
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
+msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
 
 #: ../../include/enotify.php:272
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
-msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
+msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
 
 #: ../../include/enotify.php:278
 msgid "Name:"
@@ -2946,12 +2945,12 @@ msgstr "Kann Bild nicht verarbeiten"
 msgid "Photo storage failed."
 msgstr "Foto speichern schlug fehl"
 
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1187
+#: ../../include/photos.php:306 ../../mod/photos.php:694
+#: ../../mod/photos.php:1191
 msgid "Upload New Photos"
 msgstr "Lade neue Fotos hoch"
 
-#: ../../include/reddav.php:1018
+#: ../../include/reddav.php:1061
 msgid "Edit File properties"
 msgstr "Dateieigenschaften ändern"
 
@@ -2978,8 +2977,8 @@ msgstr "Verbinden/Folgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Beispiele: Robert Morgenstein, Angeln"
 
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:357
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:207
+#: ../../mod/directory.php:212 ../../mod/connections.php:357
 msgid "Find"
 msgstr "Finde"
 
@@ -3044,7 +3043,7 @@ msgstr "Lokales Konto nicht gefunden."
 
 #: ../../include/follow.php:138
 msgid "Cannot connect to yourself."
-msgstr "Du kannst dich nicht mit dir selbst verbinden."
+msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
 
 #: ../../include/security.php:280
 msgid ""
@@ -3131,11 +3130,11 @@ msgstr "Kann meine öffentlichen Seiten bearbeiten"
 
 #: ../../include/permissions.php:31
 msgid "Can source my \"public\" posts in derived channels"
-msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden"
+msgstr "Kann meine „öffentlichen“ Beiträge als Quellen für andere Kanäle verwenden"
 
 #: ../../include/permissions.php:31
 msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften."
+msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
 
 #: ../../include/permissions.php:32
 msgid "Can send me bookmarks"
@@ -3148,50 +3147,50 @@ msgstr "Kann meine Kanäle administrieren"
 #: ../../include/permissions.php:33
 msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
+msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
 
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:350
+#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../mod/group.php:68 ../../index.php:350
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
 
-#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
 #: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
 msgid "Item not found."
 msgstr "Element nicht gefunden."
 
-#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr "Sammlung nicht gefunden"
 
-#: ../../include/items.php:3801
+#: ../../include/items.php:3824
 msgid "Collection is empty."
 msgstr "Sammlung ist leer."
 
-#: ../../include/items.php:3808
+#: ../../include/items.php:3831
 #, php-format
 msgid "Collection: %s"
 msgstr "Sammlung: %s"
 
-#: ../../include/items.php:3819
+#: ../../include/items.php:3842
 #, php-format
 msgid "Connection: %s"
 msgstr "Verbindung: %s"
 
-#: ../../include/items.php:3822
+#: ../../include/items.php:3845
 msgid "Connection not found."
 msgstr "Die Verbindung wurde nicht gefunden."
 
-#: ../../include/zot.php:545
+#: ../../include/zot.php:548
 msgid "Invalid data packet"
 msgstr "Ungültiges Datenpaket"
 
-#: ../../include/zot.php:555
+#: ../../include/zot.php:558
 msgid "Unable to verify channel signature"
 msgstr "Konnte die Signatur des Kanals nicht verifizieren"
 
-#: ../../include/zot.php:732
+#: ../../include/zot.php:735
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
@@ -3277,62 +3276,70 @@ msgstr "Titel:"
 msgid "Share this event"
 msgstr "Die Veranstaltung teilen"
 
-#: ../../mod/thing.php:94
+#: ../../mod/thing.php:98
 msgid "Thing updated"
 msgstr "Ding aktualisiert"
 
-#: ../../mod/thing.php:153
+#: ../../mod/thing.php:158
 msgid "Object store: failed"
 msgstr "Speichern des Objekts fehlgeschlagen"
 
-#: ../../mod/thing.php:157
+#: ../../mod/thing.php:162
 msgid "Thing added"
 msgstr "Ding hinzugefügt"
 
-#: ../../mod/thing.php:175
+#: ../../mod/thing.php:182
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../mod/thing.php:228
+#: ../../mod/thing.php:234
 msgid "Show Thing"
 msgstr "Ding anzeigen"
 
-#: ../../mod/thing.php:235
+#: ../../mod/thing.php:241
 msgid "item not found."
 msgstr "Eintrag nicht gefunden"
 
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:269
 msgid "Edit Thing"
 msgstr "Ding bearbeiten"
 
-#: ../../mod/thing.php:265 ../../mod/thing.php:311
+#: ../../mod/thing.php:271 ../../mod/thing.php:318
 msgid "Select a profile"
 msgstr "Wähle ein Profil"
 
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:273 ../../mod/thing.php:320
 msgid "Select a category of stuff. e.g. I ______ something"
-msgstr "Wähle eine Kategorie für das Zeugs, z.B. Ich ______ etwas"
+msgstr "Wähle eine Kategorie/Art, z.B. Ich ______ etwas"
+
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Post an activity"
+msgstr "Aktivitätsnachricht senden"
 
-#: ../../mod/thing.php:270 ../../mod/thing.php:315
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Nur an Betrachter des ausgewählten Profils senden"
+
+#: ../../mod/thing.php:277 ../../mod/thing.php:323
 msgid "Name of thing e.g. something"
 msgstr "Name des Dings, z.B. Etwas"
 
-#: ../../mod/thing.php:272 ../../mod/thing.php:316
+#: ../../mod/thing.php:279 ../../mod/thing.php:324
 msgid "URL of thing (optional)"
 msgstr "URL des Dings (optional)"
 
-#: ../../mod/thing.php:274 ../../mod/thing.php:317
+#: ../../mod/thing.php:281 ../../mod/thing.php:325
 msgid "URL for photo of thing (optional)"
 msgstr "URL eines Fotos von dem Ding (optional)"
 
-#: ../../mod/thing.php:309
+#: ../../mod/thing.php:316
 msgid "Add Thing to your Profile"
-msgstr "Das Ding deinem Profil hinzufügen"
+msgstr "Das Ding Deinem Profil hinzufügen"
 
 #: ../../mod/invite.php:25
 msgid "Total invitation limit exceeded."
-msgstr "Limit der maximalen Einladungen überschritten."
+msgstr "Einladungslimit überschritten."
 
 #: ../../mod/invite.php:49
 #, php-format
@@ -3345,7 +3352,7 @@ msgstr "Schließe Dich uns an und werde Teil der Red-Matrix"
 
 #: ../../mod/invite.php:87
 msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator deiner Seite."
+msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers."
 
 #: ../../mod/invite.php:92
 #, php-format
@@ -3380,7 +3387,7 @@ msgid ""
 "You are cordially invited to join me and some other close friends on the Red"
 " Matrix - a revolutionary new decentralised communication and information "
 "tool."
-msgstr "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralisierten Kommunikations- und Informationsnetzwerk."
+msgstr "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralen Kommunikations- und Informationsnetzwerk."
 
 #: ../../mod/invite.php:146
 msgid "You will need to supply this invitation code: $invite_code"
@@ -3394,7 +3401,7 @@ msgstr "Bitte besuche meinen Kanal auf"
 msgid ""
 "Once you have registered (on ANY Red Matrix site - they are all inter-"
 "connected), please connect with my Red Matrix channel address:"
-msgstr "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:"
+msgstr "Wenn Du Dich registriert hast (egal auf welchem Server in der Red-Matrix, sie sind alle miteinander verbunden) verbinde Dich bitte mit meinem Kanal in der Matrix. Adresse:"
 
 #: ../../mod/invite.php:153
 msgid "Click the [Register] link on the following page to join."
@@ -3405,34 +3412,34 @@ msgid ""
 "For more information about the Red Matrix Project and why it has the "
 "potential to change the internet as we know it, please visit "
 "http://getzot.com"
-msgstr "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an"
+msgstr "Für weitere Informationen über das Red-Matrix-Projekt und warum es das Potential hat, das Internet, wie wir es kennen, grundlegend zu verändern, besuche http://getzot.com"
 
 #: ../../mod/item.php:145
 msgid "Unable to locate original post."
-msgstr "Originalbeitrag kann nicht gefunden werden."
+msgstr "Originalbeitrag nicht gefunden."
 
 #: ../../mod/item.php:346
 msgid "Empty post discarded."
-msgstr "Leerer Beitrag verworfen."
+msgstr "Leeren Beitrag verworfen."
 
 #: ../../mod/item.php:388
 msgid "Executable content type not permitted to this channel."
 msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
 
-#: ../../mod/item.php:819
+#: ../../mod/item.php:835
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
 msgid "Wall Photos"
 msgstr "Wall Fotos"
 
-#: ../../mod/item.php:1166
+#: ../../mod/item.php:1182
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../mod/item.php:1172
+#: ../../mod/item.php:1188
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
@@ -3487,7 +3494,7 @@ msgstr "Menü Name"
 
 #: ../../mod/menu.php:81 ../../mod/menu.php:110
 msgid "Must be unique, only seen by you"
-msgstr "Muss unverwechselbar sein, nur für dich sichtbar"
+msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
 
 #: ../../mod/menu.php:82 ../../mod/menu.php:111
 msgid "Menu title"
@@ -3545,11 +3552,11 @@ msgstr "Ansicht"
 
 #: ../../mod/api.php:76 ../../mod/api.php:102
 msgid "Authorize application connection"
-msgstr "Zugriff der Anwendung authorizieren"
+msgstr "Zugriff für die Anwendung autorisieren"
 
 #: ../../mod/api.php:77
 msgid "Return to your app and insert this Securty Code:"
-msgstr "Trage folgenden Sicherheitscode bei der Anwendung ein:"
+msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
 
 #: ../../mod/api.php:89
 msgid "Please login to continue."
@@ -3559,21 +3566,21 @@ msgstr "Zum Weitermachen, bitte einloggen."
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
-msgstr "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"
+msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
 
-#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:483
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:484
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
 msgid "No"
 msgstr "Nein"
 
 #: ../../mod/apps.php:8
 msgid "No installed applications."
-msgstr "Keine installierten Applikationen"
+msgstr "Keine installierten Anwendungen."
 
 #: ../../mod/apps.php:13
 msgid "Applications"
@@ -3585,7 +3592,7 @@ msgstr "Bearbeite Beitrag"
 
 #: ../../mod/cloud.php:112
 msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
-msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"
+msgstr "Red-Matrix-Gäste: Nutzername: {Deine E-Mail-Adresse}; Passwort: +++"
 
 #: ../../mod/bookmarks.php:38
 msgid "Bookmark added"
@@ -3599,2566 +3606,2598 @@ msgstr "Meine Lesezeichen"
 msgid "My Connections Bookmarks"
 msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
-msgstr "Name wird benötigt"
+#: ../../mod/subthread.php:105
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt nun %2$ss %3$s"
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
-msgstr "Schlüssel und Geheimnis werden benötigt"
+#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
+#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
+#: ../../mod/update_community.php:18
+msgid "[Embedded content - reload page to view]"
+msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:539
-msgid "Update"
-msgstr "Update"
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:35
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
 
-#: ../../mod/settings.php:192
-msgid "Passwords do not match. Password unchanged."
-msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
+#: ../../mod/chanview.php:93
+msgid "toggle full screen mode"
+msgstr "auf Vollbildmodus umschalten"
 
-#: ../../mod/settings.php:196
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
 
-#: ../../mod/settings.php:209
-msgid "Password changed."
-msgstr "Kennwort geändert."
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../mod/settings.php:211
-msgid "Password update failed. Please try again."
-msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
+#: ../../mod/chat.php:163
+msgid "Leave Room"
+msgstr "Raum verlassen"
 
-#: ../../mod/settings.php:225
-msgid "Not valid email."
-msgstr "Keine gültige E-Mail Adresse."
+#: ../../mod/chat.php:164
+msgid "I am away right now"
+msgstr "Ich bin gerade nicht da"
 
-#: ../../mod/settings.php:228
-msgid "Protected email address. Cannot change to that email."
-msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
+#: ../../mod/chat.php:165
+msgid "I am online"
+msgstr "Ich bin online"
 
-#: ../../mod/settings.php:237
-msgid "System failure storing new email. Please try again."
-msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
+msgid "New Chatroom"
+msgstr "Neuer Chatraum"
 
-#: ../../mod/settings.php:441
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
+#: ../../mod/chat.php:190
+msgid "Chatroom Name"
+msgstr "Name des Chatraums"
 
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
-#: ../../mod/settings.php:574
-msgid "Add application"
-msgstr "Anwendung hinzufügen"
+#: ../../mod/chat.php:205
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$ss Chaträume"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-msgid "Name"
-msgstr "Name"
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
+#: ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:443
+msgid "Public access denied."
+msgstr "Öffentlicher Zugang verweigert."
 
-#: ../../mod/settings.php:515
-msgid "Name of application"
-msgstr "Name der Anwendung"
+#: ../../mod/viewconnections.php:43
+msgid "No connections."
+msgstr "Keine Verbindungen."
 
-#: ../../mod/settings.php:516 ../../mod/settings.php:542
-msgid "Consumer Key"
-msgstr "Consumer Key"
+#: ../../mod/viewconnections.php:55
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "%ss Profil [%s] besuchen"
 
-#: ../../mod/settings.php:516 ../../mod/settings.php:517
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
+#: ../../mod/viewconnections.php:70
+msgid "View Connnections"
+msgstr "Zeige Verbindungen"
 
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Schlagwort entfernt"
 
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Redirect"
-msgstr "Umleitung"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Schlagwort entfernen"
 
-#: ../../mod/settings.php:518
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Schlagwort zum Entfernen auswählen:"
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
-msgid "Icon url"
-msgstr "Symbol-URL"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
+msgid "Remove"
+msgstr "Entferne"
 
-#: ../../mod/settings.php:519
-msgid "Optional"
-msgstr "Optional"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
+msgstr "Fortfahren"
 
-#: ../../mod/settings.php:530
-msgid "You can't edit this application."
-msgstr "Diese Anwendung kann nicht bearbeitet werden."
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
+msgstr "Premium-Kanal-Einrichtung"
 
-#: ../../mod/settings.php:573
-msgid "Connected Apps"
-msgstr "Verbundene Apps"
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
 
-#: ../../mod/settings.php:577
-msgid "Client key starts with"
-msgstr "Client key beginnt mit"
+#: ../../mod/connect.php:87
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
 
-#: ../../mod/settings.php:578
-msgid "No name"
-msgstr "Kein Name"
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
 
-#: ../../mod/settings.php:579
-msgid "Remove authorization"
-msgstr "Authorisierung aufheben"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
 
-#: ../../mod/settings.php:590
-msgid "No feature settings configured"
-msgstr "Keine Funktions-Einstellungen konfiguriert"
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite."
 
-#: ../../mod/settings.php:598
-msgid "Feature Settings"
-msgstr "Funktions-Einstellungen"
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
 
-#: ../../mod/settings.php:621
-msgid "Account Settings"
-msgstr "Konto-Einstellungen"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
+msgstr "Eingeschränkter oder Premium-Kanal"
 
-#: ../../mod/settings.php:622
-msgid "Password Settings"
-msgstr "Kennwort-Einstellungen"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
 
-#: ../../mod/settings.php:623
-msgid "New Password:"
-msgstr "Neues Passwort:"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Delegiere das Management für diese Seite"
 
-#: ../../mod/settings.php:624
-msgid "Confirm:"
-msgstr "Bestätigen:"
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
 
-#: ../../mod/settings.php:624
-msgid "Leave password fields blank unless changing"
-msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Vorhandene Seitenmanager"
 
-#: ../../mod/settings.php:626 ../../mod/settings.php:921
-msgid "Email Address:"
-msgstr "Email Adresse:"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Vorhandene Bevollmächtigte für die Seite"
 
-#: ../../mod/settings.php:627
-msgid "Remove Account"
-msgstr "Konto entfernen"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potentielle Bevollmächtigte"
 
-#: ../../mod/settings.php:628
-msgid "Warning: This action is permanent and cannot be reversed."
-msgstr "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden."
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: ../../mod/settings.php:644
-msgid "Off"
-msgstr "Aus"
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Keine Einträge."
 
-#: ../../mod/settings.php:644
-msgid "On"
-msgstr "An"
+#: ../../mod/chatsvc.php:102
+msgid "Away"
+msgstr "Abwesend"
 
-#: ../../mod/settings.php:651
-msgid "Additional Features"
-msgstr "Zusätzliche Funktionen"
+#: ../../mod/chatsvc.php:106
+msgid "Online"
+msgstr "Online"
 
-#: ../../mod/settings.php:676
-msgid "Connector Settings"
-msgstr "Connector-Einstellungen"
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Element nicht verfügbar."
 
-#: ../../mod/settings.php:706 ../../mod/admin.php:379
-msgid "No special theme for mobile devices"
-msgstr "Keine spezielle Theme für mobile Geräte"
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr "Menü-Element aktualisiert."
 
-#: ../../mod/settings.php:746
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
 
-#: ../../mod/settings.php:752
-msgid "Display Theme:"
-msgstr "Anzeige Theme:"
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr "Menü-Bestandteil hinzugefügt."
 
-#: ../../mod/settings.php:753
-msgid "Mobile Theme:"
-msgstr "Mobile Theme:"
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
 
-#: ../../mod/settings.php:754
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr "Menü-Bestandteile verwalten"
 
-#: ../../mod/settings.php:754
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimum von 10 Sekunden, kein Maximum"
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
 
-#: ../../mod/settings.php:755
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
 
-#: ../../mod/settings.php:755
-msgid "Maximum of 100 items"
-msgstr "Maximum von 100 Beiträgen"
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr "Bestandteil löschen"
 
-#: ../../mod/settings.php:756
-msgid "Don't show emoticons"
-msgstr "Emoticons nicht zeigen"
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr "Neues Bestandteil"
 
-#: ../../mod/settings.php:792
-msgid "Nobody except yourself"
-msgstr "Niemand außer du selbst"
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
 
-#: ../../mod/settings.php:793
-msgid "Only those you specifically allow"
-msgstr "Nur die, denen du es explizit erlaubst"
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
 
-#: ../../mod/settings.php:794
-msgid "Anybody in your address book"
-msgstr "Jeder aus Ihrem Adressbuch"
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
 
-#: ../../mod/settings.php:795
-msgid "Anybody on this website"
-msgstr "Jeder auf dieser Website"
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
 
-#: ../../mod/settings.php:796
-msgid "Anybody in this network"
-msgstr "Jeder in diesem Netzwerk"
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr "Neues Menü-Bestandteil"
 
-#: ../../mod/settings.php:797
-msgid "Anybody on the internet"
-msgstr "Jeder im Internet"
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr "Zugriffsrechte des Menü-Elements"
 
-#: ../../mod/settings.php:874
-msgid "Publish your default profile in the network directory"
-msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
 
-#: ../../mod/settings.php:879
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr "Link Text"
 
-#: ../../mod/settings.php:883 ../../mod/profile_photo.php:288
-msgid "or"
-msgstr "oder"
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr "URL des Links"
 
-#: ../../mod/settings.php:888
-msgid "Your channel address is"
-msgstr "Deine Kanal-Adresse lautet"
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr "Verwende Red Magic-Auth wenn verfügbar"
 
-#: ../../mod/settings.php:910
-msgid "Channel Settings"
-msgstr "Kanal-Einstellungen"
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
 
-#: ../../mod/settings.php:919
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
 
-#: ../../mod/settings.php:922
-msgid "Your Timezone:"
-msgstr "Ihre Zeitzone:"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
 
-#: ../../mod/settings.php:923
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
 
-#: ../../mod/settings.php:924
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
 
-#: ../../mod/settings.php:926
-msgid "Adult Content"
-msgstr "Nicht Jugendfreie-Inhalte"
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
 
-#: ../../mod/settings.php:926
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
 
-#: ../../mod/settings.php:928
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Datenschutz-Einstellungen"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Identifikator"
 
-#: ../../mod/settings.php:930
-msgid "Hide my online presence"
-msgstr "Meine Online-Präsenz verbergen"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../mod/settings.php:930
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Verhindert die Anzeige deines Online-Status in deinem Profil"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
 
-#: ../../mod/settings.php:932
-msgid "Simple Privacy Settings:"
-msgstr "Einfache Privatsphären-Einstellungen"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Sichtbar für"
 
-#: ../../mod/settings.php:933
-msgid ""
-"Very Public - extremely permissive (should be used with caution)"
-msgstr ""
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Alle Verbindungen"
 
-#: ../../mod/settings.php:934
-msgid ""
-"Typical - default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)"
-msgstr ""
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Sammlung erstellt."
 
-#: ../../mod/settings.php:935
-msgid "Private - default private, never open or public"
-msgstr ""
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Sammlung kann nicht erstellt werden."
 
-#: ../../mod/settings.php:936
-msgid "Blocked - default blocked to/from everybody"
-msgstr ""
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Sammlung aktualisiert."
 
-#: ../../mod/settings.php:939
-msgid "Advanced Privacy Settings"
-msgstr ""
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Erstelle eine Sammlung von Kanälen."
 
-#: ../../mod/settings.php:941
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Kontaktanfragen pro Tag:"
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
+msgstr "Name der Sammlung:"
 
-#: ../../mod/settings.php:941
-msgid "May reduce spam activity"
-msgstr "Kann die Spam-Aktivität verringern"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
+msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../mod/settings.php:942
-msgid "Default Post Permissions"
-msgstr "Beitragszugriffrechte Standardeinstellungen"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Sammlung gelöscht."
 
-#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Löschen der Sammlung nicht möglich."
 
-#: ../../mod/settings.php:954
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
+msgstr "Sammlung-Editor"
 
-#: ../../mod/settings.php:954
-msgid "Useful to reduce spamming"
-msgstr "Nützlich um Spam zu verringern"
+#: ../../mod/group.php:196
+msgid "Members"
+msgstr "Mitglieder"
 
-#: ../../mod/settings.php:957
-msgid "Notification Settings"
-msgstr "Benachrichtigungs-Einstellungen"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
+msgstr "Alle verbundenen Kanäle"
 
-#: ../../mod/settings.php:958
-msgid "By default post a status message when:"
-msgstr "Sende standardmäßig Status-Nachrichten wenn:"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
+msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../mod/settings.php:959
-msgid "accepting a friend request"
-msgstr "einer Kontaktanfrage stattgegeben wurde"
+#: ../../mod/admin.php:48
+msgid "Theme settings updated."
+msgstr "Theme-Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:960
-msgid "joining a forum/community"
-msgstr "ein Forum beigetreten wurde"
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
+msgid "Site"
+msgstr "Seite"
 
-#: ../../mod/settings.php:961
-msgid "making an interesting profile change"
-msgstr "eine interessante Änderung am Profil vorgenommen wurde"
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
+msgid "Users"
+msgstr "Benutzer"
 
-#: ../../mod/settings.php:962
-msgid "Send a notification email when:"
-msgstr "Eine Email Benachrichtigung senden wenn:"
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
+msgid "Plugins"
+msgstr "Plug-Ins"
 
-#: ../../mod/settings.php:963
-msgid "You receive an introduction"
-msgstr "Du eine Vorstellung erhältst"
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
+msgid "Themes"
+msgstr "Themes"
 
-#: ../../mod/settings.php:964
-msgid "Your introductions are confirmed"
-msgstr "Deine Vorstellung bestätigt wurde."
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
+msgid "Server"
+msgstr "Server"
 
-#: ../../mod/settings.php:965
-msgid "Someone writes on your profile wall"
-msgstr "Jemand auf deine Pinnwand schreibt"
+#: ../../mod/admin.php:93
+msgid "DB updates"
+msgstr "DB-Aktualisierungen"
 
-#: ../../mod/settings.php:966
-msgid "Someone writes a followup comment"
-msgstr "Jemand einen Beitrag kommentiert"
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
+msgid "Logs"
+msgstr "Protokolle"
 
-#: ../../mod/settings.php:967
-msgid "You receive a private message"
-msgstr "Du eine private Nachricht erhältst"
+#: ../../mod/admin.php:113
+msgid "Plugin Features"
+msgstr "Plug-In Funktionen"
 
-#: ../../mod/settings.php:968
-msgid "You receive a friend suggestion"
-msgstr "Du einen Kontaktvorschlag erhältst"
+#: ../../mod/admin.php:115
+msgid "User registrations waiting for confirmation"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
 
-#: ../../mod/settings.php:969
-msgid "You are tagged in a post"
-msgstr "Du wurdest in einem Beitrag getaggt"
+#: ../../mod/admin.php:189
+msgid "Message queues"
+msgstr "Nachrichten-Warteschlangen"
 
-#: ../../mod/settings.php:970
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
+msgid "Administration"
+msgstr "Administration"
 
-#: ../../mod/settings.php:973
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Account / Seiten Arten Einstellungen"
+#: ../../mod/admin.php:195
+msgid "Summary"
+msgstr "Zusammenfassung"
 
-#: ../../mod/settings.php:974
-msgid "Change the behaviour of this account for special situations"
-msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
+#: ../../mod/admin.php:197
+msgid "Registered users"
+msgstr "Registrierte Benutzer"
 
-#: ../../mod/subthread.php:105
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt nun %2$s's %3$s"
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
+msgid "Pending registrations"
+msgstr "Ausstehende Registrierungen"
 
-#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
-#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
-#: ../../mod/update_community.php:18
-msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]"
+#: ../../mod/admin.php:200
+msgid "Version"
+msgstr "Version"
 
-#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
+msgid "Active plugins"
+msgstr "Aktive Plug-Ins"
 
-#: ../../mod/chanview.php:93
-msgid "toggle full screen mode"
-msgstr "auf Vollbildmodus umschalten"
+#: ../../mod/admin.php:350
+msgid "Site settings updated."
+msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../mod/tagger.php:98
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$s's %3$s mit %4$s getaggt"
+#: ../../mod/admin.php:379 ../../mod/settings.php:709
+msgid "No special theme for mobile devices"
+msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
+#: ../../mod/admin.php:381
+msgid "No special theme for accessibility"
+msgstr "Kein spezielles Accessibility-Theme vorhanden"
 
-#: ../../mod/chat.php:120
-msgid "Leave Room"
-msgstr "Raum verlassen"
+#: ../../mod/admin.php:409
+msgid "Closed"
+msgstr "Geschlossen"
 
-#: ../../mod/chat.php:121
-msgid "I am away right now"
-msgstr "Ich bin gerade nicht da"
+#: ../../mod/admin.php:410
+msgid "Requires approval"
+msgstr "Genehmigung erforderlich"
 
-#: ../../mod/chat.php:122
-msgid "I am online"
-msgstr "Ich bin online"
+#: ../../mod/admin.php:411
+msgid "Open"
+msgstr "Offen"
 
-#: ../../mod/chat.php:146 ../../mod/chat.php:166
-msgid "New Chatroom"
-msgstr "Neuen Chatraum"
+#: ../../mod/admin.php:416
+msgid "Private"
+msgstr "Privat"
 
-#: ../../mod/chat.php:147
-msgid "Chatroom Name"
-msgstr "Chatraum Name"
+#: ../../mod/admin.php:417
+msgid "Paid Access"
+msgstr "Kostenpflichtiger Zugang"
 
-#: ../../mod/chat.php:162
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$s's Chat-Räume"
+#: ../../mod/admin.php:418
+msgid "Free Access"
+msgstr "Kostenloser Zugang"
 
-#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/directory.php:15 ../../mod/display.php:9
-#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:442
-msgid "Public access denied."
-msgstr "Öffentlicher Zugang verweigert."
+#: ../../mod/admin.php:419
+msgid "Tiered Access"
+msgstr "Abgestufter Zugang"
 
-#: ../../mod/viewconnections.php:43
-msgid "No connections."
-msgstr "Keine Verbindungen."
+#: ../../mod/admin.php:432 ../../mod/register.php:189
+msgid "Registration"
+msgstr "Registrierung"
 
-#: ../../mod/viewconnections.php:55
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Besuche %s's Profil [%s]"
+#: ../../mod/admin.php:433
+msgid "File upload"
+msgstr "Dateiupload"
 
-#: ../../mod/viewconnections.php:70
-msgid "View Connnections"
-msgstr "Zeige Verbindungen"
+#: ../../mod/admin.php:434
+msgid "Policies"
+msgstr "Richtlinien"
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Schlagwort entfernt"
+#: ../../mod/admin.php:435
+msgid "Advanced"
+msgstr "Fortgeschritten"
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Schlagwort des Beitrags entfernen"
+#: ../../mod/admin.php:439
+msgid "Site name"
+msgstr "Seitenname"
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Schlagwort zum entfernen auswählen:"
+#: ../../mod/admin.php:440
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
-msgid "Remove"
-msgstr "Entferne"
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr "Administrator-Informationen"
 
-#: ../../mod/connect.php:55 ../../mod/connect.php:103
-msgid "Continue"
-msgstr "Fortfahren"
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../mod/connect.php:84
-msgid "Premium Channel Setup"
-msgstr "Prämium-Kanal Einrichtung"
+#: ../../mod/admin.php:442
+msgid "System language"
+msgstr "System-Sprache"
 
-#: ../../mod/connect.php:86
-msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für den Prämium-Kanal aktivieren"
+#: ../../mod/admin.php:443
+msgid "System theme"
+msgstr "System-Theme"
 
-#: ../../mod/connect.php:87
+#: ../../mod/admin.php:443
 msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Bitte gib deine Nutzungseinschränkungen ein, z.B. Paypal Quittung, Nutzungsbestimmungen etc."
+"Default system theme - may be over-ridden by user profiles - change theme settings"
+msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern"
 
-#: ../../mod/connect.php:89 ../../mod/connect.php:109
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen, vor dem Verbinden mit diesem Kanal nötig."
+#: ../../mod/admin.php:444
+msgid "Mobile system theme"
+msgstr "Mobile System-Theme:"
 
-#: ../../mod/connect.php:90
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Verbindungen werden den folgenden Text sehen bevor fortgefahren wird:"
+#: ../../mod/admin.php:444
+msgid "Theme for mobile devices"
+msgstr "Theme für mobile Geräte"
 
-#: ../../mod/connect.php:91 ../../mod/connect.php:112
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Mit dem fortfahren bestätige ich die Erfüllung aller Anweisungen die vom Seitenbetreiber erteilt wurden."
+#: ../../mod/admin.php:445
+msgid "Accessibility system theme"
+msgstr "Accessibility-System-Theme"
 
-#: ../../mod/connect.php:100
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Seitenbetreiber hat keine speziellen Anweisungen für Kanal-Betreiber hinterlegt.)"
+#: ../../mod/admin.php:445
+msgid "Accessibility theme"
+msgstr "Accessibility-Theme"
 
-#: ../../mod/connect.php:108
-msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Prämium-Kanal"
+#: ../../mod/admin.php:446
+msgid "Channel to use for this website's static pages"
+msgstr "Kanal für die statischen Seiten dieser Webseite verwenden"
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
+#: ../../mod/admin.php:446
+msgid "Site Channel"
+msgstr "Seiten Kanal"
 
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
-msgstr "Delegiere das Management für die Seite"
+#: ../../mod/admin.php:448
+msgid "Maximum image size"
+msgstr "Maximale Bildgröße"
 
-#: ../../mod/delegate.php:123
+#: ../../mod/admin.php:448
 msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr "Vorhandene Seitenmanager"
+#: ../../mod/admin.php:449
+msgid "Register policy"
+msgstr "Registrierungsrichtlinie"
 
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr "Vorhandene Bevollmächtigte für die Seite"
+#: ../../mod/admin.php:450
+msgid "Access policy"
+msgstr "Zugangsrichtlinien"
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr "Potentielle Bevollmächtigte"
+#: ../../mod/admin.php:451
+msgid "Register text"
+msgstr "Registrierungstext"
 
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../../mod/admin.php:451
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr "Keine Einträge."
+#: ../../mod/admin.php:452
+msgid "Accounts abandoned after x days"
+msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../mod/chatsvc.php:102
-msgid "Away"
-msgstr "Abwesend"
+#: ../../mod/admin.php:452
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../mod/chatsvc.php:106
-msgid "Online"
-msgstr "Online"
+#: ../../mod/admin.php:453
+msgid "Allowed friend domains"
+msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Element nicht verfügbar."
+#: ../../mod/admin.php:453
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
-msgstr "Menü-Element aktualisiert."
+#: ../../mod/admin.php:454
+msgid "Allowed email domains"
+msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
+#: ../../mod/admin.php:454
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
-msgstr "Menü-Bestandteil hinzugefügt."
+#: ../../mod/admin.php:455
+msgid "Block public"
+msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
+#: ../../mod/admin.php:455
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
-msgstr "Menü-Bestandteile verwalten"
+#: ../../mod/admin.php:456
+msgid "Force publish"
+msgstr "Veröffentlichung erzwingen"
 
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
+#: ../../mod/admin.php:456
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../mod/mitem.php:102
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
+#: ../../mod/admin.php:457
+msgid "No login on Homepage"
+msgstr "Kein Login auf der Homepage"
 
-#: ../../mod/mitem.php:103
-msgid "Drop element"
-msgstr "Bestandteil löschen"
+#: ../../mod/admin.php:457
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
+msgstr "Ktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört."
 
-#: ../../mod/mitem.php:104
-msgid "New element"
-msgstr "Neues Bestandteil"
+#: ../../mod/admin.php:459
+msgid "Proxy user"
+msgstr "Proxy Benutzer"
 
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
+#: ../../mod/admin.php:460
+msgid "Proxy URL"
+msgstr "Proxy URL"
 
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
+#: ../../mod/admin.php:461
+msgid "Network timeout"
+msgstr "Netzwerk-Timeout"
 
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
+#: ../../mod/admin.php:461
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
+#: ../../mod/admin.php:462
+msgid "Delivery interval"
+msgstr "Auslieferung Intervall"
 
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
-msgstr "Neues Menü-Bestandteil"
+#: ../../mod/admin.php:462
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
-msgstr "Menü-Element Zugriffsrechte"
+#: ../../mod/admin.php:463
+msgid "Poll interval"
+msgstr "Abfrageintervall"
 
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
-msgstr "Link Text"
+#: ../../mod/admin.php:463
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
-msgstr "URL des Links"
+#: ../../mod/admin.php:464
+msgid "Maximum Load Average"
+msgstr "Maximales Load Average"
 
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
-msgstr "Verwende Red Magic-Auth wenn verfügbar"
+#: ../../mod/admin.php:464
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
+#: ../../mod/admin.php:520
+msgid "No server found"
+msgstr "Kein Server gefunden"
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
+msgid "ID"
+msgstr "ID"
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
+#: ../../mod/admin.php:527
+msgid "for channel"
+msgstr "für Kanal"
 
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
+#: ../../mod/admin.php:527
+msgid "on server"
+msgstr "auf Server"
 
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
+#: ../../mod/admin.php:527
+msgid "Status"
+msgstr "Status"
 
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+#: ../../mod/admin.php:548
+msgid "Update has been marked successful"
+msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
+#: ../../mod/admin.php:558
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
 
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Sammlung erstellt."
-
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Sammlung kann nicht erstellt werden."
-
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Sammlung aktualisiert."
-
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Erstelle eine Sammlung von Kanälen."
-
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr "Name der Sammlung:"
-
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr "Mitglieder sind sichtbar für andere Kanäle"
-
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Sammlung gelöscht."
-
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Löschen der Sammlung nicht möglich."
-
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr "Sammlung-Editor"
+#: ../../mod/admin.php:561
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Update %s wurde erfolgreich ausgeführt."
 
-#: ../../mod/group.php:196
-msgid "Members"
-msgstr "Mitglieder"
+#: ../../mod/admin.php:565
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
 
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
-msgstr "Alle verbundenen Kanäle"
+#: ../../mod/admin.php:568
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "Update-Funktion %s konnte nicht gefunden werden."
 
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
-msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
+#: ../../mod/admin.php:583
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil Identifikator"
+#: ../../mod/admin.php:587
+msgid "Failed Updates"
+msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits Editor"
+#: ../../mod/admin.php:589
+msgid "Mark success (if update was manually applied)"
+msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
-msgstr "Wähle einen Kontakt zum Hinzufügen oder Löschen aus."
+#: ../../mod/admin.php:590
+msgid "Attempt to execute this update step automatically"
+msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
-msgstr "Sichtbar für"
+#: ../../mod/admin.php:616
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s Nutzer blockiert/freigegeben"
+msgstr[1] "%s Nutzer blockiert/freigegeben"
 
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
-msgstr "Alle Verbindungen"
+#: ../../mod/admin.php:623
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s Nutzer gelöscht"
+msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:48
-msgid "Theme settings updated."
-msgstr "Theme-Einstellungen aktualisiert."
+#: ../../mod/admin.php:654
+msgid "Account not found"
+msgstr "Konto nicht gefunden"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:430
-msgid "Site"
-msgstr "Seite"
+#: ../../mod/admin.php:665
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Benutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
-msgid "Users"
-msgstr "Benutzer"
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Benutzer '%s' freigegeben"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
-msgid "Plugins"
-msgstr "Plug-Ins"
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Benutzer '%s' blockiert"
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
-msgid "Themes"
-msgstr "Themes"
+#: ../../mod/admin.php:739
+msgid "select all"
+msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:92 ../../mod/admin.php:529
-msgid "Server"
-msgstr "Server"
+#: ../../mod/admin.php:740
+msgid "User registrations waiting for confirm"
+msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
 
-#: ../../mod/admin.php:93
-msgid "DB updates"
-msgstr "DB-Aktualisierungen"
+#: ../../mod/admin.php:741
+msgid "Request date"
+msgstr "Antragsdatum"
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
-msgid "Logs"
-msgstr "Protokolle"
+#: ../../mod/admin.php:742
+msgid "No registrations."
+msgstr "Keine Registrierungen."
 
-#: ../../mod/admin.php:113
-msgid "Plugin Features"
-msgstr "Plug-In Funktionen"
+#: ../../mod/admin.php:743
+msgid "Approve"
+msgstr "Genehmigen"
 
-#: ../../mod/admin.php:115
-msgid "User registrations waiting for confirmation"
-msgstr "Nutzer Anmeldungen die auf Bestätigung warten"
+#: ../../mod/admin.php:744
+msgid "Deny"
+msgstr "Verweigern"
 
-#: ../../mod/admin.php:189
-msgid "Message queues"
-msgstr "Nachrichten Warteschlange"
+#: ../../mod/admin.php:746 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
+msgstr "Blockieren"
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
-#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
-#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
-msgid "Administration"
-msgstr "Administration"
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
+msgstr "Freigeben"
 
-#: ../../mod/admin.php:195
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: ../../mod/admin.php:750
+msgid "Register date"
+msgstr "Registrierungs-Datum"
 
-#: ../../mod/admin.php:197
-msgid "Registered users"
-msgstr "Registrierte Benutzer"
+#: ../../mod/admin.php:750
+msgid "Last login"
+msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:199 ../../mod/admin.php:532
-msgid "Pending registrations"
-msgstr "Ausstehende Registrierungen"
+#: ../../mod/admin.php:750
+msgid "Expires"
+msgstr "Verfällt"
 
-#: ../../mod/admin.php:200
-msgid "Version"
-msgstr "Version"
+#: ../../mod/admin.php:750
+msgid "Service Class"
+msgstr "Service-Klasse"
 
-#: ../../mod/admin.php:202 ../../mod/admin.php:533
-msgid "Active plugins"
-msgstr "Aktive Plug-Ins"
+#: ../../mod/admin.php:752
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../mod/admin.php:350
-msgid "Site settings updated."
-msgstr "Site-Einstellungen aktualisiert."
+#: ../../mod/admin.php:753
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
 
-#: ../../mod/admin.php:381
-msgid "No special theme for accessibility"
-msgstr "Kein spezielles Accessibility Theme vorhanden"
+#: ../../mod/admin.php:794
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plug-In %s deaktiviert."
 
-#: ../../mod/admin.php:409
-msgid "Closed"
-msgstr "Geschlossen"
+#: ../../mod/admin.php:798
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plug-In %s aktiviert."
 
-#: ../../mod/admin.php:410
-msgid "Requires approval"
-msgstr "Genehmigung erforderlich"
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
+msgid "Disable"
+msgstr "Deaktivieren"
 
-#: ../../mod/admin.php:411
-msgid "Open"
-msgstr "Offen"
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
+msgid "Enable"
+msgstr "Aktivieren"
 
-#: ../../mod/admin.php:416
-msgid "Private"
-msgstr "Privat"
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
+msgid "Toggle"
+msgstr "Umschalten"
 
-#: ../../mod/admin.php:417
-msgid "Paid Access"
-msgstr "Kostenpflichtiger Zugang"
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
+msgid "Author: "
+msgstr "Autor: "
 
-#: ../../mod/admin.php:418
-msgid "Free Access"
-msgstr "Kostenloser Zugang"
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
+msgid "Maintainer: "
+msgstr "Betreuer:"
 
-#: ../../mod/admin.php:419
-msgid "Tiered Access"
-msgstr "Abgestufter Zugang"
+#: ../../mod/admin.php:974
+msgid "No themes found."
+msgstr "Keine Theme gefunden."
 
-#: ../../mod/admin.php:432 ../../mod/register.php:189
-msgid "Registration"
-msgstr "Registrierung"
+#: ../../mod/admin.php:1033
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:433
-msgid "File upload"
-msgstr "Dateiupload"
+#: ../../mod/admin.php:1081
+msgid "[Experimental]"
+msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:434
-msgid "Policies"
-msgstr "Richtlinien"
+#: ../../mod/admin.php:1082
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:435
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: ../../mod/admin.php:1109
+msgid "Log settings updated."
+msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:439
-msgid "Site name"
-msgstr "Seitenname"
+#: ../../mod/admin.php:1165
+msgid "Clear"
+msgstr "Leeren"
 
-#: ../../mod/admin.php:440
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
+#: ../../mod/admin.php:1171
+msgid "Debugging"
+msgstr "Debugging"
 
-#: ../../mod/admin.php:441
-msgid "Administrator Information"
-msgstr "Administrator Informationen"
+#: ../../mod/admin.php:1172
+msgid "Log file"
+msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:1172
 msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden."
+"Must be writable by web server. Relative to your Red top-level directory."
+msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."
 
-#: ../../mod/admin.php:442
-msgid "System language"
-msgstr "System-Sprache"
+#: ../../mod/admin.php:1173
+msgid "Log level"
+msgstr "Protokollstufe"
 
-#: ../../mod/admin.php:443
-msgid "System theme"
-msgstr "System-Theme"
+#: ../../mod/filer.php:35
+msgid "- select -"
+msgstr "– auswählen –"
 
-#: ../../mod/admin.php:443
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
-msgstr "Standard System-Theme - kann durch Nutzerprofile überschieben werden - Theme.Einstellungen ändern"
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
 
-#: ../../mod/admin.php:444
-msgid "Mobile system theme"
-msgstr "Mobile System-Theme:"
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
+msgstr "Element nicht gefunden"
 
-#: ../../mod/admin.php:444
-msgid "Theme for mobile devices"
-msgstr "Theme für mobile Geräte"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../mod/admin.php:445
-msgid "Accessibility system theme"
-msgstr "Accessibility System-Theme"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr "Eintrag löschen?"
 
-#: ../../mod/admin.php:445
-msgid "Accessibility theme"
-msgstr "Accessibility Theme"
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
+msgstr "YouTube-Video einfügen"
 
-#: ../../mod/admin.php:446
-msgid "Channel to use for this website's static pages"
-msgstr "Kanal für die statischen Seiten dieser Webseite verwenden"
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis [.ogg]-Video einfügen"
 
-#: ../../mod/admin.php:446
-msgid "Site Channel"
-msgstr "Seiten Kanal"
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis [.ogg]-Audio einfügen"
 
-#: ../../mod/admin.php:448
-msgid "Maximum image size"
-msgstr "Maximale Bildgröße"
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
+msgstr "Alter:"
 
-#: ../../mod/admin.php:448
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Maximale Größe in Bytes von hochgeladenen Bildern. Standard ist 0, was keine Einschränkung bedeutet."
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
+msgid "Gender: "
+msgstr "Geschlecht:"
 
-#: ../../mod/admin.php:449
-msgid "Register policy"
-msgstr "Registrierungsmethode"
+#: ../../mod/directory.php:208
+msgid "Finding:"
+msgstr "Ergebnisse:"
 
-#: ../../mod/admin.php:450
-msgid "Access policy"
-msgstr "Zugangsrichtlinien"
+#: ../../mod/directory.php:216
+msgid "next page"
+msgstr "nächste Seite"
 
-#: ../../mod/admin.php:451
-msgid "Register text"
-msgstr "Registrierungstext"
+#: ../../mod/directory.php:216
+msgid "previous page"
+msgstr "vorige Seite"
 
-#: ../../mod/admin.php:451
-msgid "Will be displayed prominently on the registration page."
-msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
+#: ../../mod/directory.php:223
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../mod/admin.php:452
-msgid "Accounts abandoned after x days"
-msgstr "Accounts gelten nach X Tagen als unbenutzt"
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
 
-#: ../../mod/admin.php:452
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Verschwende keine Systemressourchen auf das Pollen von externen Seiten wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
+msgstr "Gewähltes Profil nicht gefunden."
 
-#: ../../mod/admin.php:453
-msgid "Allowed friend domains"
-msgstr "Erlaubte Domains für Kontakte"
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
+msgstr "Verbindung aktualisiert."
 
-#: ../../mod/admin.php:453
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
+msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../mod/admin.php:454
-msgid "Allowed email domains"
-msgstr "Erlaubte Domains für E-Mails"
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
+msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
 
-#: ../../mod/admin.php:454
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../mod/admin.php:455
-msgid "Block public"
-msgstr "Öffentlichen Zugriff blockieren"
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
+msgstr "Kanal nicht mehr blockiert"
 
-#: ../../mod/admin.php:455
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
+msgstr "Kanal blockiert"
 
-#: ../../mod/admin.php:456
-msgid "Force publish"
-msgstr "Veröffentlichung erzwingen"
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
+msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 
-#: ../../mod/admin.php:456
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
+msgstr "Kanal wird nicht mehr ignoriert"
 
-#: ../../mod/admin.php:457
-msgid "No login on Homepage"
-msgstr "Kein Login auf der Homepage"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
+msgstr "Kanal wird ignoriert"
 
-#: ../../mod/admin.php:457
-msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
-msgstr "Wählen um das Login Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört."
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
+msgstr "Kanal wurde aus dem Archiv zurück geholt"
 
-#: ../../mod/admin.php:459
-msgid "Proxy user"
-msgstr "Proxy Benutzer"
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
+msgstr "Kanal wurde archiviert"
 
-#: ../../mod/admin.php:460
-msgid "Proxy URL"
-msgstr "Proxy URL"
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
+msgstr "Kanal wird nicht mehr versteckt"
+
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
+msgstr "Kanal wurde versteckt"
 
-#: ../../mod/admin.php:461
-msgid "Network timeout"
-msgstr "Netzwerk-Timeout"
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
+msgstr "Kanal wurde zugelassen"
 
-#: ../../mod/admin.php:461
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
+msgstr "Zulassung des Kanals entfernt"
 
-#: ../../mod/admin.php:462
-msgid "Delivery interval"
-msgstr "Auslieferung Intervall"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
+msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/admin.php:462
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
+msgstr "%ss Profil ansehen"
 
-#: ../../mod/admin.php:463
-msgid "Poll interval"
-msgstr "Abfrageintervall"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
+msgstr "Zugriffsrechte neu laden"
 
-#: ../../mod/admin.php:463
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
+msgstr "Aktualisierte Zugriffsrechte abfragen"
 
-#: ../../mod/admin.php:464
-msgid "Maximum Load Average"
-msgstr "Maximum Load Average"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
+msgstr "Kürzliche Aktivitäten"
 
-#: ../../mod/admin.php:464
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
+msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../mod/admin.php:520
-msgid "No server found"
-msgstr "Kein Server gefunden"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
+msgstr "Verbindung blockieren oder freigeben"
 
-#: ../../mod/admin.php:527 ../../mod/admin.php:750
-msgid "ID"
-msgstr "ID"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
+msgstr "Nicht ignorieren"
 
-#: ../../mod/admin.php:527
-msgid "for channel"
-msgstr "für Kanal"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorieren"
 
-#: ../../mod/admin.php:527
-msgid "on server"
-msgstr "auf Server"
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
+msgstr "Verbindung ignorieren oder wieder beachten"
 
-#: ../../mod/admin.php:527
-msgid "Status"
-msgstr "Status"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/admin.php:548
-msgid "Update has been marked successful"
-msgstr "Update wurde als erfolgreich markiert"
+#: ../../mod/connedit.php:346
+msgid "Archive"
+msgstr "Archivieren"
 
-#: ../../mod/admin.php:558
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs."
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
+msgstr "Verbindung archivieren oder aus dem Archiv zurückholen"
 
-#: ../../mod/admin.php:561
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Update %s wurde erfolgreich angewandt."
+#: ../../mod/connedit.php:352
+msgid "Unhide"
+msgstr "Wieder sichtbar machen"
 
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Update %s liefert keinen Rückgabewert. Unbekannt ob es erfolgreich war."
+#: ../../mod/connedit.php:352
+msgid "Hide"
+msgstr "Verstecken"
 
-#: ../../mod/admin.php:568
-#, php-format
-msgid "Update function %s could not be found."
-msgstr "Update Funktion %s konnte nicht gefunden werden."
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
+msgstr "Diese Verbindung verstecken oder wieder sichtbar machen"
 
-#: ../../mod/admin.php:583
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Aktualisierungen."
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
+msgstr "Verbindung löschen"
 
-#: ../../mod/admin.php:587
-msgid "Failed Updates"
-msgstr "Fehlgeschlagene Aktualisierungen"
+#: ../../mod/connedit.php:395
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../../mod/admin.php:589
-msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)"
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
+msgstr "Verbindung genehmigen"
 
-#: ../../mod/admin.php:590
-msgid "Attempt to execute this update step automatically"
-msgstr "Versuche diesen Updateschritt automatisch anzuwenden"
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
+msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
 
-#: ../../mod/admin.php:616
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s Nutzer blockiert/freigegeben"
-msgstr[1] "%s Nutzer blockiert/freigegeben"
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
+msgstr "Automatische Berechtigungs-Einstellungen"
 
-#: ../../mod/admin.php:623
+#: ../../mod/connedit.php:421
 #, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s Nutzer gelöscht"
-msgstr[1] "%s Nutzer gelöscht"
+msgid "Connections: settings for %s"
+msgstr "Verbindungseinstellungen für %s"
 
-#: ../../mod/admin.php:654
-msgid "Account not found"
-msgstr "Konto nicht gefunden"
+#: ../../mod/connedit.php:425
+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 "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest."
 
-#: ../../mod/admin.php:665
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Benutzer '%s' gelöscht"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
+msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Benutzer '%s' freigegeben"
+#: ../../mod/connedit.php:433
+msgid "inherited"
+msgstr "geerbt"
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Benutzer '%s' blockiert"
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
+msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!"
 
-#: ../../mod/admin.php:739
-msgid "select all"
-msgstr "Alle auswählen"
+#: ../../mod/connedit.php:436
+msgid ""
+"This may be appropriate based on your privacy "
+"settings, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Abhängig von Deinen Privatsphäre-Einstellungen könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen."
 
-#: ../../mod/admin.php:740
-msgid "User registrations waiting for confirm"
-msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
+msgstr "Sichtbarkeit des Profils"
 
-#: ../../mod/admin.php:741
-msgid "Request date"
-msgstr "Antragsdatum"
+#: ../../mod/connedit.php:439
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../mod/admin.php:742
-msgid "No registrations."
-msgstr "Keine Registrierungen."
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
+msgstr "Kontaktinformationen / Notizen"
 
-#: ../../mod/admin.php:743
-msgid "Approve"
-msgstr "Genehmigen"
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
+msgstr "Kontaktnotizen bearbeiten"
 
-#: ../../mod/admin.php:744
-msgid "Deny"
-msgstr "Verweigern"
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
+msgstr "Deren Einstellungen"
 
-#: ../../mod/admin.php:746 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Block"
-msgstr "Blockieren"
+#: ../../mod/connedit.php:444
+msgid "My Settings"
+msgstr "Meine Einstellungen"
 
-#: ../../mod/admin.php:747 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Unblock"
-msgstr "Freigeben"
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
+msgstr "Forum Mitglieder"
 
-#: ../../mod/admin.php:750
-msgid "Register date"
-msgstr "Registrierungs-Datum"
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
+msgstr "Marktschreier"
 
-#: ../../mod/admin.php:750
-msgid "Last login"
-msgstr "Letzte Anmeldung"
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
+msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)"
 
-#: ../../mod/admin.php:750
-msgid "Expires"
-msgstr "Verfällt"
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
+msgstr "Vorsichtiges Teilen"
 
-#: ../../mod/admin.php:750
-msgid "Service Class"
-msgstr "Service-Klasse"
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
+msgstr "Nur folgen"
 
-#: ../../mod/admin.php:752
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
+msgstr "Individuelle Zugriffsrechte"
 
-#: ../../mod/admin.php:753
+#: ../../mod/connedit.php:452
 msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?"
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
+"individual settings. Changing those inherited settings on this page will "
+"have no effect."
+msgstr "Einige Berechtigungen werden von den Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen."
+
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
+msgstr "Zugriffsrechte für Fortgeschrittene"
 
-#: ../../mod/admin.php:794
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Plug-In %s deaktiviert."
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
+msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)"
 
-#: ../../mod/admin.php:798
+#: ../../mod/connedit.php:458
 #, php-format
-msgid "Plugin %s enabled."
-msgstr "Plug-In %s aktiviert."
+msgid "Visit %s's profile - %s"
+msgstr "%ss Profil besuchen - %s"
 
-#: ../../mod/admin.php:808 ../../mod/admin.php:1010
-msgid "Disable"
-msgstr "Deaktivieren"
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
+msgstr "Kontakt blockieren/freigeben"
 
-#: ../../mod/admin.php:810 ../../mod/admin.php:1012
-msgid "Enable"
-msgstr "Aktivieren"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
+msgstr "Kontakt ignorieren"
 
-#: ../../mod/admin.php:836 ../../mod/admin.php:1041
-msgid "Toggle"
-msgstr "Umschalten"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
+msgstr "URL-Einstellungen reparieren"
 
-#: ../../mod/admin.php:844 ../../mod/admin.php:1051
-msgid "Author: "
-msgstr "Autor: "
+#: ../../mod/connedit.php:462
+msgid "View conversations"
+msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/admin.php:845 ../../mod/admin.php:1052
-msgid "Maintainer: "
-msgstr "Betreuer:"
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
+msgstr "Kontakt löschen"
 
-#: ../../mod/admin.php:974
-msgid "No themes found."
-msgstr "Keine Theme gefunden."
+#: ../../mod/connedit.php:467
+msgid "Last update:"
+msgstr "Letzte Aktualisierung:"
 
-#: ../../mod/admin.php:1033
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
+msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/admin.php:1081
-msgid "[Experimental]"
-msgstr "[Experimentell]"
+#: ../../mod/connedit.php:471
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
 
-#: ../../mod/admin.php:1082
-msgid "[Unsupported]"
-msgstr "[Nicht unterstützt]"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
+msgstr "Derzeit blockiert"
 
-#: ../../mod/admin.php:1109
-msgid "Log settings updated."
-msgstr "Protokoll-Einstellungen aktualisiert."
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
 
-#: ../../mod/admin.php:1165
-msgid "Clear"
-msgstr "Leeren"
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
+msgstr "Derzeit archiviert"
 
-#: ../../mod/admin.php:1171
-msgid "Debugging"
-msgstr "Debugging"
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
+msgstr "Derzeit anstehend"
 
-#: ../../mod/admin.php:1172
-msgid "Log file"
-msgstr "Protokolldatei"
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
+msgstr "Diese Verbindung vor den anderen verbergen."
 
-#: ../../mod/admin.php:1172
+#: ../../mod/connedit.php:481
 msgid ""
-"Must be writable by web server. Relative to your Red top-level directory."
-msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis."
+"Replies/likes to your public posts may still be visible"
+msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"
 
-#: ../../mod/admin.php:1173
-msgid "Log level"
-msgstr "Protokollstufe"
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
+msgstr "Layout-Hilfe"
 
-#: ../../mod/filer.php:35
-msgid "- select -"
-msgstr "-auswählen-"
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
+msgstr "Hilfe zu dieser Funktion"
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
+msgstr "Layout-Name"
 
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
-msgstr "Element nicht gefunden"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
+msgstr "Hilfe:"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
+msgstr "Nicht gefunden"
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Eintrag löschen?"
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
 
-#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
-msgstr "YouTube-Video einfügen"
+#: ../../mod/rmagic.php:56
+msgid "Remote Authentication"
+msgstr "Entfernte Authentifizierung"
 
-#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis [.ogg]-Video einfügen"
+#: ../../mod/rmagic.php:57
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
 
-#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis [.ogg]-Audio einfügen"
+#: ../../mod/rmagic.php:58
+msgid "Authenticate"
+msgstr "Authentifizieren"
 
-#: ../../mod/directory.php:143 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
-msgstr "Alter:"
+#: ../../mod/page.php:35
+msgid "Invalid item."
+msgstr "Ungültiges Element."
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
-msgid "Gender: "
-msgstr "Geschlecht:"
+#: ../../mod/network.php:79
+msgid "No such group"
+msgstr "Gruppe existiert nicht"
 
-#: ../../mod/directory.php:207
-msgid "Finding:"
-msgstr "Ergebnisse:"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
+msgstr "Suchergebnisse für:"
 
-#: ../../mod/directory.php:215
-msgid "next page"
-msgstr "nächste Seite"
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "Sammlung ist leer"
 
-#: ../../mod/directory.php:215
-msgid "previous page"
-msgstr "vorige Seite"
+#: ../../mod/network.php:180
+msgid "Collection: "
+msgstr "Sammlung:"
 
-#: ../../mod/directory.php:222
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr "Verbindung:"
 
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
-msgstr "Konnte auf den Kontakteintrag nicht zugreifen."
+#: ../../mod/network.php:196
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
 
-#: ../../mod/connedit.php:63 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
-msgstr "Konnte das gewählte Profil nicht finden."
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
+msgid "Profile not found."
+msgstr "Profil nicht gefunden."
 
-#: ../../mod/connedit.php:107 ../../mod/connections.php:94
-msgid "Connection updated."
-msgstr "Verbindung aktualisiert."
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
 
-#: ../../mod/connedit.php:109 ../../mod/connections.php:96
-msgid "Failed to update connection record."
-msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Profil-"
 
-#: ../../mod/connedit.php:204
-msgid "Could not access address book record."
-msgstr "Konnte nicht auf den Eintrag im Adressbuch zugreifen."
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "Neues Profil erstellt."
 
-#: ../../mod/connedit.php:218
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
+msgstr "Profil kann nicht geklont werden."
 
-#: ../../mod/connedit.php:225
-msgid "Channel has been unblocked"
-msgstr "Kanal nicht mehr blockiert"
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
+msgstr "Profil-Name erforderlich."
 
-#: ../../mod/connedit.php:226
-msgid "Channel has been blocked"
-msgstr "Kanal blockiert"
+#: ../../mod/profiles.php:294
+msgid "Marital Status"
+msgstr "Familienstand"
 
-#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
-#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
-#: ../../mod/connedit.php:281
-msgid "Unable to set address book parameters."
-msgstr "Konnte die Adressbuch Parameter nicht setzen."
+#: ../../mod/profiles.php:298
+msgid "Romantic Partner"
+msgstr "Romantische Partner"
 
-#: ../../mod/connedit.php:237
-msgid "Channel has been unignored"
-msgstr "Kanal wird nicht mehr ignoriert"
+#: ../../mod/profiles.php:302
+msgid "Likes"
+msgstr "Gefällt"
+
+#: ../../mod/profiles.php:306
+msgid "Dislikes"
+msgstr "Gefällt nicht"
+
+#: ../../mod/profiles.php:310
+msgid "Work/Employment"
+msgstr "Arbeit/Anstellung"
+
+#: ../../mod/profiles.php:313
+msgid "Religion"
+msgstr "Religion"
+
+#: ../../mod/profiles.php:317
+msgid "Political Views"
+msgstr "Politische Ansichten"
+
+#: ../../mod/profiles.php:321
+msgid "Gender"
+msgstr "Geschlecht"
 
-#: ../../mod/connedit.php:238
-msgid "Channel has been ignored"
-msgstr "Kanal wird ignoriert"
+#: ../../mod/profiles.php:325
+msgid "Sexual Preference"
+msgstr "Sexuelle Orientierung"
 
-#: ../../mod/connedit.php:249
-msgid "Channel has been unarchived"
-msgstr "Kanal wurde aus dem Archiv zurück geholt"
+#: ../../mod/profiles.php:329
+msgid "Homepage"
+msgstr "Webseite"
 
-#: ../../mod/connedit.php:250
-msgid "Channel has been archived"
-msgstr "Kanal wurde archiviert"
+#: ../../mod/profiles.php:333
+msgid "Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../mod/connedit.php:261
-msgid "Channel has been unhidden"
-msgstr "Kanal wird nicht mehr versteckt"
+#: ../../mod/profiles.php:337
+msgid "Address"
+msgstr "Adresse"
 
-#: ../../mod/connedit.php:262
-msgid "Channel has been hidden"
-msgstr "Kanal wurde versteckt"
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
+msgid "Location"
+msgstr "Ort"
 
-#: ../../mod/connedit.php:276
-msgid "Channel has been approved"
-msgstr "Kanal wurde zugelassen"
+#: ../../mod/profiles.php:427
+msgid "Profile updated."
+msgstr "Profil aktualisiert."
 
-#: ../../mod/connedit.php:277
-msgid "Channel has been unapproved"
-msgstr "Zulassung des Kanals entfernt"
+#: ../../mod/profiles.php:482
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/connedit.php:295
-msgid "Contact has been removed."
-msgstr "Kontakt wurde entfernt."
+#: ../../mod/profiles.php:505
+msgid "Edit Profile Details"
+msgstr "Bearbeite Profil-Details"
 
-#: ../../mod/connedit.php:315
-#, php-format
-msgid "View %s's profile"
-msgstr "%s's Profil ansehen"
+#: ../../mod/profiles.php:507
+msgid "View this profile"
+msgstr "Dieses Profil ansehen"
 
-#: ../../mod/connedit.php:319
-msgid "Refresh Permissions"
-msgstr "Zugriffsrechte auffrischen"
+#: ../../mod/profiles.php:508
+msgid "Change Profile Photo"
+msgstr "Profilfoto ändern"
 
-#: ../../mod/connedit.php:322
-msgid "Fetch updated permissions"
-msgstr "Aktualisierte Zugriffsrechte abfragen"
+#: ../../mod/profiles.php:509
+msgid "Create a new profile using these settings"
+msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../mod/connedit.php:326
-msgid "Recent Activity"
-msgstr "Kürzliche Aktivitäten"
+#: ../../mod/profiles.php:510
+msgid "Clone this profile"
+msgstr "Dieses Profil klonen"
 
-#: ../../mod/connedit.php:329
-msgid "View recent posts and comments"
-msgstr "Betrachte die neuesten Beiträge und Kommentare"
+#: ../../mod/profiles.php:511
+msgid "Delete this profile"
+msgstr "Dieses Profil löschen"
 
-#: ../../mod/connedit.php:336
-msgid "Block or Unblock this connection"
-msgstr "Verbindung blockieren oder frei geben"
+#: ../../mod/profiles.php:512
+msgid "Profile Name:"
+msgstr "Profilname:"
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-msgid "Unignore"
-msgstr "Nicht ignorieren"
+#: ../../mod/profiles.php:513
+msgid "Your Full Name:"
+msgstr "Dein voller Name:"
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-#: ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorieren"
+#: ../../mod/profiles.php:514
+msgid "Title/Description:"
+msgstr "Titel/Stellenbeschreibung:"
 
-#: ../../mod/connedit.php:343
-msgid "Ignore or Unignore this connection"
-msgstr "Verbindung ignorieren oder wieder beachten"
+#: ../../mod/profiles.php:515
+msgid "Your Gender:"
+msgstr "Dein Geschlecht:"
 
-#: ../../mod/connedit.php:346
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
+#: ../../mod/profiles.php:516
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Geburtstag (%s):"
 
-#: ../../mod/connedit.php:346
-msgid "Archive"
-msgstr "Archivieren"
+#: ../../mod/profiles.php:517
+msgid "Street Address:"
+msgstr "Straße und Hausnummer:"
 
-#: ../../mod/connedit.php:349
-msgid "Archive or Unarchive this connection"
-msgstr "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück"
+#: ../../mod/profiles.php:518
+msgid "Locality/City:"
+msgstr "Wohnort:"
 
-#: ../../mod/connedit.php:352
-msgid "Unhide"
-msgstr "aufdecken"
+#: ../../mod/profiles.php:519
+msgid "Postal/Zip Code:"
+msgstr "Postleitzahl:"
 
-#: ../../mod/connedit.php:352
-msgid "Hide"
-msgstr "Verbergen"
+#: ../../mod/profiles.php:520
+msgid "Country:"
+msgstr "Land:"
 
-#: ../../mod/connedit.php:355
-msgid "Hide or Unhide this connection"
-msgstr "Diese Verbindung verstecken oder aufdecken"
+#: ../../mod/profiles.php:521
+msgid "Region/State:"
+msgstr "Region/Bundesstaat:"
 
-#: ../../mod/connedit.php:362
-msgid "Delete this connection"
-msgstr "Verbindung löschen"
+#: ../../mod/profiles.php:522
+msgid "♥ Marital Status:"
+msgstr "♥ Beziehungsstatus:"
 
-#: ../../mod/connedit.php:395
-msgid "Unknown"
-msgstr "Unbekannt"
+#: ../../mod/profiles.php:523
+msgid "Who: (if applicable)"
+msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
-msgid "Approve this connection"
-msgstr "Verbindung genehmigen"
+#: ../../mod/profiles.php:524
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/connedit.php:405
-msgid "Accept connection to allow communication"
-msgstr "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen"
+#: ../../mod/profiles.php:525
+msgid "Since [date]:"
+msgstr "Seit [Datum]:"
 
-#: ../../mod/connedit.php:421
-msgid "Automatic Permissions Settings"
-msgstr "Automatische Berechtigungs-Einstellungen"
+#: ../../mod/profiles.php:527
+msgid "Homepage URL:"
+msgstr "Homepage URL:"
 
-#: ../../mod/connedit.php:421
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Verbindungseinstellungen für %s"
+#: ../../mod/profiles.php:530
+msgid "Religious Views:"
+msgstr "Religiöse Ansichten:"
 
-#: ../../mod/connedit.php:425
-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 "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest."
+#: ../../mod/profiles.php:531
+msgid "Keywords:"
+msgstr "Schlüsselwörter:"
 
-#: ../../mod/connedit.php:427
-msgid "Slide to adjust your degree of friendship"
-msgstr "Schieben um den Grad der Freundschaft zu wählen"
+#: ../../mod/profiles.php:534
+msgid "Example: fishing photography software"
+msgstr "Beispiel: Angeln Fotografie Software"
 
-#: ../../mod/connedit.php:433
-msgid "inherited"
-msgstr "Geerbt"
+#: ../../mod/profiles.php:535
+msgid "Used in directory listings"
+msgstr "Wird in Verzeichnis-Auflistungen verwendet"
 
-#: ../../mod/connedit.php:435
-msgid "Connection has no individual permissions!"
-msgstr "Diese Verbindung hat keine individuellen Zugriffseinstellungen."
+#: ../../mod/profiles.php:536
+msgid "Tell us about yourself..."
+msgstr "Erzähle uns ein wenig von Dir …"
 
-#: ../../mod/connedit.php:436
-msgid ""
-"This may be appropriate based on your privacy "
-"settings, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Abhängig von deinen Privatsphären Einstellungen könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen."
+#: ../../mod/profiles.php:537
+msgid "Hobbies/Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../mod/connedit.php:438
-msgid "Profile Visibility"
-msgstr "Sichtbarkeit des Profils"
+#: ../../mod/profiles.php:538
+msgid "Contact information and Social Networks"
+msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../mod/connedit.php:439
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
+#: ../../mod/profiles.php:539
+msgid "My other channels"
+msgstr "Meine anderen Kanäle"
 
-#: ../../mod/connedit.php:440
-msgid "Contact Information / Notes"
-msgstr "Kontaktinformationen / Notizen"
+#: ../../mod/profiles.php:540
+msgid "Musical interests"
+msgstr "Musikalische Interessen"
 
-#: ../../mod/connedit.php:441
-msgid "Edit contact notes"
-msgstr "Kontaktnotizen editieren"
+#: ../../mod/profiles.php:541
+msgid "Books, literature"
+msgstr "Bücher, Literatur"
 
-#: ../../mod/connedit.php:443
-msgid "Their Settings"
-msgstr "Deren Einstellungen"
+#: ../../mod/profiles.php:542
+msgid "Television"
+msgstr "Fernsehen"
 
-#: ../../mod/connedit.php:444
-msgid "My Settings"
-msgstr "Meine Einstellungen"
+#: ../../mod/profiles.php:543
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../mod/connedit.php:446
-msgid "Forum Members"
-msgstr "Forum Mitglieder"
+#: ../../mod/profiles.php:544
+msgid "Love/romance"
+msgstr "Liebe/Romantik"
 
-#: ../../mod/connedit.php:447
-msgid "Soapbox"
-msgstr "Marktschreier"
+#: ../../mod/profiles.php:545
+msgid "Work/employment"
+msgstr "Arbeit/Anstellung"
 
-#: ../../mod/connedit.php:448
-msgid "Full Sharing (typical social network permissions)"
-msgstr ""
+#: ../../mod/profiles.php:546
+msgid "School/education"
+msgstr "Schule/Ausbildung"
+
+#: ../../mod/profiles.php:551
+msgid ""
+"This is your public profile.
                                      It may "
+"be visible to anybody using the internet."
+msgstr "Das ist Dein öffentliches Profil.
                                      Es könnte für jeden im Internet sichtbar sein."
 
-#: ../../mod/connedit.php:449
-msgid "Cautious Sharing "
-msgstr ""
+#: ../../mod/profiles.php:600
+msgid "Edit/Manage Profiles"
+msgstr "Bearbeite/Verwalte Profile"
 
-#: ../../mod/connedit.php:450
-msgid "Follow Only"
-msgstr "Nur Folgen"
+#: ../../mod/profiles.php:601
+msgid "Add profile things"
+msgstr "Profil-Dinge hinzufügen"
 
-#: ../../mod/connedit.php:451
-msgid "Individual Permissions"
-msgstr "Individuelle Zugriffseinstellungen"
+#: ../../mod/profiles.php:602
+msgid "Include desirable objects in your profile"
+msgstr "Binde begehrenswerte Dinge in Dein Profil ein"
 
-#: ../../mod/connedit.php:452
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
+
+#: ../../mod/post.php:226
 msgid ""
-"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
-"individual settings. Changing those inherited settings on this page will "
-"have no effect."
-msgstr ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
 
-#: ../../mod/connedit.php:453
-msgid "Advanced Permissions"
-msgstr "Erweiterte Zugriffsrechte"
+#: ../../mod/post.php:256
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../mod/connedit.php:454
-msgid "Simple Permissions (select one and submit)"
-msgstr ""
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Diese Website ist kein Verzeichnis-Server"
 
-#: ../../mod/connedit.php:458
-#, php-format
-msgid "Visit %s's profile - %s"
-msgstr "%s's Profil besuchen - %s"
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
 
-#: ../../mod/connedit.php:459
-msgid "Block/Unblock contact"
-msgstr "Geblockt Status ein- / ausschalten"
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Quelle erstellt."
 
-#: ../../mod/connedit.php:460
-msgid "Ignore contact"
-msgstr "Kontakt ignorieren"
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Quelle aktualisiert."
 
-#: ../../mod/connedit.php:461
-msgid "Repair URL settings"
-msgstr "URL Einstellungen reparieren"
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
 
-#: ../../mod/connedit.php:462
-msgid "View conversations"
-msgstr "Unterhaltungen anzeigen"
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Quellen von Inhalten Deines Kanals verwalten."
 
-#: ../../mod/connedit.php:464
-msgid "Delete contact"
-msgstr "Kontakt löschen"
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Neue Quelle"
 
-#: ../../mod/connedit.php:467
-msgid "Last update:"
-msgstr "Letzte Aktualisierung:"
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
-#: ../../mod/connedit.php:469
-msgid "Update public posts"
-msgstr "Öffentliche Beiträge aktualisieren"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../mod/connedit.php:471
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
 
-#: ../../mod/connedit.php:477
-msgid "Currently blocked"
-msgstr "Derzeit blockiert"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
+msgstr "Name des Kanals"
 
-#: ../../mod/connedit.php:478
-msgid "Currently ignored"
-msgstr "Derzeit ignoriert"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Quelle nicht gefunden."
 
-#: ../../mod/connedit.php:479
-msgid "Currently archived"
-msgstr "Derzeit archiviert"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Quelle bearbeiten"
 
-#: ../../mod/connedit.php:480
-msgid "Currently pending"
-msgstr "Derzeit anstehend"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Quelle löschen"
 
-#: ../../mod/connedit.php:481
-msgid "Hide this contact from others"
-msgstr "Diese Verbindung vor den anderen verbergen."
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Quelle gelöscht"
 
-#: ../../mod/connedit.php:481
-msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Konnte die Quelle nicht löschen."
 
-#: ../../mod/layouts.php:52
-msgid "Layout Help"
-msgstr "Layout Hilfe"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
 
-#: ../../mod/layouts.php:55
-msgid "Help with this feature"
-msgstr "Hilfe zu diesem Feature"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Sichtbar für:"
 
-#: ../../mod/layouts.php:74
-msgid "Layout Name"
-msgstr "Layout Name"
+#: ../../mod/magic.php:70
+msgid "Hub not found."
+msgstr "Server nicht gefunden."
 
-#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
-msgid "Help:"
-msgstr "Hilfe:"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
+msgstr "Red Matrix Server - Installation"
 
-#: ../../mod/help.php:68 ../../index.php:223
-msgid "Not Found"
-msgstr "Nicht gefunden"
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
+msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
+#: ../../mod/setup.php:171
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
 
-#: ../../mod/rmagic.php:56
-msgid "Remote Authentication"
-msgstr "Entfernte Authentifizierung"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
+msgstr "Kann Tabelle nicht erstellen."
 
-#: ../../mod/rmagic.php:57
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
+msgstr "Die Datenbank Deines Servers wurde installiert."
 
-#: ../../mod/rmagic.php:58
-msgid "Authenticate"
-msgstr "Authentifizieren"
+#: ../../mod/setup.php:187
+msgid ""
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
+msgstr "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren."
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
-msgstr "Ungültiges Element."
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../mod/network.php:79
-msgid "No such group"
-msgstr "Gruppe existiert nicht"
+#: ../../mod/setup.php:254
+msgid "System check"
+msgstr "Systemprüfung"
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
-msgstr "Suchergebnisse für:"
+#: ../../mod/setup.php:259
+msgid "Check again"
+msgstr "Bitte nochmal prüfen"
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
-msgstr "Sammlung ist leer"
+#: ../../mod/setup.php:281
+msgid "Database connection"
+msgstr "Datenbank Verbindung"
 
-#: ../../mod/network.php:180
-msgid "Collection: "
-msgstr "Sammlung:"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
+msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
 
-#: ../../mod/network.php:193
-msgid "Connection: "
-msgstr "Verbindung:"
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
-msgid "Profile not found."
-msgstr "Profil nicht gefunden."
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
+msgstr "Datenbank-Servername"
 
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profil gelöscht."
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
+msgstr "Standard ist localhost"
 
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Profil-"
+#: ../../mod/setup.php:289
+msgid "Database Port"
+msgstr "Datenbank-Port"
 
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Neues Profil erstellt."
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
+msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
+
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
+msgstr "Datenbank-Benutzername"
+
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
+msgstr "Datenbank-Kennwort"
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Profil kann nicht geklont werden."
+#: ../../mod/setup.php:292
+msgid "Database Name"
+msgstr "Datenbank-Name"
 
-#: ../../mod/profiles.php:178
-msgid "Profile Name is required."
-msgstr "Profil-Name erforderlich."
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
+msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../mod/profiles.php:294
-msgid "Marital Status"
-msgstr "Familienstand"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
 
-#: ../../mod/profiles.php:298
-msgid "Romantic Partner"
-msgstr "Romantische Partner"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
+msgstr "Server-URL"
 
-#: ../../mod/profiles.php:302
-msgid "Likes"
-msgstr "Gefällt-mir"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
+msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../mod/profiles.php:306
-msgid "Dislikes"
-msgstr "Gefällt-mir-nicht"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
+msgstr "Standard-Zeitzone für Deinen Server"
 
-#: ../../mod/profiles.php:310
-msgid "Work/Employment"
-msgstr "Arbeit/Anstellung"
+#: ../../mod/setup.php:325
+msgid "Site settings"
+msgstr "Seiteneinstellungen"
 
-#: ../../mod/profiles.php:313
-msgid "Religion"
-msgstr "Religion"
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
 
-#: ../../mod/profiles.php:317
-msgid "Political Views"
-msgstr "Politische Anscihten"
+#: ../../mod/setup.php:385
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
 
-#: ../../mod/profiles.php:321
-msgid "Gender"
-msgstr "Geschlecht"
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
+msgstr "PHP Pfad zu ausführbarer Datei"
 
-#: ../../mod/profiles.php:325
-msgid "Sexual Preference"
-msgstr "Sexuelle Orientierung"
+#: ../../mod/setup.php:389
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../mod/profiles.php:329
-msgid "Homepage"
-msgstr "Webseite"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
+msgstr "PHP Befehlszeile"
 
-#: ../../mod/profiles.php:333
-msgid "Interests"
-msgstr "Hobbys/Interessen"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../mod/profiles.php:337
-msgid "Address"
-msgstr "Adresse"
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
+msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
-msgid "Location"
-msgstr "Ort"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/profiles.php:427
-msgid "Profile updated."
-msgstr "Profil aktualisiert."
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../mod/profiles.php:482
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../mod/profiles.php:505
-msgid "Edit Profile Details"
-msgstr "Bearbeite Profil-Details"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
+msgstr "Verschlüsselungsschlüssel  generieren"
 
-#: ../../mod/profiles.php:507
-msgid "View this profile"
-msgstr "Dieses Profil ansehen"
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
+msgstr "libCurl-PHP-Modul"
 
-#: ../../mod/profiles.php:508
-msgid "Change Profile Photo"
-msgstr "Profilfoto ändern"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
+msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../mod/profiles.php:509
-msgid "Create a new profile using these settings"
-msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL-PHP-Modul"
 
-#: ../../mod/profiles.php:510
-msgid "Clone this profile"
-msgstr "Dieses Profil klonen"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
+msgstr "mysqli-PHP-Modul"
 
-#: ../../mod/profiles.php:511
-msgid "Delete this profile"
-msgstr "Dieses Profil löschen"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
+msgstr "mb_string-PHP-Modul"
 
-#: ../../mod/profiles.php:512
-msgid "Profile Name:"
-msgstr "Profilname:"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
+msgstr "mcrypt-PHP-Modul"
 
-#: ../../mod/profiles.php:513
-msgid "Your Full Name:"
-msgstr "Dein voller Name:"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
+msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../mod/profiles.php:514
-msgid "Title/Description:"
-msgstr "Titel/Beschreibung:"
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:515
-msgid "Your Gender:"
-msgstr "Dein Geschlecht:"
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../mod/profiles.php:516
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Geburtstag (%s):"
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../mod/profiles.php:517
-msgid "Street Address:"
-msgstr "Straße und Hausnummer:"
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:518
-msgid "Locality/City:"
-msgstr "Wohnort:"
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:519
-msgid "Postal/Zip Code:"
-msgstr "Postleitzahl:"
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:520
-msgid "Country:"
-msgstr "Land:"
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:521
-msgid "Region/State:"
-msgstr "Region/Bundesstaat"
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:522
-msgid "♥ Marital Status:"
-msgstr "♥ Beziehungsstatus:"
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/profiles.php:523
-msgid "Who: (if applicable)"
-msgstr "Wer: (falls anwendbar)"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../mod/profiles.php:524
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../mod/profiles.php:525
-msgid "Since [date]:"
-msgstr "Seit [Datum]:"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst."
 
-#: ../../mod/profiles.php:527
-msgid "Homepage URL:"
-msgstr "Homepage URL:"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../mod/profiles.php:530
-msgid "Religious Views:"
-msgstr "Religiöse Ansichten:"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../mod/profiles.php:531
-msgid "Keywords:"
-msgstr "Schlüsselwörter:"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../mod/profiles.php:534
-msgid "Example: fishing photography software"
-msgstr "Beispiel: fischen Fotografie Software"
+#: ../../mod/setup.php:514
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
+msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver Schreibzugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red-Stammverzeichnisses haben."
 
-#: ../../mod/profiles.php:535
-msgid "Used in directory listings"
-msgstr "Wird in Verzeichnis Auflistungen verwendet"
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../mod/profiles.php:536
-msgid "Tell us about yourself..."
-msgstr "Erzähl uns ein wenig von Dir..."
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: Als Sicherheitsvorkehrung solltest Du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht auf die Vorlagen (.tpl-Dateien) in view/tpl/ ."
 
-#: ../../mod/profiles.php:537
-msgid "Hobbies/Interests"
-msgstr "Hobbys/Interessen"
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
+msgstr "view/tpl/smarty3 ist beschreibbar"
 
-#: ../../mod/profiles.php:538
-msgid "Contact information and Social Networks"
-msgstr "Kontaktinformation und soziale Netzwerke"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
 
-#: ../../mod/profiles.php:539
-msgid "My other channels"
-msgstr "Meine anderen Kanäle"
+#: ../../mod/setup.php:536
+msgid "store is writable"
+msgstr "store ist schreibbar"
 
-#: ../../mod/profiles.php:540
-msgid "Musical interests"
-msgstr "Musikalische Interessen"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
+msgstr "SSL Zertifikatverifizierung"
 
-#: ../../mod/profiles.php:541
-msgid "Books, literature"
-msgstr "Bücher, Literatur"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../mod/profiles.php:542
-msgid "Television"
-msgstr "Fernsehen"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration."
 
-#: ../../mod/profiles.php:543
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/Tanz/Kultur/Unterhaltung"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
+msgstr "Url rewrite funktioniert"
 
-#: ../../mod/profiles.php:544
-msgid "Love/romance"
-msgstr "Liebe/Romantik"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../mod/profiles.php:545
-msgid "Work/employment"
-msgstr "Arbeit/Anstellung"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../mod/profiles.php:546
-msgid "School/education"
-msgstr "Schule/Ausbildung"
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
+msgstr "
                                      Was als Nächstes
                                      "
 
-#: ../../mod/profiles.php:551
+#: ../../mod/setup.php:608
 msgid ""
-"This is your public profile.
                                      It may "
-"be visible to anybody using the internet."
-msgstr "Dies ist Dein öffentliches Profil.
                                      Es könnte für jeden im Internet sichtbar sein."
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
 
-#: ../../mod/profiles.php:600
-msgid "Edit/Manage Profiles"
-msgstr "Bearbeite/Verwalte Profile"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
 
-#: ../../mod/profiles.php:601
-msgid "Add profile things"
-msgstr "Profil-Dinge hinzufügen"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
 
-#: ../../mod/profiles.php:602
-msgid "Include desirable objects in your profile"
-msgstr "binde begehrenswerte Dinge in dein Profil ein"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
+msgstr "Projekt Spenden"
 
-#: ../../mod/post.php:226
+#: ../../mod/siteinfo.php:94
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut."
+"
                                      The Red Matrix is provided for you by volunteers working in their spare "
+"time. Your support will help us to build a better web. Select the following "
+"option for a one-time donation of your choosing
                                      "
+msgstr ""
 
-#: ../../mod/post.php:256
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
+#: ../../mod/siteinfo.php:95
+msgid "
                                      or
                                      "
+msgstr "
                                      oder
                                      "
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Diese Website ist kein Verzeichnis-Server"
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
+msgstr ""
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
+#: ../../mod/siteinfo.php:115
+msgid "Red"
+msgstr "Red"
 
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "Quelle erstellt."
+#: ../../mod/siteinfo.php:116
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
 
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "Quelle aktualisiert."
+#: ../../mod/siteinfo.php:119
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
 
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
+#: ../../mod/siteinfo.php:120
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren."
 
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "Entfernte Quellen von Inhalten deines Kanals verwalten."
+#: ../../mod/siteinfo.php:121
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Neue Quelle"
+#: ../../mod/siteinfo.php:124
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
 
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
+#: ../../mod/siteinfo.php:126
+msgid "Site Administrators"
+msgstr "Administratoren"
+
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr "Kanal hinzufügen"
+
+#: ../../mod/new_channel.php:108
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt."
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
+#: ../../mod/new_channel.php:111
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "Leer lassen um alle öffentlichen Beiträge zu importieren"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr "Wähle einen kurzen Spitznamen"
 
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
-msgstr "Name des Kanals"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
 
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "Quelle nicht gefunden."
+#: ../../mod/new_channel.php:114
+msgid "Or import an existing channel from another location"
+msgstr "Oder importiere einen bestehenden Kanal von einem anderen Server"
 
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Quelle bearbeiten"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Kein gültiges Konto gefunden."
 
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Quelle löschen"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "Quelle gelöscht"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Nutzer (%s)"
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Konnte die Quelle nicht löschen."
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Passwort-Rücksetzung auf %s angefordert"
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
-msgstr "Entfernte Privatsphären Einstellungen sind nicht verfügbar."
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Sichtbar für:"
+#: ../../mod/lostpass.php:85 ../../boot.php:1434
+msgid "Password Reset"
+msgstr "Zurücksetzen des Kennworts"
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
-msgstr "Server nicht gefunden."
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie angefordert neu erstellt."
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
-msgstr "Red Matrix Server - Installation"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
-msgstr "Kann nicht mit der Datenbank verbinden."
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
 
-#: ../../mod/setup.php:171
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
+msgstr "Klicke hier, um dich anzumelden"
+
+#: ../../mod/lostpass.php:90
 msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS."
+"Your password may be changed from the Settings page after "
+"successful login."
+msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
-msgstr "Kann Tabelle nicht erstellen."
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Auf %s wurde Dein Passwort geändert"
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
-msgstr "Die Datenbank deiner Seite wurde installiert."
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Kennwort vergessen?"
 
-#: ../../mod/setup.php:187
+#: ../../mod/lostpass.php:123
 msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
-msgstr "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
+
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr "E-Mail Adresse"
+
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Zurücksetzen"
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Lies die Datei \"install/INSTALL.txt\"."
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "Name ist erforderlich"
 
-#: ../../mod/setup.php:254
-msgid "System check"
-msgstr "Systemprüfung"
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../mod/setup.php:259
-msgid "Check again"
-msgstr "Bitte nochmal prüfen"
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
+msgstr "Aktualisieren"
 
-#: ../../mod/setup.php:281
-msgid "Database connection"
-msgstr "Datenbank Verbindung"
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
+msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../mod/setup.php:282
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
-msgstr "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können."
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest."
+#: ../../mod/settings.php:212
+msgid "Password changed."
+msgstr "Kennwort geändert."
 
-#: ../../mod/setup.php:284
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst."
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
+msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
-msgstr "Datenbank-Servername"
+#: ../../mod/settings.php:228
+msgid "Not valid email."
+msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
-msgstr "Standard ist localhost"
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
+msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
-msgstr "Datenbank-Port"
+#: ../../mod/settings.php:240
+msgid "System failure storing new email. Please try again."
+msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
-msgstr "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:"
+#: ../../mod/settings.php:444
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
-msgstr "Datenbank-Benutzername"
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
+msgstr "Anwendung hinzufügen"
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
-msgstr "Datenbank-Kennwort"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
+msgstr "Name"
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
-msgstr "Datenbank-Name"
+#: ../../mod/settings.php:518
+msgid "Name of application"
+msgstr "Name der Anwendung"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
-msgstr "E-Mail Adresse des Seiten-Administrators"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
+msgstr "Consumer Key"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst."
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
-msgstr "Webseiten URL"
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
-msgstr "Nutze wenn möglich eine SSL-URL (https)."
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
+msgstr "Umleitung"
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
-msgstr "Standard-Zeitzone für deine Website"
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert"
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
-msgstr "Seiteneinstellungen"
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
+msgstr "Symbol-URL"
 
-#: ../../mod/setup.php:384
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden."
+#: ../../mod/settings.php:522
+msgid "Optional"
+msgstr "Optional"
 
-#: ../../mod/setup.php:385
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen."
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
+msgstr "Diese Anwendung kann nicht bearbeitet werden."
 
-#: ../../mod/setup.php:389
-msgid "PHP executable path"
-msgstr "PHP Pfad zu ausführbarer Datei"
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
+msgstr "Verbundene Apps"
 
-#: ../../mod/setup.php:389
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren."
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
+msgstr "Client key beginnt mit"
 
-#: ../../mod/setup.php:394
-msgid "Command line PHP"
-msgstr "PHP Befehlszeile"
+#: ../../mod/settings.php:581
+msgid "No name"
+msgstr "Kein Name"
 
-#: ../../mod/setup.php:403
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
+msgstr "Authorisierung aufheben"
 
-#: ../../mod/setup.php:404
-msgid "This is required for message delivery to work."
-msgstr "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
+msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../mod/setup.php:406
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
+msgstr "Funktions-Einstellungen"
 
-#: ../../mod/setup.php:427
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen."
+#: ../../mod/settings.php:624
+msgid "Account Settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../mod/setup.php:428
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung."
+#: ../../mod/settings.php:625
+msgid "Password Settings"
+msgstr "Kennwort-Einstellungen"
 
-#: ../../mod/setup.php:430
-msgid "Generate encryption keys"
-msgstr "Verschlüsselungsschlüssel  generieren"
+#: ../../mod/settings.php:626
+msgid "New Password:"
+msgstr "Neues Passwort:"
 
-#: ../../mod/setup.php:437
-msgid "libCurl PHP module"
-msgstr "libCurl PHP Modul"
+#: ../../mod/settings.php:627
+msgid "Confirm:"
+msgstr "Bestätigen:"
 
-#: ../../mod/setup.php:438
-msgid "GD graphics PHP module"
-msgstr "GD Graphik PHP Modul"
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
+msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
 
-#: ../../mod/setup.php:439
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP Modul"
+#: ../../mod/settings.php:629 ../../mod/settings.php:925
+msgid "Email Address:"
+msgstr "Email Adresse:"
 
-#: ../../mod/setup.php:440
-msgid "mysqli PHP module"
-msgstr "mysqli PHP Modul"
+#: ../../mod/settings.php:630
+msgid "Remove Account"
+msgstr "Konto entfernen"
 
-#: ../../mod/setup.php:441
-msgid "mb_string PHP module"
-msgstr "mb_string PHP Modul"
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden."
 
-#: ../../mod/setup.php:442
-msgid "mcrypt PHP module"
-msgstr "mcrypt PHP Modul"
+#: ../../mod/settings.php:647
+msgid "Off"
+msgstr "Aus"
 
-#: ../../mod/setup.php:447 ../../mod/setup.php:449
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite Modul"
+#: ../../mod/settings.php:647
+msgid "On"
+msgstr "An"
 
-#: ../../mod/setup.php:447
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:654
+msgid "Additional Features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/setup.php:453 ../../mod/setup.php:456
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
+msgstr "Connector-Einstellungen"
 
-#: ../../mod/setup.php:453
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+#: ../../mod/settings.php:750
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/setup.php:461
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert."
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
+msgstr "Anzeige-Theme:"
 
-#: ../../mod/setup.php:465
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
+msgstr "Mobile Theme:"
 
-#: ../../mod/setup.php:469
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/setup.php:473
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../mod/setup.php:477
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
 
-#: ../../mod/setup.php:481
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert."
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
+msgstr "Maximum: 100 Beiträge"
 
-#: ../../mod/setup.php:497
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht."
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
+msgstr "Emoticons nicht zeigen"
 
-#: ../../mod/setup.php:498
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst."
+#: ../../mod/settings.php:761
+msgid "View remote profiles as webpages"
+msgstr ""
 
-#: ../../mod/setup.php:499
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern."
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
+msgstr ""
 
-#: ../../mod/setup.php:500
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
+msgstr "Niemand außer Dir selbst"
 
-#: ../../mod/setup.php:503
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php ist beschreibbar"
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
+msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../mod/setup.php:513
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen."
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
+msgstr "Jeder aus Ihrem Adressbuch"
 
-#: ../../mod/setup.php:514
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
-msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben."
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
+msgstr "Jeder auf dieser Website"
 
-#: ../../mod/setup.php:515 ../../mod/setup.php:533
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat."
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
+msgstr "Jeder in diesem Netzwerk"
 
-#: ../../mod/setup.php:516
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen."
+#: ../../mod/settings.php:801
+msgid "Anybody on the internet"
+msgstr "Jeder im Internet"
 
-#: ../../mod/setup.php:519
-msgid "view/tpl/smarty3 is writable"
-msgstr "view/tpl/smarty3 ist beschreibbar"
+#: ../../mod/settings.php:878
+msgid "Publish your default profile in the network directory"
+msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../mod/setup.php:532
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis."
+#: ../../mod/settings.php:883
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/setup.php:536
-msgid "store is writable"
-msgstr "store ist schreibbar"
+#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "oder"
 
-#: ../../mod/setup.php:551
-msgid "SSL certificate validation"
-msgstr "SSL Zertifikatverifizierung"
+#: ../../mod/settings.php:892
+msgid "Your channel address is"
+msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../mod/setup.php:551
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen."
+#: ../../mod/settings.php:914
+msgid "Channel Settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../mod/setup.php:558
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration."
+#: ../../mod/settings.php:923
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
 
-#: ../../mod/setup.php:560
-msgid "Url rewrite is working"
-msgstr "Url rewrite funktioniert"
+#: ../../mod/settings.php:926
+msgid "Your Timezone:"
+msgstr "Ihre Zeitzone:"
 
-#: ../../mod/setup.php:570
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
+#: ../../mod/settings.php:927
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
 
-#: ../../mod/setup.php:594
-msgid "Errors encountered creating database tables."
-msgstr "Fehler während des Anlegens der Datenbank Tabellen aufgetreten."
+#: ../../mod/settings.php:928
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/setup.php:607
-msgid "
                                      What next
                                      "
-msgstr "
                                      Was als Nächstes
                                      "
+#: ../../mod/settings.php:930
+msgid "Adult Content"
+msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../mod/setup.php:608
+#: ../../mod/settings.php:930
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr "Version %s"
+#: ../../mod/settings.php:932
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
+#: ../../mod/settings.php:934
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
+#: ../../mod/settings.php:934
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../mod/siteinfo.php:109
-msgid "Red"
-msgstr "Red"
+#: ../../mod/settings.php:936
+msgid "Simple Privacy Settings:"
+msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../mod/siteinfo.php:110
+#: ../../mod/settings.php:937
 msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
-
-#: ../../mod/siteinfo.php:113
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
+"Very Public - extremely permissive (should be used with caution)"
+msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)"
 
-#: ../../mod/siteinfo.php:114
+#: ../../mod/settings.php:938
 msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
+msgstr "Typisch – Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)"
 
-#: ../../mod/siteinfo.php:115
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+#: ../../mod/settings.php:939
+msgid "Private - default private, never open or public"
+msgstr "Private – Default privat, nie offen oder öffentlich"
 
-#: ../../mod/siteinfo.php:118
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
+#: ../../mod/settings.php:940
+msgid "Blocked - default blocked to/from everybody"
+msgstr "Blockiert – Alle per Default blockiert"
 
-#: ../../mod/siteinfo.php:120
-msgid "Site Administrators"
-msgstr "Administratoren"
+#: ../../mod/settings.php:943
+msgid "Advanced Privacy Settings"
+msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
-msgstr "Kanal hinzufügen"
+#: ../../mod/settings.php:945
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../mod/new_channel.php:108
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt."
+#: ../../mod/settings.php:945
+msgid "May reduce spam activity"
+msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../mod/new_channel.php:111
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+#: ../../mod/settings.php:946
+msgid "Default Post Permissions"
+msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznahmen"
+#: ../../mod/settings.php:958
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
+#: ../../mod/settings.php:958
+msgid "Useful to reduce spamming"
+msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../mod/new_channel.php:114
-msgid "Or import an existing channel from another location"
-msgstr "Oder importiere einen bestehenden Kanal von einem anderen Ort"
+#: ../../mod/settings.php:961
+msgid "Notification Settings"
+msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Kein gültiges Konto gefunden."
+#: ../../mod/settings.php:962
+msgid "By default post a status message when:"
+msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab."
+#: ../../mod/settings.php:963
+msgid "accepting a friend request"
+msgstr "Du eine Kontaktanfrage annimmst"
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Seiten Mitglied (%s)"
+#: ../../mod/settings.php:964
+msgid "joining a forum/community"
+msgstr "Du einem Forum beitrittst"
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Passwort Rücksetzung auf %s angefordert"
+#: ../../mod/settings.php:965
+msgid "making an interesting profile change"
+msgstr "Du eine interessante Änderung an Deinem Profil vornimmst"
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen."
+#: ../../mod/settings.php:966
+msgid "Send a notification email when:"
+msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1434
-msgid "Password Reset"
-msgstr "Zurücksetzen des Kennworts"
+#: ../../mod/settings.php:967
+msgid "You receive an introduction"
+msgstr "Du eine Vorstellung erhältst"
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie angefordert neu erstellt."
+#: ../../mod/settings.php:968
+msgid "Your introductions are confirmed"
+msgstr "Deine Vorstellung bestätigt wurde."
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
-msgstr "Dein neues Passwort lautet"
+#: ../../mod/settings.php:969
+msgid "Someone writes on your profile wall"
+msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere dein neues Passwort - und dann"
+#: ../../mod/settings.php:970
+msgid "Someone writes a followup comment"
+msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
-msgstr "Klicke hier, um dich anzumelden"
+#: ../../mod/settings.php:971
+msgid "You receive a private message"
+msgstr "Du eine private Nachricht erhältst"
 
-#: ../../mod/lostpass.php:90
-msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
-msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
+#: ../../mod/settings.php:972
+msgid "You receive a friend suggestion"
+msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Auf %s wurde dein Passwort geändert"
+#: ../../mod/settings.php:973
+msgid "You are tagged in a post"
+msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr "Kennwort vergessen?"
+#: ../../mod/settings.php:974
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
+#: ../../mod/settings.php:977
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
-msgstr "E-Mail Adresse"
+#: ../../mod/settings.php:978
+msgid "Change the behaviour of this account for special situations"
+msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: ../../mod/settings.php:981
+msgid ""
+"Please enable expert mode (in Settings > Additional features) to adjust!"
+msgstr ""
 
 #: ../../mod/import.php:36
 msgid "Nothing to import."
@@ -6175,7 +6214,7 @@ msgstr "Die importierte Datei ist leer."
 #: ../../mod/import.php:88
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kann auf diesem System keinen duplizierten Kanal-Identifikator erzeugen. Import fehlgeschlagen."
+msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
 
 #: ../../mod/import.php:106
 msgid "Channel clone failed. Import failed."
@@ -6203,7 +6242,7 @@ msgid ""
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file. Only identity and connections/relationships will "
 "be imported. Importation of content is not yet available."
-msgstr "Verwende dieses Formular um einen existierenden Kanal von einem anderen Server/Hub zu importieren. Du kannst die Kanal-Identität vom alten Server/Hub über das Netzwerk erhalten oder über eine exportierte Sicherungskopie. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich."
+msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Red-Server zu importieren. Du kannst den Kanal direkt vom bisherigen Red-Server über das Netzwerk importieren oder eine exportierte Sicherheitskopie benutzen. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich."
 
 #: ../../mod/import.php:378
 msgid "File to Upload"
@@ -6211,11 +6250,11 @@ msgstr "Hochzuladende Datei:"
 
 #: ../../mod/import.php:379
 msgid "Or provide the old server/hub details"
-msgstr "Oder gib die Deteils deines alten Server/Hubs an"
+msgstr "Oder gib die Details Deines bisherigen Red-Servers ein"
 
 #: ../../mod/import.php:380
 msgid "Your old identity address (xyz@example.com)"
-msgstr "Die alte Adresse der Identität (xyz@example.com)"
+msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
 
 #: ../../mod/import.php:381
 msgid "Your old login email address"
@@ -6231,16 +6270,16 @@ msgid ""
 "address, or whether your old location should continue this role. You will be"
 " able to post from either location, but only one can be marked as the "
 "primary location for files, photos, and media."
-msgstr "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue primäre Adresse sein soll oder ob dein alter Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Orten aus neue Dinge posten, aber nur einer kann die primäre Adresse deiner Dateien, Fotos und anderen Mediendaten sein."
+msgstr "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
 
 #: ../../mod/import.php:384
 msgid "Make this hub my primary location"
-msgstr "Dieser Hub ist mein primärer Server."
+msgstr "Dieser Red-Server ist mein primärer Server."
 
 #: ../../mod/manage.php:63
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet."
+msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
 
 #: ../../mod/manage.php:71
 msgid "Create a new channel"
@@ -6256,7 +6295,7 @@ msgstr "Aktueller Kanal"
 
 #: ../../mod/manage.php:79
 msgid "Attach to one of your channels by selecting it."
-msgstr "Wähle einen deiner Kanäle aus um ihn zu verwenden."
+msgstr "Wähle einen Deiner Kanäle aus, um ihn zu verwenden."
 
 #: ../../mod/manage.php:80
 msgid "Default Channel"
@@ -6272,7 +6311,7 @@ msgstr "Stimmen gesamt"
 
 #: ../../mod/vote.php:98
 msgid "Average Rating"
-msgstr "durchschnittliche Bewertung"
+msgstr "Durchschnittliche Bewertung"
 
 #: ../../mod/match.php:16
 msgid "Profile Match"
@@ -6280,7 +6319,7 @@ msgstr "Profil-Übereinstimmungen"
 
 #: ../../mod/match.php:24
 msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselbegriffe für den Abgleich gefunden. Bitte füge Schlüsselbegriffe zu deinem Standardprofil hinzu."
+msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
 
 #: ../../mod/match.php:61
 msgid "is interested in:"
@@ -6344,7 +6383,7 @@ msgstr "Nachricht löschen"
 
 #: ../../mod/mail.php:293
 msgid "Recall message"
-msgstr "Widerrufe die Nachricht"
+msgstr "Nachricht widerrufen"
 
 #: ../../mod/mail.php:295
 msgid "Message has been recalled."
@@ -6362,7 +6401,7 @@ msgstr "Unterhaltung löschen"
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
-msgstr "Keine sichere Kommunikation verfügbar. Eventuell kannst du von der Profilseite des Absenders antworten."
+msgstr "Keine sichere Kommunikation verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten."
 
 #: ../../mod/mail.php:322
 msgid "Send Reply"
@@ -6382,7 +6421,7 @@ msgstr "Layout löschen"
 
 #: ../../mod/profile_photo.php:44
 msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das zurecht schneiden schlug fehl."
+msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
 
 #: ../../mod/profile_photo.php:97
 msgid "Image resize failed."
@@ -6392,7 +6431,7 @@ msgstr "Bild-Anpassung fehlgeschlagen."
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
-msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden sollte das neue Foto nicht sofort angezeigt werden."
+msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
 
 #: ../../mod/profile_photo.php:163
 #, php-format
@@ -6437,7 +6476,7 @@ msgstr "Bild zuschneiden"
 
 #: ../../mod/profile_photo.php:303
 msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Bitte passe das Bild zur optimalen Anzeige an."
+msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
 
 #: ../../mod/profile_photo.php:305
 msgid "Done Editing"
@@ -6482,7 +6521,7 @@ msgstr "Neue Verbindungen vorschlagen"
 
 #: ../../mod/connections.php:247
 msgid "Show pending (new) connections"
-msgstr "Zeige schwebende (neue) Verbindungen"
+msgstr "Zeige ausstehende (neue) Verbindungsanfragen"
 
 #: ../../mod/connections.php:253
 msgid "Show all connections"
@@ -6531,7 +6570,7 @@ msgstr "Ergebnisse:"
 
 #: ../../mod/notifications.php:26
 msgid "Invalid request identifier."
-msgstr "Ungültige Anfrage Identifikator."
+msgstr "Ungültiger Anfrage-Identifikator."
 
 #: ../../mod/notifications.php:35
 msgid "Discard"
@@ -6547,11 +6586,11 @@ msgstr "System-Benachrichtigungen"
 
 #: ../../mod/blocks.php:65
 msgid "Block Name"
-msgstr "Block Name"
+msgstr "Block-Name"
 
 #: ../../mod/oexchange.php:23
 msgid "Unable to find your hub."
-msgstr "Konnte den Hub nicht finden."
+msgstr "Konnte Deinen Server nicht finden."
 
 #: ../../mod/oexchange.php:37
 msgid "Post successful."
@@ -6575,7 +6614,7 @@ msgstr "Der Zugang zu diesem Profil ist begrenzt."
 
 #: ../../mod/poke.php:159
 msgid "Poke/Prod"
-msgstr "Anstupsen/Kuffen"
+msgstr "Anstupsen/Knuffen"
 
 #: ../../mod/poke.php:160
 msgid "poke, prod or do other things to somebody"
@@ -6587,7 +6626,7 @@ msgstr "Empfänger"
 
 #: ../../mod/poke.php:162
 msgid "Choose what you wish to do to recipient"
-msgstr "Wähle was du mit dem/r Empfänger/in tun willst"
+msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
 
 #: ../../mod/poke.php:165
 msgid "Make this post private"
@@ -6619,7 +6658,7 @@ msgstr "Freundschaftsempfehlung senden."
 
 #: ../../mod/fsuggest.php:97
 msgid "Suggest Friends"
-msgstr "Kontakte Vorschlagen"
+msgstr "Kontakte vorschlagen"
 
 #: ../../mod/fsuggest.php:99
 #, php-format
@@ -6644,7 +6683,7 @@ msgstr "Status:"
 
 #: ../../mod/dirprofile.php:115
 msgid "Sexual Preference: "
-msgstr "Sexuelle Vorlieben:"
+msgstr "Sexuelle Ausrichtung:"
 
 #: ../../mod/dirprofile.php:117
 msgid "Homepage: "
@@ -6660,7 +6699,7 @@ msgstr "Über:"
 
 #: ../../mod/dirprofile.php:168
 msgid "Keywords: "
-msgstr "Schlüsselbegriffe:"
+msgstr "Schlüsselwörter:"
 
 #: ../../mod/filestorage.php:68
 msgid "Permission Denied."
@@ -6668,14 +6707,14 @@ msgstr "Zugriff verweigert."
 
 #: ../../mod/filestorage.php:85
 msgid "File not found."
-msgstr "Datei nicht gefunden"
+msgstr "Datei nicht gefunden."
 
 #: ../../mod/filestorage.php:119
 msgid "Edit file permissions"
 msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
-#: ../../mod/photos.php:946
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:607
+#: ../../mod/photos.php:950
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -6689,11 +6728,11 @@ msgstr "Zurück zur Dateiliste"
 
 #: ../../mod/filestorage.php:129
 msgid "Copy/paste this code to attach file to a post"
-msgstr "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen"
+msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
 
 #: ../../mod/filestorage.php:130
 msgid "Copy/paste this URL to link file from a web page"
-msgstr "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen"
+msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
 
 #: ../../mod/filestorage.php:167
 msgid "Download"
@@ -6715,7 +6754,7 @@ msgstr "Limit:"
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
-msgstr "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut."
+msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
 
 #: ../../mod/message.php:41
 msgid "Conversation removed."
@@ -6731,7 +6770,7 @@ msgstr "D, d. M Y - g:i A"
 
 #: ../../mod/pubsites.php:22
 msgid "Public Sites"
-msgstr "Öffentliche Seiten"
+msgstr "Öffentliche Server"
 
 #: ../../mod/pubsites.php:25
 msgid ""
@@ -6740,15 +6779,15 @@ msgid ""
 "in the matrix as a whole. Some sites may require subscription or provide "
 "tiered service plans. The provider links may provide "
 "additional details."
-msgstr "Die hier aufgeführten Seiten erlauben dir einen Account in der Red Matrix anzulegen. Alle Seiten der Matrix sind mit einander verbunden, so dass die Mitgliedschaft auf einer Seite die Mitgliedschaft auf einer beliebigen anderen Seite der Matrix beinhaltet. Es könnte sein, dass einige dieser Seiten Abonnements benötigen oder abgestufte Service-Pläne anbieten. Auf den jeweiligen Seiten könnten nähere Details diesbezüglich stehen."
+msgstr "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten könnten nähere Details dazu stehen."
 
 #: ../../mod/pubsites.php:31
 msgid "Site URL"
-msgstr "URL der Seite"
+msgstr "Server-URL"
 
 #: ../../mod/pubsites.php:31
 msgid "Access Type"
-msgstr "Zugangs Typ"
+msgstr "Zugangstyp"
 
 #: ../../mod/pubsites.php:31
 msgid "Registration Policy"
@@ -6756,12 +6795,12 @@ msgstr "Registrierungsrichtlinien"
 
 #: ../../mod/register.php:43
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Maximale Anzahl von Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
+msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
 
 #: ../../mod/register.php:49
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "Bitte stimme den Nutzungsbedingungen zu. Anmeldung fehlgeschlagen."
+msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
 
 #: ../../mod/register.php:77
 msgid "Passwords do not match."
@@ -6771,7 +6810,7 @@ msgstr "Passwörter stimmen nicht überein."
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
 
 #: ../../mod/register.php:111
 msgid "Your registration is pending approval by the site owner."
@@ -6783,17 +6822,17 @@ msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
 #: ../../mod/register.php:147
 msgid "Registration on this site/hub is by approval only."
-msgstr "Anmeldungen auf dieser Seite / diesem Hub benötigen Zustimmung durch den Administrator"
+msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"
 
 #: ../../mod/register.php:148
 msgid "Register at another affiliated site/hub"
-msgstr "Registrierung auf einer angeschlossenen Seite"
+msgstr "Registrierung auf einem anderen, angeschlossenen Server"
 
 #: ../../mod/register.php:156
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
-msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
+msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
 
 #: ../../mod/register.php:167
 msgid "Terms of Service"
@@ -6815,7 +6854,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli
 
 #: ../../mod/register.php:195
 msgid "Please enter your invitation code"
-msgstr "Bitte trage deinen Einladungs-Code ein"
+msgstr "Bitte trage Deinen Einladungs-Code ein"
 
 #: ../../mod/register.php:198
 msgid "Your email address"
@@ -6827,7 +6866,7 @@ msgstr "Passwort"
 
 #: ../../mod/register.php:200
 msgid "Please re-enter your password"
-msgstr "Bitte gib dein Passwort noch einmal ein"
+msgstr "Bitte gib Dein Passwort noch einmal ein"
 
 #: ../../mod/regmod.php:12
 msgid "Please login."
@@ -6835,17 +6874,17 @@ msgstr "Bitte melde dich an."
 
 #: ../../mod/removeme.php:49
 msgid "Remove This Channel"
-msgstr "Diesen Kanal löschen!"
+msgstr "Diesen Kanal löschen"
 
 #: ../../mod/removeme.php:50
 msgid ""
 "This will completely remove this channel from the network. Once this has "
 "been done it is not recoverable."
-msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar."
+msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden."
 
 #: ../../mod/removeme.php:51
 msgid "Please enter your password for verification:"
-msgstr "Bitte gib zur Bestätigung dein Passwort ein:"
+msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
 
 #: ../../mod/removeme.php:52
 msgid "Remove this channel and all its clones from the network"
@@ -6855,137 +6894,137 @@ msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
-msgstr "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk"
+msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
 
 #: ../../mod/removeme.php:53
 msgid "Remove Channel"
-msgstr "Kanal entfernen"
+msgstr "Kanal löschen"
 
 #: ../../mod/photos.php:77
 msgid "Page owner information could not be retrieved."
-msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werden."
+msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
 
 #: ../../mod/photos.php:97
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:119 ../../mod/photos.php:668
+#: ../../mod/photos.php:119 ../../mod/photos.php:672
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:951
+#: ../../mod/photos.php:159 ../../mod/photos.php:955
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
-#: ../../mod/photos.php:452
+#: ../../mod/photos.php:453
 msgid "No photos selected"
 msgstr "Keine Fotos ausgewählt"
 
-#: ../../mod/photos.php:499
+#: ../../mod/photos.php:500
 msgid "Access to this item is restricted."
-msgstr "Zugriff auf dieses Foto wurde eingeschränkt."
+msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
 
-#: ../../mod/photos.php:573
+#: ../../mod/photos.php:577
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers."
+msgstr "Du benutzt %1$.2f MBytes Deines %2$.2f MBytes großen Bilder-Speichers."
 
-#: ../../mod/photos.php:576
+#: ../../mod/photos.php:580
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr "Du verwendets %1$.2f MBytes deines Foto-Speichers."
+msgstr "Du verwendest %1$.2f MBytes Deines Foto-Speichers."
 
-#: ../../mod/photos.php:595
+#: ../../mod/photos.php:599
 msgid "Upload Photos"
 msgstr "Fotos hochladen"
 
-#: ../../mod/photos.php:599 ../../mod/photos.php:663
+#: ../../mod/photos.php:603 ../../mod/photos.php:667
 msgid "New album name: "
 msgstr "Name des neuen Albums:"
 
-#: ../../mod/photos.php:600
+#: ../../mod/photos.php:604
 msgid "or existing album name: "
-msgstr "oder bestehenden Album Namen:"
+msgstr "Oder bestehender Album-Name:"
 
-#: ../../mod/photos.php:601
+#: ../../mod/photos.php:605
 msgid "Do not show a status post for this upload"
 msgstr "Keine Statusnachricht für diesen Upload senden"
 
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
-#: ../../mod/photos.php:1138
+#: ../../mod/photos.php:656 ../../mod/photos.php:678 ../../mod/photos.php:1127
+#: ../../mod/photos.php:1142
 msgid "Contact Photos"
-msgstr "Kontakt Bilder"
+msgstr "Kontakt-Bilder"
 
-#: ../../mod/photos.php:678
+#: ../../mod/photos.php:682
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:684
+#: ../../mod/photos.php:688
 msgid "Show Newest First"
-msgstr "Zeige neueste zuerst"
+msgstr "Zeige Neueste zuerst"
 
-#: ../../mod/photos.php:686
+#: ../../mod/photos.php:690
 msgid "Show Oldest First"
-msgstr "Zeige älteste zuerst"
+msgstr "Zeige Älteste zuerst"
 
-#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+#: ../../mod/photos.php:733 ../../mod/photos.php:1174
 msgid "View Photo"
 msgstr "Foto ansehen"
 
-#: ../../mod/photos.php:775
+#: ../../mod/photos.php:779
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
 
-#: ../../mod/photos.php:777
+#: ../../mod/photos.php:781
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:837
+#: ../../mod/photos.php:841
 msgid "Use as profile photo"
 msgstr "Als Profilfoto verwenden"
 
-#: ../../mod/photos.php:861
+#: ../../mod/photos.php:865
 msgid "View Full Size"
 msgstr "In voller Größe anzeigen"
 
-#: ../../mod/photos.php:935
+#: ../../mod/photos.php:939
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:937
+#: ../../mod/photos.php:941
 msgid "Rotate CW (right)"
-msgstr "Drehen US (rechts)"
+msgstr "Drehen im UZS (rechts)"
 
-#: ../../mod/photos.php:938
+#: ../../mod/photos.php:942
 msgid "Rotate CCW (left)"
-msgstr "Drehen EUS (links)"
+msgstr "Drehen gegen UZS (links)"
 
-#: ../../mod/photos.php:940
+#: ../../mod/photos.php:944
 msgid "New album name"
 msgstr "Name des neuen Albums:"
 
-#: ../../mod/photos.php:943
+#: ../../mod/photos.php:947
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:945
+#: ../../mod/photos.php:949
 msgid "Add a Tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../mod/photos.php:948
+#: ../../mod/photos.php:952
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1105
 msgid "In This Photo:"
 msgstr "Auf diesem Foto:"
 
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1180
 msgid "View Album"
 msgstr "Album ansehen"
 
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1189
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -6995,7 +7034,7 @@ msgstr "Laune"
 
 #: ../../mod/mood.php:139
 msgid "Set your current mood and tell your friends"
-msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
+msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
 
 #: ../../mod/ping.php:192
 msgid "sent you a private message"
@@ -7015,7 +7054,7 @@ msgstr "Standard-Schema"
 
 #: ../../view/theme/redbasic/php/config.php:87
 msgid "silver"
-msgstr "Silber"
+msgstr "silbern"
 
 #: ../../view/theme/redbasic/php/config.php:98
 #: ../../view/theme/apw/php/config.php:234
@@ -7035,7 +7074,7 @@ msgstr "Farbe der Navigationsleiste"
 
 #: ../../view/theme/redbasic/php/config.php:101
 msgid "link colour"
-msgstr "Farbe der Verweise"
+msgstr "Farbe der Links"
 
 #: ../../view/theme/redbasic/php/config.php:102
 msgid "Set font-colour for banner"
@@ -7072,7 +7111,7 @@ msgstr "Schriftgröße für die ganze Applikation"
 #: ../../view/theme/redbasic/php/config.php:110
 #: ../../view/theme/apw/php/config.php:236
 msgid "Set font-size for posts and comments"
-msgstr "Wähle die Schriftgröße für Beiträge und Kommentare"
+msgstr "Schriftgröße für Beiträge und Kommentare"
 
 #: ../../view/theme/redbasic/php/config.php:111
 msgid "Set font-colour for posts and comments"
@@ -7088,7 +7127,7 @@ msgstr "Schattentiefe von Fotos"
 
 #: ../../view/theme/redbasic/php/config.php:114
 msgid "Set maximum width of conversation regions"
-msgstr "Maximalbreite der Konversationsbereiche"
+msgstr "Maximalbreite der Unterhaltungsbereiche"
 
 #: ../../view/theme/redbasic/php/config.php:115
 msgid "Set minimum opacity of nav bar - to hide it"
@@ -7108,7 +7147,7 @@ msgstr "Schräge Fotoalben"
 
 #: ../../view/theme/redbasic/php/config.php:118
 msgid "Are you a clean desk or a messy desk person?"
-msgstr "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
+msgstr "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
 
 #: ../../view/theme/apw/php/config.php:193
 #: ../../view/theme/apw/php/config.php:211
@@ -7129,7 +7168,7 @@ msgstr "Schriftart"
 
 #: ../../view/theme/apw/php/config.php:238
 msgid "Set iconset"
-msgstr "Iconset"
+msgstr "Icon-Set"
 
 #: ../../view/theme/apw/php/config.php:239
 msgid "Set big shadow size, default 15px 15px 15px"
@@ -7149,7 +7188,7 @@ msgstr "Ecken-Radius (Default 5px)"
 
 #: ../../view/theme/apw/php/config.php:243
 msgid "Set line-height for posts and comments"
-msgstr "Wähle die Zeilenhöhe in Beiträgen und Kommentaren"
+msgstr "Zeilenhöhe für Beiträge und Kommentare"
 
 #: ../../view/theme/apw/php/config.php:244
 msgid "Set background image"
@@ -7197,7 +7236,7 @@ msgstr "Größe des Hintergrund-Elements"
 
 #: ../../view/theme/apw/php/config.php:255
 msgid "Item opacity"
-msgstr "Opazität von Beiträgen"
+msgstr "Deckkraft von Beiträgen (z.B. 0.8)"
 
 #: ../../view/theme/apw/php/config.php:256
 msgid "Display post previews only"
@@ -7263,7 +7302,7 @@ msgstr "Aktualisierungsfehler auf %s"
 #: ../../boot.php:1399
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
-msgstr "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können."
+msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."
 
 #: ../../boot.php:1427
 msgid "Password"
@@ -7287,4 +7326,4 @@ msgstr "Haste schon Zot?"
 
 #: ../../boot.php:1899
 msgid "toggle mobile"
-msgstr "auf/von Mobile Ansicht wechseln"
+msgstr "auf/von mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index 00da85a02..ac1abc8f7 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -4,6 +4,45 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }
 ;
+$a->strings["Categories"] = "Kategorien";
+$a->strings["Connect"] = "Verbinden";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
+$a->strings["Suggestions"] = "Vorschläge";
+$a->strings["See more..."] = "Mehr anzeigen …";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
+$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
+$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
+$a->strings["Notes"] = "Notizen";
+$a->strings["Save"] = "Speichern";
+$a->strings["Remove term"] = "Eintrag löschen";
+$a->strings["Saved Searches"] = "Gesicherte Suchanfragen";
+$a->strings["add"] = "hinzufügen";
+$a->strings["Saved Folders"] = "Gesicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Archives"] = "Archive";
+$a->strings["Refresh"] = "Aktualisieren";
+$a->strings["Me"] = "Ich";
+$a->strings["Best Friends"] = "Beste Freunde";
+$a->strings["Friends"] = "Freunde";
+$a->strings["Co-workers"] = "Kollegen";
+$a->strings["Former Friends"] = "ehem. Freunde";
+$a->strings["Acquaintances"] = "Bekannte";
+$a->strings["Everybody"] = "Jeder";
+$a->strings["Account settings"] = "Konto-Einstellungen";
+$a->strings["Channel settings"] = "Kanal-Einstellungen";
+$a->strings["Additional features"] = "Zusätzliche Funktionen";
+$a->strings["Feature settings"] = "Funktions-Einstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Apps";
+$a->strings["Export channel"] = "Kanal exportieren";
+$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
+$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
+$a->strings["Channel Sources"] = "Kanal-Quellen";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Check Mail"] = "E-Mails abrufen";
+$a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Chat Rooms"] = "Chaträume";
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
 $a->strings["show"] = "zeigen";
 $a->strings["don't show"] = "Verbergen";
@@ -25,9 +64,9 @@ $a->strings["Your photos"] = "Deine Bilder";
 $a->strings["Files"] = "Dateien";
 $a->strings["Your files"] = "Deine Dateien";
 $a->strings["Chat"] = "Chat";
-$a->strings["Your chatrooms"] = "Deine Chat-Räume";
+$a->strings["Your chatrooms"] = "Deine Chaträume";
 $a->strings["Events"] = "Veranstaltungen";
-$a->strings["Your events"] = "Deine Veransctaltungen";
+$a->strings["Your events"] = "Deine Veranstaltungen";
 $a->strings["Bookmarks"] = "Lesezeichen";
 $a->strings["Your bookmarks"] = "Deine Lesezeichen";
 $a->strings["Webpages"] = "Webseiten";
@@ -35,7 +74,7 @@ $a->strings["Your webpages"] = "Deine Webseiten";
 $a->strings["Login"] = "Anmelden";
 $a->strings["Sign in"] = "Anmelden";
 $a->strings["%s - click to logout"] = "%s - Klick zum Abmelden";
-$a->strings["Click to authenticate to your home hub"] = "Klick zum Authentifizieren bei Deinem Heimat-Hub";
+$a->strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
 $a->strings["Home Page"] = "Homepage";
 $a->strings["Register"] = "Registrieren";
 $a->strings["Create an account"] = "Erzeuge ein Konto";
@@ -65,16 +104,14 @@ $a->strings["See all private messages"] = "Alle persönlichen Nachrichten ansehe
 $a->strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
 $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
-$a->strings["New Message"] = "Neue Nachricht";
 $a->strings["Event Calendar"] = "Veranstaltungskalender";
 $a->strings["See all events"] = "Alle Ereignisse ansehen";
 $a->strings["Mark all events seen"] = "Markiere alle Ereignisse als gesehen";
 $a->strings["Channel Select"] = "Kanal-Auswahl";
 $a->strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
 $a->strings["Connections"] = "Verbindungen";
-$a->strings["Manage/Edit Friends and Connections"] = "Verwalte/Bearbeite Freunde und Verbindungen";
+$a->strings["Manage/Edit Friends and Connections"] = "Freunde und Verbindungen verwalten";
 $a->strings["Admin"] = "Admin";
 $a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
 $a->strings["Nothing new here"] = "Nichts Neues hier";
@@ -90,8 +127,7 @@ $a->strings["%d Connection"] = array(
 	0 => "%d Verbindung",
 	1 => "%d Verbindungen",
 );
-$a->strings["View Connections"] = "Zeige Verbindungen";
-$a->strings["Save"] = "Speichern";
+$a->strings["View Connections"] = "Verbindungen anzeigen";
 $a->strings["poke"] = "anstupsen";
 $a->strings["poked"] = "stupste";
 $a->strings["ping"] = "anpingen";
@@ -149,9 +185,9 @@ $a->strings["remove category"] = "Kategorie entfernen";
 $a->strings["remove from file"] = "aus der Datei entfernen";
 $a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
 $a->strings["link to source"] = "Link zum Originalbeitrag";
-$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
+$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen:";
 $a->strings["default"] = "Standard";
-$a->strings["Page content type: "] = "Content-Typ der Seite";
+$a->strings["Page content type: "] = "Content-Typ der Seite:";
 $a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
 $a->strings["photo"] = "Foto";
 $a->strings["event"] = "Ereignis";
@@ -163,42 +199,12 @@ $a->strings["Blocks"] = "Blöcke";
 $a->strings["Menus"] = "Menüs";
 $a->strings["Layouts"] = "Layouts";
 $a->strings["Pages"] = "Seiten";
-$a->strings["Categories"] = "Kategorien";
-$a->strings["Connect"] = "Verbinden";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
-$a->strings["Suggestions"] = "Vorschläge";
-$a->strings["See more..."] = "Mehr anzeigen...";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen.";
-$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
-$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
-$a->strings["Notes"] = "Notizen";
-$a->strings["Remove term"] = "Eintrag löschen";
-$a->strings["Saved Searches"] = "Gesicherte Suchanfragen";
-$a->strings["add"] = "hinzufügen";
-$a->strings["Saved Folders"] = "Gesicherte Ordner";
-$a->strings["Everything"] = "Alles";
-$a->strings["Archives"] = "Archive";
-$a->strings["Refresh"] = "Aktualisieren";
-$a->strings["Me"] = "Ich";
-$a->strings["Best Friends"] = "Beste Freunde";
-$a->strings["Friends"] = "Freunde";
-$a->strings["Co-workers"] = "Kollegen";
-$a->strings["Former Friends"] = "ehem. Freunde";
-$a->strings["Acquaintances"] = "Bekanntschaften";
-$a->strings["Everybody"] = "Jeder";
-$a->strings["Account settings"] = "Konto-Einstellungen";
-$a->strings["Channel settings"] = "Kanal-Einstellungen";
-$a->strings["Additional features"] = "Zusätzliche Funktionen";
-$a->strings["Feature settings"] = "Funktions-Einstellungen";
-$a->strings["Display settings"] = "Anzeige-Einstellungen";
-$a->strings["Connected apps"] = "Verbundene Apps";
-$a->strings["Export channel"] = "Kanal exportieren";
-$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
-$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen";
-$a->strings["Channel Sources"] = "Kanal Quellen";
-$a->strings["Check Mail"] = "E-Mails abrufen";
-$a->strings["Chat Rooms"] = "Chaträume";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["QR code"] = "QR-Code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+$a->strings["post"] = "Beitrag";
+$a->strings["$1 wrote:"] = "$1 schrieb:";
 $a->strings["New window"] = "Neues Fenster";
 $a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
 $a->strings["General Features"] = "Allgemeine Funktionen";
@@ -208,20 +214,20 @@ $a->strings["Multiple Profiles"] = "Mehrfachprofile";
 $a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
 $a->strings["Web Pages"] = "Webseiten";
 $a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
-$a->strings["Private Notes"] = "private Notizen";
+$a->strings["Private Notes"] = "Private Notizen";
 $a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
 $a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt.";
+$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt.";
 $a->strings["Expert Mode"] = "Expertenmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren";
 $a->strings["Premium Channel"] = "Premium-Kanal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals";
 $a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
 $a->strings["Richtext Editor"] = "Formatierungseditor";
 $a->strings["Enable richtext editor"] = "Aktiviere Formatierungseditor";
 $a->strings["Post Preview"] = "Voransicht";
 $a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds.";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds";
 $a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
 $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
 $a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
@@ -236,7 +242,7 @@ $a->strings["Network New Tab"] = "Netzwerkreiter Neu";
 $a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
 $a->strings["Affinity Tool"] = "Beziehungs-Tool";
 $a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
-$a->strings["Suggest Channels"] = "Kanäle Vorschlagen";
+$a->strings["Suggest Channels"] = "Kanäle vorschlagen";
 $a->strings["Show channel suggestions"] = "Kanal-Vorschläge anzeigen";
 $a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
 $a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge";
@@ -247,11 +253,11 @@ $a->strings["Post Categories"] = "Beitrags-Kategorien";
 $a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
 $a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
 $a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
-$a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare";
+$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen";
 $a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
 $a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
-$a->strings["Tag Cloud"] = "Tag Wolke";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen";
+$a->strings["Tag Cloud"] = "Schlagwort-Wolke";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen";
 $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
 $a->strings["Block immediately"] = "Sofort blockieren";
 $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller";
@@ -292,7 +298,7 @@ $a->strings["minutes"] = "Minuten";
 $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
 $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i";
 $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
@@ -312,8 +318,8 @@ $a->strings["show fewer"] = "Zeige weniger";
 $a->strings["Password too short"] = "Kennwort zu kurz";
 $a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
 $a->strings["everybody"] = "alle";
-$a->strings["Secret Passphrase"] = "geheime Passwort-Phrase";
-$a->strings["Passphrase hint"] = "Hinweis zur Phrase";
+$a->strings["Secret Passphrase"] = "geheime Passphrase";
+$a->strings["Passphrase hint"] = "Hinweis zur Passphrase";
 $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
 $a->strings["timeago.suffixAgo"] = "timeago.suffixAgo";
 $a->strings["ago"] = "her";
@@ -342,32 +348,26 @@ $a->strings["No source file."] = "Keine Quelldatei.";
 $a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
 $a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
 $a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht.";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
 $a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
 $a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
 $a->strings["Path not available."] = "Pfad nicht verfügbar.";
-$a->strings["Empty pathname"] = "leere Pfadangabe";
+$a->strings["Empty pathname"] = "Leere Pfadangabe";
 $a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
 $a->strings["Path not found."] = "Pfad nicht gefunden.";
 $a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
 $a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["QR code"] = "QR Code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-$a->strings["post"] = "Beitrag";
-$a->strings["$1 wrote:"] = "$1 schrieb:";
-$a->strings["%1\$s's bookmarks"] = "%1\$s's Lesezeichen";
+$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
 $a->strings["channel"] = "Kanal";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
 $a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
 $a->strings["Select"] = "Auswählen";
 $a->strings["Delete"] = "Löschen";
 $a->strings["Message is verified"] = "Nachricht überprüft";
-$a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an.";
+$a->strings["View %s's profile @ %s"] = "%ss Profil auf %s ansehen";
 $a->strings["Categories:"] = "Kategorien:";
 $a->strings["Filed under:"] = "Gespeichert unter:";
 $a->strings[" from %s"] = "von %s";
@@ -382,7 +382,7 @@ $a->strings["View Source"] = "Quelle anzeigen";
 $a->strings["Follow Thread"] = "Unterhaltung folgen";
 $a->strings["View Status"] = "Status ansehen";
 $a->strings["View Photos"] = "Fotos ansehen";
-$a->strings["Matrix Activity"] = "Matrix Aktivität";
+$a->strings["Matrix Activity"] = "Matrix-Aktivität";
 $a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Sende PN";
 $a->strings["Poke"] = "Anstupsen";
@@ -409,7 +409,7 @@ $a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:";
 $a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:";
 $a->strings["Tag term:"] = "Schlagwort:";
 $a->strings["Save to Folder:"] = "Speichern in Ordner:";
-$a->strings["Where are you right now?"] = "Wo bist du jetzt grade?";
+$a->strings["Where are you right now?"] = "Wo bist Du jetzt grade?";
 $a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
 $a->strings["Preview"] = "Vorschau";
 $a->strings["Share"] = "Teilen";
@@ -436,27 +436,27 @@ $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
 $a->strings["Set expiration date"] = "Verfallsdatum";
 $a->strings["Encrypt text"] = "Text verschlüsseln";
-$a->strings["OK"] = "OK";
+$a->strings["OK"] = "Ok";
 $a->strings["Cancel"] = "Abbrechen";
 $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
 $a->strings["Personal"] = "Persönlich";
-$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung deinerseits";
+$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
 $a->strings["New"] = "Neu";
-$a->strings["Activity Stream - by date"] = "Activity Stream - nach Datum sortiert";
+$a->strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
 $a->strings["Starred"] = "Markiert";
-$a->strings["Favourite Posts"] = "Beiträge mit Sternchen";
+$a->strings["Favourite Posts"] = "Markierte Beiträge";
 $a->strings["Spam"] = "Spam";
-$a->strings["Posts flagged as SPAM"] = "Nachrichten die als SPAM markiert wurden";
+$a->strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden";
 $a->strings["Channel"] = "Kanal";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["About"] = "Über";
 $a->strings["Profile Details"] = "Profil-Details";
 $a->strings["Photo Albums"] = "Fotoalben";
 $a->strings["Files and Storage"] = "Dateien und Speicher";
-$a->strings["Chatrooms"] = "Chat-Räume";
+$a->strings["Chatrooms"] = "Chaträume";
 $a->strings["Events and Calendar"] = "Veranstaltungen und Kalender";
 $a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
 $a->strings["Manage Webpages"] = "Webseiten verwalten";
@@ -469,9 +469,9 @@ $a->strings["Nickname has unsupported characters or is already being used on thi
 $a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
 $a->strings["Default Profile"] = "Standard-Profil";
 $a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen.";
+$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, Du besitzt nicht die nötigen Rechte, um dieses Profil zu betrachten.";
 $a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
-$a->strings["Change profile photo"] = "Ändere das Profilfoto";
+$a->strings["Change profile photo"] = "Profilfoto ändern";
 $a->strings["Profiles"] = "Profile";
 $a->strings["Manage/edit profiles"] = "Verwalte/Bearbeite Profile";
 $a->strings["Create New Profile"] = "Neues Profil erstellen";
@@ -497,7 +497,7 @@ $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
 $a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
+$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
 $a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
 $a->strings["Hometown:"] = "Heimatstadt:";
 $a->strings["Tags:"] = "Schlagworte:";
@@ -505,8 +505,8 @@ $a->strings["Political Views:"] = "Politische Ansichten:";
 $a->strings["Religion:"] = "Religion:";
 $a->strings["About:"] = "Über:";
 $a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-$a->strings["Likes:"] = "Gefällt-mir:";
-$a->strings["Dislikes:"] = "Gefällt-mir-nicht:";
+$a->strings["Likes:"] = "Gefällt:";
+$a->strings["Dislikes:"] = "Gefällt nicht:";
 $a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
 $a->strings["My other channels:"] = "Meine anderen Kanäle:";
 $a->strings["Musical interests:"] = "Musikalische Interessen:";
@@ -521,26 +521,26 @@ $a->strings["Edit"] = "Bearbeiten";
 $a->strings["save to folder"] = "In Ordner speichern";
 $a->strings["add star"] = "markieren";
 $a->strings["remove star"] = "Markierung entfernen";
-$a->strings["toggle star status"] = "Stern-Status umschalten";
+$a->strings["toggle star status"] = "Markierung umschalten";
 $a->strings["starred"] = "markiert";
 $a->strings["add tag"] = "Schlagwort hinzufügen";
-$a->strings["I like this (toggle)"] = "Ich mag das (Umschalter)";
-$a->strings["like"] = "Gefällt-mir";
-$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (Umschalter)";
-$a->strings["dislike"] = "Gefällt-mir-nicht";
+$a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
+$a->strings["like"] = "mag";
+$a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
+$a->strings["dislike"] = "verurteile";
 $a->strings["Share this"] = "Teile dies";
 $a->strings["share"] = "Teilen";
-$a->strings["View %s's profile - %s"] = "Schaue dir %s's Profil an - %s";
-$a->strings["to"] = "zu";
+$a->strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
+$a->strings["to"] = "an";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["Bookmark Links"] = "Setze Lesezeichen für die Verweise";
+$a->strings["Bookmark Links"] = "Setze Lesezeichen für die Links";
 $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
 );
-$a->strings["This is you"] = "Das bist du";
+$a->strings["This is you"] = "Das bist Du";
 $a->strings["Submit"] = "Bestätigen";
 $a->strings["Bold"] = "Fett";
 $a->strings["Italic"] = "Kursiv";
@@ -616,19 +616,19 @@ $a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
 $a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
 $a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
 $a->strings["Room is full"] = "Der Raum ist voll";
-$a->strings["Tags"] = "Tags";
-$a->strings["Keywords"] = "Schlüsselbegriffe";
+$a->strings["Tags"] = "Schlagwörter";
+$a->strings["Keywords"] = "Schlüsselwörter";
 $a->strings["have"] = "habe";
 $a->strings["has"] = "hat";
 $a->strings["want"] = "will";
 $a->strings["wants"] = "will";
-$a->strings["likes"] = "Gefällt-mir";
-$a->strings["dislikes"] = "Gefällt-mir-nicht";
+$a->strings["likes"] = "gefällt";
+$a->strings["dislikes"] = "missfällt";
 $a->strings["Logged out."] = "Ausgeloggt.";
 $a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
 $a->strings["Login failed."] = "Login fehlgeschlagen.";
 $a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind";
+$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt";
 $a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
 $a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
 $a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
@@ -636,7 +636,7 @@ $a->strings["Please enter the required information."] = "Bitte gib die benötigt
 $a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
 $a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
 $a->strings["Administrator"] = "Administrator";
-$a->strings["your registration password"] = "dein Registrierungspasswort";
+$a->strings["your registration password"] = "Dein Registrierungspasswort";
 $a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
 $a->strings["Account approved."] = "Account bestätigt.";
 $a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
@@ -653,36 +653,36 @@ $a->strings["Thank You,"] = "Danke.";
 $a->strings["%s Administrator"] = "%s Administrator";
 $a->strings["%s "] = "%s ";
 $a->strings["[Red:Notify] New mail received at %s"] = "[Red Notify] Neue Mail auf %s empfangen";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat dir eine private Nachricht auf %3\$s gesendet.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat dir %2\$s geschickt.";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen %4\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert";
 $a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat ein Thema kommentiert, dem du folgst.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren.";
 $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf deine Pinnwand auf %3\$s geschrieben";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]deine Pinnwand[/zrl] geschrieben";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat dich getaggt";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat dich erwähnt[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat dich angestupst[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getaggt";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat deinen Beitrag auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen Beitrag[/zrl] getaggt";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf Deine Pinnwand auf %3\$s geschrieben";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]Deine Pinnwand[/zrl] geschrieben";
+$a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat Dich erwähnt";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s erwähnt";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat Dich erwähnt[/zrl].";
+$a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat Dich angestupst";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s angestupst";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat Dich angestupst[/zrl].";
+$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Deinen Beitrag verschlagwortet";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat Deinen Beitrag auf %3\$s verschlagwortet";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen Beitrag[/zrl] verschlagwortet";
 $a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten";
-$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
-$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, Du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, Du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
 $a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen.";
 $a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du hast einen Freundschaftsvorschlag von „%2\$s“ auf %3\$s erhalten";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du hast [zrl=%2\$s]einen Freundschaftvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, Du hast einen Kontaktvorschlag von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, Du hast [zrl=%2\$s]einen Kontaktvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
 $a->strings["Name:"] = "Name:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
@@ -718,7 +718,7 @@ $a->strings["Channel discovery failed. Website may be down or misconfigured."] =
 $a->strings["Response from remote channel was not understood."] = "Antwort des entfernten Kanals war unverständlich.";
 $a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
 $a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
-$a->strings["Cannot connect to yourself."] = "Du kannst dich nicht mit dir selbst verbinden.";
+$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
 $a->strings["Default"] = "Standard";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
@@ -739,11 +739,11 @@ $a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschr
 $a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
 $a->strings["Can write to my \"public\" file storage"] = "Kann in meinen öffentlichen Dateiordner schreiben";
 $a->strings["Can edit my \"public\" pages"] = "Kann meine öffentlichen Seiten bearbeiten";
-$a->strings["Can source my \"public\" posts in derived channels"] = "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften.";
+$a->strings["Can source my \"public\" posts in derived channels"] = "Kann meine „öffentlichen“ Beiträge als Quellen für andere Kanäle verwenden";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
 $a->strings["Can send me bookmarks"] = "Darf mir Lesezeichen senden";
 $a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
 $a->strings["Permission denied"] = "Keine Berechtigung";
 $a->strings["Item not found."] = "Element nicht gefunden.";
 $a->strings["Collection not found."] = "Sammlung nicht gefunden";
@@ -782,15 +782,17 @@ $a->strings["Show Thing"] = "Ding anzeigen";
 $a->strings["item not found."] = "Eintrag nicht gefunden";
 $a->strings["Edit Thing"] = "Ding bearbeiten";
 $a->strings["Select a profile"] = "Wähle ein Profil";
-$a->strings["Select a category of stuff. e.g. I ______ something"] = "Wähle eine Kategorie für das Zeugs, z.B. Ich ______ etwas";
+$a->strings["Select a category of stuff. e.g. I ______ something"] = "Wähle eine Kategorie/Art, z.B. Ich ______ etwas";
+$a->strings["Post an activity"] = "Aktivitätsnachricht senden";
+$a->strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
 $a->strings["Name of thing e.g. something"] = "Name des Dings, z.B. Etwas";
 $a->strings["URL of thing (optional)"] = "URL des Dings (optional)";
 $a->strings["URL for photo of thing (optional)"] = "URL eines Fotos von dem Ding (optional)";
-$a->strings["Add Thing to your Profile"] = "Das Ding deinem Profil hinzufügen";
-$a->strings["Total invitation limit exceeded."] = "Limit der maximalen Einladungen überschritten.";
+$a->strings["Add Thing to your Profile"] = "Das Ding Deinem Profil hinzufügen";
+$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
 $a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
 $a->strings["Please join us on Red"] = "Schließe Dich uns an und werde Teil der Red-Matrix";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator deiner Seite.";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers.";
 $a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
 $a->strings["%d message sent."] = array(
 	0 => "%d Nachricht gesendet.",
@@ -800,14 +802,14 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
 $a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralisierten Kommunikations- und Informationsnetzwerk.";
+$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralen Kommunikations- und Informationsnetzwerk.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du musst dann den folgenden Einladungs-Code angeben: \$invite_code";
 $a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf";
-$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:";
+$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn Du Dich registriert hast (egal auf welchem Server in der Red-Matrix, sie sind alle miteinander verbunden) verbinde Dich bitte mit meinem Kanal in der Matrix. Adresse:";
 $a->strings["Click the [Register] link on the following page to join."] = "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden.";
-$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an";
-$a->strings["Unable to locate original post."] = "Originalbeitrag kann nicht gefunden werden.";
-$a->strings["Empty post discarded."] = "Leerer Beitrag verworfen.";
+$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red-Matrix-Projekt und warum es das Potential hat, das Internet, wie wir es kennen, grundlegend zu verändern, besuche http://getzot.com";
+$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
 $a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
 $a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
 $a->strings["Wall Photos"] = "Wall Fotos";
@@ -825,7 +827,7 @@ $a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
 $a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
 $a->strings["New Menu"] = "Neues Menü";
 $a->strings["Menu name"] = "Menü Name";
-$a->strings["Must be unique, only seen by you"] = "Muss unverwechselbar sein, nur für dich sichtbar";
+$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
 $a->strings["Menu title"] = "Menü Titel";
 $a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
 $a->strings["Allow bookmarks"] = "Erlaube Lesezeichen";
@@ -839,148 +841,51 @@ $a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü h
 $a->strings["Modify"] = "Ändern";
 $a->strings["Not found."] = "Nicht gefunden.";
 $a->strings["View"] = "Ansicht";
-$a->strings["Authorize application connection"] = "Zugriff der Anwendung authorizieren";
-$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode bei der Anwendung ein:";
+$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
+$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
 $a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
 $a->strings["Yes"] = "Ja";
 $a->strings["No"] = "Nein";
-$a->strings["No installed applications."] = "Keine installierten Applikationen";
+$a->strings["No installed applications."] = "Keine installierten Anwendungen.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["Edit post"] = "Bearbeite Beitrag";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++";
+$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red-Matrix-Gäste: Nutzername: {Deine E-Mail-Adresse}; Passwort: +++";
 $a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
 $a->strings["My Bookmarks"] = "Meine Lesezeichen";
 $a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
-$a->strings["Name is required"] = "Name wird benötigt";
-$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
-$a->strings["Update"] = "Update";
-$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
-$a->strings["Password changed."] = "Kennwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
-$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
-$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
-$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Add application"] = "Anwendung hinzufügen";
-$a->strings["Name"] = "Name";
-$a->strings["Name of application"] = "Name der Anwendung";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Umleitung";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit";
-$a->strings["Icon url"] = "Symbol-URL";
-$a->strings["Optional"] = "Optional";
-$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
-$a->strings["Connected Apps"] = "Verbundene Apps";
-$a->strings["Client key starts with"] = "Client key beginnt mit";
-$a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Authorisierung aufheben";
-$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
-$a->strings["Feature Settings"] = "Funktions-Einstellungen";
-$a->strings["Account Settings"] = "Konto-Einstellungen";
-$a->strings["Password Settings"] = "Kennwort-Einstellungen";
-$a->strings["New Password:"] = "Neues Passwort:";
-$a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern";
-$a->strings["Email Address:"] = "Email Adresse:";
-$a->strings["Remove Account"] = "Konto entfernen";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden.";
-$a->strings["Off"] = "Aus";
-$a->strings["On"] = "An";
-$a->strings["Additional Features"] = "Zusätzliche Funktionen";
-$a->strings["Connector Settings"] = "Connector-Einstellungen";
-$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
-$a->strings["Display Settings"] = "Anzeige-Einstellungen";
-$a->strings["Display Theme:"] = "Anzeige Theme:";
-$a->strings["Mobile Theme:"] = "Mobile Theme:";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum von 10 Sekunden, kein Maximum";
-$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:";
-$a->strings["Maximum of 100 items"] = "Maximum von 100 Beiträgen";
-$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
-$a->strings["Nobody except yourself"] = "Niemand außer du selbst";
-$a->strings["Only those you specifically allow"] = "Nur die, denen du es explizit erlaubst";
-$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
-$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
-$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
-$a->strings["Anybody on the internet"] = "Jeder im Internet";
-$a->strings["Publish your default profile in the network directory"] = "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-$a->strings["or"] = "oder";
-$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
-$a->strings["Channel Settings"] = "Kanal-Einstellungen";
-$a->strings["Basic Settings"] = "Grundeinstellungen";
-$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
-$a->strings["Default Post Location:"] = "Standardstandort:";
-$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
-$a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
-$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
-$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
-$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige deines Online-Status in deinem Profil";
-$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphären-Einstellungen";
-$a->strings["Very Public - extremely permissive (should be used with caution)"] = "";
-$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "";
-$a->strings["Private - default private, never open or public"] = "";
-$a->strings["Blocked - default blocked to/from everybody"] = "";
-$a->strings["Advanced Privacy Settings"] = "";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
-$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
-$a->strings["Default Post Permissions"] = "Beitragszugriffrechte Standardeinstellungen";
-$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
-$a->strings["Useful to reduce spamming"] = "Nützlich um Spam zu verringern";
-$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
-$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten wenn:";
-$a->strings["accepting a friend request"] = "einer Kontaktanfrage stattgegeben wurde";
-$a->strings["joining a forum/community"] = "ein Forum beigetreten wurde";
-$a->strings["making an interesting profile change"] = "eine interessante Änderung am Profil vorgenommen wurde";
-$a->strings["Send a notification email when:"] = "Eine Email Benachrichtigung senden wenn:";
-$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
-$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
-$a->strings["Someone writes on your profile wall"] = "Jemand auf deine Pinnwand schreibt";
-$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
-$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
-$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag getaggt";
-$a->strings["You are poked/prodded/etc. in a post"] = "Du in einer Nachricht angestupst/geknufft/o.ä. wirst";
-$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account / Seiten Arten Einstellungen";
-$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$s's %3\$s";
-$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
+$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]";
 $a->strings["Channel not found."] = "Kanal nicht gefunden.";
 $a->strings["toggle full screen mode"] = "auf Vollbildmodus umschalten";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$s's %3\$s mit %4\$s getaggt";
-$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet";
+$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
 $a->strings["Leave Room"] = "Raum verlassen";
 $a->strings["I am away right now"] = "Ich bin gerade nicht da";
 $a->strings["I am online"] = "Ich bin online";
-$a->strings["New Chatroom"] = "Neuen Chatraum";
-$a->strings["Chatroom Name"] = "Chatraum Name";
-$a->strings["%1\$s's Chatrooms"] = "%1\$s's Chat-Räume";
+$a->strings["New Chatroom"] = "Neuer Chatraum";
+$a->strings["Chatroom Name"] = "Name des Chatraums";
+$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
 $a->strings["Public access denied."] = "Öffentlicher Zugang verweigert.";
 $a->strings["No connections."] = "Keine Verbindungen.";
-$a->strings["Visit %s's profile [%s]"] = "Besuche %s's Profil [%s]";
+$a->strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
 $a->strings["View Connnections"] = "Zeige Verbindungen";
 $a->strings["Tag removed"] = "Schlagwort entfernt";
-$a->strings["Remove Item Tag"] = "Schlagwort des Beitrags entfernen";
-$a->strings["Select a tag to remove: "] = "Schlagwort zum entfernen auswählen:";
+$a->strings["Remove Item Tag"] = "Schlagwort entfernen";
+$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
 $a->strings["Remove"] = "Entferne";
 $a->strings["Continue"] = "Fortfahren";
-$a->strings["Premium Channel Setup"] = "Prämium-Kanal Einrichtung";
-$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für den Prämium-Kanal aktivieren";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib deine Nutzungseinschränkungen ein, z.B. Paypal Quittung, Nutzungsbestimmungen etc.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen, vor dem Verbinden mit diesem Kanal nötig.";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Verbindungen werden den folgenden Text sehen bevor fortgefahren wird:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Mit dem fortfahren bestätige ich die Erfüllung aller Anweisungen die vom Seitenbetreiber erteilt wurden.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Seitenbetreiber hat keine speziellen Anweisungen für Kanal-Betreiber hinterlegt.)";
-$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Prämium-Kanal";
+$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
+$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
+$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
 $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
-$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!";
+$a->strings["Delegate Page Management"] = "Delegiere das Management für diese Seite";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!";
 $a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager";
 $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
@@ -1003,7 +908,8 @@ $a->strings["Add menu element"] = "Menüelement hinzufügen";
 $a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
 $a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
 $a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
-$a->strings["Menu Item Permissions"] = "Menü-Element Zugriffsrechte";
+$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
+$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
 $a->strings["Link text"] = "Link Text";
 $a->strings["URL of link"] = "URL des Links";
 $a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar";
@@ -1014,6 +920,11 @@ $a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
 $a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
 $a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
 $a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
+$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
+$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
+$a->strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
+$a->strings["Visible To"] = "Sichtbar für";
+$a->strings["All Connections"] = "Alle Verbindungen";
 $a->strings["Collection created."] = "Sammlung erstellt.";
 $a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
 $a->strings["Collection updated."] = "Sammlung aktualisiert.";
@@ -1026,11 +937,6 @@ $a->strings["Collection Editor"] = "Sammlung-Editor";
 $a->strings["Members"] = "Mitglieder";
 $a->strings["All Connected Channels"] = "Alle verbundenen Kanäle";
 $a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
-$a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator";
-$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor";
-$a->strings["Click on a contact to add or remove."] = "Wähle einen Kontakt zum Hinzufügen oder Löschen aus.";
-$a->strings["Visible To"] = "Sichtbar für";
-$a->strings["All Connections"] = "Alle Verbindungen";
 $a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Benutzer";
@@ -1040,8 +946,8 @@ $a->strings["Server"] = "Server";
 $a->strings["DB updates"] = "DB-Aktualisierungen";
 $a->strings["Logs"] = "Protokolle";
 $a->strings["Plugin Features"] = "Plug-In Funktionen";
-$a->strings["User registrations waiting for confirmation"] = "Nutzer Anmeldungen die auf Bestätigung warten";
-$a->strings["Message queues"] = "Nachrichten Warteschlange";
+$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
+$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Administration"] = "Administration";
 $a->strings["Summary"] = "Zusammenfassung";
 $a->strings["Registered users"] = "Registrierte Benutzer";
@@ -1049,7 +955,8 @@ $a->strings["Pending registrations"] = "Ausstehende Registrierungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plug-Ins";
 $a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
-$a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility Theme vorhanden";
+$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
+$a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility-Theme vorhanden";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Genehmigung erforderlich";
 $a->strings["Open"] = "Offen";
@@ -1063,59 +970,59 @@ $a->strings["Policies"] = "Richtlinien";
 $a->strings["Advanced"] = "Fortgeschritten";
 $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
-$a->strings["Administrator Information"] = "Administrator Informationen";
-$a->strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden.";
+$a->strings["Administrator Information"] = "Administrator-Informationen";
+$a->strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden.";
 $a->strings["System language"] = "System-Sprache";
 $a->strings["System theme"] = "System-Theme";
-$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard System-Theme - kann durch Nutzerprofile überschieben werden - Theme.Einstellungen ändern";
+$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern";
 $a->strings["Mobile system theme"] = "Mobile System-Theme:";
 $a->strings["Theme for mobile devices"] = "Theme für mobile Geräte";
-$a->strings["Accessibility system theme"] = "Accessibility System-Theme";
-$a->strings["Accessibility theme"] = "Accessibility Theme";
+$a->strings["Accessibility system theme"] = "Accessibility-System-Theme";
+$a->strings["Accessibility theme"] = "Accessibility-Theme";
 $a->strings["Channel to use for this website's static pages"] = "Kanal für die statischen Seiten dieser Webseite verwenden";
 $a->strings["Site Channel"] = "Seiten Kanal";
 $a->strings["Maximum image size"] = "Maximale Bildgröße";
-$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Größe in Bytes von hochgeladenen Bildern. Standard ist 0, was keine Einschränkung bedeutet.";
-$a->strings["Register policy"] = "Registrierungsmethode";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung).";
+$a->strings["Register policy"] = "Registrierungsrichtlinie";
 $a->strings["Access policy"] = "Zugangsrichtlinien";
 $a->strings["Register text"] = "Registrierungstext";
-$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
-$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach X Tagen als unbenutzt";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine Systemressourchen auf das Pollen von externen Seiten wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit.";
+$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
+$a->strings["Accounts abandoned after x days"] = "Konten gelten nach X Tagen als unbenutzt";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
 $a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
 $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
 $a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist.";
 $a->strings["Force publish"] = "Veröffentlichung erzwingen";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen.";
 $a->strings["No login on Homepage"] = "Kein Login auf der Homepage";
-$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Wählen um das Login Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört.";
+$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Ktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört.";
 $a->strings["Proxy user"] = "Proxy Benutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk-Timeout";
-$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen).";
 $a->strings["Delivery interval"] = "Auslieferung Intervall";
-$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server.";
+$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server.";
 $a->strings["Poll interval"] = "Abfrageintervall";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet.";
-$a->strings["Maximum Load Average"] = "Maximum Load Average";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet.";
+$a->strings["Maximum Load Average"] = "Maximales Load Average";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50";
 $a->strings["No server found"] = "Kein Server gefunden";
 $a->strings["ID"] = "ID";
 $a->strings["for channel"] = "für Kanal";
 $a->strings["on server"] = "auf Server";
 $a->strings["Status"] = "Status";
 $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
-$a->strings["Executing %s failed. Check system logs."] = "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs.";
-$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich angewandt.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s liefert keinen Rückgabewert. Unbekannt ob es erfolgreich war.";
-$a->strings["Update function %s could not be found."] = "Update Funktion %s konnte nicht gefunden werden.";
+$a->strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle.";
+$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt.";
+$a->strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden.";
 $a->strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
 $a->strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
-$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)";
-$a->strings["Attempt to execute this update step automatically"] = "Versuche diesen Updateschritt automatisch anzuwenden";
+$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
+$a->strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
 $a->strings["%s user blocked/unblocked"] = array(
 	0 => "%s Nutzer blockiert/freigegeben",
 	1 => "%s Nutzer blockiert/freigegeben",
@@ -1129,7 +1036,7 @@ $a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
 $a->strings["User '%s' unblocked"] = "Benutzer '%s' freigegeben";
 $a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert";
 $a->strings["select all"] = "Alle auswählen";
-$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
+$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten";
 $a->strings["Request date"] = "Antragsdatum";
 $a->strings["No registrations."] = "Keine Registrierungen.";
 $a->strings["Approve"] = "Genehmigen";
@@ -1140,8 +1047,8 @@ $a->strings["Register date"] = "Registrierungs-Datum";
 $a->strings["Last login"] = "Letzte Anmeldung";
 $a->strings["Expires"] = "Verfällt";
 $a->strings["Service Class"] = "Service-Klasse";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?";
 $a->strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
 $a->strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
 $a->strings["Disable"] = "Deaktivieren";
@@ -1157,9 +1064,9 @@ $a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
 $a->strings["Clear"] = "Leeren";
 $a->strings["Debugging"] = "Debugging";
 $a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis.";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis.";
 $a->strings["Log level"] = "Protokollstufe";
-$a->strings["- select -"] = "-auswählen-";
+$a->strings["- select -"] = "– auswählen –";
 $a->strings["Welcome to %s"] = "Willkommen auf %s";
 $a->strings["Item not found"] = "Element nicht gefunden";
 $a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
@@ -1173,15 +1080,15 @@ $a->strings["Finding:"] = "Ergebnisse:";
 $a->strings["next page"] = "nächste Seite";
 $a->strings["previous page"] = "vorige Seite";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
-$a->strings["Could not access contact record."] = "Konnte auf den Kontakteintrag nicht zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das gewählte Profil nicht finden.";
+$a->strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
+$a->strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
 $a->strings["Connection updated."] = "Verbindung aktualisiert.";
 $a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
-$a->strings["Could not access address book record."] = "Konnte nicht auf den Eintrag im Adressbuch zugreifen.";
+$a->strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen.";
 $a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
 $a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
 $a->strings["Channel has been blocked"] = "Kanal blockiert";
-$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch Parameter nicht setzen.";
+$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch-Parameter nicht setzen.";
 $a->strings["Channel has been unignored"] = "Kanal wird nicht mehr ignoriert";
 $a->strings["Channel has been ignored"] = "Kanal wird ignoriert";
 $a->strings["Channel has been unarchived"] = "Kanal wurde aus dem Archiv zurück geholt";
@@ -1191,51 +1098,51 @@ $a->strings["Channel has been hidden"] = "Kanal wurde versteckt";
 $a->strings["Channel has been approved"] = "Kanal wurde zugelassen";
 $a->strings["Channel has been unapproved"] = "Zulassung des Kanals entfernt";
 $a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
-$a->strings["View %s's profile"] = "%s's Profil ansehen";
-$a->strings["Refresh Permissions"] = "Zugriffsrechte auffrischen";
+$a->strings["View %s's profile"] = "%ss Profil ansehen";
+$a->strings["Refresh Permissions"] = "Zugriffsrechte neu laden";
 $a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
 $a->strings["Recent Activity"] = "Kürzliche Aktivitäten";
 $a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
-$a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder frei geben";
+$a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder freigeben";
 $a->strings["Unignore"] = "Nicht ignorieren";
 $a->strings["Ignore"] = "Ignorieren";
 $a->strings["Ignore or Unignore this connection"] = "Verbindung ignorieren oder wieder beachten";
 $a->strings["Unarchive"] = "Aus Archiv zurückholen";
 $a->strings["Archive"] = "Archivieren";
-$a->strings["Archive or Unarchive this connection"] = "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück";
-$a->strings["Unhide"] = "aufdecken";
-$a->strings["Hide"] = "Verbergen";
-$a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder aufdecken";
+$a->strings["Archive or Unarchive this connection"] = "Verbindung archivieren oder aus dem Archiv zurückholen";
+$a->strings["Unhide"] = "Wieder sichtbar machen";
+$a->strings["Hide"] = "Verstecken";
+$a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder wieder sichtbar machen";
 $a->strings["Delete this connection"] = "Verbindung löschen";
 $a->strings["Unknown"] = "Unbekannt";
 $a->strings["Approve this connection"] = "Verbindung genehmigen";
-$a->strings["Accept connection to allow communication"] = "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen";
+$a->strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
 $a->strings["Automatic Permissions Settings"] = "Automatische Berechtigungs-Einstellungen";
 $a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
-$a->strings["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."] = "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest.";
-$a->strings["Slide to adjust your degree of friendship"] = "Schieben um den Grad der Freundschaft zu wählen";
-$a->strings["inherited"] = "Geerbt";
-$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffseinstellungen.";
-$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von deinen Privatsphären Einstellungen könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen.";
+$a->strings["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."] = "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest.";
+$a->strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
+$a->strings["inherited"] = "geerbt";
+$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffsrechte!";
+$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von Deinen Privatsphäre-Einstellungen könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen.";
 $a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
 $a->strings["Contact Information / Notes"] = "Kontaktinformationen / Notizen";
-$a->strings["Edit contact notes"] = "Kontaktnotizen editieren";
+$a->strings["Edit contact notes"] = "Kontaktnotizen bearbeiten";
 $a->strings["Their Settings"] = "Deren Einstellungen";
 $a->strings["My Settings"] = "Meine Einstellungen";
 $a->strings["Forum Members"] = "Forum Mitglieder";
 $a->strings["Soapbox"] = "Marktschreier";
-$a->strings["Full Sharing (typical social network permissions)"] = "";
-$a->strings["Cautious Sharing "] = "";
-$a->strings["Follow Only"] = "Nur Folgen";
-$a->strings["Individual Permissions"] = "Individuelle Zugriffseinstellungen";
-$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "";
-$a->strings["Advanced Permissions"] = "Erweiterte Zugriffsrechte";
-$a->strings["Simple Permissions (select one and submit)"] = "";
-$a->strings["Visit %s's profile - %s"] = "%s's Profil besuchen - %s";
-$a->strings["Block/Unblock contact"] = "Geblockt Status ein- / ausschalten";
+$a->strings["Full Sharing (typical social network permissions)"] = "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)";
+$a->strings["Cautious Sharing "] = "Vorsichtiges Teilen";
+$a->strings["Follow Only"] = "Nur folgen";
+$a->strings["Individual Permissions"] = "Individuelle Zugriffsrechte";
+$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Einige Berechtigungen werden von den Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen.";
+$a->strings["Advanced Permissions"] = "Zugriffsrechte für Fortgeschrittene";
+$a->strings["Simple Permissions (select one and submit)"] = "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)";
+$a->strings["Visit %s's profile - %s"] = "%ss Profil besuchen - %s";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freigeben";
 $a->strings["Ignore contact"] = "Kontakt ignorieren";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["Repair URL settings"] = "URL-Einstellungen reparieren";
 $a->strings["View conversations"] = "Unterhaltungen anzeigen";
 $a->strings["Delete contact"] = "Kontakt löschen";
 $a->strings["Last update:"] = "Letzte Aktualisierung:";
@@ -1247,9 +1154,9 @@ $a->strings["Currently archived"] = "Derzeit archiviert";
 $a->strings["Currently pending"] = "Derzeit anstehend";
 $a->strings["Hide this contact from others"] = "Diese Verbindung vor den anderen verbergen.";
 $a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein";
-$a->strings["Layout Help"] = "Layout Hilfe";
-$a->strings["Help with this feature"] = "Hilfe zu diesem Feature";
-$a->strings["Layout Name"] = "Layout Name";
+$a->strings["Layout Help"] = "Layout-Hilfe";
+$a->strings["Help with this feature"] = "Hilfe zu dieser Funktion";
+$a->strings["Layout Name"] = "Layout-Name";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Page not found."] = "Seite nicht gefunden.";
@@ -1271,11 +1178,11 @@ $a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden
 $a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
 $a->strings["Marital Status"] = "Familienstand";
 $a->strings["Romantic Partner"] = "Romantische Partner";
-$a->strings["Likes"] = "Gefällt-mir";
-$a->strings["Dislikes"] = "Gefällt-mir-nicht";
+$a->strings["Likes"] = "Gefällt";
+$a->strings["Dislikes"] = "Gefällt nicht";
 $a->strings["Work/Employment"] = "Arbeit/Anstellung";
 $a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politische Anscihten";
+$a->strings["Political Views"] = "Politische Ansichten";
 $a->strings["Gender"] = "Geschlecht";
 $a->strings["Sexual Preference"] = "Sexuelle Orientierung";
 $a->strings["Homepage"] = "Webseite";
@@ -1283,7 +1190,7 @@ $a->strings["Interests"] = "Hobbys/Interessen";
 $a->strings["Address"] = "Adresse";
 $a->strings["Location"] = "Ort";
 $a->strings["Profile updated."] = "Profil aktualisiert.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?";
 $a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
 $a->strings["View this profile"] = "Dieses Profil ansehen";
 $a->strings["Change Profile Photo"] = "Profilfoto ändern";
@@ -1292,14 +1199,14 @@ $a->strings["Clone this profile"] = "Dieses Profil klonen";
 $a->strings["Delete this profile"] = "Dieses Profil löschen";
 $a->strings["Profile Name:"] = "Profilname:";
 $a->strings["Your Full Name:"] = "Dein voller Name:";
-$a->strings["Title/Description:"] = "Titel/Beschreibung:";
+$a->strings["Title/Description:"] = "Titel/Stellenbeschreibung:";
 $a->strings["Your Gender:"] = "Dein Geschlecht:";
 $a->strings["Birthday (%s):"] = "Geburtstag (%s):";
 $a->strings["Street Address:"] = "Straße und Hausnummer:";
 $a->strings["Locality/City:"] = "Wohnort:";
 $a->strings["Postal/Zip Code:"] = "Postleitzahl:";
 $a->strings["Country:"] = "Land:";
-$a->strings["Region/State:"] = "Region/Bundesstaat";
+$a->strings["Region/State:"] = "Region/Bundesstaat:";
 $a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:";
 $a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
@@ -1307,9 +1214,9 @@ $a->strings["Since [date]:"] = "Seit [Datum]:";
 $a->strings["Homepage URL:"] = "Homepage URL:";
 $a->strings["Religious Views:"] = "Religiöse Ansichten:";
 $a->strings["Keywords:"] = "Schlüsselwörter:";
-$a->strings["Example: fishing photography software"] = "Beispiel: fischen Fotografie Software";
-$a->strings["Used in directory listings"] = "Wird in Verzeichnis Auflistungen verwendet";
-$a->strings["Tell us about yourself..."] = "Erzähl uns ein wenig von Dir...";
+$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
+$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet";
+$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …";
 $a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
 $a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
 $a->strings["My other channels"] = "Meine anderen Kanäle";
@@ -1320,165 +1227,267 @@ $a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung
 $a->strings["Love/romance"] = "Liebe/Romantik";
 $a->strings["Work/employment"] = "Arbeit/Anstellung";
 $a->strings["School/education"] = "Schule/Ausbildung";
-$a->strings["This is your public profile.
                                      It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
                                      Es könnte für jeden im Internet sichtbar sein.";
+$a->strings["This is your public profile.
                                      It may be visible to anybody using the internet."] = "Das ist Dein öffentliches Profil.
                                      Es könnte für jeden im Internet sichtbar sein.";
 $a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
 $a->strings["Add profile things"] = "Profil-Dinge hinzufügen";
-$a->strings["Include desirable objects in your profile"] = "binde begehrenswerte Dinge in dein Profil ein";
+$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein";
 $a->strings["Channel added."] = "Kanal hinzugefügt.";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
 $a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
 $a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
 $a->strings["Source created."] = "Quelle erstellt.";
 $a->strings["Source updated."] = "Quelle aktualisiert.";
 $a->strings["*"] = "*";
-$a->strings["Manage remote sources of content for your channel."] = "Entfernte Quellen von Inhalten deines Kanals verwalten.";
+$a->strings["Manage remote sources of content for your channel."] = "Quellen von Inhalten Deines Kanals verwalten.";
 $a->strings["New Source"] = "Neue Quelle";
 $a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
-$a->strings["Only import content with these words (one per line)"] = "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
-$a->strings["Leave blank to import all public content"] = "Leer lassen um alle öffentlichen Beiträge zu importieren";
+$a->strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
+$a->strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
 $a->strings["Channel Name"] = "Name des Kanals";
 $a->strings["Source not found."] = "Quelle nicht gefunden.";
 $a->strings["Edit Source"] = "Quelle bearbeiten";
 $a->strings["Delete Source"] = "Quelle löschen";
 $a->strings["Source removed"] = "Quelle gelöscht";
 $a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
-$a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
+$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
 $a->strings["Hub not found."] = "Server nicht gefunden.";
 $a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation";
 $a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
 $a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
-$a->strings["Your site database has been installed."] = "Die Datenbank deiner Seite wurde installiert.";
-$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren.";
+$a->strings["Your site database has been installed."] = "Die Datenbank Deines Servers wurde installiert.";
+$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren.";
 $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
 $a->strings["System check"] = "Systemprüfung";
 $a->strings["Check again"] = "Bitte nochmal prüfen";
 $a->strings["Database connection"] = "Datenbank Verbindung";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst.";
+$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
 $a->strings["Database Server Name"] = "Datenbank-Servername";
 $a->strings["Default is localhost"] = "Standard ist localhost";
 $a->strings["Database Port"] = "Datenbank-Port";
-$a->strings["Communication port number - use 0 for default"] = "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:";
+$a->strings["Communication port number - use 0 for default"] = "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung";
 $a->strings["Database Login Name"] = "Datenbank-Benutzername";
 $a->strings["Database Login Password"] = "Datenbank-Kennwort";
 $a->strings["Database Name"] = "Datenbank-Name";
 $a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst.";
-$a->strings["Website URL"] = "Webseiten URL";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
+$a->strings["Website URL"] = "Server-URL";
 $a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
-$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für deine Website";
+$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
 $a->strings["Site settings"] = "Seiteneinstellungen";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen.";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
 $a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren.";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
 $a->strings["Command line PHP"] = "PHP Befehlszeile";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
 $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen.";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn du Windows verwendest, siehe  http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung.";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
 $a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel  generieren";
-$a->strings["libCurl PHP module"] = "libCurl PHP Modul";
-$a->strings["GD graphics PHP module"] = "GD Graphik PHP Modul";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP Modul";
-$a->strings["mysqli PHP module"] = "mysqli PHP Modul";
-$a->strings["mb_string PHP module"] = "mb_string PHP Modul";
-$a->strings["mcrypt PHP module"] = "mcrypt PHP Modul";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite Modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert.";
+$a->strings["libCurl PHP module"] = "libCurl-PHP-Modul";
+$a->strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
+$a->strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
+$a->strings["mysqli PHP module"] = "mysqli-PHP-Modul";
+$a->strings["mb_string PHP module"] = "mb_string-PHP-Modul";
+$a->strings["mcrypt PHP module"] = "mcrypt-PHP-Modul";
+$a->strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
 $a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen.";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver Schreibzugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red-Stammverzeichnisses haben.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: Als Sicherheitsvorkehrung solltest Du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht auf die Vorlagen (.tpl-Dateien) in view/tpl/ .";
 $a->strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 ist beschreibbar";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis.";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses";
 $a->strings["store is writable"] = "store ist schreibbar";
 $a->strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen.";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration.";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration.";
 $a->strings["Url rewrite is working"] = "Url rewrite funktioniert";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
-$a->strings["Errors encountered creating database tables."] = "Fehler während des Anlegens der Datenbank Tabellen aufgetreten.";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
+$a->strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
 $a->strings["
                                      What next
                                      "] = "
                                      Was als Nächstes
                                      ";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
 $a->strings["Version %s"] = "Version %s";
 $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
+$a->strings["Project Donations"] = "Projekt Spenden";
+$a->strings["
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
                                      "] = "";
+$a->strings["
                                      or
                                      "] = "
                                      oder
                                      ";
+$a->strings["Recurring Donation Options"] = "";
 $a->strings["Red"] = "Red";
 $a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
 $a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com um mehr über die Red Matrix zu erfahren.";
+$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
 $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
 $a->strings["Site Administrators"] = "Administratoren";
 $a->strings["Add a Channel"] = "Kanal hinzufügen";
-$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt.";
-$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" ";
-$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznahmen";
-$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
-$a->strings["Or import an existing channel from another location"] = "Oder importiere einen bestehenden Kanal von einem anderen Ort";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt.";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
+$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
+$a->strings["Or import an existing channel from another location"] = "Oder importiere einen bestehenden Kanal von einem anderen Server";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
-$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab.";
-$a->strings["Site Member (%s)"] = "Seiten Mitglied (%s)";
-$a->strings["Password reset requested at %s"] = "Passwort Rücksetzung auf %s angefordert";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen.";
+$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
+$a->strings["Site Member (%s)"] = "Nutzer (%s)";
+$a->strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
 $a->strings["Password Reset"] = "Zurücksetzen des Kennworts";
 $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
 $a->strings["Your new password is"] = "Dein neues Passwort lautet";
-$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
+$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
 $a->strings["click here to login"] = "Klicke hier, um dich anzumelden";
 $a->strings["Your password may be changed from the Settings page after successful login."] = "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden.";
-$a->strings["Your password has changed at %s"] = "Auf %s wurde dein Passwort geändert";
+$a->strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
 $a->strings["Forgot your Password?"] = "Kennwort vergessen?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
 $a->strings["Email Address"] = "E-Mail Adresse";
 $a->strings["Reset"] = "Zurücksetzen";
+$a->strings["Name is required"] = "Name ist erforderlich";
+$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
+$a->strings["Update"] = "Aktualisieren";
+$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
+$a->strings["Password changed."] = "Kennwort geändert.";
+$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
+$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
+$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
+$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Add application"] = "Anwendung hinzufügen";
+$a->strings["Name"] = "Name";
+$a->strings["Name of application"] = "Name der Anwendung";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Umleitung";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert";
+$a->strings["Icon url"] = "Symbol-URL";
+$a->strings["Optional"] = "Optional";
+$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
+$a->strings["Connected Apps"] = "Verbundene Apps";
+$a->strings["Client key starts with"] = "Client key beginnt mit";
+$a->strings["No name"] = "Kein Name";
+$a->strings["Remove authorization"] = "Authorisierung aufheben";
+$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
+$a->strings["Feature Settings"] = "Funktions-Einstellungen";
+$a->strings["Account Settings"] = "Konto-Einstellungen";
+$a->strings["Password Settings"] = "Kennwort-Einstellungen";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
+$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
+$a->strings["Email Address:"] = "Email Adresse:";
+$a->strings["Remove Account"] = "Konto entfernen";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden.";
+$a->strings["Off"] = "Aus";
+$a->strings["On"] = "An";
+$a->strings["Additional Features"] = "Zusätzliche Funktionen";
+$a->strings["Connector Settings"] = "Connector-Einstellungen";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
+$a->strings["Display Theme:"] = "Anzeige-Theme:";
+$a->strings["Mobile Theme:"] = "Mobile Theme:";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
+$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
+$a->strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
+$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
+$a->strings["View remote profiles as webpages"] = "";
+$a->strings["By default open in a sub-window of your own site"] = "";
+$a->strings["Nobody except yourself"] = "Niemand außer Dir selbst";
+$a->strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
+$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
+$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
+$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
+$a->strings["Anybody on the internet"] = "Jeder im Internet";
+$a->strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+$a->strings["or"] = "oder";
+$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
+$a->strings["Channel Settings"] = "Kanal-Einstellungen";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
+$a->strings["Default Post Location:"] = "Standardstandort:";
+$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
+$a->strings["Adult Content"] = "Nicht jugendfreie Inhalte";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
+$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige Deines Online-Status in deinem Profil";
+$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphäre-Einstellungen";
+$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)";
+$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Typisch – Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)";
+$a->strings["Private - default private, never open or public"] = "Private – Default privat, nie offen oder öffentlich";
+$a->strings["Blocked - default blocked to/from everybody"] = "Blockiert – Alle per Default blockiert";
+$a->strings["Advanced Privacy Settings"] = "Fortgeschrittene Privatsphäre-Einstellungen";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
+$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
+$a->strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
+$a->strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
+$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
+$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten, wenn:";
+$a->strings["accepting a friend request"] = "Du eine Kontaktanfrage annimmst";
+$a->strings["joining a forum/community"] = "Du einem Forum beitrittst";
+$a->strings["making an interesting profile change"] = "Du eine interessante Änderung an Deinem Profil vornimmst";
+$a->strings["Send a notification email when:"] = "Eine E-Mail-Benachrichtigung senden, wenn:";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
+$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
+$a->strings["Someone writes on your profile wall"] = "Jemand auf Deine Pinnwand schreibt";
+$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
+$a->strings["You are tagged in a post"] = "Du in einem Beitrag erwähnt wurdest";
+$a->strings["You are poked/prodded/etc. in a post"] = "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest";
+$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
+$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
+$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "";
 $a->strings["Nothing to import."] = "Nichts zu importieren.";
 $a->strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
 $a->strings["Imported file is empty."] = "Die importierte Datei ist leer.";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann auf diesem System keinen duplizierten Kanal-Identifikator erzeugen. Import fehlgeschlagen.";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
 $a->strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
 $a->strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
 $a->strings["Import completed."] = "Import abgeschlossen.";
 $a->strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
 $a->strings["Import Channel"] = "Kanal importieren";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Verwende dieses Formular um einen existierenden Kanal von einem anderen Server/Hub zu importieren. Du kannst die Kanal-Identität vom alten Server/Hub über das Netzwerk erhalten oder über eine exportierte Sicherungskopie. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich.";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Red-Server zu importieren. Du kannst den Kanal direkt vom bisherigen Red-Server über das Netzwerk importieren oder eine exportierte Sicherheitskopie benutzen. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich.";
 $a->strings["File to Upload"] = "Hochzuladende Datei:";
-$a->strings["Or provide the old server/hub details"] = "Oder gib die Deteils deines alten Server/Hubs an";
-$a->strings["Your old identity address (xyz@example.com)"] = "Die alte Adresse der Identität (xyz@example.com)";
+$a->strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen Red-Servers ein";
+$a->strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
 $a->strings["Your old login email address"] = "Ihre alte Login E-Mail Adresse";
 $a->strings["Your old login password"] = "Ihr altes Login Kennwort";
-$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue primäre Adresse sein soll oder ob dein alter Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Orten aus neue Dinge posten, aber nur einer kann die primäre Adresse deiner Dateien, Fotos und anderen Mediendaten sein.";
-$a->strings["Make this hub my primary location"] = "Dieser Hub ist mein primärer Server.";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet.";
+$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
+$a->strings["Make this hub my primary location"] = "Dieser Red-Server ist mein primärer Server.";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
 $a->strings["Create a new channel"] = "Erzeuge neues Kanal";
 $a->strings["Channel Manager"] = "Kanal-Manager";
 $a->strings["Current Channel"] = "Aktueller Kanal";
-$a->strings["Attach to one of your channels by selecting it."] = "Wähle einen deiner Kanäle aus um ihn zu verwenden.";
+$a->strings["Attach to one of your channels by selecting it."] = "Wähle einen Deiner Kanäle aus, um ihn zu verwenden.";
 $a->strings["Default Channel"] = "Standard Kanal";
 $a->strings["Make Default"] = "Zum Standard machen";
 $a->strings["Total votes"] = "Stimmen gesamt";
-$a->strings["Average Rating"] = "durchschnittliche Bewertung";
+$a->strings["Average Rating"] = "Durchschnittliche Bewertung";
 $a->strings["Profile Match"] = "Profil-Übereinstimmungen";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselbegriffe für den Abgleich gefunden. Bitte füge Schlüsselbegriffe zu deinem Standardprofil hinzu.";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
 $a->strings["is interested in:"] = "interessiert sich für:";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["invalid target signature"] = "Ungültige Signatur des Ziels";
@@ -1494,18 +1503,18 @@ $a->strings["To:"] = "An:";
 $a->strings["Subject:"] = "Betreff:";
 $a->strings["Message not found."] = "Nachricht nicht gefunden.";
 $a->strings["Delete message"] = "Nachricht löschen";
-$a->strings["Recall message"] = "Widerrufe die Nachricht";
+$a->strings["Recall message"] = "Nachricht widerrufen";
 $a->strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
 $a->strings["Private Conversation"] = "Private Unterhaltung";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
-$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. Eventuell kannst du von der Profilseite des Absenders antworten.";
+$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Edit Layout"] = "Layout bearbeiten";
 $a->strings["Delete layout?"] = "Layout löschen?";
 $a->strings["Delete Layout"] = "Layout löschen";
-$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das zurecht schneiden schlug fehl.";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
 $a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden sollte das neue Foto nicht sofort angezeigt werden.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
 $a->strings["Image exceeds size limit of %d"] = "Bild ist größer als das Limit von %d";
 $a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
 $a->strings["Photo not available."] = "Foto nicht verfügbar.";
@@ -1516,7 +1525,7 @@ $a->strings["Upload"] = "Hochladen";
 $a->strings["skip this step"] = "diesen Schritt überspringen";
 $a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
 $a->strings["Crop Image"] = "Bild zuschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte passe das Bild zur optimalen Anzeige an.";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
 $a->strings["Done Editing"] = "Bearbeitung fertigstellen";
 $a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
 $a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
@@ -1527,7 +1536,7 @@ $a->strings["Hidden"] = "Versteckt";
 $a->strings["Archived"] = "Archiviert";
 $a->strings["All"] = "Alle";
 $a->strings["Suggest new connections"] = "Neue Verbindungen vorschlagen";
-$a->strings["Show pending (new) connections"] = "Zeige schwebende (neue) Verbindungen";
+$a->strings["Show pending (new) connections"] = "Zeige ausstehende (neue) Verbindungsanfragen";
 $a->strings["Show all connections"] = "Zeige alle Verbindungen";
 $a->strings["Unblocked"] = "Freigegeben";
 $a->strings["Only show unblocked connections"] = "Zeige nur freigegebene Verbindungen";
@@ -1539,21 +1548,21 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit contact"] = "Kontakt bearbeiten";
 $a->strings["Search your connections"] = "Verbindungen durchsuchen";
 $a->strings["Finding: "] = "Ergebnisse:";
-$a->strings["Invalid request identifier."] = "Ungültige Anfrage Identifikator.";
+$a->strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
 $a->strings["Discard"] = "Verwerfen";
 $a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
 $a->strings["System Notifications"] = "System-Benachrichtigungen";
-$a->strings["Block Name"] = "Block Name";
-$a->strings["Unable to find your hub."] = "Konnte den Hub nicht finden.";
+$a->strings["Block Name"] = "Block-Name";
+$a->strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
 $a->strings["Post successful."] = "Veröffentlichung erfolgreich.";
 $a->strings["Edit Webpage"] = "Webseite bearbeiten";
 $a->strings["Delete webpage?"] = "Webseite löschen?";
 $a->strings["Delete Webpage"] = "Webseite löschen";
 $a->strings["Access to this profile has been restricted."] = "Der Zugang zu diesem Profil ist begrenzt.";
-$a->strings["Poke/Prod"] = "Anstupsen/Kuffen";
+$a->strings["Poke/Prod"] = "Anstupsen/Knuffen";
 $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
 $a->strings["Recipient"] = "Empfänger";
-$a->strings["Choose what you wish to do to recipient"] = "Wähle was du mit dem/r Empfänger/in tun willst";
+$a->strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
 $a->strings["Make this post private"] = "Diesen Beitrag privat machen";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
 $a->strings["Not available."] = "Nicht verfügbar.";
@@ -1561,86 +1570,86 @@ $a->strings["Community"] = "Gemeinschaft";
 $a->strings["No results."] = "Keine Ergebnisse.";
 $a->strings["Contact not found."] = "Kontakt nicht gefunden";
 $a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden.";
-$a->strings["Suggest Friends"] = "Kontakte Vorschlagen";
+$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
 $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
 $a->strings["Edit Block"] = "Block bearbeiten";
 $a->strings["Delete block?"] = "Block löschen?";
 $a->strings["Delete Block"] = "Block löschen";
 $a->strings["Status: "] = "Status:";
-$a->strings["Sexual Preference: "] = "Sexuelle Vorlieben:";
+$a->strings["Sexual Preference: "] = "Sexuelle Ausrichtung:";
 $a->strings["Homepage: "] = "Webseite:";
 $a->strings["Hometown: "] = "Wohnort:";
 $a->strings["About: "] = "Über:";
-$a->strings["Keywords: "] = "Schlüsselbegriffe:";
+$a->strings["Keywords: "] = "Schlüsselwörter:";
 $a->strings["Permission Denied."] = "Zugriff verweigert.";
-$a->strings["File not found."] = "Datei nicht gefunden";
+$a->strings["File not found."] = "Datei nicht gefunden.";
 $a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
 $a->strings["Permissions"] = "Berechtigungen";
 $a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
 $a->strings["Return to file list"] = "Zurück zur Dateiliste";
-$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen";
-$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen";
+$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
+$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
 $a->strings["Download"] = "Download";
 $a->strings["Used: "] = "Verwendet:";
 $a->strings["[directory]"] = "[Verzeichnis]";
 $a->strings["Limit: "] = "Limit:";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut.";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
 $a->strings["No messages."] = "Keine Nachrichten.";
 $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A";
-$a->strings["Public Sites"] = "Öffentliche Seiten";
-$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details."] = "Die hier aufgeführten Seiten erlauben dir einen Account in der Red Matrix anzulegen. Alle Seiten der Matrix sind mit einander verbunden, so dass die Mitgliedschaft auf einer Seite die Mitgliedschaft auf einer beliebigen anderen Seite der Matrix beinhaltet. Es könnte sein, dass einige dieser Seiten Abonnements benötigen oder abgestufte Service-Pläne anbieten. Auf den jeweiligen Seiten könnten nähere Details diesbezüglich stehen.";
-$a->strings["Site URL"] = "URL der Seite";
-$a->strings["Access Type"] = "Zugangs Typ";
+$a->strings["Public Sites"] = "Öffentliche Server";
+$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten könnten nähere Details dazu stehen.";
+$a->strings["Site URL"] = "Server-URL";
+$a->strings["Access Type"] = "Zugangstyp";
 $a->strings["Registration Policy"] = "Registrierungsrichtlinien";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl von Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Anmeldung fehlgeschlagen.";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
 $a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
 $a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
 $a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
-$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf dieser Seite / diesem Hub benötigen Zustimmung durch den Administrator";
-$a->strings["Register at another affiliated site/hub"] = "Registrierung auf einer angeschlossenen Seite";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.";
+$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator";
+$a->strings["Register at another affiliated site/hub"] = "Registrierung auf einem anderen, angeschlossenen Server";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
 $a->strings["Terms of Service"] = "Nutzungsbedingungen";
 $a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
 $a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
 $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
-$a->strings["Please enter your invitation code"] = "Bitte trage deinen Einladungs-Code ein";
+$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
 $a->strings["Your email address"] = "Ihre E-Mail Adresse";
 $a->strings["Choose a password"] = "Passwort";
-$a->strings["Please re-enter your password"] = "Bitte gib dein Passwort noch einmal ein";
+$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
 $a->strings["Please login."] = "Bitte melde dich an.";
-$a->strings["Remove This Channel"] = "Diesen Kanal löschen!";
-$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar.";
-$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung dein Passwort ein:";
+$a->strings["Remove This Channel"] = "Diesen Kanal löschen";
+$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden.";
+$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:";
 $a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
-$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk";
-$a->strings["Remove Channel"] = "Kanal entfernen";
-$a->strings["Page owner information could not be retrieved."] = "Informationen über den Betreiber der Seite konnten nicht gefunden werden.";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
+$a->strings["Remove Channel"] = "Kanal löschen";
+$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
 $a->strings["Album not found."] = "Album nicht gefunden.";
 $a->strings["Delete Album"] = "Album löschen";
 $a->strings["Delete Photo"] = "Foto löschen";
 $a->strings["No photos selected"] = "Keine Fotos ausgewählt";
-$a->strings["Access to this item is restricted."] = "Zugriff auf dieses Foto wurde eingeschränkt.";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers.";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendets %1$.2f MBytes deines Foto-Speichers.";
+$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes Deines %2$.2f MBytes großen Bilder-Speichers.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendest %1$.2f MBytes Deines Foto-Speichers.";
 $a->strings["Upload Photos"] = "Fotos hochladen";
 $a->strings["New album name: "] = "Name des neuen Albums:";
-$a->strings["or existing album name: "] = "oder bestehenden Album Namen:";
+$a->strings["or existing album name: "] = "Oder bestehender Album-Name:";
 $a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload senden";
-$a->strings["Contact Photos"] = "Kontakt Bilder";
+$a->strings["Contact Photos"] = "Kontakt-Bilder";
 $a->strings["Edit Album"] = "Album bearbeiten";
-$a->strings["Show Newest First"] = "Zeige neueste zuerst";
-$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
+$a->strings["Show Newest First"] = "Zeige Neueste zuerst";
+$a->strings["Show Oldest First"] = "Zeige Älteste zuerst";
 $a->strings["View Photo"] = "Foto ansehen";
 $a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
 $a->strings["Photo not available"] = "Foto nicht verfügbar";
 $a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
 $a->strings["View Full Size"] = "In voller Größe anzeigen";
 $a->strings["Edit photo"] = "Foto bearbeiten";
-$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
-$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
+$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
+$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
 $a->strings["New album name"] = "Name des neuen Albums:";
 $a->strings["Caption"] = "Bildunterschrift";
 $a->strings["Add a Tag"] = "Schlagwort hinzufügen";
@@ -1649,16 +1658,16 @@ $a->strings["In This Photo:"] = "Auf diesem Foto:";
 $a->strings["View Album"] = "Album ansehen";
 $a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Mood"] = "Laune";
-$a->strings["Set your current mood and tell your friends"] = "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden";
+$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
 $a->strings["sent you a private message"] = "eine private Nachricht schicken";
 $a->strings["added your channel"] = "hat deinen Kanal hinzugefügt";
 $a->strings["posted an event"] = "hat eine Veranstaltung veröffentlicht";
 $a->strings["Scheme Default"] = "Standard-Schema";
-$a->strings["silver"] = "Silber";
+$a->strings["silver"] = "silbern";
 $a->strings["Theme settings"] = "Theme-Einstellungen";
 $a->strings["Set scheme"] = "Schema";
 $a->strings["Navigation bar colour"] = "Farbe der Navigationsleiste";
-$a->strings["link colour"] = "Farbe der Verweise";
+$a->strings["link colour"] = "Farbe der Links";
 $a->strings["Set font-colour for banner"] = "Farbe des Banners";
 $a->strings["Set the background colour"] = "Hintergrundfarbe";
 $a->strings["Set the background image"] = "Hintergrundbild";
@@ -1667,26 +1676,26 @@ $a->strings["Set the opacity of items"] = "Deckkraft von Beiträgen";
 $a->strings["Set the basic colour for item icons"] = "Basisfarbe der Beitrags-Icons";
 $a->strings["Set the hover colour for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger";
 $a->strings["Set font-size for the entire application"] = "Schriftgröße für die ganze Applikation";
-$a->strings["Set font-size for posts and comments"] = "Wähle die Schriftgröße für Beiträge und Kommentare";
+$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare";
 $a->strings["Set font-colour for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare";
 $a->strings["Set radius of corners"] = "Ecken-Radius";
 $a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
-$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Konversationsbereiche";
+$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Unterhaltungsbereiche";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)";
 $a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern";
 $a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren";
 $a->strings["Sloppy photo albums"] = "Schräge Fotoalben";
-$a->strings["Are you a clean desk or a messy desk person?"] = "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
+$a->strings["Are you a clean desk or a messy desk person?"] = "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
 $a->strings["Schema Default"] = "Standard-Schema";
 $a->strings["Sans-Serif"] = "Sans-Serif";
 $a->strings["Monospace"] = "Monospace";
 $a->strings["Set font face"] = "Schriftart";
-$a->strings["Set iconset"] = "Iconset";
+$a->strings["Set iconset"] = "Icon-Set";
 $a->strings["Set big shadow size, default 15px 15px 15px"] = "Ausmaß der großen Schatten (Default 15px 15px 15px)";
 $a->strings["Set small shadow size, default 5px 5px 5px"] = "Ausmaß der kleinen Schatten (Default 5px 5px 5px)";
 $a->strings["Set shadow colour, default #000"] = "Farbe der Schatten (Default #000)";
 $a->strings["Set radius size, default 5px"] = "Ecken-Radius (Default 5px)";
-$a->strings["Set line-height for posts and comments"] = "Wähle die Zeilenhöhe in Beiträgen und Kommentaren";
+$a->strings["Set line-height for posts and comments"] = "Zeilenhöhe für Beiträge und Kommentare";
 $a->strings["Set background image"] = "Hintergrundbild";
 $a->strings["Set background colour"] = "Hintergrundfarbe";
 $a->strings["Set section background image"] = "Hintergrundbild des mittleren Bereichs";
@@ -1698,7 +1707,7 @@ $a->strings["Set min-width for items.  Default 240px"] = "Minimalbreite von Beit
 $a->strings["Set the generic content wrapper width.  Default 48%"] = "Breite des „generic content wrapper“ (Default 48%)";
 $a->strings["Set colour of fonts - use hex"] = "Schriftfarbe (HEX)";
 $a->strings["Set background-size element"] = "Größe des Hintergrund-Elements";
-$a->strings["Item opacity"] = "Opazität von Beiträgen";
+$a->strings["Item opacity"] = "Deckkraft von Beiträgen (z.B. 0.8)";
 $a->strings["Display post previews only"] = "Nur Beitragsvorschau anzeigen";
 $a->strings["Display side bar on channel page"] = "Zeige die Seitenleiste auf der Kanal-Seite";
 $a->strings["Colour of the navigation bar"] = "Farbe der Navigationsleiste";
@@ -1713,10 +1722,10 @@ $a->strings["Header image"] = "Titelbild";
 $a->strings["Header image only on profile pages"] = "Titelbild nur auf Profil-Seiten anzeigen";
 $a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
 $a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können.";
+$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können.";
 $a->strings["Password"] = "Kennwort";
 $a->strings["Remember me"] = "Angaben speichern";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
 $a->strings["permission denied"] = "Zugriff verweigert";
 $a->strings["Got Zot?"] = "Haste schon Zot?";
-$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
+$a->strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
-- 
cgit v1.2.3


From 29f6a1ee33b27886afc135e05ecac592651bb7b2 Mon Sep 17 00:00:00 2001
From: Klaus 
Date: Sun, 16 Feb 2014 10:25:32 +0100
Subject: removed unused function posted_date_widget

This functions seems not to be used anywhere. include/widgets.php contains widget_archive($arr) which has the same functionality.
---
 include/items.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/include/items.php b/include/items.php
index 3c10b8f5c..9dc65f89c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3622,26 +3622,6 @@ function posted_dates($uid,$wall) {
 }
 
 
-function posted_date_widget($url,$uid,$wall) {
-	$o = '';
-
-	if(! feature_enabled($uid,'archives'))
-		return $o;
-
-	$ret = posted_dates($uid,$wall);
-	if(! count($ret))
-		return $o;
-
-	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
-		'$title' => t('Archives'),
-		'$size' => ((count($ret) > 6) ? 6 : count($ret)),
-		'$url' => $url,
-		'$dates' => $ret
-	));
-	return $o;
-}
-
-
 function fetch_post_tags($items,$link = false) {
 
 	$tag_finder = array();
-- 
cgit v1.2.3


From e40cdb2047c22a5cd7adbca16fa3c804d7b80509 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Sun, 16 Feb 2014 21:53:07 +0000
Subject: Windows hack for proc_run() from Marshall

---
 boot.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 41282bb13..b875014bd 100755
--- a/boot.php
+++ b/boot.php
@@ -1574,8 +1574,13 @@ function proc_run($cmd){
 		$args[$x] = escapeshellarg($args[$x]);
 
 	$cmdline = implode($args," ");
-	if(is_windows())
-		proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
+
+
+	if(is_windows()) {
+		$cwd = getcwd();
+		$cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
+		proc_close(proc_open($cmd, array(), $foo));
+	}
 	else
 		proc_close(proc_open($cmdline." &",array(),$foo));
 }
-- 
cgit v1.2.3


From ebd52368bb134e57a54d853732b5b4970a8ce02b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 16 Feb 2014 14:13:26 -0800
Subject: strip hard-wired zids from posted links as they will have the wrong
 identity when somebody tries to view the link

---
 include/items.php | 11 ++++++++++-
 include/text.php  |  5 +++++
 index.php         |  2 +-
 mod/cloud.php     |  4 ++--
 mod/item.php      |  8 +-------
 version.inc       |  2 +-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/include/items.php b/include/items.php
index 3c10b8f5c..9bcdd7d0b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -145,7 +145,9 @@ function can_comment_on_post($observer_xchan,$item) {
  * @function red_zrl_callback
  *   preg_match function when fixing 'naked' links in mod item.php
  *   Check if we've got a hubloc for the site and use a zrl if we do, a url if we don't. 
- * 
+ *   Remove any existing zid= param which may have been pasted by mistake - and will have
+ *   the author's credentials. zid's are dynamic and can't really be passed around like
+ *   that.
  */
 
 
@@ -159,6 +161,13 @@ function red_zrl_callback($matches) {
 		if($r)
 			$zrl = true;
 	}
+
+	$t = strip_zids($matches[2]);
+	if($t !== $matches[2]) {
+		$zrl = true;
+		$matches[2] = $t;
+	}
+
 	if($matches[1] === '#^')
 		$matches[1] = '';
 	if($zrl)
diff --git a/include/text.php b/include/text.php
index 2b334068f..2f5accf6e 100755
--- a/include/text.php
+++ b/include/text.php
@@ -621,6 +621,11 @@ function get_tags($s) {
 }
 
 
+function strip_zids($s) {
+	return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s);
+}
+
+
 // quick and dirty quoted_printable encoding
 
 
diff --git a/index.php b/index.php
index 736918661..24d54d829 100755
--- a/index.php
+++ b/index.php
@@ -92,7 +92,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 }
 
 if((x($_GET,'zid')) && (! $a->install)) {
-	$a->query_string = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/is','',$a->query_string);
+	$a->query_string = strip_zids($a->query_string);
 	if(! local_user()) {
 		$_SESSION['my_address'] = $_GET['zid'];
 		zid_init($a);
diff --git a/mod/cloud.php b/mod/cloud.php
index 18b61f941..3606325bd 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -73,11 +73,11 @@ function cloud_init(&$a) {
 
 
 	$_SERVER['QUERY_STRING'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['QUERY_STRING']);
-	$_SERVER['QUERY_STRING'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']);
+	$_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']);
 	$_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']);
 
 	$_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']);
-	$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']);
 	$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']);
 
 	$rootDirectory = new RedDirectory('/',$auth);
diff --git a/mod/item.php b/mod/item.php
index 48f85f692..1c32a637a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -423,19 +423,13 @@ function item_post(&$a) {
 		/**
 		 * fix naked links by passing through a callback to see if this is a red site
 		 * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both.
-		 * First wrap any url which is part of link anchor text already in quotes so we don't double link it.
-		 * e.g. [url=http://foobar.com]something with http://elsewhere.com in it[/url]
-		 * becomes [url=http://foobar.com]something with "http://elsewhere.com" in it[/url]
-		 * otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
+		 * First protect any url inside certain bbcode tags so we don't double link it.
 		 */
 
 		$body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','red_escape_codeblock',$body);
 		$body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','red_escape_codeblock',$body);
 		$body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','red_escape_codeblock',$body);
 
-// no longer needed
-//		$body = preg_replace_callback('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','red_escape_zrl_callback',$body);
-
 		$body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
 
 		$body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','red_unescape_codeblock',$body);
diff --git a/version.inc b/version.inc
index b73d1c3e6..cc21a24b6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-14.588
+2014-02-16.590
-- 
cgit v1.2.3


From 663dd39015e3e7ef25dda94f34bfb40c7e494325 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 16 Feb 2014 14:39:27 -0800
Subject: don't show deleted channels on admin account summary page

---
 mod/admin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 01296bd29..c4a284941 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -706,9 +706,10 @@ function admin_page_users(&$a){
 
 	$users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . 			"`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " .
 			"(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " .
-			"WHERE ch.channel_account_id = ac.account_id) as `channels` " .
+			"WHERE ch.channel_account_id = ac.account_id and not (ch.channel_pageflags & %d )) as `channels` " .
 		"FROM account as ac where true $serviceclass $order limit %d , %d ",
-		intval(ACCOUNT_BLOCKED),		
+		intval(ACCOUNT_BLOCKED),
+		intval(PAGE_REMOVED),		
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
-- 
cgit v1.2.3


From 16cd9e2a7e111b4c1ea8babb69862cb82775fa09 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 16 Feb 2014 14:48:07 -0800
Subject: don't include deleted channels in number of channels service class
 checks

---
 include/identity.php | 12 ++++++++----
 mod/manage.php       |  5 +++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 627e808ea..d0fffaede 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -22,8 +22,9 @@ require_once('include/crypto.php');
 function identity_check_service_class($account_id) {
 	$ret = array('success' => false, $message => '');
 	
-	$r = q("select count(channel_id) as total from channel where channel_account_id = %d ",
-		intval($account_id)
+	$r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d ) ",
+		intval($account_id),
+		intval(PAGE_REMOVED)
 	);
 	if(! ($r && count($r))) {
 		$ret['message'] = t('Unable to obtain identity information from database');
@@ -101,7 +102,7 @@ function get_sys_channel() {
 
 /**
  * @channel_total()
- *   Return the total number of channels on this site. No filtering is performed.
+ *   Return the total number of channels on this site. No filtering is performed except to check PAGE_REMOVED
  *
  * @returns int 
  *   on error returns boolean false
@@ -109,7 +110,10 @@ function get_sys_channel() {
  */
 
 function channel_total() {
-	$r = q("select channel_id from channel where true");
+	$r = q("select channel_id from channel where not ( channel_pageflags & %d )",
+		intval(PAGE_REMOVED)
+	);
+
 	if(is_array($r))
 		return count($r);
 	return false;
diff --git a/mod/manage.php b/mod/manage.php
index a2f65b271..0772e2d61 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -55,8 +55,9 @@ function manage_content(&$a) {
 			}
 		}
 		
-	    $r = q("select count(channel_id) as total from channel where channel_account_id = %d ",
-		intval(get_account_id())
+	    $r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d )",
+			intval(get_account_id()),
+			intval(PAGE_REMOVED)
 		);
 		$limit = service_class_fetch(local_user(),'total_identities');
 		if($limit !== false) {
-- 
cgit v1.2.3


From 70526915c87b57e4d91f0ab9a518d34a6dc04c82 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 16 Feb 2014 16:04:46 -0800
Subject: several things were not working correctly w/r/t community tagging.
 The preference vanished from settings at some point, and we also weren't
 updating the original post timestamp so that the changed taxonomy would
 propagate correctly as an edit.

---
 include/items.php     |  7 +++++++
 include/zot.php       | 12 +++++++-----
 mod/settings.php      |  1 +
 view/tpl/settings.tpl |  4 ++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/include/items.php b/include/items.php
index 9bcdd7d0b..bf575860a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2263,6 +2263,13 @@ function tag_deliver($uid,$item_id) {
 						if(is_array($j_obj['link']))
 							$taglink = get_rel_link($j_obj['link'],'alternate');
 						store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j_obj['id']);
+						$x = q("update item set edited = '%s', received = '%s', changed = '%s' where mid = '%s' and uid = %d limit 1",
+							dbesc(datetime_convert()),
+							dbesc(datetime_convert()),
+							dbesc(datetime_convert()),
+							dbesc($j_tgt['id']),
+							intval($u[0]['channel_id'])
+						);		
 						proc_run('php','include/notifier.php','edit_post',$p[0]['id']);
 					}
 				}
diff --git a/include/zot.php b/include/zot.php
index 21eef073c..c9d426cc2 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1064,7 +1064,9 @@ function zot_import($arr, $sender_url) {
 				}
 				stringify_array_elms($recip_arr);
 				$recips = implode(',',$recip_arr);
-				$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) ");
+				$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) ",
+					intval(PAGE_REMOVED)
+				);
 				if(! $r) {
 					logger('recips: no recipients on this site');
 					continue;
@@ -1222,8 +1224,7 @@ function public_recips($msg) {
 	if(! $r)
 		$r = array();
 
-	$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s'
-		and (( " . $col . " & " . PERMS_SPECIFIC . " )  and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ",
+	$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " ) and (( " . $col . " & " . PERMS_SPECIFIC . " )  and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ",
 		dbesc($msg['notify']['sender']['hash'])
 	); 
 
@@ -1304,8 +1305,9 @@ function allowed_public_recips($msg) {
 			$condensed_recips[] = $rr['hash'];
 
 		$results = array();
-		$r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' ",
-			dbesc($hash)
+		$r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & %d ) ",
+			dbesc($hash),
+			intval(PAGE_REMOVED)
 		);
 		if($r) {
 			foreach($r as $rr)
diff --git a/mod/settings.php b/mod/settings.php
index ec758bc90..97965d0fd 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -939,6 +939,7 @@ function settings_content(&$a) {
 			'$pmacro1'    => t('Private - default private, never open or public'),
 			'$pmacro0'    => t('Blocked - default blocked to/from everybody'),
 			'$permiss_arr' => $permiss,
+			'$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'),array(t('No'),t('Yes'))),
 
 			'$lbl_p2macro' => t('Advanced Privacy Settings'),
 
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 808078413..f5f2206bc 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -59,10 +59,14 @@
 
 
                                      
 
                                      
+
+
 {{$profile_in_dir}}
 
 {{$suggestme}}
 
+{{include file="field_yesno.tpl" field=$blocktags}}
+
 {{include file="field_input.tpl" field=$maxreq}}
 
 {{include file="field_input.tpl" field=$cntunkmail}}
-- 
cgit v1.2.3


From 08b571c9d0843b19115bd9bb892cb141c508ea3b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 14:30:02 -0800
Subject: project "snakebite"

---
 include/items.php              | 50 ++++++++++++++++++++++++++++++++++++++++--
 include/photo/photo_driver.php | 16 +++++++++-----
 version.inc                    |  2 +-
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/include/items.php b/include/items.php
index c90bfb41c..7e15e9411 100755
--- a/include/items.php
+++ b/include/items.php
@@ -725,14 +725,60 @@ function import_author_xchan($x) {
 		return $arr['xchan_hash'];
 
 	if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) {
-		return import_author_zot($x);
+		$y = import_author_zot($x);
 	}
 
-	// TODO: create xchans for other common and/or aligned networks
+	if($x['network'] === 'rss') {
+		$y = import_author_rss($x);
+	}
+
+	return(($y) ? $y : false);
+}
+
+function import_author_rss($x) {
+
+	if(! $x['url'])
+		return false;
+
+	$r = q("select xchan_hash from xchan where xchan_network = 'rss' and xchan_url = '%s' limit 1",
+		dbesc($x['url'])
+	);
+	if($r) {
+		logger('import_author_rss: in cache' , LOGGER_DEBUG);
+		return $r[0]['xchan_hash'];
+	}
+	$name = trim($x['name']);
+
+	$r = q("insert into xchan ( xchan_hash, xchan_url, xchan_name, xchan_network ) 
+		values ( '%s', '%s', '%s', '%s' )",
+		dbesc($x['url']),
+		dbesc($x['url']),
+		dbesc(($name) ? $name : t('Unknown')),
+		dbesc('rss')
+	);
+	if($r) {
+
+		$photos = import_profile_photo($x['photo'],$x['url']);
+
+		if($photos) {
+			$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_url = '%s' and xchan_network = 'rss' limit 1",
+				dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])),
+				dbesc($photos[0]),
+				dbesc($photos[1]),
+				dbesc($photos[2]),
+				dbesc($photos[3]),
+				dbesc($x['url'])
+			);
+			if($r)
+				return $x['url'];
+		}
+	}
 
 	return false;
+	
 }
 
+
 function encode_item($item) {
 	$x = array();
 	$x['type'] = 'activity';
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index c2eeafa54..484550cb7 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -538,14 +538,20 @@ function import_profile_photo($photo,$xchan,$thing = false) {
 	}
 
 	$photo_failure = false;
+	$img_str = '';
 
+	if($photo) {
+		$filename = basename($photo);
+		$type = guess_image_type($photo,true);
 
-	$filename = basename($photo);
-	$type = guess_image_type($photo,true);
-	$result = z_fetch_url($photo,true);
+		if(! $type)
+			$type = 'image/jpeg';
 
-	if($result['success'])
-		$img_str = $result['body'];
+		$result = z_fetch_url($photo,true);
+
+		if($result['success'])
+			$img_str = $result['body'];
+	}
 
 	$img = photo_factory($img_str, $type);
 	if($img->is_valid()) {
diff --git a/version.inc b/version.inc
index cc21a24b6..ee51fad76 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-16.590
+2014-02-17.591
-- 
cgit v1.2.3


From bee287f859e08b9033e83852f17d5bc52e22521b Mon Sep 17 00:00:00 2001
From: Klaus 
Date: Tue, 18 Feb 2014 00:14:07 +0100
Subject: Commenting language.php and some changes

Some commenting for Doxygen, simplified detect_language() a bit, added a new function get_language_name() that I will use soon or can be used in general to display localized language names from language codes.
---
 include/language.php | 171 ++++++++++++++++++++++++++-------------------------
 1 file changed, 87 insertions(+), 84 deletions(-)

diff --git a/include/language.php b/include/language.php
index 2e7ad5ff1..b43f5aacc 100644
--- a/include/language.php
+++ b/include/language.php
@@ -1,22 +1,28 @@
-strings = array();
 	load_translation_table($language);
 	$a->language = $language;
-
 }
 
 function pop_lang() {
@@ -109,7 +123,7 @@ function load_translation_table($lang, $install = false) {
 
 	if(! $install) {
 		$plugins = q("SELECT name FROM addon WHERE installed=1;");
-		if ($plugins!==false) {
+		if ($plugins !== false) {
 			foreach($plugins as $p) {
 				$name = $p['name'];
 				if(file_exists("addon/$name/lang/$lang/strings.php")) {
@@ -128,15 +142,18 @@ function load_translation_table($lang, $install = false) {
 
 }
 
-// translate string if translation exists
-
+/**
+ * @brief translate string if translation exists.
+ *
+ * @param s string that should get translated
+ * @return translated string if exsists, otherwise s
+ */
 function t($s) {
-
 	global $a;
 
 	if(x($a->strings,$s)) {
 		$t = $a->strings[$s];
-		return is_array($t)?$t[0]:$t;
+		return is_array($t) ? $t[0] : $t;
 	}
 	return $s;
 }
@@ -147,14 +164,14 @@ function tt($singular, $plural, $count){
 
 	if(x($a->strings,$singular)) {
 		$t = $a->strings[$singular];
-		$f = 'string_plural_select_' . str_replace('-','_',$a->language);
+		$f = 'string_plural_select_' . str_replace('-', '_', $a->language);
 		if(! function_exists($f))
 			$f = 'string_plural_select_default';
 		$k = $f($count);
-		return is_array($t)?$t[$k]:$t;
+		return is_array($t) ? $t[$k] : $t;
 	}
 	
-	if ($count!=1){
+	if ($count != 1){
 		return $plural;
 	} else {
 		return $singular;
@@ -168,84 +185,47 @@ function string_plural_select_default($n) {
 	return ($n != 1);
 }
 
-
-
+/**
+ * @brief Takes a string and tries to identify the language.
+ *
+ * It uses the pear library Text_LanguageDetect and it can identify 52 human languages.
+ * It returns the identified languges and a confidence score for each.
+ *
+ * Strings need to have a min length config['system']['language_detect_min_length']
+ * and you can influence the confidence that must be met before a result will get
+ * returned through config['system']['language_detect_min_confidence'].
+ *
+ * @see http://pear.php.net/package/Text_LanguageDetect
+ * @param s A string to examine
+ * @return Language code in 2-letter ISO 639-1 (en, de, fr) format
+ */
 function detect_language($s) {
-
-	$detected_languages = array(
-		'Albanian'   => 'sq',
-		'Arabic'     => 'ar',
-		'Azeri'      => 'az',
-		'Bengali'    => 'bn',
-		'Bulgarian'  => 'bg',
-		'Cebuano'    => '',
-		'Croatian'   => 'hr',
-		'Czech'      => 'cz',
-		'Danish'     => 'da',
-		'Dutch'      => 'nl',
-		'English'    => 'en',
-		'Estonian'   => 'et',
-		'Farsi'      => 'fa',
-		'Finnish'    => 'fi',
-		'French'     => 'fr',
-		'German'     => 'de',
-		'Hausa'      => 'ha',
-		'Hawaiian'   => '',
-		'Hindi'      => 'hi',
-		'Hungarian'  => 'hu',
-		'Icelandic'  => 'is',
-		'Indonesian' => 'id',
-		'Italian'    => 'it',
-		'Kazakh'     => 'kk',
-		'Kyrgyz'     => 'ky',
-		'Latin'      => 'la',
-		'Latvian'    => 'lv',
-		'Lithuanian' => 'lt',
-		'Macedonian' => 'mk',
-		'Mongolian'  => 'mn',
-		'Nepali'     => 'ne',
-		'Norwegian'  => 'no',
-		'Pashto'     => 'ps',
-		'Pidgin'     => '',
-		'Polish'     => 'pl',
-		'Portuguese' => 'pt',
-		'Romanian'   => 'ro',
-		'Russian'    => 'ru',
-		'Serbian'    => 'sr',
-		'Slovak'     => 'sk',
-		'Slovene'    => 'sl',
-		'Somali'     => 'so',
-		'Spanish'    => 'es',
-		'Swahili'    => 'sw',
-		'Swedish'    => 'sv',
-		'Tagalog'    => 'tl',
-		'Turkish'    => 'tr',
-		'Ukrainian'  => 'uk',
-		'Urdu'       => 'ur',
-		'Uzbek'      => 'uz',
-		'Vietnamese' => 'vi',
-		'Welsh'      => 'cy'
-	);
-
 	require_once('Text/LanguageDetect.php');
 
-	$min_length = get_config('system','language_detect_min_length');
+	$min_length = get_config('system', 'language_detect_min_length');
 	if($min_length === false)
 		$min_length = LANGUAGE_DETECT_MIN_LENGTH;
 
-	$min_confidence = get_config('system','language_detect_min_confidence');
+	$min_confidence = get_config('system', 'language_detect_min_confidence');
 	if($min_confidence === false)
 		$min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE;
 
-
-	$naked_body = preg_replace('/\[(.+?)\]/','',$s);
-	if(mb_strlen($naked_body) < intval($min_length))
+	// strip off bbcode
+	$naked_body = preg_replace('/\[(.+?)\]/', '', $s);
+	if(mb_strlen($naked_body) < intval($min_length)) {
+		logger('detect language: string length less than ' . intval($min_length), LOGGER_DATA);
 		return '';
+	}
 
 	$l = new Text_LanguageDetect;
-	$lng = $l->detectConfidence($naked_body);
-
-	logger('detect language: ' . print_r($lng,true) . $naked_body, LOGGER_DATA);
+	try {
+		// return 2-letter ISO 639-1 (en) language code
+		$l->setNameMode(2);
+		$lng = $l->detectConfidence($naked_body);
+		logger('detect language: ' . print_r($lng, true) . $naked_body, LOGGER_DATA);
+	} catch (Text_LanguageDetect_Exception $e) {
+		logger('detect language exception: ' . $e->getMessage(), LOGGER_DATA);
+	}
 
 	if((! $lng) || (! (x($lng,'language')))) {
 		return '';
@@ -256,6 +236,29 @@ function detect_language($s) {
 		return '';
 	}
 
-	return(($lng && (x($lng,'language'))) ? $detected_languages[ucfirst($lng['language'])] : '');
+	return($lng['language']);
+}
+
+/**
+ * @brief Returns the display name of a given language code.
+ *
+ * By default we use the localized language name. You can switch the result
+ * to any language with the optional 2nd parameter $l.
+ *
+ * $s and $l can be in any format that PHP's Locale understands. We will mostly
+ * use the 2-letter ISO 639-1 (en, de, fr) format.
+ *
+ * If nothing could be looked up it returns $s.
+ *
+ * @param $s Language code to look up
+ * @param $l (optional) In which language to return the name
+ * @return string with the language name, or $s if unrecognized
+ */
+function get_language_name($s, $l = null) {
+	if($l === null)
+		$l = $s;
 
+	logger('get_language_name: for ' . $s . ' in ' . $l . ' returns: ' . Locale::getDisplayLanguage($s, $l), LOGGER_DEBUG);
+	return Locale::getDisplayLanguage($s, $l);
 }
+
-- 
cgit v1.2.3


From b3ce1cd87b700073cab23eac4427671577e2f77e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 16:00:17 -0800
Subject: project "snakebite"

---
 include/follow.php | 131 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 70 insertions(+), 61 deletions(-)

diff --git a/include/follow.php b/include/follow.php
index 845ce11da..0508a8b37 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -16,6 +16,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 	$result = array('success' => false,'message' => '');
 
 	$a = get_app();
+	$is_red = false;
+
 
 	if(! allowed_url($url)) {
 		$result['message'] = t('Channel is blocked on this site.');
@@ -37,82 +39,94 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		$ret = zot_finger($url,$channel);
 
 	if($ret['success']) {
+		$is_red = true;
 		$j = json_decode($ret['body'],true);
 	}
-	else {
-		$result['message'] = t('Channel discovery failed. Website may be down or misconfigured.');
-		logger('mod_follow: ' . $result['message']);
-		return $result;
-	}
 
-	logger('follow: ' . $url . ' ' . print_r($j,true));
+	if($is_red && $j) {
 
-	if(! $j) {
-		$result['message'] = t('Response from remote channel was not understood.');
-		logger('mod_follow: ' . $result['message']);
-		return $result;
-	}
+		$my_perms = PERMS_W_STREAM|PERMS_W_MAIL;
 
+		logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG);
 
-	if(! ($j['success'] && $j['guid'])) {
-		$result['message'] = t('Response from remote channel was incomplete.');
-		logger('mod_follow: ' . $result['message']);
-		return $result;
-	}
 
-	// Premium channel, set confirm before callback to avoid recursion
+		if(! ($j['success'] && $j['guid'])) {
+			$result['message'] = t('Response from remote channel was incomplete.');
+			logger('mod_follow: ' . $result['message']);
+			return $result;
+		}
 
-	if(array_key_exists('connect_url',$j) && (! $confirm))
-		goaway(zid($j['connect_url']));
+		// Premium channel, set confirm before callback to avoid recursion
 
+		if(array_key_exists('connect_url',$j) && (! $confirm))
+			goaway(zid($j['connect_url']));
 
-	// check service class limits
+		// check service class limits
 
-	$r = q("select count(*) as total from abook where abook_channel = %d and not (abook_flags & %d) ",
-		intval($uid),
-		intval(ABOOK_FLAG_SELF)
-	);
-	if($r)
-		$total_channels = $r[0]['total'];
+		$r = q("select count(*) as total from abook where abook_channel = %d and not (abook_flags & %d) ",
+			intval($uid),
+			intval(ABOOK_FLAG_SELF)
+		);
+		if($r)
+			$total_channels = $r[0]['total'];
 
-	if(! service_class_allows($uid,'total_channels',$total_channels)) {
-		$result['message'] = upgrade_message();
-		return $result;
-	}
+		if(! service_class_allows($uid,'total_channels',$total_channels)) {
+			$result['message'] = upgrade_message();
+			return $result;
+		}
 
-	// do we have an xchan and hubloc?
-	// If not, create them.	
+		// do we have an xchan and hubloc?
+		// If not, create them.	
 
-	$x = import_xchan($j);
+		$x = import_xchan($j);
 
-	if(! $x['success']) 
-		return $x;
+		if(! $x['success']) 
+			return $x;
 
-	$xchan_hash = $x['hash'];
+		$xchan_hash = $x['hash'];
 
 
-	$their_perms = 0;
+		$their_perms = 0;
 
-	$global_perms = get_perms();
+		$global_perms = get_perms();
 
-	if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) {
-		$permissions = crypto_unencapsulate(array(
-			'data' => $j['permissions']['data'],
-			'key'  => $j['permissions']['key'],
-			'iv'   => $j['permissions']['iv']),
-			$channel['channel_prvkey']);
-		if($permissions)
-			$permissions = json_decode($permissions,true);
-		logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
-	}
-	else
-		$permissions = $j['permissions'];
+		if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) {
+			$permissions = crypto_unencapsulate(array(
+				'data' => $j['permissions']['data'],
+				'key'  => $j['permissions']['key'],
+				'iv'   => $j['permissions']['iv']),
+				$channel['channel_prvkey']);
+			if($permissions)
+				$permissions = json_decode($permissions,true);
+			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]);
+		foreach($permissions as $k => $v) {
+			if($v) {
+				$their_perms = $their_perms | intval($global_perms[$k][1]);
+			}
 		}
 	}
+	else {
+
+		// attempt network auto-discovery
+		
+		$my_perms = 0;
+		$their_perms = 0;
+		$xchan_hash = '';
+		
+
+
+
+	}
+
+	if(! $xchan_hash) {
+		$result['message'] = t('Channel discovery failed.');
+		logger('follow: ' . $result['message']);
+		return $result;
+	}
 
 	if((local_user()) && $uid == local_user()) {
 		$aid = get_account_id();
@@ -156,7 +170,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			intval($uid),
 			dbesc($xchan_hash),
 			intval($their_perms),
-			intval(PERMS_W_STREAM|PERMS_W_MAIL),
+			intval($my_perms),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert())
 		);
@@ -172,7 +186,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 	);
 	if($r) {
 		$result['abook'] = $r[0];
-		proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
+		if($is_red)
+			proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
 	}
 
 	$arr = array('channel_id' => $uid, 'abook' => $result['abook']);
@@ -188,12 +203,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			group_add_member($uid,'',$xchan_hash,$g['id']);
 	}
 
-	// Then send a ping/message to the other side
-
-
 	$result['success'] = true;
 	return $result;
-
-
-
 }
-- 
cgit v1.2.3


From d3120264cb99b8c87ecce01795bbc96265028b47 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 18:23:01 -0800
Subject: more snakebite stuff

---
 include/permissions.php | 13 +++++++------
 mod/rmagic.php          | 52 +++++++++++++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/include/permissions.php b/include/permissions.php
index 420591c54..0cbb5b984 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -89,7 +89,7 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
 
 		if($observer_xchan) {
 			if(! $abook_checked) {
-				$x = q("select abook_my_perms, abook_flags from abook 
+				$x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash
 					where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
 					intval($uid),
 					dbesc($observer_xchan),
@@ -137,9 +137,9 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
 			continue;
 		}
 
-		// If we're still here, we have an observer, which means they're in the network.
+		// If we're still here, we have an observer, check the network.
 
-		if($r[0][$channel_perm] & PERMS_NETWORK) {
+		if(($r[0][$channel_perm] & PERMS_NETWORK) && ($x[0]['xchan_network'] === 'zot')) {
 			$ret[$perm_name] = true;
 			continue;
 		}
@@ -240,7 +240,8 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
 		return false;
 
 	if($observer_xchan) {
-		$x = q("select abook_my_perms, abook_flags from abook where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
+		$x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash 
+			where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
 			intval($uid),
 			dbesc($observer_xchan),
 			intval(ABOOK_FLAG_SELF)
@@ -272,9 +273,9 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
 		return false;
 	}
 
-	// If we're still here, we have an observer, which means they're in the network.
+	// If we're still here, we have an observer, check the network.
 
-	if($r[0][$channel_perm] & PERMS_NETWORK)
+	if(($r[0][$channel_perm] & PERMS_NETWORK) && ($x[0]['xchan_network'] === 'zot'))
 		return true;
 
 
diff --git a/mod/rmagic.php b/mod/rmagic.php
index b8c1c6553..093ccd328 100644
--- a/mod/rmagic.php
+++ b/mod/rmagic.php
@@ -22,31 +22,45 @@ function rmagic_init(&$a) {
 
 function rmagic_post(&$a) {
 
-	$address = $_REQUEST['address'];
-	if(strpos($address,'@') === false) {
-		notice('Invalid address.');
-		return;
-	}
+	$address = trim($_REQUEST['address']);
+	$other = intval($_REQUEST['other']);
 
-	$r = null;
-	if($address) {
-		$r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
-			dbesc($address)
-		);		
-	}
-	if($r) {
-		$url = $r[0]['hubloc_url'];
+	if($other) {
+		$arr = array('address' => $address);
+		call_hooks('reverse_magic_auth', $arr);		
+
+
+		// if they're still here...
+		notice( t('Authentication failed.') . EOL);		
+		return;
 	}
 	else {
-		$url = 'https://' . substr($address,strpos($address,'@')+1);
-	}	
 
-	if($url) {	
-		$dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
-		goaway($url . '/magic' . '?f=&dest=' . $dest);
-	}
+		// Presumed Red identity. Perform reverse magic auth
 
+		if(strpos($address,'@') === false) {
+			notice('Invalid address.');
+			return;
+		}
 
+		$r = null;
+		if($address) {
+			$r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
+				dbesc($address)
+			);		
+		}
+		if($r) {
+			$url = $r[0]['hubloc_url'];
+		}
+		else {
+			$url = 'https://' . substr($address,strpos($address,'@')+1);
+		}	
+
+		if($url) {	
+			$dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
+			goaway($url . '/magic' . '?f=&dest=' . $dest);
+		}
+	}
 }
 
 
-- 
cgit v1.2.3


From 7fc292831cfc86cf818c3fb71596ef8acb01f689 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 18:50:24 -0800
Subject: update openid for snakebite

---
 library/openid.php                        | 725 -------------------------
 library/openid/README                     |  49 ++
 library/openid/example-google.php         |  24 +
 library/openid/example.php                |  23 +
 library/openid/openid.php                 | 781 +++++++++++++++++++++++++++
 library/openid/provider/example-mysql.php | 194 +++++++
 library/openid/provider/example.php       |  53 ++
 library/openid/provider/provider.php      | 845 ++++++++++++++++++++++++++++++
 8 files changed, 1969 insertions(+), 725 deletions(-)
 delete mode 100644 library/openid.php
 create mode 100644 library/openid/README
 create mode 100644 library/openid/example-google.php
 create mode 100644 library/openid/example.php
 create mode 100644 library/openid/openid.php
 create mode 100644 library/openid/provider/example-mysql.php
 create mode 100644 library/openid/provider/example.php
 create mode 100644 library/openid/provider/provider.php

diff --git a/library/openid.php b/library/openid.php
deleted file mode 100644
index 3c58beb8a..000000000
--- a/library/openid.php
+++ /dev/null
@@ -1,725 +0,0 @@
-
- * $openid = new LightOpenID;
- * $openid->identity = 'ID supplied by user';
- * header('Location: ' . $openid->authUrl());
- * 
- * The provider then sends various parameters via GET, one of them is openid_mode.
- * Step two is verification:
- * 
- * if ($this->data['openid_mode']) {
- *     $openid = new LightOpenID;
- *     echo $openid->validate() ? 'Logged in.' : 'Failed';
- * }
- * 
- *
- * Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
- * The default values for those are:
- * $openid->realm     = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
- * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI']; # without the query part, if present
- * If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
- *
- * AX and SREG extensions are supported.
- * To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
- * These are arrays, with values being AX schema paths (the 'path' part of the URL).
- * For example:
- *   $openid->required = array('namePerson/friendly', 'contact/email');
- *   $openid->optional = array('namePerson/first');
- * If the server supports only SREG or OpenID 1.1, these are automaticaly
- * mapped to SREG names, so that user doesn't have to know anything about the server.
- *
- * To get the values, use $openid->getAttributes().
- *
- *
- * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled..
- * @author Mewp
- * @copyright Copyright (c) 2010, Mewp
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- */
-class LightOpenID
-{
-    public $returnUrl
-         , $required = array()
-         , $optional = array()
-         , $verify_perr = null
-         , $capath = null;
-    private $identity, $claimed_id;
-    protected $server, $version, $trustRoot, $aliases, $identifier_select = false
-            , $ax = false, $sreg = false, $data;
-    static protected $ax_to_sreg = array(
-        'namePerson/friendly'     => 'nickname',
-        'contact/email'           => 'email',
-        'namePerson'              => 'fullname',
-        'birthDate'               => 'dob',
-        'person/gender'           => 'gender',
-        'contact/postalCode/home' => 'postcode',
-        'contact/country/home'    => 'country',
-        'pref/language'           => 'language',
-        'pref/timezone'           => 'timezone',
-        );
-
-    function __construct()
-    {
-        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
-        $uri = $_SERVER['REQUEST_URI'];
-        $uri = strpos($uri, '?') ? substr($uri, 0, strpos($uri, '?')) : $uri;
-        $this->returnUrl = $this->trustRoot . $uri;
-
-        $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
-    }
-
-    function __set($name, $value)
-    {
-        switch ($name) {
-        case 'identity':
-            if (strlen($value = trim((String) $value))) {
-                if (preg_match('#^xri:/*#i', $value, $m)) {
-                    $value = substr($value, strlen($m[0]));
-                } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
-                    $value = "http://$value";
-                }
-                if (preg_match('#^https?://[^/]+$#i', $value, $m)) {
-                    $value .= '/';
-                }
-            }
-            $this->$name = $this->claimed_id = $value;
-            break;
-        case 'trustRoot':
-        case 'realm':
-            $this->trustRoot = trim($value);
-        }
-    }
-
-    function __get($name)
-    {
-        switch ($name) {
-        case 'identity':
-            # We return claimed_id instead of identity,
-            # because the developer should see the claimed identifier,
-            # i.e. what he set as identity, not the op-local identifier (which is what we verify)
-            return $this->claimed_id;
-        case 'trustRoot':
-        case 'realm':
-            return $this->trustRoot;
-        }
-    }
-
-    /**
-     * Checks if the server specified in the url exists.
-     *
-     * @param $url url to check
-     * @return true, if the server exists; false otherwise
-     */
-    function hostExists($url)
-    {
-        if (strpos($url, '/') === false) {
-            $server = $url;
-        } else {
-            $server = @parse_url($url, PHP_URL_HOST);
-        }
-
-        if (!$server) {
-            return false;
-        }
-
-        return !!gethostbynamel($server);
-    }
-
-    protected function request_curl($url, $method='GET', $params=array())
-    {
-        $params = http_build_query($params, '', '&');
-        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($curl, CURLOPT_HEADER, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
-
-        if($this->verify_perr !== null) {
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
-            if($this->capath) {
-                curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
-            }
-        }
-
-        if ($method == 'POST') {
-            curl_setopt($curl, CURLOPT_POST, true);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
-        } elseif ($method == 'HEAD') {
-            curl_setopt($curl, CURLOPT_HEADER, true);
-            curl_setopt($curl, CURLOPT_NOBODY, true);
-        } else {
-            curl_setopt($curl, CURLOPT_HTTPGET, true);
-        }
-        $response = curl_exec($curl);
-
-        if($method == 'HEAD') {
-            $headers = array();
-            foreach(explode("\n", $response) as $header) {
-                $pos = strpos($header,':');
-                $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
-            }
-
-            # Updating claimed_id in case of redirections.
-            $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-            if($effective_url != $url) {
-                $this->identity = $this->claimed_id = $effective_url;
-            }
-
-            return $headers;
-        }
-
-        if (curl_errno($curl)) {
-            throw new ErrorException(curl_error($curl), curl_errno($curl));
-        }
-
-        return $response;
-    }
-
-    protected function request_streams($url, $method='GET', $params=array())
-    {
-        if(!$this->hostExists($url)) {
-            throw new ErrorException('Invalid request.');
-        }
-
-        $params = http_build_query($params, '', '&');
-        switch($method) {
-        case 'GET':
-            $opts = array(
-                'http' => array(
-                    'method' => 'GET',
-                    'header' => 'Accept: application/xrds+xml, */*',
-                    'ignore_errors' => true,
-                )
-            );
-            $url = $url . ($params ? '?' . $params : '');
-            break;
-        case 'POST':
-            $opts = array(
-                'http' => array(
-                    'method' => 'POST',
-                    'header'  => 'Content-type: application/x-www-form-urlencoded',
-                    'content' => $params,
-                    'ignore_errors' => true,
-                )
-            );
-            break;
-        case 'HEAD':
-            # We want to send a HEAD request,
-            # but since get_headers doesn't accept $context parameter,
-            # we have to change the defaults.
-            $default = stream_context_get_options(stream_context_get_default());
-            stream_context_get_default(
-                array('http' => array(
-                    'method' => 'HEAD',
-                    'header' => 'Accept: application/xrds+xml, */*',
-                    'ignore_errors' => true,
-                ))
-            );
-
-            $url = $url . ($params ? '?' . $params : '');
-            $headers_tmp = get_headers ($url);
-            if(!$headers_tmp) {
-                return array();
-            }
-
-            # Parsing headers.
-            $headers = array();
-            foreach($headers_tmp as $header) {
-                $pos = strpos($header,':');
-                $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
-
-                # Following possible redirections. The point is just to have
-                # claimed_id change with them, because get_headers() will
-                # follow redirections automatically.
-                # We ignore redirections with relative paths.
-                # If any known provider uses them, file a bug report.
-                if($name == 'location') {
-                    if(strpos($headers[$name], 'http') === 0) {
-                        $this->identity = $this->claimed_id = $headers[$name];
-                    } elseif($headers[$name][0] == '/') {
-                        $parsed_url = parse_url($this->claimed_id);
-                        $this->identity =
-                        $this->claimed_id = $parsed_url['scheme'] . '://'
-                                          . $parsed_url['host']
-                                          . $headers[$name];
-                    }
-                }
-            }
-
-            # And restore them.
-            stream_context_get_default($default);
-            return $headers;
-        }
-
-        if($this->verify_peer) {
-            $opts += array('ssl' => array(
-                'verify_peer' => true,
-                'capath'      => $this->capath,
-            ));
-        }
-
-        $context = stream_context_create ($opts);
-
-        return file_get_contents($url, false, $context);
-    }
-
-    protected function request($url, $method='GET', $params=array())
-    {
-        if(function_exists('curl_init') && !ini_get('safe_mode') && (! strlen(ini_get('open_basedir')))) {
-            return $this->request_curl($url, $method, $params);
-        }
-        return $this->request_streams($url, $method, $params);
-    }
-
-    protected function build_url($url, $parts)
-    {
-        if (isset($url['query'], $parts['query'])) {
-            $parts['query'] = $url['query'] . '&' . $parts['query'];
-        }
-
-        $url = $parts + $url;
-        $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
-                 :(empty($url['password'])? "{$url['username']}@"
-                 :"{$url['username']}:{$url['password']}@"))
-             . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':":{$url['fragment']}");
-        return $url;
-    }
-
-    /**
-     * Helper function used to scan for / tags and extract information
-     * from them
-     */
-    protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
-    {
-        preg_match_all("#<{$tag}[^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*$valueName=['\"](.+?)['\"][^>]*/?>#i", $content, $matches1);
-        preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
-
-        $result = array_merge($matches1[1], $matches2[1]);
-        return empty($result)?false:$result[0];
-    }
-
-    /**
-     * Performs Yadis and HTML discovery. Normally not used.
-     * @param $url Identity URL.
-     * @return String OP Endpoint (i.e. OpenID provider address).
-     * @throws ErrorException
-     */
-    function discover($url)
-    {
-        if (!$url) throw new ErrorException('No identity supplied.');
-        # Use xri.net proxy to resolve i-name identities
-        if (!preg_match('#^https?:#', $url)) {
-            $url = "https://xri.net/$url";
-        }
-
-        # We save the original url in case of Yadis discovery failure.
-        # It can happen when we'll be lead to an XRDS document
-        # which does not have any OpenID2 services.
-        $originalUrl = $url;
-
-        # A flag to disable yadis discovery in case of failure in headers.
-        $yadis = true;
-
-        # We'll jump a maximum of 5 times, to avoid endless redirections.
-        for ($i = 0; $i < 5; $i ++) {
-            if ($yadis) {
-                $headers = $this->request($url, 'HEAD');
-
-                $next = false;
-                    if (isset($headers['x-xrds-location'])) {
-                        $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location'])));
-                        $next = true;
-                    }
-
-                    if (isset($headers['content-type'])
-                        && ((strpos($headers['content-type'], 'application/xrds+xml') !== false
-                    ) || (strpos($headers['content-type'], 'text/xml') !== false))) {
-                        # Found an XRDS document, now let's find the server, and optionally delegate.
-                        $content = $this->request($url, 'GET');
-
-                        preg_match_all('#(.*?)#s', $content, $m);
-                        foreach($m[1] as $content) {
-                            $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
-
-                            # OpenID 2
-                            $ns = preg_quote('http://specs.openid.net/auth/2.0/');
-                            if(preg_match('#\s*'.$ns.'(server|signon)\s*#s', $content, $type)) {
-                                if ($type[1] == 'server') $this->identifier_select = true;
-
-                                preg_match('#(.*)#', $content, $server);
-                                preg_match('#<(Local|Canonical)ID>(.*)#', $content, $delegate);
-                                if (empty($server)) {
-                                    return false;
-                                }
-                                # Does the server advertise support for either AX or SREG?
-                                $this->ax   = (bool) strpos($content, 'http://openid.net/srv/ax/1.0');
-                                $this->sreg = strpos($content, 'http://openid.net/sreg/1.0')
-                                           || strpos($content, 'http://openid.net/extensions/sreg/1.1');
-
-                                $server = $server[1];
-                                if (isset($delegate[2])) $this->identity = trim($delegate[2]);
-                                $this->version = 2;
-logger('Server: ' . $server);
-                                $this->server = $server;
-                                return $server;
-                            }
-
-                            # OpenID 1.1
-                            $ns = preg_quote('http://openid.net/signon/1.1');
-                            if (preg_match('#\s*'.$ns.'\s*#s', $content)) {
-
-                                preg_match('#(.*)#', $content, $server);
-                                preg_match('#<.*?Delegate>(.*)#', $content, $delegate);
-                                if (empty($server)) {
-                                    return false;
-                                }
-                                # AX can be used only with OpenID 2.0, so checking only SREG
-                                $this->sreg = strpos($content, 'http://openid.net/sreg/1.0')
-                                           || strpos($content, 'http://openid.net/extensions/sreg/1.1');
-
-                                $server = $server[1];
-                                if (isset($delegate[1])) $this->identity = $delegate[1];
-                                $this->version = 1;
-
-                                $this->server = $server;
-                                return $server;
-                            }
-                        }
-
-                        $next = true;
-                        $yadis = false;
-                        $url = $originalUrl;
-                        $content = null;
-                        break;
-                    }
-                if ($next) continue;
-
-                # There are no relevant information in headers, so we search the body.
-                $content = $this->request($url, 'GET');
-                if ($location = $this->htmlTag($content, 'meta', 'http-equiv', 'X-XRDS-Location', 'content')) {
-                    $url = $this->build_url(parse_url($url), parse_url($location));
-                    continue;
-                }
-            }
-
-            if (!$content) $content = $this->request($url, 'GET');
-logger('openid' . $content);
-            # At this point, the YADIS Discovery has failed, so we'll switch
-            # to openid2 HTML discovery, then fallback to openid 1.1 discovery.
-            $server   = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href');
-            $delegate = $this->htmlTag($content, 'link', 'rel', 'openid2.local_id', 'href');
-            $this->version = 2;
-
-            if (!$server) {
-                # The same with openid 1.1
-                $server   = $this->htmlTag($content, 'link', 'rel', 'openid.server', 'href');
-                $delegate = $this->htmlTag($content, 'link', 'rel', 'openid.delegate', 'href');
-                $this->version = 1;
-            }
-
-            if ($server) {
-                # We found an OpenID2 OP Endpoint
-                if ($delegate) {
-                    # We have also found an OP-Local ID.
-                    $this->identity = $delegate;
-                }
-                $this->server = $server;
-                return $server;
-            }
-
-            throw new ErrorException('No servers found!');
-        }
-        throw new ErrorException('Endless redirection!');
-    }
-
-    protected function sregParams()
-    {
-        $params = array();
-        # We always use SREG 1.1, even if the server is advertising only support for 1.0.
-        # That's because it's fully backwards compatibile with 1.0, and some providers
-        # advertise 1.0 even if they accept only 1.1. One such provider is myopenid.com
-        $params['openid.ns.sreg'] = 'http://openid.net/extensions/sreg/1.1';
-        if ($this->required) {
-            $params['openid.sreg.required'] = array();
-            foreach ($this->required as $required) {
-                if (!isset(self::$ax_to_sreg[$required])) continue;
-                $params['openid.sreg.required'][] = self::$ax_to_sreg[$required];
-            }
-            $params['openid.sreg.required'] = implode(',', $params['openid.sreg.required']);
-        }
-
-        if ($this->optional) {
-            $params['openid.sreg.optional'] = array();
-            foreach ($this->optional as $optional) {
-                if (!isset(self::$ax_to_sreg[$optional])) continue;
-                $params['openid.sreg.optional'][] = self::$ax_to_sreg[$optional];
-            }
-            $params['openid.sreg.optional'] = implode(',', $params['openid.sreg.optional']);
-        }
-        return $params;
-    }
-
-    protected function axParams()
-    {
-        $params = array();
-        if ($this->required || $this->optional) {
-            $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
-            $params['openid.ax.mode'] = 'fetch_request';
-            $this->aliases  = array();
-            $counts   = array();
-            $required = array();
-            $optional = array();
-            foreach (array('required','optional') as $type) {
-                foreach ($this->$type as $alias => $field) {
-                    if (is_int($alias)) $alias = strtr($field, '/', '_');
-                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
-                    if (empty($counts[$alias])) $counts[$alias] = 0;
-                    $counts[$alias] += 1;
-                    ${$type}[] = $alias;
-                }
-            }
-            foreach ($this->aliases as $alias => $ns) {
-                $params['openid.ax.type.' . $alias] = $ns;
-            }
-            foreach ($counts as $alias => $count) {
-                if ($count == 1) continue;
-                $params['openid.ax.count.' . $alias] = $count;
-            }
-
-            # Don't send empty ax.requied and ax.if_available.
-            # Google and possibly other providers refuse to support ax when one of these is empty.
-            if($required) {
-                $params['openid.ax.required'] = implode(',', $required);
-            }
-            if($optional) {
-                $params['openid.ax.if_available'] = implode(',', $optional);
-            }
-        }
-        return $params;
-    }
-
-    protected function authUrl_v1()
-    {
-	$returnUrl = $this->returnUrl;
-        # If we have an openid.delegate that is different from our claimed id,
-        # we need to somehow preserve the claimed id between requests.
-        # The simplest way is to just send it along with the return_to url.
-        if($this->identity != $this->claimed_id) {
-            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
-        }
-
-        $params = array(
-            'openid.return_to'  => $returnUrl,
-            'openid.mode'       => 'checkid_setup',
-            'openid.identity'   => $this->identity,
-            'openid.trust_root' => $this->trustRoot,
-            ) + $this->sregParams();
-
-        return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
-    }
-
-    protected function authUrl_v2($identifier_select)
-    {
-        $params = array(
-            'openid.ns'          => 'http://specs.openid.net/auth/2.0',
-            'openid.mode'        => 'checkid_setup',
-            'openid.return_to'   => $this->returnUrl,
-            'openid.realm'       => $this->trustRoot,
-        );
-        if ($this->ax) {
-            $params += $this->axParams();
-        }
-        if ($this->sreg) {
-            $params += $this->sregParams();
-        }
-        if (!$this->ax && !$this->sreg) {
-            # If OP doesn't advertise either SREG, nor AX, let's send them both
-            # in worst case we don't get anything in return.
-            $params += $this->axParams() + $this->sregParams();
-        }
-
-        if ($identifier_select) {
-            $params['openid.identity'] = $params['openid.claimed_id']
-                 = 'http://specs.openid.net/auth/2.0/identifier_select';
-        } else {
-            $params['openid.identity'] = $this->identity;
-            $params['openid.claimed_id'] = $this->claimed_id;
-        }
-
-        return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
-    }
-
-    /**
-     * Returns authentication url. Usually, you want to redirect your user to it.
-     * @return String The authentication url.
-     * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
-     * @throws ErrorException
-     */
-    function authUrl($identifier_select = null)
-    {
-        if (!$this->server) $this->discover($this->identity);
-
-        if ($this->version == 2) {
-            if ($identifier_select === null) {
-                return $this->authUrl_v2($this->identifier_select);
-            }
-            return $this->authUrl_v2($identifier_select);
-        }
-        return $this->authUrl_v1();
-    }
-
-    /**
-     * Performs OpenID verification with the OP.
-     * @return Bool Whether the verification was successful.
-     * @throws ErrorException
-     */
-    function validate()
-    {
-        $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
-        $params = array(
-            'openid.assoc_handle' => $this->data['openid_assoc_handle'],
-            'openid.signed'       => $this->data['openid_signed'],
-            'openid.sig'          => $this->data['openid_sig'],
-            );
-
-        if (isset($this->data['openid_ns'])) {
-            # We're dealing with an OpenID 2.0 server, so let's set an ns
-            # Even though we should know location of the endpoint,
-            # we still need to verify it by discovery, so $server is not set here
-            $params['openid.ns'] = 'http://specs.openid.net/auth/2.0';
-        } elseif(isset($this->data['openid_claimed_id'])) {
-            # If it's an OpenID 1 provider, and we've got claimed_id,
-            # we have to append it to the returnUrl, like authUrl_v1 does.
-            $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
-        }
-
-        if ($this->data['openid_return_to'] != $this->returnUrl) {
-            # The return_to url must match the url of current request.
-            # I'm assuing that noone will set the returnUrl to something that doesn't make sense.
-            return false;
-        }
-
-        $server = $this->discover($this->claimed_id);
-
-        foreach (explode(',', $this->data['openid_signed']) as $item) {
-            # Checking whether magic_quotes_gpc is turned on, because
-            # the function may fail if it is. For example, when fetching
-            # AX namePerson, it might containg an apostrophe, which will be escaped.
-            # In such case, validation would fail, since we'd send different data than OP
-            # wants to verify. stripslashes() should solve that problem, but we can't
-            # use it when magic_quotes is off.
-            $value = $this->data['openid_' . str_replace('.','_',$item)];
-            $params['openid.' . $item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
-
-        }
-
-        $params['openid.mode'] = 'check_authentication';
-
-        $response = $this->request($server, 'POST', $params);
-
-        return preg_match('/is_valid\s*:\s*true/i', $response);
-    }
-
-    protected function getAxAttributes()
-    {
-        $alias = null;
-        if (isset($this->data['openid_ns_ax'])
-            && $this->data['openid_ns_ax'] != 'http://openid.net/srv/ax/1.0'
-        ) { # It's the most likely case, so we'll check it before
-            $alias = 'ax';
-        } else {
-            # 'ax' prefix is either undefined, or points to another extension,
-            # so we search for another prefix
-            foreach ($this->data as $key => $val) {
-                if (substr($key, 0, strlen('openid_ns_')) == 'openid_ns_'
-                    && $val == 'http://openid.net/srv/ax/1.0'
-                ) {
-                    $alias = substr($key, strlen('openid_ns_'));
-                    break;
-                }
-            }
-        }
-        if (!$alias) {
-            # An alias for AX schema has not been found,
-            # so there is no AX data in the OP's response
-            return array();
-        }
-
-        $attributes = array();
-        foreach ($this->data as $key => $value) {
-            $keyMatch = 'openid_' . $alias . '_value_';
-            if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
-                continue;
-            }
-            $key = substr($key, strlen($keyMatch));
-            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
-                # OP is breaking the spec by returning a field without
-                # associated ns. This shouldn't happen, but it's better
-                # to check, than cause an E_NOTICE.
-                continue;
-            }
-            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
-                          strlen('http://axschema.org/'));
-            $attributes[$key] = $value;
-        }
-        return $attributes;
-    }
-
-    protected function getSregAttributes()
-    {
-        $attributes = array();
-        $sreg_to_ax = array_flip(self::$ax_to_sreg);
-        foreach ($this->data as $key => $value) {
-            $keyMatch = 'openid_sreg_';
-            if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
-                continue;
-            }
-            $key = substr($key, strlen($keyMatch));
-            if (!isset($sreg_to_ax[$key])) {
-                # The field name isn't part of the SREG spec, so we ignore it.
-                continue;
-            }
-            $attributes[$sreg_to_ax[$key]] = $value;
-        }
-        return $attributes;
-    }
-
-    /**
-     * Gets AX/SREG attributes provided by OP. should be used only after successful validaton.
-     * Note that it does not guarantee that any of the required/optional parameters will be present,
-     * or that there will be no other attributes besides those specified.
-     * In other words. OP may provide whatever information it wants to.
-     *     * SREG names will be mapped to AX names.
-     *     * @return Array Array of attributes with keys being the AX schema names, e.g. 'contact/email'
-     * @see http://www.axschema.org/types/
-     */
-    function getAttributes()
-    {
-        if (isset($this->data['openid_ns'])
-            && $this->data['openid_ns'] == 'http://specs.openid.net/auth/2.0'
-        ) { # OpenID 2.0
-            # We search for both AX and SREG attributes, with AX taking precedence.
-            return $this->getAxAttributes() + $this->getSregAttributes();
-        }
-        return $this->getSregAttributes();
-    }
-}
diff --git a/library/openid/README b/library/openid/README
new file mode 100644
index 000000000..799b452ac
--- /dev/null
+++ b/library/openid/README
@@ -0,0 +1,49 @@
+This class provides a simple interface for OpenID (1.1 and 2.0) authentication.
+Supports Yadis discovery.
+
+The authentication process is stateless/dumb.
+
+Usage:
+Sign-on with OpenID is a two step process:
+Step one is authentication with the provider:
+
+$openid = new LightOpenID('my-host.example.org');
+$openid->identity = 'ID supplied by user';
+header('Location: ' . $openid->authUrl());
+
+
+The provider then sends various parameters via GET, one of them is openid_mode.
+Step two is verification:
+
+if ($this->data['openid_mode']) {
+    $openid = new LightOpenID('my-host.example.org');
+    echo $openid->validate() ? 'Logged in.' : 'Failed';
+}
+
+ *
+Change the 'my-host.example.org' to your domain name. Do NOT use $_SERVER['HTTP_HOST']
+for that, unless you know what you are doing.
+ *
+Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
+The default values for those are:
+$openid->realm     = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+$openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
+If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
+ *
+AX and SREG extensions are supported.
+To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
+These are arrays, with values being AX schema paths (the 'path' part of the URL).
+For example:
+  $openid->required = array('namePerson/friendly', 'contact/email');
+  $openid->optional = array('namePerson/first');
+If the server supports only SREG or OpenID 1.1, these are automaticaly
+mapped to SREG names, so that user doesn't have to know anything about the server.
+ *
+To get the values, use $openid->getAttributes().
+ *
+The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
+@author Mewp
+@contributors Brice http://github.com/brice/
+@copyright Copyright (c) 2010, Mewp
+@copyright Copyright (c) 2010, Brice
+@license http://www.opensource.org/licenses/mit-license.php MIT
\ No newline at end of file
diff --git a/library/openid/example-google.php b/library/openid/example-google.php
new file mode 100644
index 000000000..f23f2cc48
--- /dev/null
+++ b/library/openid/example-google.php
@@ -0,0 +1,24 @@
+mode) {
+        if(isset($_GET['login'])) {
+            $openid->identity = 'https://www.google.com/accounts/o8/id';
+            header('Location: ' . $openid->authUrl());
+        }
+?>
+
                                      
+    
+
                                      
+mode == 'cancel') {
+        echo 'User has canceled authentication!';
+    } else {
+        echo 'User ' . ($openid->validate() ? $openid->identity . ' has ' : 'has not ') . 'logged in.';
+    }
+} catch(ErrorException $e) {
+    echo $e->getMessage();
+}
diff --git a/library/openid/example.php b/library/openid/example.php
new file mode 100644
index 000000000..e4ab107fe
--- /dev/null
+++ b/library/openid/example.php
@@ -0,0 +1,23 @@
+mode) {
+        if(isset($_POST['openid_identifier'])) {
+            $openid->identity = $_POST['openid_identifier'];
+            header('Location: ' . $openid->authUrl());
+        }
+?>
+
                                      
+    OpenID:  
+
                                      
+mode == 'cancel') {
+        echo 'User has canceled authentication!';
+    } else {
+        echo 'User ' . ($openid->validate() ? $openid->identity . ' has ' : 'has not ') . 'logged in.';
+    }
+} catch(ErrorException $e) {
+    echo $e->getMessage();
+}
diff --git a/library/openid/openid.php b/library/openid/openid.php
new file mode 100644
index 000000000..00250c59d
--- /dev/null
+++ b/library/openid/openid.php
@@ -0,0 +1,781 @@
+
+ * $openid = new LightOpenID('my-host.example.org');
+ * $openid->identity = 'ID supplied by user';
+ * header('Location: ' . $openid->authUrl());
+ *                                       
+ * The provider then sends various parameters via GET, one of them is openid_mode.
+ * Step two is verification:
+ * 
+ * if ($this->data['openid_mode']) {
+ *     $openid = new LightOpenID('my-host.example.org');
+ *     echo $openid->validate() ? 'Logged in.' : 'Failed';
+ * }
+ * 
+ *
+ * Change the 'my-host.example.org' to your domain name. Do NOT use $_SERVER['HTTP_HOST']
+ * for that, unless you know what you are doing.
+ *
+ * Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
+ * The default values for those are:
+ * $openid->realm     = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+ * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
+ * If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
+ *
+ * AX and SREG extensions are supported.
+ * To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
+ * These are arrays, with values being AX schema paths (the 'path' part of the URL).
+ * For example:
+ *   $openid->required = array('namePerson/friendly', 'contact/email');
+ *   $openid->optional = array('namePerson/first');
+ * If the server supports only SREG or OpenID 1.1, these are automaticaly
+ * mapped to SREG names, so that user doesn't have to know anything about the server.
+ *
+ * To get the values, use $openid->getAttributes().
+ *
+ *
+ * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
+ * @author Mewp
+ * @copyright Copyright (c) 2010, Mewp
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
+ */
+class LightOpenID
+{
+    public $returnUrl
+         , $required = array()
+         , $optional = array()
+         , $verify_peer = null
+         , $capath = null
+         , $cainfo = null
+         , $data;
+    private $identity, $claimed_id;
+    protected $server, $version, $trustRoot, $aliases, $identifier_select = false
+            , $ax = false, $sreg = false, $setup_url = null;
+    static protected $ax_to_sreg = array(
+        'namePerson/friendly'     => 'nickname',
+        'contact/email'           => 'email',
+        'namePerson'              => 'fullname',
+        'birthDate'               => 'dob',
+        'person/gender'           => 'gender',
+        'contact/postalCode/home' => 'postcode',
+        'contact/country/home'    => 'country',
+        'pref/language'           => 'language',
+        'pref/timezone'           => 'timezone',
+        );
+
+    function __construct($host)
+    {
+        $this->trustRoot = (strpos($host, '://') ? $host : 'http://' . $host);
+        if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
+            || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
+            && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
+        ) {
+            $this->trustRoot = (strpos($host, '://') ? $host : 'https://' . $host);
+        }
+
+        if(($host_end = strpos($this->trustRoot, '/', 8)) !== false) {
+            $this->trustRoot = substr($this->trustRoot, 0, $host_end);
+        }
+
+        $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
+        $this->returnUrl = $this->trustRoot . $uri;
+
+        $this->data = ($_SERVER['REQUEST_METHOD'] === 'POST') ? $_POST : $_GET;
+
+        if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
+            throw new ErrorException('You must have either https wrappers or curl enabled.');
+        }
+    }
+
+    function __set($name, $value)
+    {
+        switch ($name) {
+        case 'identity':
+            if (strlen($value = trim((String) $value))) {
+                if (preg_match('#^xri:/*#i', $value, $m)) {
+                    $value = substr($value, strlen($m[0]));
+                } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
+                    $value = "http://$value";
+                }
+                if (preg_match('#^https?://[^/]+$#i', $value, $m)) {
+                    $value .= '/';
+                }
+            }
+            $this->$name = $this->claimed_id = $value;
+            break;
+        case 'trustRoot':
+        case 'realm':
+            $this->trustRoot = trim($value);
+        }
+    }
+
+    function __get($name)
+    {
+        switch ($name) {
+        case 'identity':
+            # We return claimed_id instead of identity,
+            # because the developer should see the claimed identifier,
+            # i.e. what he set as identity, not the op-local identifier (which is what we verify)
+            return $this->claimed_id;
+        case 'trustRoot':
+        case 'realm':
+            return $this->trustRoot;
+        case 'mode':
+            return empty($this->data['openid_mode']) ? null : $this->data['openid_mode'];
+        }
+    }
+
+    /**
+     * Checks if the server specified in the url exists.
+     *
+     * @param $url url to check
+     * @return true, if the server exists; false otherwise
+     */
+    function hostExists($url)
+    {
+        if (strpos($url, '/') === false) {
+            $server = $url;
+        } else {
+            $server = @parse_url($url, PHP_URL_HOST);
+        }
+
+        if (!$server) {
+            return false;
+        }
+
+        return !!gethostbynamel($server);
+    }
+
+    protected function request_curl($url, $method='GET', $params=array())
+    {
+        $params = http_build_query($params, '', '&');
+        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($curl, CURLOPT_HEADER, false);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
+
+        if($this->verify_peer !== null) {
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
+            if($this->capath) {
+                curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
+            }
+
+            if($this->cainfo) {
+                curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
+            }
+        }
+
+        if ($method == 'POST') {
+            curl_setopt($curl, CURLOPT_POST, true);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        } elseif ($method == 'HEAD') {
+            curl_setopt($curl, CURLOPT_HEADER, true);
+            curl_setopt($curl, CURLOPT_NOBODY, true);
+        } else {
+            curl_setopt($curl, CURLOPT_HTTPGET, true);
+        }
+        $response = curl_exec($curl);
+
+        if($method == 'HEAD') {
+            $headers = array();
+            foreach(explode("\n", $response) as $header) {
+                $pos = strpos($header,':');
+                $name = strtolower(trim(substr($header, 0, $pos)));
+                $headers[$name] = trim(substr($header, $pos+1));
+            }
+
+            # Updating claimed_id in case of redirections.
+            $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
+            if($effective_url != $url) {
+                $this->identity = $this->claimed_id = $effective_url;
+            }
+
+            return $headers;
+        }
+
+        if (curl_errno($curl)) {
+            throw new ErrorException(curl_error($curl), curl_errno($curl));
+        }
+
+        return $response;
+    }
+
+    protected function request_streams($url, $method='GET', $params=array())
+    {
+        if(!$this->hostExists($url)) {
+            throw new ErrorException("Could not connect to $url.", 404);
+        }
+
+        $params = http_build_query($params, '', '&');
+        switch($method) {
+        case 'GET':
+            $opts = array(
+                'http' => array(
+                    'method' => 'GET',
+                    'header' => 'Accept: application/xrds+xml, */*',
+                    'ignore_errors' => true,
+                ), 'ssl' => array(
+                    'CN_match' => parse_url($url, PHP_URL_HOST),
+                ),
+            );
+            $url = $url . ($params ? '?' . $params : '');
+            break;
+        case 'POST':
+            $opts = array(
+                'http' => array(
+                    'method' => 'POST',
+                    'header'  => 'Content-type: application/x-www-form-urlencoded',
+                    'content' => $params,
+                    'ignore_errors' => true,
+                ), 'ssl' => array(
+                    'CN_match' => parse_url($url, PHP_URL_HOST),
+                ),
+            );
+            break;
+        case 'HEAD':
+            # We want to send a HEAD request,
+            # but since get_headers doesn't accept $context parameter,
+            # we have to change the defaults.
+            $default = stream_context_get_options(stream_context_get_default());
+            stream_context_get_default(
+                array(
+                    'http' => array(
+                        'method' => 'HEAD',
+                        'header' => 'Accept: application/xrds+xml, */*',
+                        'ignore_errors' => true,
+                    ), 'ssl' => array(
+                        'CN_match' => parse_url($url, PHP_URL_HOST),
+                    ),
+                )
+            );
+
+            $url = $url . ($params ? '?' . $params : '');
+            $headers_tmp = get_headers ($url);
+            if(!$headers_tmp) {
+                return array();
+            }
+
+            # Parsing headers.
+            $headers = array();
+            foreach($headers_tmp as $header) {
+                $pos = strpos($header,':');
+                $name = strtolower(trim(substr($header, 0, $pos)));
+                $headers[$name] = trim(substr($header, $pos+1));
+
+                # Following possible redirections. The point is just to have
+                # claimed_id change with them, because get_headers() will
+                # follow redirections automatically.
+                # We ignore redirections with relative paths.
+                # If any known provider uses them, file a bug report.
+                if($name == 'location') {
+                    if(strpos($headers[$name], 'http') === 0) {
+                        $this->identity = $this->claimed_id = $headers[$name];
+                    } elseif($headers[$name][0] == '/') {
+                        $parsed_url = parse_url($this->claimed_id);
+                        $this->identity =
+                        $this->claimed_id = $parsed_url['scheme'] . '://'
+                                          . $parsed_url['host']
+                                          . $headers[$name];
+                    }
+                }
+            }
+
+            # And restore them.
+            stream_context_get_default($default);
+            return $headers;
+        }
+
+        if($this->verify_peer) {
+            $opts['ssl'] += array(
+                'verify_peer' => true,
+                'capath'      => $this->capath,
+                'cafile'      => $this->cainfo,
+            );
+        }
+
+        $context = stream_context_create ($opts);
+
+        return file_get_contents($url, false, $context);
+    }
+
+    protected function request($url, $method='GET', $params=array())
+    {
+        if (function_exists('curl_init')
+            && (!in_array('https', stream_get_wrappers()) || !ini_get('safe_mode') && !ini_get('open_basedir'))
+        ) {
+            return $this->request_curl($url, $method, $params);
+        }
+        return $this->request_streams($url, $method, $params);
+    }
+
+    protected function build_url($url, $parts)
+    {
+        if (isset($url['query'], $parts['query'])) {
+            $parts['query'] = $url['query'] . '&' . $parts['query'];
+        }
+
+        $url = $parts + $url;
+        $url = $url['scheme'] . '://'
+             . (empty($url['username'])?''
+                 :(empty($url['password'])? "{$url['username']}@"
+                 :"{$url['username']}:{$url['password']}@"))
+             . $url['host']
+             . (empty($url['port'])?'':":{$url['port']}")
+             . (empty($url['path'])?'':$url['path'])
+             . (empty($url['query'])?'':"?{$url['query']}")
+             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+        return $url;
+    }
+
+    /**
+     * Helper function used to scan for / tags and extract information
+     * from them
+     */
+    protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
+    {
+        preg_match_all("#<{$tag}[^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*$valueName=['\"](.+?)['\"][^>]*/?>#i", $content, $matches1);
+        preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
+
+        $result = array_merge($matches1[1], $matches2[1]);
+        return empty($result)?false:$result[0];
+    }
+
+    /**
+     * Performs Yadis and HTML discovery. Normally not used.
+     * @param $url Identity URL.
+     * @return String OP Endpoint (i.e. OpenID provider address).
+     * @throws ErrorException
+     */
+    function discover($url)
+    {
+        if (!$url) throw new ErrorException('No identity supplied.');
+        # Use xri.net proxy to resolve i-name identities
+        if (!preg_match('#^https?:#', $url)) {
+            $url = "https://xri.net/$url";
+        }
+
+        # We save the original url in case of Yadis discovery failure.
+        # It can happen when we'll be lead to an XRDS document
+        # which does not have any OpenID2 services.
+        $originalUrl = $url;
+
+        # A flag to disable yadis discovery in case of failure in headers.
+        $yadis = true;
+
+        # We'll jump a maximum of 5 times, to avoid endless redirections.
+        for ($i = 0; $i < 5; $i ++) {
+            if ($yadis) {
+                $headers = $this->request($url, 'HEAD');
+
+                $next = false;
+                if (isset($headers['x-xrds-location'])) {
+                    $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location'])));
+                    $next = true;
+                }
+
+                if (isset($headers['content-type'])
+                    && (strpos($headers['content-type'], 'application/xrds+xml') !== false
+                        || strpos($headers['content-type'], 'text/xml') !== false)
+                ) {
+                    # Apparently, some providers return XRDS documents as text/html.
+                    # While it is against the spec, allowing this here shouldn't break
+                    # compatibility with anything.
+                    # ---
+                    # Found an XRDS document, now let's find the server, and optionally delegate.
+                    $content = $this->request($url, 'GET');
+
+                    preg_match_all('#(.*?)#s', $content, $m);
+                    foreach($m[1] as $content) {
+                        $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+
+                        # OpenID 2
+                        $ns = preg_quote('http://specs.openid.net/auth/2.0/');
+                        if(preg_match('#\s*'.$ns.'(server|signon)\s*#s', $content, $type)) {
+                            if ($type[1] == 'server') $this->identifier_select = true;
+
+                            preg_match('#(.*)#', $content, $server);
+                            preg_match('#<(Local|Canonical)ID>(.*)#', $content, $delegate);
+                            if (empty($server)) {
+                                return false;
+                            }
+                            # Does the server advertise support for either AX or SREG?
+                            $this->ax   = (bool) strpos($content, 'http://openid.net/srv/ax/1.0');
+                            $this->sreg = strpos($content, 'http://openid.net/sreg/1.0')
+                                       || strpos($content, 'http://openid.net/extensions/sreg/1.1');
+
+                            $server = $server[1];
+                            if (isset($delegate[2])) $this->identity = trim($delegate[2]);
+                            $this->version = 2;
+
+                            $this->server = $server;
+                            return $server;
+                        }
+
+                        # OpenID 1.1
+                        $ns = preg_quote('http://openid.net/signon/1.1');
+                        if (preg_match('#\s*'.$ns.'\s*#s', $content)) {
+
+                            preg_match('#(.*)#', $content, $server);
+                            preg_match('#<.*?Delegate>(.*)#', $content, $delegate);
+                            if (empty($server)) {
+                                return false;
+                            }
+                            # AX can be used only with OpenID 2.0, so checking only SREG
+                            $this->sreg = strpos($content, 'http://openid.net/sreg/1.0')
+                                       || strpos($content, 'http://openid.net/extensions/sreg/1.1');
+
+                            $server = $server[1];
+                            if (isset($delegate[1])) $this->identity = $delegate[1];
+                            $this->version = 1;
+
+                            $this->server = $server;
+                            return $server;
+                        }
+                    }
+
+                    $next = true;
+                    $yadis = false;
+                    $url = $originalUrl;
+                    $content = null;
+                    break;
+                }
+                if ($next) continue;
+
+                # There are no relevant information in headers, so we search the body.
+                $content = $this->request($url, 'GET');
+                $location = $this->htmlTag($content, 'meta', 'http-equiv', 'X-XRDS-Location', 'content');
+                if ($location) {
+                    $url = $this->build_url(parse_url($url), parse_url($location));
+                    continue;
+                }
+            }
+
+            if (!$content) $content = $this->request($url, 'GET');
+
+            # At this point, the YADIS Discovery has failed, so we'll switch
+            # to openid2 HTML discovery, then fallback to openid 1.1 discovery.
+            $server   = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href');
+            $delegate = $this->htmlTag($content, 'link', 'rel', 'openid2.local_id', 'href');
+            $this->version = 2;
+
+            if (!$server) {
+                # The same with openid 1.1
+                $server   = $this->htmlTag($content, 'link', 'rel', 'openid.server', 'href');
+                $delegate = $this->htmlTag($content, 'link', 'rel', 'openid.delegate', 'href');
+                $this->version = 1;
+            }
+
+            if ($server) {
+                # We found an OpenID2 OP Endpoint
+                if ($delegate) {
+                    # We have also found an OP-Local ID.
+                    $this->identity = $delegate;
+                }
+                $this->server = $server;
+                return $server;
+            }
+
+            throw new ErrorException("No OpenID Server found at $url", 404);
+        }
+        throw new ErrorException('Endless redirection!', 500);
+    }
+
+    protected function sregParams()
+    {
+        $params = array();
+        # We always use SREG 1.1, even if the server is advertising only support for 1.0.
+        # That's because it's fully backwards compatibile with 1.0, and some providers
+        # advertise 1.0 even if they accept only 1.1. One such provider is myopenid.com
+        $params['openid.ns.sreg'] = 'http://openid.net/extensions/sreg/1.1';
+        if ($this->required) {
+            $params['openid.sreg.required'] = array();
+            foreach ($this->required as $required) {
+                if (!isset(self::$ax_to_sreg[$required])) continue;
+                $params['openid.sreg.required'][] = self::$ax_to_sreg[$required];
+            }
+            $params['openid.sreg.required'] = implode(',', $params['openid.sreg.required']);
+        }
+
+        if ($this->optional) {
+            $params['openid.sreg.optional'] = array();
+            foreach ($this->optional as $optional) {
+                if (!isset(self::$ax_to_sreg[$optional])) continue;
+                $params['openid.sreg.optional'][] = self::$ax_to_sreg[$optional];
+            }
+            $params['openid.sreg.optional'] = implode(',', $params['openid.sreg.optional']);
+        }
+        return $params;
+    }
+
+    protected function axParams()
+    {
+        $params = array();
+        if ($this->required || $this->optional) {
+            $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
+            $params['openid.ax.mode'] = 'fetch_request';
+            $this->aliases  = array();
+            $counts   = array();
+            $required = array();
+            $optional = array();
+            foreach (array('required','optional') as $type) {
+                foreach ($this->$type as $alias => $field) {
+                    if (is_int($alias)) $alias = strtr($field, '/', '_');
+                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
+                    if (empty($counts[$alias])) $counts[$alias] = 0;
+                    $counts[$alias] += 1;
+                    ${$type}[] = $alias;
+                }
+            }
+            foreach ($this->aliases as $alias => $ns) {
+                $params['openid.ax.type.' . $alias] = $ns;
+            }
+            foreach ($counts as $alias => $count) {
+                if ($count == 1) continue;
+                $params['openid.ax.count.' . $alias] = $count;
+            }
+
+            # Don't send empty ax.requied and ax.if_available.
+            # Google and possibly other providers refuse to support ax when one of these is empty.
+            if($required) {
+                $params['openid.ax.required'] = implode(',', $required);
+            }
+            if($optional) {
+                $params['openid.ax.if_available'] = implode(',', $optional);
+            }
+        }
+        return $params;
+    }
+
+    protected function authUrl_v1($immediate)
+    {
+	$returnUrl = $this->returnUrl;
+        # If we have an openid.delegate that is different from our claimed id,
+        # we need to somehow preserve the claimed id between requests.
+        # The simplest way is to just send it along with the return_to url.
+        if($this->identity != $this->claimed_id) {
+            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
+        }
+
+        $params = array(
+            'openid.return_to'  => $returnUrl,
+            'openid.mode'       => $immediate ? 'checkid_immediate' : 'checkid_setup',
+            'openid.identity'   => $this->identity,
+            'openid.trust_root' => $this->trustRoot,
+            ) + $this->sregParams();
+
+        return $this->build_url(parse_url($this->server)
+                               , array('query' => http_build_query($params, '', '&')));
+    }
+
+    protected function authUrl_v2($immediate)
+    {
+        $params = array(
+            'openid.ns'          => 'http://specs.openid.net/auth/2.0',
+            'openid.mode'        => $immediate ? 'checkid_immediate' : 'checkid_setup',
+            'openid.return_to'   => $this->returnUrl,
+            'openid.realm'       => $this->trustRoot,
+        );
+        if ($this->ax) {
+            $params += $this->axParams();
+        }
+        if ($this->sreg) {
+            $params += $this->sregParams();
+        }
+        if (!$this->ax && !$this->sreg) {
+            # If OP doesn't advertise either SREG, nor AX, let's send them both
+            # in worst case we don't get anything in return.
+            $params += $this->axParams() + $this->sregParams();
+        }
+
+        if ($this->identifier_select) {
+            $params['openid.identity'] = $params['openid.claimed_id']
+                 = 'http://specs.openid.net/auth/2.0/identifier_select';
+        } else {
+            $params['openid.identity'] = $this->identity;
+            $params['openid.claimed_id'] = $this->claimed_id;
+        }
+
+        return $this->build_url(parse_url($this->server)
+                               , array('query' => http_build_query($params, '', '&')));
+    }
+
+    /**
+     * Returns authentication url. Usually, you want to redirect your user to it.
+     * @return String The authentication url.
+     * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
+     * @throws ErrorException
+     */
+    function authUrl($immediate = false)
+    {
+        if ($this->setup_url && !$immediate) return $this->setup_url;
+        if (!$this->server) $this->discover($this->identity);
+
+        if ($this->version == 2) {
+            return $this->authUrl_v2($immediate);
+        }
+        return $this->authUrl_v1($immediate);
+    }
+
+    /**
+     * Performs OpenID verification with the OP.
+     * @return Bool Whether the verification was successful.
+     * @throws ErrorException
+     */
+    function validate()
+    {
+        # If the request was using immediate mode, a failure may be reported
+        # by presenting user_setup_url (for 1.1) or reporting
+        # mode 'setup_needed' (for 2.0). Also catching all modes other than
+        # id_res, in order to avoid throwing errors.
+        if(isset($this->data['openid_user_setup_url'])) {
+            $this->setup_url = $this->data['openid_user_setup_url'];
+            return false;
+        }
+        if($this->mode != 'id_res') {
+            return false;
+        }
+
+        $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
+        $params = array(
+            'openid.assoc_handle' => $this->data['openid_assoc_handle'],
+            'openid.signed'       => $this->data['openid_signed'],
+            'openid.sig'          => $this->data['openid_sig'],
+            );
+
+        if (isset($this->data['openid_ns'])) {
+            # We're dealing with an OpenID 2.0 server, so let's set an ns
+            # Even though we should know location of the endpoint,
+            # we still need to verify it by discovery, so $server is not set here
+            $params['openid.ns'] = 'http://specs.openid.net/auth/2.0';
+        } elseif (isset($this->data['openid_claimed_id'])
+            && $this->data['openid_claimed_id'] != $this->data['openid_identity']
+        ) {
+            # If it's an OpenID 1 provider, and we've got claimed_id,
+            # we have to append it to the returnUrl, like authUrl_v1 does.
+            $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
+                             .  'openid.claimed_id=' . $this->claimed_id;
+        }
+
+        if ($this->data['openid_return_to'] != $this->returnUrl) {
+            # The return_to url must match the url of current request.
+            # I'm assuing that noone will set the returnUrl to something that doesn't make sense.
+            return false;
+        }
+
+        $server = $this->discover($this->claimed_id);
+
+        foreach (explode(',', $this->data['openid_signed']) as $item) {
+            # Checking whether magic_quotes_gpc is turned on, because
+            # the function may fail if it is. For example, when fetching
+            # AX namePerson, it might containg an apostrophe, which will be escaped.
+            # In such case, validation would fail, since we'd send different data than OP
+            # wants to verify. stripslashes() should solve that problem, but we can't
+            # use it when magic_quotes is off.
+            $value = $this->data['openid_' . str_replace('.','_',$item)];
+            $params['openid.' . $item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
+
+        }
+
+        $params['openid.mode'] = 'check_authentication';
+
+        $response = $this->request($server, 'POST', $params);
+
+        return preg_match('/is_valid\s*:\s*true/i', $response);
+    }
+
+    protected function getAxAttributes()
+    {
+        $alias = null;
+        if (isset($this->data['openid_ns_ax'])
+            && $this->data['openid_ns_ax'] != 'http://openid.net/srv/ax/1.0'
+        ) { # It's the most likely case, so we'll check it before
+            $alias = 'ax';
+        } else {
+            # 'ax' prefix is either undefined, or points to another extension,
+            # so we search for another prefix
+            foreach ($this->data as $key => $val) {
+                if (substr($key, 0, strlen('openid_ns_')) == 'openid_ns_'
+                    && $val == 'http://openid.net/srv/ax/1.0'
+                ) {
+                    $alias = substr($key, strlen('openid_ns_'));
+                    break;
+                }
+            }
+        }
+        if (!$alias) {
+            # An alias for AX schema has not been found,
+            # so there is no AX data in the OP's response
+            return array();
+        }
+
+        $attributes = array();
+        foreach (explode(',', $this->data['openid_signed']) as $key) {
+            $keyMatch = $alias . '.value.';
+            if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
+                continue;
+            }
+            $key = substr($key, strlen($keyMatch));
+            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
+                # OP is breaking the spec by returning a field without
+                # associated ns. This shouldn't happen, but it's better
+                # to check, than cause an E_NOTICE.
+                continue;
+            }
+            $value = $this->data['openid_' . $alias . '_value_' . $key];
+            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
+                          strlen('http://axschema.org/'));
+
+            $attributes[$key] = $value;
+        }
+        return $attributes;
+    }
+
+    protected function getSregAttributes()
+    {
+        $attributes = array();
+        $sreg_to_ax = array_flip(self::$ax_to_sreg);
+        foreach (explode(',', $this->data['openid_signed']) as $key) {
+            $keyMatch = 'sreg.';
+            if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
+                continue;
+            }
+            $key = substr($key, strlen($keyMatch));
+            if (!isset($sreg_to_ax[$key])) {
+                # The field name isn't part of the SREG spec, so we ignore it.
+                continue;
+            }
+            $attributes[$sreg_to_ax[$key]] = $this->data['openid_sreg_' . $key];
+        }
+        return $attributes;
+    }
+
+    /**
+     * Gets AX/SREG attributes provided by OP. should be used only after successful validaton.
+     * Note that it does not guarantee that any of the required/optional parameters will be present,
+     * or that there will be no other attributes besides those specified.
+     * In other words. OP may provide whatever information it wants to.
+     *     * SREG names will be mapped to AX names.
+     *     * @return Array Array of attributes with keys being the AX schema names, e.g. 'contact/email'
+     * @see http://www.axschema.org/types/
+     */
+    function getAttributes()
+    {
+        if (isset($this->data['openid_ns'])
+            && $this->data['openid_ns'] == 'http://specs.openid.net/auth/2.0'
+        ) { # OpenID 2.0
+            # We search for both AX and SREG attributes, with AX taking precedence.
+            return $this->getAxAttributes() + $this->getSregAttributes();
+        }
+        return $this->getSregAttributes();
+    }
+}
diff --git a/library/openid/provider/example-mysql.php b/library/openid/provider/example-mysql.php
new file mode 100644
index 000000000..574e3c811
--- /dev/null
+++ b/library/openid/provider/example-mysql.php
@@ -0,0 +1,194 @@
+dh = false;
+ * However, the latter one would disable stateful mode, unless connecting via HTTPS.
+ */
+require 'provider.php';
+
+mysql_connect();
+mysql_select_db('test');
+
+function getUserData($handle=null)
+{
+    if(isset($_POST['login'],$_POST['password'])) {
+        $login = mysql_real_escape_string($_POST['login']);
+        $password = sha1($_POST['password']);
+        $q = mysql_query("SELECT * FROM Users WHERE login = '$login' AND password = '$password'");
+        if($data = mysql_fetch_assoc($q)) {
+            return $data;
+        }
+        if($handle) {
+            echo 'Wrong login/password.';
+        }
+    }
+    if($handle) {
+    ?>
+    
                                      
+    
+    Login: 
                                      
+    Password: 
                                      
+    
+    
                                      
+     'First name',
+        'namePerson/last'     => 'Last name',
+        'namePerson/friendly' => 'Nickname (login)'
+        );
+    
+    private $attrFieldMap = array(
+        'namePerson/first'    => 'firstName',
+        'namePerson/last'     => 'lastName',
+        'namePerson/friendly' => 'login'
+        );
+    
+    function setup($identity, $realm, $assoc_handle, $attributes)
+    {
+        $data = getUserData($assoc_handle);
+        echo '
                                      '
+           . ''
+           . ''
+           . ''
+           . "$realm wishes to authenticate you.";
+        if($attributes['required'] || $attributes['optional']) {
+            echo " It also requests following information (required fields marked with *):"
+               . '
                                        ';
+            
+            foreach($attributes['required'] as $attr) {
+                if(isset($this->attrMap[$attr])) {
+                    echo '
                                      • '
+                       . ' '
+                       . $this->attrMap[$attr] . '(*)
                                        • ';
+                }
+            }
+            
+            foreach($attributes['optional'] as $attr) {
+                if(isset($this->attrMap[$attr])) {
+                    echo '
                                      • '
+                       . ' '
+                       . $this->attrMap[$attr] . '
                                        • ';
+                }
+            }
+            echo '
                                      ';
+        }
+        echo '
                                      '
+           . ' '
+           . ' '
+           . ' '
+           . '
                                      ';
+    }
+    
+    function checkid($realm, &$attributes)
+    {
+        if(isset($_POST['cancel'])) {
+            $this->cancel();
+        }
+        
+        $data = getUserData();
+        if(!$data) {
+            return false;
+        }
+        $realm = mysql_real_escape_string($realm);
+        $q = mysql_query("SELECT attributes FROM AllowedSites WHERE user = '{$data['id']}' AND realm = '$realm'");
+        
+        $attrs = array();
+        if($attrs = mysql_fetch_row($q)) {
+            $attrs = explode(',', $attributes[0]);
+        } elseif(isset($_POST['attributes'])) {
+            $attrs = array_keys($_POST['attributes']);
+        } elseif(!isset($_POST['once']) && !isset($_POST['always'])) {
+            return false;
+        }
+        
+        $attributes = array();
+        foreach($attrs as $attr) {
+            if(isset($this->attrFieldMap[$attr])) {
+                $attributes[$attr] = $data[$this->attrFieldMap[$attr]];
+            }
+        }
+        
+        if(isset($_POST['always'])) {
+            $attrs = mysql_real_escape_string(implode(',', array_keys($attributes)));
+            mysql_query("REPLACE INTO AllowedSites VALUES('{$data['id']}', '$realm', '$attrs')");
+        }
+        
+        return $this->serverLocation . '?' . $data['login'];
+    }
+    
+    function assoc_handle()
+    {
+        # We generate an integer assoc handle, because it's just faster to look up an integer later.
+        $q = mysql_query("SELECT MAX(id) FROM Associations");
+        $result = mysql_fetch_row($q);
+        return $q[0]+1;
+    }
+    
+    function setAssoc($handle, $data)
+    {
+        $data = mysql_real_escape_string(serialize($data));
+        mysql_query("REPLACE INTO Associations VALUES('$handle', '$data')");
+    }
+    
+    function getAssoc($handle)
+    {
+        if(!is_numeric($handle)) {
+            return false;
+        }
+        $q = mysql_query("SELECT data FROM Associations WHERE id = '$handle'");
+        $data = mysql_fetch_row($q);
+        if(!$data) {
+            return false;
+        }
+        return unserialize($data[0]);
+    }
+    
+    function delAssoc($handle)
+    {
+        if(!is_numeric($handle)) {
+            return false;
+        }
+        mysql_query("DELETE FROM Associations WHERE id = '$handle'");
+    }
+    
+}
+$op = new MysqlProvider;
+$op->server();
diff --git a/library/openid/provider/example.php b/library/openid/provider/example.php
new file mode 100644
index 000000000..b8a4c24a9
--- /dev/null
+++ b/library/openid/provider/example.php
@@ -0,0 +1,53 @@
+select_id = false;
+        }
+    }
+    
+    function setup($identity, $realm, $assoc_handle, $attributes)
+    {
+        header('WWW-Authenticate: Basic realm="' . $this->data['openid_realm'] . '"');
+        header('HTTP/1.0 401 Unauthorized');
+    }
+    
+    function checkid($realm, &$attributes)
+    {
+        if(!isset($_SERVER['PHP_AUTH_USER'])) {
+            return false;
+        }
+        
+        if ($_SERVER['PHP_AUTH_USER'] == $this->login
+            && $_SERVER['PHP_AUTH_PW'] == $this->password
+        ) {
+            # Returning identity
+            # It can be any url that leads here, or to any other place that hosts
+            # an XRDS document pointing here.
+            return $this->serverLocation . '?id=' . $this->login;
+        }
+        
+        return false;
+    }
+    
+}
+$op = new BasicProvider;
+$op->login = 'test';
+$op->password = 'test';
+$op->server();
diff --git a/library/openid/provider/provider.php b/library/openid/provider/provider.php
new file mode 100644
index 000000000..03fbe1c81
--- /dev/null
+++ b/library/openid/provider/provider.php
@@ -0,0 +1,845 @@
+= 5.1.2
+ * 
+ * This is an alpha version, using it in production code is not recommended,
+ * until you are *sure* that it works and is secure.
+ *
+ * Please send me messages about your testing results 
+ * (even if successful, so I know that it has been tested).
+ * Also, if you think there's a way to make it easier to use, tell me -- it's an alpha for a reason.
+ * Same thing applies to bugs in code, suggestions, 
+ * and everything else you'd like to say about the library.
+ *
+ * There's no usage documentation here, see the examples.
+ *
+ * @author Mewp
+ * @copyright Copyright (c) 2010, Mewp
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
+ */
+ini_set('error_log','log');
+abstract class LightOpenIDProvider
+{
+    # URL-s to XRDS and server location.
+    public $xrdsLocation, $serverLocation;
+    
+    # Should we operate in server, or signon mode?
+    public $select_id = false;
+    
+    # Lifetime of an association.
+    protected $assoc_lifetime = 600;
+    
+    # Variables below are either set automatically, or are constant.
+    # -----
+    # Can we support DH?
+    protected $dh = true;
+    protected $ns = 'http://specs.openid.net/auth/2.0';
+    protected $data, $assoc;
+    
+    # Default DH parameters as defined in the specification.
+    protected $default_modulus;
+    protected $default_gen = 'Ag==';
+    
+    # AX <-> SREG transform
+    protected $ax_to_sreg = array(
+        'namePerson/friendly'     => 'nickname',
+        'contact/email'           => 'email',
+        'namePerson'              => 'fullname',
+        'birthDate'               => 'dob',
+        'person/gender'           => 'gender',
+        'contact/postalCode/home' => 'postcode',
+        'contact/country/home'    => 'country',
+        'pref/language'           => 'language',
+        'pref/timezone'           => 'timezone',
+        );
+    
+    # Math
+    private $add, $mul, $pow, $mod, $div, $powmod;
+    # -----
+    
+    # ------------------------------------------------------------------------ #
+    #  Functions you probably want to implement when extending the class.
+    
+    /**
+     * Checks whether an user is authenticated.
+     * The function should determine what fields it wants to send to the RP, 
+     * and put them in the $attributes array.
+     * @param Array $attributes
+     * @param String $realm Realm used for authentication.
+     * @return String OP-local identifier of an authenticated user, or an empty value.
+     */
+    abstract function checkid($realm, &$attributes);
+    
+    /**
+     * Displays an user interface for inputting user's login and password.
+     * Attributes are always AX field namespaces, with stripped host part.
+     * For example, the $attributes array may be:
+     * array( 'required' => array('namePerson/friendly', 'contact/email'),
+     *        'optional' => array('pref/timezone', 'pref/language')
+     * @param String $identity Discovered identity string. May be used to extract login, unless using $this->select_id
+     * @param String $realm Realm used for authentication.
+     * @param String Association handle. must be sent as openid.assoc_handle in $_GET or $_POST in subsequent requests.
+     * @param Array User attributes requested by the RP.
+     */
+    abstract function setup($identity, $realm, $assoc_handle, $attributes);
+    
+    /**
+     * Stores an association.
+     * If you want to use php sessions in your provider code, you have to replace it.
+     * @param String $handle Association handle -- should be used as a key.
+     * @param Array $assoc Association data.
+     */
+    protected function setAssoc($handle, $assoc)
+    {
+        $oldSession = session_id();
+        session_commit();
+        session_id($assoc['handle']);
+        session_start();
+        $_SESSION['assoc'] = $assoc;
+        session_commit();
+        if($oldSession) {
+            session_id($oldSession);
+            session_start();
+        }
+    }
+    
+    /**
+     * Retreives association data.
+     * If you want to use php sessions in your provider code, you have to replace it.
+     * @param String $handle Association handle.
+     * @return Array Association data.
+     */
+    protected function getAssoc($handle)
+    {
+        $oldSession = session_id();
+        session_commit();
+        session_id($handle);
+        session_start();
+        if(empty($_SESSION['assoc'])) {
+            return null;
+        }
+        return $_SESSION['assoc'];
+        session_commit();
+        if($oldSession) {
+            session_id($oldSession);
+            session_start();
+        }
+    }
+    
+    /**
+     * Deletes an association.
+     * If you want to use php sessions in your provider code, you have to replace it.
+     * @param String $handle Association handle.
+     */
+    protected function delAssoc($handle)
+    {
+        $oldSession = session_id();
+        session_commit();
+        session_id($handle);
+        session_start();
+        session_destroy();
+        if($oldSession) {
+            session_id($oldSession);
+            session_start();
+        }
+    }
+    
+    # ------------------------------------------------------------------------ #
+    # Functions that you might want to implement.
+    
+    /**
+     * Redirects the user to an url.
+     * @param String $location The url that the user will be redirected to.
+     */
+    protected function redirect($location)
+    {
+        header('Location: ' . $location);
+        die();
+    }
+    
+    /**
+     * Generates a new association handle.
+     * @return string
+     */
+    protected function assoc_handle()
+    {
+        return sha1(microtime());
+    }
+    
+    /**
+     * Generates a random shared secret.
+     * @return string
+     */
+    protected function shared_secret($hash)
+    {
+        $length = 20;
+        if($hash == 'sha256') {
+            $length = 256;
+        }
+        
+        $secret = '';
+        for($i = 0; $i < $length; $i++) {
+            $secret .= mt_rand(0,255);
+        }
+        
+        return $secret;
+    }
+    
+    /**
+     * Generates a private key.
+     * @param int $length Length of the key.
+     */
+    protected function keygen($length)
+    {
+        $key = '';
+        for($i = 1; $i < $length; $i++) {
+            $key .= mt_rand(0,9);
+        }
+        $key .= mt_rand(1,9);
+        
+        return $key;
+    }
+    
+    # ------------------------------------------------------------------------ #
+    # Functions that you probably shouldn't touch.
+    
+    function __construct()
+    {
+        $this->default_modulus = 
+            'ANz5OguIOXLsDhmYmsWizjEOHTdxfo2Vcbt2I3MYZuYe91ouJ4mLBX+YkcLiemOcPy'
+          . 'm2CBRYHNOyyjmG0mg3BVd9RcLn5S3IHHoXGHblzqdLFEi/368Ygo79JRnxTkXjgmY0'
+          . 'rxlJ5bU1zIKaSDuKdiI+XUkKJX8Fvf8W8vsixYOr';
+
+        $location = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+                  . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        $location = preg_replace('/\?.*/','',$location);
+        $this->serverLocation = $location;
+        $location .= (strpos($location, '?') ? '&' : '?') . 'xrds';
+        $this->xrdsLocation = $location;
+        
+        $this->data = $_GET + $_POST;
+        
+        # We choose GMP if avaiable, and bcmath otherwise
+        if(function_exists('gmp_add')) {
+            $this->add = 'gmp_add';
+            $this->mul = 'gmp_mul';
+            $this->pow = 'gmp_pow';
+            $this->mod = 'gmp_mod';
+            $this->div = 'gmp_div';
+            $this->powmod = 'gmp_powm';
+        } elseif(function_exists('bcadd')) {
+            $this->add = 'bcadd';
+            $this->mul = 'bcmul';
+            $this->pow = 'bcpow';
+            $this->mod = 'bcmod';
+            $this->div = 'bcdiv';
+            $this->powmod = 'bcpowmod';
+        } else {
+            # If neither are avaiable, we can't use DH
+            $this->dh = false;
+        }
+        
+        # However, we do require the hash functions.
+        # They should be built-in anyway.
+        if(!function_exists('hash_algos')) {
+            $this->dh = false;
+        }
+    }
+    
+    /**
+     * Displays an XRDS document, or redirects to it.
+     * By default, it detects whether it should display or redirect automatically.
+     * @param bool|null $force When true, always display the document, when false always redirect.
+     */
+    function xrds($force=null)
+    {
+        if($force) {
+            echo $this->xrdsContent();
+            die();
+        } elseif($force === false) {
+            header('X-XRDS-Location: '. $this->xrdsLocation);
+            return;
+        }
+        
+        if (isset($_GET['xrds'])
+            || (isset($_SERVER['HTTP_ACCEPT']) &&  strpos($_SERVER['HTTP_ACCEPT'], 'application/xrds+xml') !== false)
+        ) {
+            header('Content-Type: application/xrds+xml');
+            echo $this->xrdsContent();
+            die();
+        }
+        
+        header('X-XRDS-Location: ' . $this->xrdsLocation);
+    }
+    
+    /**
+     * Returns the content of the XRDS document
+     * @return String The XRDS document.
+     */
+    protected function xrdsContent()
+    {
+        $lines = array(
+            '',
+            '',
+            '',
+            '    ',
+            '        ' . $this->ns . '/' . ($this->select_id ? 'server' : 'signon') .'',
+            '        ' . $this->serverLocation . '',
+            '    ',
+            '',
+            ''
+            );
+        return implode("\n", $lines);
+    }
+    
+    /**
+     * Does everything that a provider has to -- in one function.
+     */
+    function server()
+    {
+        if(isset($this->data['openid_assoc_handle'])) {
+            $this->assoc = $this->getAssoc($this->data['openid_assoc_handle']);
+            if(isset($this->assoc['data'])) {
+                # We have additional data stored for setup.
+                $this->data += $this->assoc['data'];
+                unset($this->assoc['data']);
+            }
+        }
+            
+        if (isset($this->data['openid_ns'])
+            && $this->data['openid_ns'] == $this->ns
+        ) {
+            if(!isset($this->data['openid_mode'])) $this->errorResponse();
+            
+            switch($this->data['openid_mode'])
+            { 
+            case 'checkid_immediate':
+            case 'checkid_setup':
+                $this->checkRealm();
+                # We support AX xor SREG.
+                $attributes = $this->ax();
+                if(!$attributes) {
+                    $attributes = $this->sreg();
+                }
+                
+                # Even if some user is authenticated, we need to know if it's
+                # the same one that want's to authenticate.
+                # Of course, if we use select_id, we accept any user.
+                if (($identity = $this->checkid($this->data['openid_realm'], $attrValues))
+                    && ($this->select_id || $identity == $this->data['openid_identity'])
+                ) {
+                    $this->positiveResponse($identity, $attrValues);
+                } elseif($this->data['openid_mode'] == 'checkid_immediate') {
+                    $this->redirect($this->response(array('openid.mode' => 'setup_needed')));
+                } else {
+                    if(!$this->assoc) {
+                        $this->generateAssociation();
+                        $this->assoc['private'] = true;
+                    }
+                    $this->assoc['data'] = $this->data;
+                    $this->setAssoc($this->assoc['handle'], $this->assoc);
+                    $this->setup($this->data['openid_identity'],
+                                 $this->data['openid_realm'],
+                                 $this->assoc['handle'],
+                                 $attributes);
+                }
+                break;
+            case 'associate':
+                $this->associate();
+                break;
+            case 'check_authentication':
+                $this->checkRealm();
+                if($this->verify()) {
+                    echo "ns:$this->ns\nis_valid:true";
+                    if(strpos($this->data['openid_signed'],'invalidate_handle') !== false) {
+                        echo "\ninvalidate_handle:" . $this->data['openid_invalidate_handle'];
+                    }
+                } else {
+                    echo "ns:$this->ns\nis_valid:false";
+                }
+                die();
+                break;
+            default:
+                $this->errorResponse();
+            }
+        } else {
+            $this->xrds();
+        }
+    }
+    
+    protected function checkRealm()
+    {
+        if (!isset($this->data['openid_return_to'], $this->data['openid_realm'])) {
+            $this->errorResponse();
+        }
+        
+        $realm = str_replace('\*', '[^/]', preg_quote($this->data['openid_realm']));
+        if(!preg_match("#^$realm#", $this->data['openid_return_to'])) {
+            $this->errorResponse();
+        }
+    }
+    
+    protected function ax()
+    {
+        # Namespace prefix that the fields must have.
+        $ns = 'http://axschema.org/';
+        
+        # First, we must find out what alias is used for AX.
+        # Let's check the most likely one
+        $alias = null;
+        if (isset($this->data['openid_ns_ax'])
+            && $this->data['openid_ns_ax'] == 'http://openid.net/srv/ax/1.0'
+        ) {
+            $alias = 'ax';
+        } else {
+            foreach($this->data as $name => $value) {
+                if ($value == 'http://openid.net/srv/ax/1.0'
+                    && preg_match('/openid_ns_(.+)/', $name, $m)
+                ) {
+                    $alias = $m[1];
+                    break;
+                }
+            }
+        }
+        
+        if(!$alias) {
+            return null;
+        }
+        
+        $fields = array();
+        # Now, we must search again, this time for field aliases
+        foreach($this->data as $name => $value) {
+            if (strpos($name, 'openid_' . $alias . '_type') === false
+                || strpos($value, $ns) === false) {
+                continue;
+            }
+            
+            $name = substr($name, strlen('openid_' . $alias . '_type_'));
+            $value = substr($value, strlen($ns));
+            
+            $fields[$name] = $value;
+        }
+        
+        # Then, we find out what fields are required and optional
+        $required = array();
+        $if_available = array();
+        foreach(array('required','if_available') as $type) {
+            if(empty($this->data["openid_{$alias}_{$type}"])) {
+                continue;
+            }
+            $attributes = explode(',', $this->data["openid_{$alias}_{$type}"]);
+            foreach($attributes as $attr) {
+                if(empty($fields[$attr])) {
+                    # There is an undefined field here, so we ignore it.
+                    continue;
+                }
+                
+                ${$type}[] = $fields[$attr];
+            }
+        }
+        
+        $this->data['ax'] = true;
+        return array('required' => $required, 'optional' => $if_available);
+    }
+    
+    protected function sreg()
+    {
+        $sreg_to_ax = array_flip($this->ax_to_sreg);
+        
+        $attributes = array('required' => array(), 'optional' => array());
+        
+        if (empty($this->data['openid_sreg_required'])
+            && empty($this->data['openid_sreg_optional'])
+        ) {
+            return $attributes;
+        }
+        
+        foreach(array('required', 'optional') as $type) {
+            foreach(explode(',',$this->data['openid_sreg_' . $type]) as $attr) {
+                if(empty($sreg_to_ax[$attr])) {
+                    # Undefined attribute in SREG request.
+                    # Shouldn't happen, but we check anyway.
+                    continue;
+                }
+                
+                $attributes[$type][] = $sreg_to_ax[$attr];
+            }
+        }
+        
+        return $attributes;
+    }
+    
+    /**
+     * Aids an RP in assertion verification.
+     * @return bool Information whether the verification suceeded.
+     */
+    protected function verify()
+    {
+        # Firstly, we need to make sure that there's an association.
+        # Otherwise the verification will fail, 
+        # because we've signed assoc_handle in the assertion
+        if(empty($this->assoc)) {
+            return false;
+        }
+        
+        # Next, we check that it's a private association, 
+        # i.e. one made without RP input.
+        # Otherwise, the RP shouldn't ask us to verify.
+        if(empty($this->assoc['private'])) {
+            return false;
+        }
+        
+        # Now we have to check if the nonce is correct, to prevent replay attacks.
+        if($this->data['openid_response_nonce'] != $this->assoc['nonce']) {
+            return false;
+        }
+        
+        # Getting the signed fields for signature.
+        $sig = array();
+        $signed = explode(',', $this->data['openid_signed']);
+        foreach($signed as $field) {
+            $name = strtr($field, '.', '_');
+            if(!isset($this->data['openid_' . $name])) {
+                return false;
+            }
+            
+            $sig[$field] = $this->data['openid_' . $name];
+        }
+        
+        # Computing the signature and checking if it matches.
+        $sig = $this->keyValueForm($sig);
+        if ($this->data['openid_sig'] != 
+            base64_encode(hash_hmac($this->assoc['hash'], $sig, $this->assoc['mac'], true))
+        ) {
+            return false;
+        }
+        
+        # Clearing the nonce, so that it won't be used again.
+        $this->assoc['nonce'] = null;
+        
+        if(empty($this->assoc['private'])) {
+            # Commiting changes to the association.
+            $this->setAssoc($this->assoc['handle'], $this->assoc);
+        } else {
+            # Private associations shouldn't be used again, se we can as well delete them.
+            $this->delAssoc($this->assoc['handle']);
+        }
+        
+        # Nothing has failed, so the verification was a success.
+        return true;
+    }
+    
+    /**
+     * Performs association with an RP.
+     */
+    protected function associate()
+    {
+        # Rejecting no-encryption without TLS.
+        if(empty($_SERVER['HTTPS']) && $this->data['openid_session_type'] == 'no-encryption') {
+            $this->directErrorResponse();
+        }
+        
+        # Checking whether we support DH at all.
+        if (!$this->dh && substr($this->data['openid_session_type'], 0, 2) == 'DH') {
+            $this->redirect($this->response(array(
+                'openid.error' => 'DH not supported',
+                'openid.error_code' => 'unsupported-type',
+                'openid.session_type' => 'no-encryption'
+                )));
+        }
+        
+        # Creating the association
+        $this->assoc = array();
+        $this->assoc['hash'] = $this->data['openid_assoc_type'] == 'HMAC-SHA256' ? 'sha256' : 'sha1';
+        $this->assoc['handle'] = $this->assoc_handle();
+        
+        # Getting the shared secret
+        if($this->data['openid_session_type'] == 'no-encryption') {
+            $this->assoc['mac'] = base64_encode($this->shared_secret($this->assoc['hash']));
+        } else {
+            $this->dh();
+        }
+        
+        # Preparing the direct response...
+        $response = array(
+            'ns'           => $this->ns,
+            'assoc_handle' => $this->assoc['handle'],
+            'assoc_type'   => $this->data['openid_assoc_type'],
+            'session_type' => $this->data['openid_session_type'],
+            'expires_in'   => $this->assoc_lifetime
+            );
+        
+        if(isset($this->assoc['dh_server_public'])) {
+            $response['dh_server_public'] = $this->assoc['dh_server_public'];
+            $response['enc_mac_key'] = $this->assoc['mac'];
+        } else {
+            $response['mac_key'] = $this->assoc['mac'];
+        }
+        
+        # ...and sending it.
+        echo $this->keyValueForm($response);
+        die();
+    }
+    
+    /**
+     * Creates a private association.
+     */
+    protected function generateAssociation()
+    {
+        $this->assoc = array();
+        # We use sha1 by default.
+        $this->assoc['hash']   = 'sha1';
+        $this->assoc['mac']    = $this->shared_secret('sha1');
+        $this->assoc['handle'] = $this->assoc_handle();
+    }
+    
+    /**
+     * Encrypts the MAC key using DH key exchange.
+     */
+    protected function dh()
+    {
+        if(empty($this->data['openid_dh_modulus'])) {
+            $this->data['openid_dh_modulus'] = $this->default_modulus;
+        }
+        
+        if(empty($this->data['openid_dh_gen'])) {
+            $this->data['openid_dh_gen'] = $this->default_gen;
+        }
+        
+        if(empty($this->data['openid_dh_consumer_public'])) {
+            $this->directErrorResponse();
+        }
+        
+        $modulus = $this->b64dec($this->data['openid_dh_modulus']);
+        $gen = $this->b64dec($this->data['openid_dh_gen']);
+        $consumerKey = $this->b64dec($this->data['openid_dh_consumer_public']);
+        
+        $privateKey = $this->keygen(strlen($modulus));
+        $publicKey = $this->powmod($gen, $privateKey, $modulus);
+        $ss = $this->powmod($consumerKey, $privateKey, $modulus);
+        
+        $mac = $this->x_or(hash($this->assoc['hash'], $ss, true), $this->shared_secret($this->assoc['hash']));
+        $this->assoc['dh_server_public'] = $this->decb64($publicKey);
+        $this->assoc['mac'] = base64_encode($mac);
+    }
+    
+    /**
+     * XORs two strings.
+     * @param String $a
+     * @param String $b
+     * @return String $a ^ $b
+     */
+    protected function x_or($a, $b)
+    {
+        $length = strlen($a);
+        for($i = 0; $i < $length; $i++) {
+            $a[$i] = $a[$i] ^ $b[$i];
+        }
+        
+        return $a;
+    }
+    
+    /**
+     * Prepares an indirect response url.
+     * @param array $params Parameters to be sent.
+     */
+    protected function response($params)
+    {
+        $params += array('openid.ns' => $this->ns);
+        return $this->data['openid_return_to']
+             . (strpos($this->data['openid_return_to'],'?') ? '&' : '?')
+             . http_build_query($params, '', '&');
+    }
+    
+    /**
+     * Outputs a direct error.
+     */
+    protected function errorResponse()
+    {
+        if(!empty($this->data['openid_return_to'])) {
+            $response = array(
+            'openid.mode'  => 'error',
+            'openid.error' => 'Invalid request'
+            );
+            $this->redirect($this->response($response));
+        } else {
+            header('HTTP/1.1 400 Bad Request');
+            $response = array(
+                'ns' => $this->ns,
+                'error' => 'Invalid request'
+                );
+            echo $this->keyValueForm($response);
+        }
+        die();
+    }
+    
+    /**
+     * Sends an positive assertion.
+     * @param String $identity the OP-Local Identifier that is being authenticated.
+     * @param Array $attributes User attributes to be sent.
+     */
+    protected function positiveResponse($identity, $attributes)
+    {
+        # We generate a private association if there is none established.
+        if(!$this->assoc) {
+            $this->generateAssociation();
+            $this->assoc['private'] = true;
+        }
+        
+        # We set openid.identity (and openid.claimed_id if necessary) to our $identity
+        if($this->data['openid_identity'] == $this->data['openid_claimed_id'] || $this->select_id) {
+            $this->data['openid_claimed_id'] = $identity;
+        }
+        $this->data['openid_identity'] = $identity;
+        
+        # Preparing fields to be signed
+        $params = array(
+            'op_endpoint'    => $this->serverLocation,
+            'claimed_id'     => $this->data['openid_claimed_id'],
+            'identity'       => $this->data['openid_identity'],
+            'return_to'      => $this->data['openid_return_to'],
+            'realm'          => $this->data['openid_realm'],
+            'response_nonce' => gmdate("Y-m-d\TH:i:s\Z"),
+            'assoc_handle'   => $this->assoc['handle'],
+            );
+        
+        $params += $this->responseAttributes($attributes);
+        
+        # Has the RP used an invalid association handle?
+        if (isset($this->data['openid_assoc_handle'])
+            && $this->data['openid_assoc_handle'] != $this->assoc['handle']
+        ) {
+            $params['invalidate_handle'] = $this->data['openid_assoc_handle'];
+        }
+        
+        # Signing the $params
+        $sig = hash_hmac($this->assoc['hash'], $this->keyValueForm($params), $this->assoc['mac'], true);
+        $req = array(
+            'openid.mode'   => 'id_res',
+            'openid.signed' => implode(',', array_keys($params)),
+            'openid.sig'    => base64_encode($sig),
+            );
+        
+        # Saving the nonce and commiting the association.
+        $this->assoc['nonce'] = $params['response_nonce'];
+        $this->setAssoc($this->assoc['handle'], $this->assoc);
+        
+        # Preparing and sending the response itself
+        foreach($params as $name => $value) {
+            $req['openid.' . $name] = $value;
+        }
+        
+        $this->redirect($this->response($req));
+    }
+    
+    /**
+     * Prepares an array of attributes to send
+     */
+    protected function responseAttributes($attributes)
+    {
+        if(!$attributes) return array();
+        
+        $ns = 'http://axschema.org/';
+
+        $response = array();
+        if(isset($this->data['ax'])) {
+            $response['ns.ax'] = 'http://openid.net/srv/ax/1.0';
+            foreach($attributes as $name => $value) {
+                $alias = strtr($name, '/', '_');
+                $response['ax.type.' . $alias] = $ns . $name;
+                $response['ax.value.' . $alias] = $value;
+            }
+            return $response;
+        }
+        
+        foreach($attributes as $name => $value) {
+            if(!isset($this->ax_to_sreg[$name])) {
+                continue;
+            }
+            
+            $response['sreg.' . $this->ax_to_sreg[$name]] = $value;
+        }
+        return $response;
+    }
+    
+    /**
+     * Encodes fields in key-value form.
+     * @param Array $params Fields to be encoded.
+     * @return String $params in key-value form.
+     */
+    protected function keyValueForm($params)
+    {
+        $str = '';
+        foreach($params as $name => $value) {
+            $str .= "$name:$value\n";
+        }
+        
+        return $str;
+    }
+    
+    /**
+     * Responds with an information that the user has canceled authentication.
+     */
+    protected function cancel()
+    {
+        $this->redirect($this->response(array('openid.mode' => 'cancel')));
+    }
+    
+    /**
+     * Converts base64 encoded number to it's decimal representation.
+     * @param String $str base64 encoded number.
+     * @return String Decimal representation of that number.
+     */
+    protected function b64dec($str)
+    {
+        $bytes = unpack('C*', base64_decode($str));
+        $n = 0;
+        foreach($bytes as $byte) {
+            $n = $this->add($this->mul($n, 256), $byte);
+        }
+        
+        return $n;
+    }
+    
+    /**
+     * Complements b64dec.
+     */
+    protected function decb64($num)
+    {
+        $bytes = array();
+        while($num) {
+            array_unshift($bytes, $this->mod($num, 256));
+            $num = $this->div($num, 256);
+        }
+        
+        if($bytes && $bytes[0] > 127) {
+            array_unshift($bytes,0);
+        }
+        
+        array_unshift($bytes, 'C*');
+        
+        return base64_encode(call_user_func_array('pack', $bytes));
+    }
+    
+    function __call($name, $args)
+    {
+        switch($name) {
+        case 'add':
+        case 'mul':
+        case 'pow':
+        case 'mod':
+        case 'div':
+        case 'powmod':
+            if(function_exists('gmp_strval')) {
+                return gmp_strval(call_user_func_array($this->$name, $args));
+            }
+            return call_user_func_array($this->$name, $args);
+        default:
+            throw new BadMethodCallException();
+        }
+    }
+}
-- 
cgit v1.2.3


From d6ab975b188778a0be936c3065b502e0c58b8c91 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 19:48:05 -0800
Subject: operation snakebite continued. openid now works for local accounts
 using the rmagic module and after storing your openid in pconfig. This is
 just an interesting but trivial (in the bigger scheme of things) side effect
 of snakebite. The snake hasn't even waken up yet.

---
 include/auth.php |  10 ++++++
 include/text.php |   4 +++
 mod/openid.php   | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mod/rmagic.php   |  12 +++++--
 4 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 mod/openid.php

diff --git a/include/auth.php b/include/auth.php
index 2b7c385fd..a4e859e0c 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -230,3 +230,13 @@ else {
 		authenticate_success($record, true, true);
 	}
 }
+
+
+function match_openid($authid) {
+	$r = q("select * from pconfig where cat = 'system' and k = 'openid' ");
+	if($r)
+		foreach($r as $rr)
+			if($rr['v'] === $authid)
+				return $rr['uid'];
+	return false;
+}					
diff --git a/include/text.php b/include/text.php
index 2f5accf6e..2bf760035 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1924,3 +1924,7 @@ function in_arrayi($needle, $haystack) {
 	return in_array(strtolower($needle), array_map('strtolower', $haystack));
 }
 
+function normalise_openid($s) {
+	return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
+}
+
diff --git a/mod/openid.php b/mod/openid.php
new file mode 100644
index 000000000..d59d671e7
--- /dev/null
+++ b/mod/openid.php
@@ -0,0 +1,101 @@
+validate()) {
+
+			logger('openid: validate');
+
+			$authid = normalise_openid($_REQUEST['openid_identity']);
+
+			if(! strlen($authid)) {
+				logger( t('OpenID protocol error. No ID returned.') . EOL);
+				goaway(z_root());
+			}
+			
+			$x = match_openid($authid);
+			if($x) {	
+
+				$r = q("select * from channel where channel_id = %d limit 1",
+					intval($x)
+				);
+				if($r) {
+					$y = q("select * from account where account_id = %d limit 1",
+						intval($r[0]['channel_account_id'])
+					);
+					if($y) {
+					    foreach($y as $record) {
+					        if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) {
+			            		logger('mod_openid: openid success for ' . $x[0]['channel_name']);
+								$_SESSION['uid'] = $r[0]['channel_id'];
+								$_SESSION['authenticated'] = true;
+								authenticate_success($record,true,true,true,true);
+								goaway(z_root());
+							}
+						}
+					}
+				}
+			}
+
+			// Successful OpenID login - but we can't match it to an existing account.
+			// New registration?
+
+//			if($a->config['register_policy'] == REGISTER_CLOSED) {
+				notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
+				goaway(z_root());
+//			}
+
+			unset($_SESSION['register']);
+			$args = '';
+			$attr = $openid->getAttributes();
+			if(is_array($attr) && count($attr)) {
+				foreach($attr as $k => $v) {
+					if($k === 'namePerson/friendly')
+						$nick = notags(trim($v));
+					if($k === 'namePerson/first')
+						$first = notags(trim($v));
+					if($k === 'namePerson')
+						$args .= '&username=' . notags(trim($v));
+					if($k === 'contact/email')
+						$args .= '&email=' . notags(trim($v));
+					if($k === 'media/image/aspect11')
+						$photosq = bin2hex(trim($v));
+					if($k === 'media/image/default')
+						$photo = bin2hex(trim($v));
+				}
+			}
+			if($nick)
+				$args .= '&nickname=' . $nick;
+			elseif($first)
+				$args .= '&nickname=' . $first;
+
+			if($photosq)
+				$args .= '&photo=' . $photosq;
+			elseif($photo)
+				$args .= '&photo=' . $photo;
+
+			$args .= '&openid_url=' . notags(trim($authid));
+
+			goaway($a->get_baseurl() . '/register' . $args);
+
+			// NOTREACHED
+		}
+	}
+	notice( t('Login failed.') . EOL);
+	goaway(z_root());
+	// NOTREACHED
+}
diff --git a/mod/rmagic.php b/mod/rmagic.php
index 093ccd328..946277327 100644
--- a/mod/rmagic.php
+++ b/mod/rmagic.php
@@ -23,12 +23,20 @@ function rmagic_init(&$a) {
 function rmagic_post(&$a) {
 
 	$address = trim($_REQUEST['address']);
-	$other = intval($_REQUEST['other']);
 
-	if($other) {
+	if(strpos($address,'@') === false) {
 		$arr = array('address' => $address);
 		call_hooks('reverse_magic_auth', $arr);		
 
+		try {
+			require_once('library/openid/openid.php');
+			$openid = new LightOpenID(z_root());
+			$openid->identity = $address;
+			$openid->returnUrl = z_root() . '/openid'; 
+			goaway($openid->authUrl());
+		} catch (Exception $e) {
+			notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'

                                      '. t('The error message was:').' '.$e->getMessage());
+		}
 
 		// if they're still here...
 		notice( t('Authentication failed.') . EOL);		
-- 
cgit v1.2.3


From ea709361f6a27f3234afbaeb6d3d1759eeca2ee5 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 20:10:43 -0800
Subject: snakebite, cont. magic-auth via openid is now possible, with the
 caveat that one needs a hand-crafted xchan at the moment to make use of it
 and if you wish to do so, there will be no assistance or help provided. The
 risk of system instability and mangled DBs now and going forward is
 significant if you try this.

---
 include/identity.php |  2 +-
 mod/openid.php       | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index d0fffaede..05a228abf 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1137,7 +1137,7 @@ function get_default_profile_photo($size = 175) {
  */
 
 function is_foreigner($s) {
-	return((strpbrk($s,':@')) ? true : false);
+	return((strpbrk($s,'.:@')) ? true : false);
 }
 
 
diff --git a/mod/openid.php b/mod/openid.php
index d59d671e7..42efeac70 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -59,8 +59,26 @@ function openid_content(&$a) {
 				goaway(z_root());
 //			}
 
-			unset($_SESSION['register']);
-			$args = '';
+			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+				dbesc($authid)
+			);				
+
+			if($r) {
+				$_SESSION['authenticated'] = 1;
+				$_SESSION['visitor_id'] = $r[0]['xchan_hash'];
+				$_SESSION['my_address'] = $r[0]['xchan_addr'];
+				$arr = array('xchan' => $r[0], 'session' => $_SESSION);
+				call_hooks('magic_auth_openid_success',$arr);
+				$a->set_observer($r[0]);
+				require_once('include/security.php');
+				$a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
+				info(sprintf( t('Welcome %s. Remote authentication successful.'),$r[0]['xchan_name']));
+				logger('mod_openid: remote auth success from ' . $r[0]['xchan_addr']); 
+				if($_SESSION['return_url'])
+					goaway($_SESSION['return_url']);
+				goaway(z_root());
+			}
+
 			$attr = $openid->getAttributes();
 			if(is_array($attr) && count($attr)) {
 				foreach($attr as $k => $v) {
-- 
cgit v1.2.3


From d5c55250f96e4fc16afc08ae910ac75fa9b43fa6 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 20:24:34 -0800
Subject: remove the exit clause

---
 mod/openid.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mod/openid.php b/mod/openid.php
index 42efeac70..aae8b17d3 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -52,12 +52,6 @@ function openid_content(&$a) {
 			}
 
 			// Successful OpenID login - but we can't match it to an existing account.
-			// New registration?
-
-//			if($a->config['register_policy'] == REGISTER_CLOSED) {
-				notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
-				goaway(z_root());
-//			}
 
 			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($authid)
-- 
cgit v1.2.3


From 309ae2d1e4d54e4940cd619ae4937f710a75b1ca Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 20:33:52 -0800
Subject: update the donation link

---
 README.md        | 2 +-
 mod/siteinfo.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 93dad882b..419793e19 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ The Red Matrix is free and open source distributed under the MIT license.
 
 Please connect with one of the developer channels ("Channel One" would be a good choice) if you are interested in helping us out. 
 
-[Please help us change the world by providing a small donation.](http://pledgie.com/campaigns/18417) (Large donations are also graciously accepted).
+[Please help us change the world by providing a small donation.](http://redmatrix.me/siteinfo) (Large donations are also graciously accepted).
 
 
 If you would like to become a member of the Red Matrix **right now** , please select a public hub from one of our open providers at [https://zothub.com/pubsites](https://zothub.com/pubsites). All sites are interlinked and you can always move to another, so the choice of site can be somewhat arbitrary.
\ No newline at end of file
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 6b962c488..7fdb892d2 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -91,7 +91,7 @@ function siteinfo_content(&$a) {
 	$admininfo = bbcode(get_config('system','admininfo'));
 
 	$project_donate = t('Project Donations');
-	$donate_text = t('
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
                                      ');
+	$donate_text = t('
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better, freer, and privacy respecting web. Select the following option for a one-time donation of your choosing
                                      ');
 	$alternatively = t('
                                      or
                                      ');
 	$recurring = t('Recurring Donation Options');
 	
@@ -99,12 +99,12 @@ function siteinfo_content(&$a) {
 
                                      {$project_donate}
                                      
 $donate_text
 

                                      
-$alternatively
+$alternatively
 

                                      
 
-
                                      $recurring
 
                                      
 
                                      
+
                                      
 
                                      
 EOT;
 
-- 
cgit v1.2.3


From 0b4aa5a39c6cef862b4fbcbc71771f4931a4bc68 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 17 Feb 2014 20:38:30 -0800
Subject: get_theme_uid() - if no uid, look for a system channel and use that.
 This allows default theme/scheme tweaks at the server level.

---
 include/identity.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/identity.php b/include/identity.php
index 05a228abf..d83498a69 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1104,6 +1104,11 @@ function get_theme_uid() {
 		if(! $uid)
 			return local_user();
 	}
+	if(! $uid) {
+		$x = get_sys_channel();
+		if($x)
+			return $x['channel_id'];
+	}	
 	return $uid;
 }
 
-- 
cgit v1.2.3


From aa44d3abab07205a747874b244e71181e4e7a1b0 Mon Sep 17 00:00:00 2001
From: Klaus 
Date: Tue, 18 Feb 2014 17:41:59 +0100
Subject: Let user cancel the red_encrypt dialogue

If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
---
 view/js/crypto.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/view/js/crypto.js b/view/js/crypto.js
index 2e6402c62..c3a37d177 100644
--- a/view/js/crypto.js
+++ b/view/js/crypto.js
@@ -1,5 +1,4 @@
 
-
 function str_rot13 (str) {
   // http://kevin.vanzonneveld.net
   // +   original by: Jonas Raoni Soares Silva (http://www.jsfromhell.com)
@@ -43,7 +42,11 @@ function red_encrypt(alg, elem,text) {
 
 	// key and hint need to be localised
 
-	var enc_key = bin2hex(prompt(aStr['passphrase']));
+        var passphrase = prompt(aStr['passphrase']);
+        // let the user cancel this dialogue
+        if (passphrase == null)
+                return false;
+        var enc_key = bin2hex(passphrase);
 
 	// If you don't provide a key you get rot13, which doesn't need a key
 	// but consequently isn't secure.  
-- 
cgit v1.2.3


From 9a51f8ce650d295e7bc2322b9f2f10b340d8e076 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 18 Feb 2014 14:26:23 -0800
Subject: edit bookmarks

---
 include/menu.php       | 2 +-
 mod/bookmarks.php      | 4 ++--
 mod/openid.php         | 2 +-
 version.inc            | 2 +-
 view/css/mod_mitem.css | 7 +++++++
 view/tpl/mitemlist.tpl | 5 +++--
 view/tpl/usermenu.tpl  | 3 +++
 7 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 view/css/mod_mitem.css

diff --git a/include/menu.php b/include/menu.php
index e9049bf8e..2f1719d0b 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -38,7 +38,7 @@ function menu_render($menu, $edit = false) {
 
 	return replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
-		'$edit' => $edit,
+		'$edit' => (($edit) ? t("Edit") : ''),
 		'$items' => $menu['items']
 	));
 }
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 67208937d..c5be68b8e 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -57,7 +57,7 @@ function bookmarks_content(&$a) {
 	if($x) {
 		foreach($x as $xx) {
 			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
-			$o .= menu_render($y);
+			$o .= menu_render($y,true);
 		}
 	}
 
@@ -69,7 +69,7 @@ function bookmarks_content(&$a) {
 	if($x) {
 		foreach($x as $xx) {
 			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
-			$o .= menu_render($y);
+			$o .= menu_render($y,true);
 		}
 	}
 
diff --git a/mod/openid.php b/mod/openid.php
index aae8b17d3..6f97c6fb9 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -6,7 +6,7 @@ require_once('include/auth.php');
 
 function openid_content(&$a) {
 
-	$noid = get_config('system','no_openid');
+	$noid = get_config('system','disable_openid');
 	if($noid)
 		goaway(z_root());
 
diff --git a/version.inc b/version.inc
index ee51fad76..4551fa398 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-17.591
+2014-02-18.592
diff --git a/view/css/mod_mitem.css b/view/css/mod_mitem.css
new file mode 100644
index 000000000..377d164fe
--- /dev/null
+++ b/view/css/mod_mitem.css
@@ -0,0 +1,7 @@
+.menu-item-list {
+	list-style-type: none;
+}
+
+.mitem-edit {
+	margin-right: 15px;
+}
\ No newline at end of file
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 057665d49..421b610f1 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -4,12 +4,13 @@
 {{$edmenu}}
                                      
 {{$hintnew}}
 
+
                                      
 
                                      
 
 {{if $mlist }}
-
                                        
+
 {{/if}}
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index 3904f4696..80e160fdf 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -2,6 +2,9 @@
 {{if $menu.menu_desc}}
   
                                        {{$menu.menu_desc}}
                                        
 {{/if}}
+{{if $edit}}
+
+{{/if}}
 {{if $items }}
 
                                          
 {{foreach $items as $mitem }}
-- 
cgit v1.2.3


From 7d4916ec714d834db3493c2fc12e76b0ffdb26b2 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 18 Feb 2014 15:17:18 -0800
Subject: service class downgrade to the default service class on account
 expiration if using a non-default service class and account has expired.

---
 include/account.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/poller.php  | 13 +++----------
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/include/account.php b/include/account.php
index 7d1aa598d..242e6512f 100644
--- a/include/account.php
+++ b/include/account.php
@@ -401,3 +401,55 @@ function user_deny($hash) {
 	return true;
 	
 }
+
+
+/**
+ * @function downgrade_accounts()
+ *    Checks for accounts that have past their expiration date.
+ * If the account has a service class which is not the site default, 
+ * the service class is reset to the site default and expiration reset to never.
+ * If the account has no service class it is expired and subsequently disabled.
+ * called from include/poller.php as a scheduled task.
+ *
+ * Reclaiming resources which are no longer within the service class limits is
+ * not the job of this function, but this can be implemented by plugin if desired. 
+ * Default behaviour is to stop allowing additional resources to be consumed. 
+ */
+ 
+
+function downgrade_accounts() {
+
+	$r = q("select * from account where not ( account_flags & %d ) 
+		and account_expires != '0000-00-00 00:00:00' 
+		and account_expires < UTC_TIMESTAMP() ",
+		intval(ACCOUNT_EXPIRED)
+	);
+
+	if(! $r)
+		return;
+
+	$basic = get_config('system','default_service_class');
+
+
+	foreach($r as $rr) {
+
+		if(($basic) && ($rr['account_service_class']) && ($rr['account_service_class'] != $basic)) {
+			$x = q("UPDATE account set account_service_class = '%s', account_expires = '%s'
+				where account_id = %d limit 1",
+				dbesc($basic),
+				dbesc('0000-00-00 00:00:00'),
+				intval($rr['account_id'])
+			);
+			call_hooks('account_downgrade', array('account' => $rr));
+			logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.');
+		}
+		else {
+			$x = q("UPDATE account SET account_flags = (account_flags | %d) where account_id = %d limit 1",
+				intval(ACCOUNT_EXPIRED),
+				intval($rr['account_id'])
+			);
+			call_hooks('account_downgrade', array('account' => $rr));
+			logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' expired.');
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/poller.php b/include/poller.php
index ce9b75eb3..1c6f68eab 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -32,16 +32,6 @@ function poller_run($argv, $argc){
 
 	proc_run('php',"include/queue.php");
 	
-	// expire any expired accounts
-
-	q("UPDATE account 
-		SET account_flags = (account_flags | %d) 
-		where not (account_flags & %d) 
-		and account_expires != '0000-00-00 00:00:00' 
-		and account_expires < UTC_TIMESTAMP() ",
-		intval(ACCOUNT_EXPIRED),
-		intval(ACCOUNT_EXPIRED)
-	);
 
 	// expire any expired mail
 
@@ -115,6 +105,9 @@ function poller_run($argv, $argc){
 
 		q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY");
 
+		// expire any expired accounts
+		require_once('include/account.php');
+		downgrade_accounts();
 
 		// If this is a directory server, request a sync with an upstream
 		// directory at least once a day, up to once every poll interval. 
-- 
cgit v1.2.3


From 5747e20e502cd4504aef4371b30631265579e81c Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 18 Feb 2014 16:59:31 -0800
Subject: some more snakebite and fix up include/account - forgot about that
 inline array stuff

---
 include/account.php |  9 ++++++---
 include/auth.php    |  8 ++++----
 mod/item.php        | 10 ++++++++++
 mod/openid.php      | 51 +++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/include/account.php b/include/account.php
index 242e6512f..1206223d9 100644
--- a/include/account.php
+++ b/include/account.php
@@ -440,7 +440,8 @@ function downgrade_accounts() {
 				dbesc('0000-00-00 00:00:00'),
 				intval($rr['account_id'])
 			);
-			call_hooks('account_downgrade', array('account' => $rr));
+			$ret = array('account' => $rr);
+			call_hooks('account_downgrade', $ret );
 			logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.');
 		}
 		else {
@@ -448,8 +449,10 @@ function downgrade_accounts() {
 				intval(ACCOUNT_EXPIRED),
 				intval($rr['account_id'])
 			);
-			call_hooks('account_downgrade', array('account' => $rr));
+			$ret = array('account' => $rr);
+			call_hooks('account_downgrade', $ret);
 			logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' expired.');
 		}
 	}
-}
\ No newline at end of file
+}
+
diff --git a/include/auth.php b/include/auth.php
index a4e859e0c..425715014 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -233,10 +233,10 @@ else {
 
 
 function match_openid($authid) {
-	$r = q("select * from pconfig where cat = 'system' and k = 'openid' ");
+	$r = q("select * from pconfig where cat = 'system' and k = 'openid' and v = '%s' limit 1",
+		dbesc($authid)
+	);
 	if($r)
-		foreach($r as $rr)
-			if($rr['v'] === $authid)
-				return $rr['uid'];
+		return $r[0]['uid'];
 	return false;
 }					
diff --git a/mod/item.php b/mod/item.php
index fa7720791..dc005bb20 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -453,6 +453,16 @@ function item_post(&$a) {
 		 * the post and we should keep it private. If it's encrypted we have no way of knowing
 		 * so we'll set the permissions regardless and realise that the media may not be 
 		 * referenced in the post. 
+		 *
+		 * What is preventing us from being able to upload photos into comments is dealing with
+		 * the photo and attachment permissions, since we don't always know who was in the 
+		 * distribution for the top level post.
+		 * 
+		 * We might be able to provide this functionality with a lot of fiddling:
+		 * - if the top level post is public (make the photo public)
+		 * - if the top level post was written by us or a wall post that belongs to us (match the top level post)
+		 * - if the top level post has privacy mentions, add those to the permissions.
+		 * - otherwise disallow the photo *or* make the photo public. This is the part that gets messy. 
 		 */
 
 		if(! $preview) {
diff --git a/mod/openid.php b/mod/openid.php
index 6f97c6fb9..e1c71f9ee 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -52,8 +52,9 @@ function openid_content(&$a) {
 			}
 
 			// Successful OpenID login - but we can't match it to an existing account.
+			// See if they've got an xchan
 
-			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+			$r = q("select * from xconfig left join xchan on xchan_hash = xconfig.xchan where cat = 'system' and k = 'openid' and v = '%s' limit 1",
 				dbesc($authid)
 			);				
 
@@ -73,7 +74,22 @@ function openid_content(&$a) {
 				goaway(z_root());
 			}
 
+			// no xchan...
+			// create one.
+			// We should probably probe the openid url.
+
+			$name = $authid;
+			$url = $_REQUEST['openid_identity'];
+			if(strpos($url,'http') === false)
+				$url = 'https://' . $url;
+			$pphoto = get_default_profile_photo();
+			$parsed = @parse_url($url);
+			if($parsed) {
+				$host = $parsed['host'];
+			}
+
 			$attr = $openid->getAttributes();
+
 			if(is_array($attr) && count($attr)) {
 				foreach($attr as $k => $v) {
 					if($k === 'namePerson/friendly')
@@ -81,30 +97,37 @@ function openid_content(&$a) {
 					if($k === 'namePerson/first')
 						$first = notags(trim($v));
 					if($k === 'namePerson')
-						$args .= '&username=' . notags(trim($v));
+						$name = notags(trim($v));
 					if($k === 'contact/email')
-						$args .= '&email=' . notags(trim($v));
+						$addr = notags(trim($v));
 					if($k === 'media/image/aspect11')
-						$photosq = bin2hex(trim($v));
+						$photosq = trim($v);
 					if($k === 'media/image/default')
-						$photo = bin2hex(trim($v));
+						$photo_other = trim($v);
 				}
 			}
-			if($nick)
-				$args .= '&nickname=' . $nick;
-			elseif($first)
-				$args .= '&nickname=' . $first;
+			if(! $nick) {
+				if($first)
+					$nick = $first;
+				else
+					$nick = $name;
+			}
 
+			require_once('library/urlify/URLify.php');
+			$x = strtolower(URLify::transliterate($nick));
+			if(! $addr)
+				$addr = $nick . '@' . $host;
+			$network = 'unknown';
+			
 			if($photosq)
-				$args .= '&photo=' . $photosq;
+				$pphoto = $photosq;
 			elseif($photo)
-				$args .= '&photo=' . $photo;
-
-			$args .= '&openid_url=' . notags(trim($authid));
+				$pphoto = $photo;
 
-			goaway($a->get_baseurl() . '/register' . $args);
+			// add the xchan record and xconfig for the openid
 
 			// NOTREACHED
+			// actually it is reached until the other bits get written
 		}
 	}
 	notice( t('Login failed.') . EOL);
-- 
cgit v1.2.3


From 87bb568d678c88efacc5d849af7a474e8efc9359 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 18 Feb 2014 19:17:11 -0800
Subject: change edit/delete to icons on filestorage page

---
 view/tpl/filestorage.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl
index 7b88c6440..1995b95e1 100644
--- a/view/tpl/filestorage.tpl
+++ b/view/tpl/filestorage.tpl
@@ -2,13 +2,14 @@
 
 	   
                                          
 		{{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}}
-
+		
                                          
+		
                                          
 
 		{{foreach $files as $key => $items}} 
 				{{foreach $items as $item}}
 					
                                          
-					{{$edit}}   |
-					{{$delete}} |   
+					    
+					    
 					{{if ! $item.dir}}{{/if}}{{$item.title}}{{if ! $item.dir}}{{/if}}
 					{{if ! $item.dir}} | {{$item.size}} bytes{{else}}{{$directory}}{{/if}}
 
-- 
cgit v1.2.3


From 6ac81c936077caa7167ddc3a2eb3c1022826d5d9 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Tue, 18 Feb 2014 19:47:13 -0800
Subject: fix zrl bookmarks which broke with this checkin: c9192991c95a5145 It
 was documented that:   Issues: Currently the order of HTML parameters in the
 text is somewhat rigid and inflexible. but as that was in a different
 function it was easy to overlook.

---
 include/text.php | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/include/text.php b/include/text.php
index 2bf760035..dfd35c769 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1324,24 +1324,15 @@ function prepare_text($text,$content_type = 'text/bbcode') {
 
 
 function zidify_callback($match) {
-	if (feature_enabled(local_user(),'sendzid')) {
-		$replace = '
Date: Tue, 18 Feb 2014 20:59:25 -0800
Subject: introduce a new privacy level "PERMS_AUTHED" to indicate somebody
 that is able to successfully authenticate (but is not necessarily in this
 network).

---
 boot.php                |  1 +
 include/auth.php        |  2 +-
 include/permissions.php |  8 ++++++
 mod/openid.php          | 68 +++++++++++++++++++++++++++++++++++++++++++------
 mod/settings.php        |  3 ++-
 view/js/mod_settings.js | 24 ++++++++---------
 6 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/boot.php b/boot.php
index b875014bd..1d8ec2143 100755
--- a/boot.php
+++ b/boot.php
@@ -279,6 +279,7 @@ define ( 'PERMS_NETWORK'    , 0x0002 );
 define ( 'PERMS_SITE'       , 0x0004 );
 define ( 'PERMS_CONTACTS'   , 0x0008 );
 define ( 'PERMS_SPECIFIC'   , 0x0080 );
+define ( 'PERMS_AUTHED'     , 0x0100 );
 
 
 // Address book flags
diff --git a/include/auth.php b/include/auth.php
index 425715014..a3b028c73 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -93,7 +93,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 			}
 		}
 
-		$r = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_hash = '%s' limit 1",
+		$r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1",
 			dbesc($_SESSION['visitor_id'])
 		);
 		if($r) {
diff --git a/include/permissions.php b/include/permissions.php
index 0cbb5b984..eb1a7966f 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -88,6 +88,11 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
 		// These take priority over all other settings.
 
 		if($observer_xchan) {
+			if($r[0][$channel_perm] & PERMS_AUTHED) {
+				$ret[$perm_name] = true;
+				continue;
+			}
+			
 			if(! $abook_checked) {
 				$x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash
 					where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
@@ -240,6 +245,9 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
 		return false;
 
 	if($observer_xchan) {
+		if($r[0][$channel_perm] & PERMS_AUTHED)
+			return true;
+
 		$x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash 
 			where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
 			intval($uid),
diff --git a/mod/openid.php b/mod/openid.php
index e1c71f9ee..1ab8749ee 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -76,10 +76,11 @@ function openid_content(&$a) {
 
 			// no xchan...
 			// create one.
-			// We should probably probe the openid url.
+			// We should probably probe the openid url and figure out if they have any kind of social presence we might be able to 
+			// scrape some identifying info from. 
 
 			$name = $authid;
-			$url = $_REQUEST['openid_identity'];
+			$url = trim($_REQUEST['openid_identity'],'/');
 			if(strpos($url,'http') === false)
 				$url = 'https://' . $url;
 			$pphoto = get_default_profile_photo();
@@ -115,19 +116,70 @@ function openid_content(&$a) {
 
 			require_once('library/urlify/URLify.php');
 			$x = strtolower(URLify::transliterate($nick));
-			if(! $addr)
+			if($nick & $host)
 				$addr = $nick . '@' . $host;
 			$network = 'unknown';
 			
 			if($photosq)
 				$pphoto = $photosq;
-			elseif($photo)
-				$pphoto = $photo;
+			elseif($photo_other)
+				$pphoto = $photo_other;
+
+	        $x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
+                xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date, 
+				xchan_name_date, xchan_flags)
+                values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ",
+	            dbesc($url),
+    	        dbesc(''),
+        	    dbesc(''),
+            	dbesc(''),
+	            dbesc('image/jpeg'),
+    	        dbesc($pphoto),
+        	    dbesc($addr),
+            	dbesc($url),
+	            dbesc(''),
+    	        dbesc(''),
+        	    dbesc(''),
+            	dbesc($name),
+	            dbesc($network),
+    	        dbesc(datetime_convert()),
+        	    dbesc(datetime_convert()),
+            	intval(XCHAN_FLAGS_HIDDEN)
+        	);
+			if($x) {
+				$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+					dbesc($url)
+				);
+				if($r) {
+
+					$photos = import_profile_photo($pphoto,$url);
+					if($photos) {
+						$z = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', 
+							xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1",
+							dbesc(datetime_convert()),
+							dbesc($photos[0]),
+							dbesc($photos[1]),
+							dbesc($photos[2]),
+							dbesc($photos[3]),
+							dbesc($url)
+	            		);
+					}
 
-			// add the xchan record and xconfig for the openid
+					set_xconfig($url,'system','openid',$authid);
+					$_SESSION['authenticated'] = 1;
+					$_SESSION['visitor_id'] = $r[0]['xchan_hash'];
+					$_SESSION['my_address'] = $r[0]['xchan_addr'];
+					$arr = array('xchan' => $r[0], 'session' => $_SESSION);
+					call_hooks('magic_auth_openid_success',$arr);
+					$a->set_observer($r[0]);
+					info(sprintf( t('Welcome %s. Remote authentication successful.'),$r[0]['xchan_name']));
+					logger('mod_openid: remote auth success from ' . $r[0]['xchan_addr']); 
+					if($_SESSION['return_url'])
+						goaway($_SESSION['return_url']);
+					goaway(z_root());
+				}
+			}
 
-			// NOTREACHED
-			// actually it is reached until the other bits get written
 		}
 	}
 	notice( t('Login failed.') . EOL);
diff --git a/mod/settings.php b/mod/settings.php
index 97965d0fd..5b0a8e8f2 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -798,6 +798,7 @@ function settings_content(&$a) {
 			array( t('Anybody in your address book'), PERMS_CONTACTS),
 			array( t('Anybody on this website'), PERMS_SITE),
 			array( t('Anybody in this network'), PERMS_NETWORK),
+			array( t('Anybody authenticated'), PERMS_AUTHED),
 			array( t('Anybody on the internet'), PERMS_PUBLIC)
 		);
 
@@ -979,7 +980,7 @@ function settings_content(&$a) {
 			'$h_descadvn' => t('Change the behaviour of this account for special situations'),
 			'$pagetype' => $pagetype,
 			'$expert' => feature_enabled(local_user(),'expert'),
-			'$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'),
+			'$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'),
 		
 		));
 
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 16101db57..8cd062f43 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -72,12 +72,12 @@ function channel_privacy_macro(n) {
 		$('#id_profile_in_directory').val(0);
 	}
     if(n == 2) {
-        $('#id_view_stream option').eq(5).attr('selected','selected');
-        $('#id_view_profile option').eq(5).attr('selected','selected');
-        $('#id_view_photos option').eq(5).attr('selected','selected');
-        $('#id_view_contacts option').eq(5).attr('selected','selected');
-        $('#id_view_storage option').eq(5).attr('selected','selected');
-        $('#id_view_pages option').eq(5).attr('selected','selected');
+        $('#id_view_stream option').eq(6).attr('selected','selected');
+        $('#id_view_profile option').eq(6).attr('selected','selected');
+        $('#id_view_photos option').eq(6).attr('selected','selected');
+        $('#id_view_contacts option').eq(6).attr('selected','selected');
+        $('#id_view_storage option').eq(6).attr('selected','selected');
+        $('#id_view_pages option').eq(6).attr('selected','selected');
         $('#id_send_stream option').eq(2).attr('selected','selected');
         $('#id_post_wall option').eq(1).attr('selected','selected');
         $('#id_post_comments option').eq(2).attr('selected','selected');
@@ -95,12 +95,12 @@ function channel_privacy_macro(n) {
 		$('#id_profile_in_directory').val(1);
 	}
     if(n == 3) {
-        $('#id_view_stream option').eq(5).attr('selected','selected');
-        $('#id_view_profile option').eq(5).attr('selected','selected');
-        $('#id_view_photos option').eq(5).attr('selected','selected');
-        $('#id_view_contacts option').eq(5).attr('selected','selected');
-        $('#id_view_storage option').eq(5).attr('selected','selected');
-        $('#id_view_pages option').eq(5).attr('selected','selected');
+        $('#id_view_stream option').eq(6).attr('selected','selected');
+        $('#id_view_profile option').eq(6).attr('selected','selected');
+        $('#id_view_photos option').eq(6).attr('selected','selected');
+        $('#id_view_contacts option').eq(6).attr('selected','selected');
+        $('#id_view_storage option').eq(6).attr('selected','selected');
+        $('#id_view_pages option').eq(6).attr('selected','selected');
         $('#id_send_stream option').eq(4).attr('selected','selected');
         $('#id_post_wall option').eq(4).attr('selected','selected');
         $('#id_post_comments option').eq(4).attr('selected','selected');
-- 
cgit v1.2.3


From c09087262c29c093762e91b280fa452c7b935ce9 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Wed, 19 Feb 2014 18:42:37 +0100
Subject: bootstrapify the nav

---
 view/css/bootstrap-red.css                 |  48 +++++
 view/css/default.css                       |  14 +-
 view/css/widgets.css                       |   3 +
 view/js/main.js                            |  89 +++------
 view/theme/redbasic/css/style.css          |  88 ++++----
 view/theme/redbasic/tpl/theme_settings.tpl |   4 +-
 view/tpl/head.tpl                          |   1 +
 view/tpl/nav.tpl                           | 311 ++++++++++++++++-------------
 8 files changed, 308 insertions(+), 250 deletions(-)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 73c06fd4b..89117ac1c 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -65,3 +65,51 @@ margin-left: 0px;
 float:none;
 margin-left:0px;
 }
+
+/* nav overrides */
+
+nav .badge {
+	position: relative;
+	top: -48px;
+	float: left;
+	font-size: 10px;
+	padding: 2px 6px;
+	cursor: pointer;
+}
+
+nav .dropdown-menu {
+	top: 51px;
+	max-height: 450px;
+	max-width: 300px;
+	overflow-y: auto;
+	margin-top: 0px;
+}
+
+nav .dropdown-menu .contactname {
+	padding-top: 2px;
+	font-weight: bold;
+	display: block;
+}
+
+nav .dropdown-menu img {
+	float: left;
+	margin-right: 5px;
+	width: 32px;
+	height: 32px;
+}
+
+nav .dropdown-menu li a {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	line-height: 1em;
+	padding: 5px 10px;
+}
+
+nav .navbar-collapse {
+	max-height: 450px;
+}
+
+nav .navbar-right li:last-child {
+	padding-right: 20px;
+}
+/* nav overrides end */
diff --git a/view/css/default.css b/view/css/default.css
index 27df38dee..4afcbf1d5 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,18 +1,8 @@
-
-nav {
-	height: 24px;
-	display: block;
-	position: fixed;
-	width: 100%;
-	z-index: 100;
-	background-color: #ff0000;
-}
-
 aside#region_1 {
 	display: block;
 	width: 210px;
 	position: absolute;
-	top: 48px;
+	top: 65px;
 	left: 0;
 	margin-left: 10px;
 }
@@ -24,7 +14,7 @@ aside input[type='text'] {
 
 section {
 	position: absolute;
-	top: 48px;
+	top: 65px;
 	left: 250px;
 	display: block;
 	right: 15px;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 7ad6d79e5..dcda66b81 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -109,6 +109,9 @@
 	opacity: 0;
 }
 
+li:hover .group-edit-icon {
+	opacity: 1;
+}
 /* affinity - slider */
 
 #main-slider {
diff --git a/view/js/main.js b/view/js/main.js
index 44cb79949..fa96596f4 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -197,58 +197,34 @@
 		/* setup field_richtext */
 		setupFieldRichtext();
 
-		/* popup menus */
-		function close_last_popup_menu() {
- 			if(last_popup_menu) {
- 				last_popup_menu.hide();
-/* 				last_popup_button.removeClass("selected"); */
-	 			last_popup_menu = null;
- 				last_popup_button = null;
- 			}	
-		}
 
 		/* Turn elements with one of our special rel tags into popup menus */
+		/* CHANGES: let bootstrap handle popups and only do the loading here */
 	
 		$('a[rel^=#]').click(function(e){
 				manage_popup_menu(this,e);
-				return false;
+				return;
 		});
 
 		$('span[rel^=#]').click(function(e){
 				manage_popup_menu(this,e);
-				return false;
+				return;
 		});
 
 
 		function manage_popup_menu(w,e) {
-			close_last_popup_menu();
 			menu = $( $(w).attr('rel') );
-			e.preventDefault();
-			e.stopPropagation();
-			if (menu.attr('popup')=="false") return false;
-/*			$(w).parent().toggleClass("selected"); */
+
 			/* notification menus are loaded dynamically 
 			 * - here we find a rel tag to figure out what type of notification to load */
+
 			var loader_source = $(menu).attr('rel');
 		
 			if(typeof(loader_source) != 'undefined' && loader_source.length) {	
 				notify_popup_loader(loader_source);
 			}
-			menu.toggle();
-			if (menu.css("display") == "none") {
-				last_popup_menu = null;
-				last_popup_button = null;
-			} else {
-				last_popup_menu = menu;
-				last_popup_button = $(w).parent();
-			}
-			return false;
 		}
-	
-		$('html').click(function() {
-			close_last_popup_menu();
-		});
-		
+
 		// fancyboxes
 		$("a.popupbox").fancybox({
 			'transitionIn' : 'elastic',
@@ -324,46 +300,46 @@
 
 				if(data.network == 0) { 
 					data.network = ''; 
-					$('#net-update').removeClass('show') 
+					$('.net-update').removeClass('show')
 				} 
 				else { 
-					$('#net-update').addClass('show') 
+					$('.net-update').addClass('show')
 				}
-				$('#net-update').html(data.network);
+				$('.net-update').html(data.network);
 
-				if(data.home == 0) { data.home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
-				$('#home-update').html(data.home);
+				if(data.home == 0) { data.home = ''; $('.home-update').removeClass('show') } else { $('.home-update').addClass('show') }
+				$('.home-update').html(data.home);
 			
 
-				if(data.intros == 0) { data.intros = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
-				$('#intro-update').html(data.intros);
+				if(data.intros == 0) { data.intros = ''; $('.intro-update').removeClass('show') } else { $('.intro-update').addClass('show') }
+				$('.intro-update').html(data.intros);
 
-				if(data.mail == 0) { data.mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
-				$('#mail-update').html(data.mail);
+				if(data.mail == 0) { data.mail = ''; $('.mail-update').removeClass('show') } else { $('.mail-update').addClass('show') }
+				$('.mail-update').html(data.mail);
 			
 
-				if(data.notify == 0) { data.notify = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-				$('#notify-update').html(data.notify);
+				if(data.notify == 0) { data.notify = ''; $('.notify-update').removeClass('show') } else { $('.notify-update').addClass('show') }
+				$('.notify-update').html(data.notify);
 
-				if(data.register == 0) { data.register = ''; $('#register-update').removeClass('show') } else { $('#register-update').addClass('show') }
-				$('#register-update').html(data.register);
+				if(data.register == 0) { data.register = ''; $('.register-update').removeClass('show') } else { $('.register-update').addClass('show') }
+				$('.register-update').html(data.register);
 
-				if(data.events == 0) { data.events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
-				$('#events-update').html(data.events);
+				if(data.events == 0) { data.events = ''; $('.events-update').removeClass('show') } else { $('.events-update').addClass('show') }
+				$('.events-update').html(data.events);
 
-				if(data.events_today == 0) { data.events_today = ''; $('#events-today-update').removeClass('show') } else { $('#events-today-update').addClass('show') }
-				$('#events-today-update').html(data.events_today);
+				if(data.events_today == 0) { data.events_today = ''; $('.events-today-update').removeClass('show') } else { $('.events-today-update').addClass('show') }
+				$('.events-today-update').html(data.events_today);
 
-				if(data.birthdays == 0) { data.birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
-				$('#birthdays-update').html(data.birthdays);
+				if(data.birthdays == 0) { data.birthdays = ''; $('.birthdays-update').removeClass('show') } else { $('.birthdays-update').addClass('show') }
+				$('.birthdays-update').html(data.birthdays);
 
-				if(data.birthdays_today == 0) { data.birthdays_today = ''; $('#birthdays-today-update').removeClass('show') } else { $('#birthdays-today-update').addClass('show') }
-				$('#birthdays-today-update').html(data.birthdays_today);
+				if(data.birthdays_today == 0) { data.birthdays_today = ''; $('.birthdays-today-update').removeClass('show') } else { $('.birthdays-today-update').addClass('show') }
+				$('.birthdays-today-update').html(data.birthdays_today);
 
-				if(data.all_events == 0) { data.all_events = ''; $('#all_events-update').removeClass('show') } else { $('#all_events-update').addClass('show') }
-				$('#all_events-update').html(data.all_events);
-				if(data.all_events_today == 0) { data.all_events_today = ''; $('#all_events-today-update').removeClass('show') } else { $('#all_events-today-update').addClass('show') }
-				$('#all_events-today-update').html(data.all_events_today);
+				if(data.all_events == 0) { data.all_events = ''; $('.all_events-update').removeClass('show') } else { $('.all_events-update').addClass('show') }
+				$('.all_events-update').html(data.all_events);
+				if(data.all_events_today == 0) { data.all_events_today = ''; $('.all_events-today-update').removeClass('show') } else { $('.all_events-today-update').addClass('show') }
+				$('.all_events-today-update').html(data.all_events_today);
 
 
 				$(data.notice).each(function() {
@@ -671,8 +647,7 @@ function updateConvItems(mode,data) {
 
 
 				$(data.notify).each(function() {
-					text = ""+this.name+"" + ' ' + this.message + '
                                          ';
-					html = notifications_tpl.format(this.notify_link,this.photo,text,this.when,this.class);
+					html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class);
 					$("#nav-" + notifyType + "-menu").append(html);
 				});
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 78fdac0cd..127f09683 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -140,6 +140,8 @@ blockquote {
 	filter:alpha(opacity=100);
 }
 
+/* this is not yet supported
+
 nav {
 	background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
 	background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
@@ -151,8 +153,6 @@ nav {
 
 }
 
-
-
 nav:hover {
 	background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 	background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
@@ -163,7 +163,7 @@ nav:hover {
 	filter:alpha(opacity=100);
 
 }
-
+*/
 
 nav #site-location {
 	color: #888a85;
@@ -204,15 +204,15 @@ header #site-location {
 }
 
 header #banner {
-
   overflow: hidden;
   text-align: center;
-  font-size: 1.4em;
+  font-size: 14px;
   font-family: tahoma, "Lucida Sans", sans;
   color: $banner_colour;
   font-weight: bold;
-  margin-top: 1px;
+  margin: 14px;
 }
+
 header #banner a,
 header #banner a:active,
 header #banner a:visited,
@@ -879,8 +879,8 @@ footer {
 }
 
 #nav-search-spinner {
-	float: right;
-	margin: 12px 12px 0px 0px;
+	float: left;
+	margin: 25px 0px 0px 25px;
 	color: #fff;
 }
 
@@ -892,6 +892,7 @@ footer {
 
 #nav-search-text {
 	height: 20px;
+	margin: 15px;
 	padding: 0px 5px 0px 5px;
 	border-radius: 10px;
 	border: none;
@@ -919,11 +920,6 @@ footer {
 	font-family: FontAwesome;
 }
 
-#nav-user-linkmenu img {
-	border-radius: $radiuspx;
-	margin-top: -4px;
-}
-
 .nav-dropdown-indicator {
     opacity: 0.8;
     filter:alpha(opacity=80);
@@ -1548,8 +1544,8 @@ div.jGrowl div.info {
 
 #nav-search-text-ac .autocomplete {
 	position: fixed;
-	top: 24px;
-	border: 1px solid $nav_bg_1;
+	top: 51px;
+	border: 1px solid #222;
 	border-top: none;
 }
 
@@ -1628,26 +1624,6 @@ nav .fakelink:hover { text-decoration: none; }
 	color: #000000;
 }
 
-nav ul {
-  margin: 0px;
-  padding: 0px 20px;
-}
-nav ul li {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  float: left;
-}
-nav ul li .menu-popup {
-  left: 0px;
-  right: auto;
-  top: 33px;
-}
-
-#nav-user-linkmenu {
-	margin-left: 5px;
-}
-
 nav .nav-menu-icon {
   position: relative;
   height: 22px;
@@ -1785,13 +1761,10 @@ header {
   position: fixed;
   left: 43%;
   right: 43%;
-  top: 0px;
   margin: 0px;
   padding: 0px;
-  /*width: 100%; height: 12px; */
-
-  z-index: 110;
-  color: #ffffff;
+  z-index: 1400;
+  color: #fff;
 }
 
 
@@ -2469,3 +2442,38 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	background-color: #eee;
 }
+
+/* nav bootstrap */
+nav i {
+	font-size: 14px;
+}
+
+nav img {
+	height: 47px;
+	width: 47px;
+	margin: 2px 0px 1px 10px;
+	border-radius: $radiuspx;
+}
+
+nav ul li {
+	max-height: 50px
+}
+
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link {
+  color: #333;
+}
+
+nav .badge {
+	border-radius: $radiuspx;
+}
+
+nav .dropdown-menu {
+	font-size: $body_font_size;
+	border-top-right-radius: 0px;
+	border-top-left-radius: 0px;
+	border-bottom-right-radius: $radiuspx;
+	border-bottom-left-radius: $radiuspx;
+}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index ca05986a2..cc573d99e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -4,7 +4,7 @@
 
                                          
 
 {{if $expert}}
-{{include file="field_select.tpl" field=$nav_colour}}
+{{* include file="field_select.tpl" field=$nav_colour *}}
 {{include file="field_input.tpl" field=$banner_colour}}
 {{include file="field_input.tpl" field=$link_colour}}
 {{include file="field_input.tpl" field=$bgcolour}}
@@ -19,7 +19,7 @@
 {{include file="field_input.tpl" field=$radius}}
 {{include file="field_input.tpl" field=$shadow}}
 {{include file="field_input.tpl" field=$converse_width}}
-{{include file="field_input.tpl" field=$nav_min_opacity}}
+{{* include file="field_input.tpl" field=$nav_min_opacity *}}
 {{include file="field_input.tpl" field=$top_photo}}
 {{include file="field_input.tpl" field=$reply_photo}}
 {{include file="field_checkbox.tpl" field=$sloppy_photos}}
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index eb4c6c2ad..b96c46dd7 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,5 +1,6 @@
 
 
+
 
 
 
+	
 
-
                                          
 
+
+{{if $menus}}
+
                                          {{$lbl_misc}}
                                          
+
+
                                          {{$menu_desc}}
                                          
+
                                          
+
+
                                          
+
                                          
+
+
                                          
+
                                          
+{{/if}}
+
+
 
                                      
-- 
cgit v1.2.3


From 6eb971656ef1710596084fdaa0ae3085df2c2101 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 20 Feb 2014 01:35:08 -0800
Subject: believe i found the issue which was causing hundreds/thousands of
 identical hublocs to be created

---
 include/zot.php  | 21 ++++++++++++---------
 mod/settings.php |  2 +-
 version.inc      |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/zot.php b/include/zot.php
index c9d426cc2..a7094b2ad 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -748,6 +748,16 @@ function import_xchan($arr,$ud_flags = 1) {
 				}
 			}
 
+			if(! $location['sitekey']) {
+				logger('import_xchan: empty hubloc sitekey. ' . print_r($location,true));
+				continue;
+			}
+
+			// Catch some malformed entries from the past which still exist
+
+			if(strpos($location['address'],'/') !== false)
+				$location['address'] = substr($location['address'],0,strpos($location['address'],'/'));
+
 			// match as many fields as possible in case anything at all changed. 
 
 			$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
@@ -804,14 +814,6 @@ function import_xchan($arr,$ud_flags = 1) {
 				continue;
 			}
 
-			if(! $location['sitekey']) {
-				logger('import_xchan: empty hubloc sitekey. ' . print_r($location,true));
-				continue;
-			}
-
-			if(strpos($location['address'],'/') !== false)
-				$location['address'] = substr($location['address'],0,strpos($location['address'],'/'));
-
 			// new hub claiming to be primary. Make it so.
 
 			if(intval($location['primary'])) {
@@ -840,9 +842,11 @@ function import_xchan($arr,$ud_flags = 1) {
 			);
 			$what .= 'newhub ';
 			$changed = true;
+
 		}
 
 		// get rid of any hubs we have for this channel which weren't reported.
+
 		if($xisting) {
 			foreach($xisting as $x) {
 				if(! array_key_exists('updated',$x)) {
@@ -855,7 +859,6 @@ function import_xchan($arr,$ud_flags = 1) {
 				}
 			}
 		}
-
 	}
 
 	// Are we a directory server of some kind?
diff --git a/mod/settings.php b/mod/settings.php
index e9f4c9f8d..b88380ff0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -261,7 +261,7 @@ function settings_post(&$a) {
 	$maxreq           = ((x($_POST,'maxreq'))     ? intval($_POST['maxreq'])             : 0);
 	$expire           = ((x($_POST,'expire'))     ? intval($_POST['expire'])             : 0);
 	$def_group          = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : '');
-	$channel_menu     = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu'])) : '');
+	$channel_menu     = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : '');
 
 	$expire_items     = ((x($_POST,'expire_items')) ? intval($_POST['expire_items'])	 : 0);
 	$expire_starred   = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
diff --git a/version.inc b/version.inc
index 9e1971efd..12484d724 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-19.593
+2014-02-20.594
-- 
cgit v1.2.3


From a7194bc79a83bc7269a20a3c7ff2eb3d368527cb Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 20 Feb 2014 01:44:29 -0800
Subject: fix the broken hublocs in an update

---
 boot.php           |  2 +-
 install/update.php | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 1d8ec2143..e7f583b44 100755
--- a/boot.php
+++ b/boot.php
@@ -46,7 +46,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
 
-define ( 'DB_UPDATE_VERSION',       1097  );
+define ( 'DB_UPDATE_VERSION',       1098  );
 
 define ( 'EOL',                    '
                                      ' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/install/update.php b/install/update.php
index ccfec9ddf..3e39a5b4c 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 
Date: Thu, 20 Feb 2014 01:49:40 -0800
Subject: use the medium size photo on the nav bar if that photo stays larger,
 as the small one usually looks awful when you scale it up.

---
 include/nav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/nav.php b/include/nav.php
index 8fef4a1f9..dd15ff411 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -95,7 +95,7 @@ EOT;
 
 	if($observer) {
 			$userinfo = array(
-			'icon' => $observer['xchan_photo_s'],
+			'icon' => $observer['xchan_photo_m'],
 			'name' => $observer['xchan_addr'],
 		);
 	}
-- 
cgit v1.2.3


From 4944070e79d4914ba0503e6e90c194cbd766dc38 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 20 Feb 2014 02:30:37 -0800
Subject: vsprintf error on update

---
 include/Contact.php | 4 ++--
 install/update.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/Contact.php b/include/Contact.php
index 2dab62fd8..09f7925cb 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -81,7 +81,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
 		if($a->poi) {
 			$xchan = $a->poi;
 		}
-		elseif($a->profile['channel_hash']) {
+		elseif(is_array($a->profile) && $a->profile['channel_hash']) {
 			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($a->profile['channel_hash'])
 			);
@@ -114,7 +114,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
 					
 	return replace_macros(get_markup_template('xchan_vcard.tpl'),array(
 		'$name'    => $xchan['xchan_name'],
-		'$photo'   => ((array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']),
+		'$photo'   => ((is_array($a->profile) && array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']),
 		'$follow'  => $xchan['xchan_addr'],
 		'$connect' => $connect,
 		'$newwin'  => (($mode === 'chanview') ? t('New window') : ''),
diff --git a/install/update.php b/install/update.php
index 3e39a5b4c..7d1305863 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1088,7 +1088,7 @@ function update_r1097() {
 
 	// fix some mangled hublocs from a bug long ago
 
-	$r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%/%'");
+	$r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%%/%%'");
 	if($r) {
 		foreach($r as $rr) {
 			q("update hubloc set hubloc_addr = '%s' where hubloc_id = %d limit 1",
-- 
cgit v1.2.3


From a3191996e72012c2c4e0b50003755e4984ad1e99 Mon Sep 17 00:00:00 2001
From: marijus 
Date: Thu, 20 Feb 2014 19:54:16 +0100
Subject: fixes issue #326 initial scale to big

---
 view/tpl/head.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index b96c46dd7..c676cd773 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
 
                                      
 
diff --git a/doc/html/classRedBrowser.html b/doc/html/classRedBrowser.html
index 19a02f9e4..c1a5e5ad9 100644
--- a/doc/html/classRedBrowser.html
+++ b/doc/html/classRedBrowser.html
@@ -107,6 +107,7 @@ $(document).ready(function(){initNavTree('classRedBrowser.html','');});
 
                                      
   
                                      
 Public Member Functions |
+Protected Member Functions |
 Private Attributes |
 List of all members  
                                      
   
                                      
@@ -133,6 +134,11 @@ Public Member Functions
  htmlActionsPanel (DAV\INode $node, &$output)
  
 
+
+
+
+
                                      
+Protected Member Functions
                                       getAssetUrl ($assetName)
                                       
                                      
@@ -170,6 +176,40 @@ Private Attributes
                                      
 
                                      
 Private Attributes
                                      
 
                                       $auth
                                      
       
                                      
 
                                      
 
+
                                      
+
                                      
+
+
                                      
+
                                      
+
+  
+  
+  
+  
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      RedBrowser::getAssetUrl ( $assetName)
                                      
+                                        		
+protected  
                                      
+
                                      
+
                                      This method takes a path/name of an asset and turns it into url suiteable for http access.
                                      
+
                                      Parameters
                                      
+  
+    
+  
                                      string$assetName
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      string 
                                      
+
+
                                      Referenced by generateDirectoryIndex().
                                      
+
 
                                      
 
                                      
 
diff --git a/doc/html/classRedBrowser.js b/doc/html/classRedBrowser.js
index c0222b8f9..b6e9b2a91 100644
--- a/doc/html/classRedBrowser.js
+++ b/doc/html/classRedBrowser.js
@@ -2,6 +2,7 @@ var classRedBrowser =
 [
     [ "__construct", "classRedBrowser.html#a4b76be9ccef0262cf78fffb4129eda93", null ],
     [ "generateDirectoryIndex", "classRedBrowser.html#a1f7daf50bb9bfcde7345b3b1908dbd7e", null ],
+    [ "getAssetUrl", "classRedBrowser.html#a87529b4988a7777b49616f5c0a1c55d3", null ],
     [ "htmlActionsPanel", "classRedBrowser.html#a7f6bf0bda07833f4c647557bd172e349", null ],
     [ "set_writeable", "classRedBrowser.html#a40fdbb9d9fe6c1243bbf135dd5b0a06f", null ],
     [ "$auth", "classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35", null ]
diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html
index 62bef946e..ba5154227 100644
--- a/doc/html/datetime_8php.html
+++ b/doc/html/datetime_8php.html
@@ -334,7 +334,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().
                                      
+
                                      Referenced by account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_directory_entry(), update_modtime(), update_queue_time(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().
                                      
 
 
                                      
 
diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html
index 13b1374ea..8c47a8a44 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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(), local_dir_update(), 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(), menu_list(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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(), achievements_content(), acl_init(), admin_page_users(), 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_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), 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(), RedDirectory\createFile(), 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(), downgrade_accounts(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), RedDirectory\getDir(), RedDirectory\getLastModified(), 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_rss(), 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(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), 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(), RedFile\put(), queue_run(), rconnect_url(), red_zrl_callback(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedFile\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(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), vote_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().
                                      
 
 
                                      
 
@@ -318,7 +318,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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), 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(), chat_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), 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(), 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(), oembed_fetch_url(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), 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().
                                      
+
                                      Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), 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_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), bookmark_add(), bookmarks_init(), 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(), chat_content(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), 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(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), downgrade_accounts(), 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(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), 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_rss(), 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(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), match_content(), match_openid(), 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(), 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(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), 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(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), photo_driver\save(), search_ac_init(), search_content(), 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(), RedFile\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(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), tryzrlaudio(), tryzrlvideo(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_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_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
index 6d9fb9f31..bbf142733 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
@@ -238,6 +238,8 @@ Files
  
 file  online.php
  
+file  openid.php
+ 
 file  opensearch.php
  
 file  page.php
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index cc5010eed..1fd7d42d1 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -67,6 +67,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "oembed.php", "mod_2oembed_8php.html", "mod_2oembed_8php" ],
     [ "oexchange.php", "oexchange_8php.html", "oexchange_8php" ],
     [ "online.php", "online_8php.html", "online_8php" ],
+    [ "openid.php", "openid_8php.html", "openid_8php" ],
     [ "opensearch.php", "opensearch_8php.html", "opensearch_8php" ],
     [ "page.php", "page_8php.html", "page_8php" ],
     [ "parse_url.php", "parse__url_8php.html", "parse__url_8php" ],
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
index 04b0ad01b..9e31544c7 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -120,6 +120,7 @@ Files
 file  api.php
  
 file  attach.php
+ File/attach API with the potential for revision control. 
                                      
  
 file  auth.php
  
@@ -196,6 +197,7 @@ Files
 file  items.php
  
 file  language.php
+ translation support 
                                      
  
 file  menu.php
  
diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html
index 7a998ee4f..2a5b6ba5b 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(), api_statuses_user_timeline(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_post(), chatroom_create(), chatroom_destroy(), 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_cloudpath(), 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(), 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(), api_statuses_user_timeline(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_post(), chatroom_create(), chatroom_destroy(), 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_cloudpath(), 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_rss(), 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(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), 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(), rmagic_post(), 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(), bookmarks_init(), 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(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), 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(), sslify(), string_splitter(), stripdcode_br_cb(), t(), tag_deliver(), 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(), bookmarks_init(), 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_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_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(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), tag_deliver(), 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 b158711f7..2036487f5 100644
--- a/doc/html/features_8php.html
+++ b/doc/html/features_8php.html
@@ -142,7 +142,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by apw_form(), categories_widget(), connedit_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), mail_content(), mail_post(), nav(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), searchbox(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), and widget_tagcloud_wall().
                                      
+
                                      Referenced by apw_form(), categories_widget(), connedit_content(), conversation(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), mail_content(), mail_post(), nav(), profile_sidebar(), profiles_content(), redbasic_form(), rpost_content(), search(), searchbox(), sources_content(), sources_post(), thing_content(), widget_affinity(), widget_archive(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), and widget_tagcloud_wall().
                                      
 
 
                                      
 
diff --git a/doc/html/files.html b/doc/html/files.html
index 9c12a3e82..efc357c1c 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -122,7 +122,7 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*acl_selectors.php
 |o*activities.php
 |o*api.php
-|o*attach.php
+|o*attach.phpFile/attach API with the potential for revision control
 |o*auth.php
 |o*BaseObject.php
 |o*bb2diaspora.php
@@ -160,7 +160,7 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*ItemObject.php
 |o*ITemplateEngine.php
 |o*items.php
-|o*language.php
+|o*language.phpTranslation support
 |o*menu.php
 |o*message.php
 |o*nav.php
@@ -259,69 +259,70 @@ $(document).ready(function(){initNavTree('files.html','');});
 |o*oembed.php
 |o*oexchange.php
 |o*online.php
-|o*opensearch.php
-|o*page.php
-|o*parse_url.php
-|o*photo.php
-|o*photos.php
-|o*php.php
-|o*ping.php
-|o*poco.php
-|o*poke.php
-|o*post.php
-|o*pretheme.php
-|o*probe.php
-|o*profile.php
-|o*profile_photo.php
-|o*profiles.php
-|o*profperm.php
-|o*pubsites.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*sslify.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*xref.php
-|o*zfinger.php
-|o*zotfeed.php
-|\*zping.php
+|o*openid.php
+|o*opensearch.php
+|o*page.php
+|o*parse_url.php
+|o*photo.php
+|o*photos.php
+|o*php.php
+|o*ping.php
+|o*poco.php
+|o*poke.php
+|o*post.php
+|o*pretheme.php
+|o*probe.php
+|o*profile.php
+|o*profile_photo.php
+|o*profiles.php
+|o*profperm.php
+|o*pubsites.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*sslify.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*xref.php
+|o*zfinger.php
+|o*zotfeed.php
+|\*zping.php
 o+util
 |o+fpostit
 ||\*fpostit.php
diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html
index 9d6326e00..7211cde0c 100644
--- a/doc/html/functions_0x67.html
+++ b/doc/html/functions_0x67.html
@@ -261,6 +261,9 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');});
 
                                    • get_widgets()
 : App
 
                                      • 
+
                                    • getAssetUrl()
+: RedBrowser
+
                                      • 
 
                                    • getChild()
 : RedDirectory
 
                                      • 
@@ -283,17 +286,17 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');});
 : photo_driver
 
 
                                    • getImage()
-: photo_imagick
-, photo_gd
+: photo_gd
 , photo_driver
+, photo_imagick
 
                                      • 
 
                                    • getLastModified()
 : RedDirectory
 , RedFile
 
                                      • 
 
                                    • getName()
-: RedDirectory
-, RedFile
+: RedFile
+, RedDirectory
 
                                      • 
 
                                    • getQuotaInfo()
 : RedDirectory
diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html
index efe646350..28276423e 100644
--- a/doc/html/functions_func_0x67.html
+++ b/doc/html/functions_func_0x67.html
@@ -260,6 +260,9 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
 
                                    • get_widgets()
 : App
 
                                      • 
+
                                    • getAssetUrl()
+: RedBrowser
+
                                      • 
 
                                    • getChild()
 : RedDirectory
 
                                      • 
@@ -282,17 +285,17 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
 : photo_driver
 
 
                                    • getImage()
-: photo_imagick
-, photo_gd
+: photo_gd
 , photo_driver
+, photo_imagick
 
                                      • 
 
                                    • getLastModified()
 : RedDirectory
 , RedFile
 
                                      • 
 
                                    • getName()
-: RedDirectory
-, RedFile
+: RedFile
+, RedDirectory
 
                                      • 
 
                                    • getQuotaInfo()
 : RedDirectory
diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html
index 22f3da55b..07b3c6724 100644
--- a/doc/html/globals_0x62.html
+++ b/doc/html/globals_0x62.html
@@ -186,6 +186,9 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
 
                                    • bbcode()
 : bbcode.php
 
                                      • 
+
                                    • bbiframe()
+: bbcode.php
+
                                      • 
 
                                    • bbtoevent()
 : event.php
 
                                      • 
@@ -199,7 +202,7 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
 : blocks.php
 
 
                                    • blog_init()
-: theme.php
+: theme.php
 
                                      • 
 
                                    • blog_install()
 : theme.php
diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html
index b8730af37..7b0080904 100644
--- a/doc/html/globals_0x64.html
+++ b/doc/html/globals_0x64.html
@@ -285,6 +285,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
 
                                    • dob()
 : datetime.php
 
                                      • 
+
                                    • downgrade_accounts()
+: account.php
+
                                      • 
 
                                    • drop_item()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html
index 5f85794f4..a3578bee3 100644
--- a/doc/html/globals_0x67.html
+++ b/doc/html/globals_0x67.html
@@ -174,6 +174,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 
                                    • get_capath()
 : network.php
 
                                      • 
+
                                    • get_channel_by_nick()
+: identity.php
+
                                      • 
 
                                    • get_cloudpath()
 : attach.php
 
                                      • 
@@ -222,6 +225,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 
                                    • get_item_elements()
 : items.php
 
                                      • 
+
                                    • get_language_name()
+: language.php
+
                                      • 
 
                                    • get_mail_elements()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html
index caad74618..0d880f0ff 100644
--- a/doc/html/globals_0x69.html
+++ b/doc/html/globals_0x69.html
@@ -159,6 +159,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
 , full.php
 , style.php
 
+
                                    • import_author_rss()
+: items.php
+
                                      • 
 
                                    • import_author_xchan()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html
index 28c06d13a..26714be71 100644
--- a/doc/html/globals_0x6d.html
+++ b/doc/html/globals_0x6d.html
@@ -195,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
 
                                    • match_content()
 : match.php
 
                                      • 
+
                                    • match_openid()
+: auth.php
+
                                      • 
 
                                    • MAX_IMAGE_LENGTH
 : boot.php
 
                                      • 
diff --git a/doc/html/globals_0x6e.html b/doc/html/globals_0x6e.html
index 65ab55e66..8444dcae5 100644
--- a/doc/html/globals_0x6e.html
+++ b/doc/html/globals_0x6e.html
@@ -282,6 +282,9 @@ $(document).ready(function(){initNavTree('globals_0x6e.html','');});
 
                                    • normalise_link()
 : text.php
 
                                      • 
+
                                    • normalise_openid()
+: text.php
+
                                      • 
 
                                    • notags()
 : text.php
 
                                      • 
diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html
index aeb5a4429..790779373 100644
--- a/doc/html/globals_0x6f.html
+++ b/doc/html/globals_0x6f.html
@@ -195,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x6f.html','');});
 
                                    • online_init()
 : online.php
 
                                      • 
+
                                    • openid_content()
+: openid.php
+
                                      • 
 
                                    • opensearch_init()
 : opensearch.php
 
                                      • 
diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html
index 6695df3c8..2844d6bb2 100644
--- a/doc/html/globals_0x70.html
+++ b/doc/html/globals_0x70.html
@@ -216,6 +216,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 
                                    • PERMS_A_REPUBLISH
 : boot.php
 
                                      • 
+
                                    • PERMS_AUTHED
+: boot.php
+
                                      • 
 
                                    • PERMS_CONTACTS
 : boot.php
 
                                      • 
@@ -450,9 +453,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 
                                    • post_to_red_version
 : post_to_red.php
 
                                      • 
-
                                    • posted_date_widget()
-: items.php
-
                                      • 
 
                                    • posted_dates()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index b8ea35e57..b3892df35 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -315,6 +315,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
 
                                    • stringify_array_elms()
 : text.php
 
                                      • 
+
                                    • strip_zids()
+: text.php
+
                                      • 
 
                                    • stripdcode_br_cb()
 : bb2diaspora.php
 
                                      • 
diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html
index 7902b5776..cb663e545 100644
--- a/doc/html/globals_func_0x62.html
+++ b/doc/html/globals_func_0x62.html
@@ -185,6 +185,9 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
 
                                    • bbcode()
 : bbcode.php
 
                                      • 
+
                                    • bbiframe()
+: bbcode.php
+
                                      • 
 
                                    • bbtoevent()
 : event.php
 
                                      • 
@@ -198,7 +201,7 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
 : blocks.php
 
 
                                    • blog_init()
-: theme.php
+: theme.php
 
                                      • 
 
                                    • blog_install()
 : theme.php
diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html
index bfb83e73e..820a3b82f 100644
--- a/doc/html/globals_func_0x64.html
+++ b/doc/html/globals_func_0x64.html
@@ -257,6 +257,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
 
                                    • dob()
 : datetime.php
 
                                      • 
+
                                    • downgrade_accounts()
+: account.php
+
                                      • 
 
                                    • drop_item()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html
index e92d8eabe..abf85737c 100644
--- a/doc/html/globals_func_0x67.html
+++ b/doc/html/globals_func_0x67.html
@@ -173,6 +173,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
 
                                    • get_capath()
 : network.php
 
                                      • 
+
                                    • get_channel_by_nick()
+: identity.php
+
                                      • 
 
                                    • get_cloudpath()
 : attach.php
 
                                      • 
@@ -221,6 +224,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
 
                                    • get_item_elements()
 : items.php
 
                                      • 
+
                                    • get_language_name()
+: language.php
+
                                      • 
 
                                    • get_mail_elements()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html
index 3c5c33102..eea70e8e8 100644
--- a/doc/html/globals_func_0x69.html
+++ b/doc/html/globals_func_0x69.html
@@ -152,6 +152,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
 
                                    • ids_to_querystr()
 : text.php
 
                                      • 
+
                                    • import_author_rss()
+: items.php
+
                                      • 
 
                                    • import_author_xchan()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html
index 5073bad22..f1233bc97 100644
--- a/doc/html/globals_func_0x6d.html
+++ b/doc/html/globals_func_0x6d.html
@@ -176,6 +176,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
 
                                    • match_content()
 : match.php
 
                                      • 
+
                                    • match_openid()
+: auth.php
+
                                      • 
 
                                    • member_of()
 : group.php
 
                                      • 
diff --git a/doc/html/globals_func_0x6e.html b/doc/html/globals_func_0x6e.html
index e2d970840..8af69c3b4 100644
--- a/doc/html/globals_func_0x6e.html
+++ b/doc/html/globals_func_0x6e.html
@@ -194,6 +194,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');});
 
                                    • normalise_link()
 : text.php
 
                                      • 
+
                                    • normalise_openid()
+: text.php
+
                                      • 
 
                                    • notags()
 : text.php
 
                                      • 
diff --git a/doc/html/globals_func_0x6f.html b/doc/html/globals_func_0x6f.html
index be0dbed34..3287852d1 100644
--- a/doc/html/globals_func_0x6f.html
+++ b/doc/html/globals_func_0x6f.html
@@ -194,6 +194,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6f.html','');});
 
                                    • online_init()
 : online.php
 
                                      • 
+
                                    • openid_content()
+: openid.php
+
                                      • 
 
                                    • opensearch_init()
 : opensearch.php
 
                                      • 
diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html
index 932009ab0..f74b9044c 100644
--- a/doc/html/globals_func_0x70.html
+++ b/doc/html/globals_func_0x70.html
@@ -314,9 +314,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
 
                                    • post_to_red_settings_link()
 : post_to_red.php
 
                                      • 
-
                                    • posted_date_widget()
-: items.php
-
                                      • 
 
                                    • posted_dates()
 : items.php
 
                                      • 
diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html
index 6a2a71b69..c24e34214 100644
--- a/doc/html/globals_func_0x73.html
+++ b/doc/html/globals_func_0x73.html
@@ -302,6 +302,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
 
                                    • stringify_array_elms()
 : text.php
 
                                      • 
+
                                    • strip_zids()
+: text.php
+
                                      • 
 
                                    • stripdcode_br_cb()
 : bb2diaspora.php
 
                                      • 
diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html
index d70778e4e..386e55759 100644
--- a/doc/html/globals_vars_0x70.html
+++ b/doc/html/globals_vars_0x70.html
@@ -178,6 +178,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
 
                                    • PERMS_A_REPUBLISH
 : boot.php
 
                                      • 
+
                                    • PERMS_AUTHED
+: boot.php
+
                                      • 
 
                                    • PERMS_CONTACTS
 : boot.php
 
                                      • 
diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html
index d8522de84..24e96902c 100644
--- a/doc/html/identity_8php.html
+++ b/doc/html/identity_8php.html
@@ -160,6 +160,8 @@ Functions
  
  remote_online_status ($webbie)
  
+ get_channel_by_nick ($nick)
+ 
 
 
                                      Function Documentation
                                      
 
@@ -192,7 +194,7 @@ Functions
         
       
 
                                      
-
                                      () Return the total number of channels on this site. No filtering is performed.
                                      
+
                                      () Return the total number of channels on this site. No filtering is performed except to check PAGE_REMOVED
                                      
 
                                      Returns
                                      int on error returns boolean false 
                                      
 
 
                                      Referenced by zfinger_init().
                                      
@@ -254,6 +256,24 @@ Functions
       
 
                                      
 
+
                                      
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      get_channel_by_nick ( $nick)
                                      
+
                                      
+
+
                                      Referenced by wall_attach_post(), and wall_upload_post().
                                      
+
 
                                      
 
                                      
 
@@ -278,7 +298,7 @@ Functions
 
 
                                      Returns
                                      string 
                                      
 
-
                                      Referenced by avatar_img(), import_profile_photo(), and photo_init().
                                      
+
                                      Referenced by avatar_img(), import_profile_photo(), openid_content(), and photo_init().
                                      
 
 
 
@@ -362,7 +382,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by create_sys_channel().
                                      
+
                                      Referenced by create_sys_channel(), and get_theme_uid().
                                      
 
 
                                      
 
diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js
index c9091d29b..5da6fdb94 100644
--- a/doc/html/identity_8php.js
+++ b/doc/html/identity_8php.js
@@ -5,6 +5,7 @@ var identity_8php =
     [ "create_identity", "identity_8php.html#a345f4c943d84de502ec6e72d2c813945", null ],
     [ "create_sys_channel", "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05", null ],
     [ "get_birthdays", "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ],
+    [ "get_channel_by_nick", "identity_8php.html#ac73b3e13778c564c877554517a7f51ba", 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 ],
diff --git a/doc/html/include_2attach_8php.html b/doc/html/include_2attach_8php.html
index 21215feb6..b0d008ed3 100644
--- a/doc/html/include_2attach_8php.html
+++ b/doc/html/include_2attach_8php.html
@@ -109,35 +109,50 @@ $(document).ready(function(){initNavTree('include_2attach_8php.html','');});
 
                                      attach.php File Reference
                                        
 
 
                                      
+
+
                                      File/attach API with the potential for revision control.  
+More...
                                      
 
+
+
+
+
+
+
+
+
+
                                      
 
                                      
 Functions
                                      
 
                                       z_mime_content_type ($filename)
                                       Guess the mimetype from file ending.  More...
                                      
 
                                       
                                      
 
                                       attach_count_files ($channel_id, $observer, $hash= '', $filename= '', $filetype= '')
                                       Count files/attachments.  More...
                                      
 
                                       
                                      
 
                                       attach_list_files ($channel_id, $observer, $hash= '', $filename= '', $filetype= '', $orderby= 'created desc', $start=0, $entries=0)
                                       Returns a list of files/attachments.  More...
                                      
 
                                       
                                      
 
                                       attach_by_hash ($hash, $rev=0)
                                       Find an attachment by hash and revision.  More...
                                      
 
                                       
                                      
 
                                       attach_by_hash_nodata ($hash, $rev=0)
                                       Find an attachment by hash and revision.  More...
                                      
 
                                       
                                      
 
                                       attach_store ($channel, $observer_hash, $options= '', $arr=null)
                                      
 
                                       
                                      
 
                                       z_readdir ($channel_id, $observer_hash, $pathname, $parent_hash= '')
                                      
 
                                       
                                      
 
                                       attach_mkdir ($channel, $observer_hash, $arr=null)
                                       Create directory.  More...
                                      
 
                                       
                                      
 
                                       attach_change_permissions ($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse=false)
                                       Changes permissions of a file.  More...
                                      
 
                                       
                                      
 
                                       attach_delete ($channel_id, $resource)
                                       Delete a file.  More...
                                      
 
                                       
                                      
 
                                       get_cloudpath ($arr)
                                       Returns path to file in cloud/.  More...
                                      
 
                                       
                                      
 
                                       pipe_streams ($in, $out)
                                      
 
                                       
                                      
 
                                      
-
                                      Function Documentation
                                      
+
                                      Detailed Description
                                      
+
                                      File/attach API with the potential for revision control. 
                                      
+
                                      TODO: a filesystem storage abstraction which maintains security (and 'data' contains a system filename which is inaccessible from the web). This could get around PHP storage limits and store videos and larger items, using fread or OS methods or native code to read/write or chunk it through. Also an 'append' option to the storage function might be a useful addition. 
                                      
+
                                      Function Documentation
                                      
 
 
                                      
 
                                      
@@ -162,6 +177,17 @@ Functions
       
 
                                      
 
+
                                      Find an attachment by hash and revision. 
                                      
+
                                      Returns the entire attach structure including data.
                                      
+
                                      This could exhaust memory so most useful only when immediately sending the data.
                                      
+
                                      Parameters
                                      
+  
+    
+    
+  
                                      $hash
                                      $rev
                                      
+  
                                      
+
                                      
+
 
                                      Referenced by attach_init().
                                      
 
 
                                      
@@ -190,6 +216,17 @@ Functions
       
 
                                      
 
+
                                      Find an attachment by hash and revision. 
                                      
+
                                      Returns the entire attach structure excluding data.
                                      
+
                                      See Also
                                      attach_by_hash() 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+  
                                      $hash
                                      $ref
                                      
+  
                                      
+
                                      
+
 
                                      Referenced by item_post(), and send_message().
                                      
 
 
                                      
@@ -248,6 +285,20 @@ Functions
       
 
                                      
 
+
                                      Changes permissions of a file. 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+    
+    
+    
+    
+    
+  
                                      $channel_id
                                      $resource
                                      $allow_cid
                                      $allow_gid
                                      $deny_cid
                                      $deny_gid
                                      $recurse
                                      
+  
                                      
+
                                      
+
 
                                      Referenced by filestorage_post().
                                      
 
 
                                      
@@ -294,6 +345,19 @@ Functions
       
 
                                      
 
+
                                      Count files/attachments. 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+    
+    
+    
+  
                                      $channel_id
                                      $observer
                                      $hash(optional) 
                                      $filename(optional) 
                                      $filetype(optional) 
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      array $ret['success'] boolean $ret['results'] amount of found results, or false $ret['message'] string with error messages if any 
                                      
+
 
                                      
 
 
@@ -320,6 +384,15 @@ Functions
       
 
                                      
 
+
                                      Delete a file. 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+  
                                      $channel_id
                                      $resource
                                      
+  
                                      
+
                                      
+
 
                                      Referenced by RedDirectory\createFile(), RedFile\delete(), filestorage_content(), and RedFile\put().
                                      
 
 
                                      
@@ -384,6 +457,22 @@ Functions
       
 
                                      
 
+
                                      Returns a list of files/attachments. 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
                                      $channel_id
                                      $observer
                                      $hash(optional) 
                                      $filename(optional) 
                                      $filetype(optional) 
                                      $orderby
                                      $start
                                      $entries
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      array $ret['success'] boolean $ret['results'] array with results, or false $ret['message'] string with error messages if any 
                                      
+
 
                                      
 
 
@@ -415,18 +504,17 @@ Functions
         
       
 
                                      
+
+
                                      Create directory. 
                                      
 
                                      attach_mkdir($channel,$observer_hash,$arr);
                                      
-
                                      Create directory
                                      
 
                                      Parameters
                                      
   
-    
+    
                                      
     
                                      $channelchannel array of owner 
                                      
     
                                      $observer_hashhash of current observer 
                                      $arrparameter array to fulfil request
                                      $arrparameter array to fulfil request Required: $arr['filename'] $arr['folder'] // hash of parent directory, empty string for root directory Optional: $arr['hash'] // precumputed hash for this node $arr['allow_cid'] $arr['allow_gid'] $arr['deny_cid'] $arr['deny_gid'] 
                                      
   
                                      
   
                                      
 
                                      
-
                                      Required: $arr['filename'] $arr['folder'] // hash of parent directory, empty string for root directory
                                      
-
                                      Optional: $arr['hash'] // precumputed hash for this node $arr['allow_cid'] $arr['allow_gid'] $arr['deny_cid'] $arr['deny_gid'] 
                                      
 
 
                                      Referenced by RedDirectory\createDirectory().
                                      
 
@@ -467,6 +555,15 @@ Functions
         
       
 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+    
+    
+  
                                      $channelchannel array of owner 
                                      $observer_hashhash of current observer 
                                      $options(optional) 
                                      $arr(optional) 
                                      
+  
                                      
+
                                      
 
 
                                      Referenced by fix_attached_file_permissions(), send_message(), and wall_attach_post().
                                      
 
@@ -486,6 +583,15 @@ Functions
       
 
                                      
 
+
                                      Returns path to file in cloud/. 
                                      
+
                                      Parameters
                                      
+  
+    
+  
                                      $arr
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      string with the path the file to cloud/ 
                                      
+
 
                                      Referenced by filestorage_content().
                                      
 
 
                                      
@@ -513,6 +619,13 @@ Functions
         
       
 
                                      
+
                                      Parameters
                                      
+  
+    
+    
+  
                                      $in
                                      $out
                                      
+  
                                      
+
                                      
 
 
                                      Referenced by attach_init().
                                      
 
@@ -532,6 +645,16 @@ Functions
       
 
                                      
 
+
                                      Guess the mimetype from file ending. 
                                      
+
                                      This function takes a file name and guess the mimetype from the filename extension.
                                      
+
                                      Parameters
                                      
+  
+    
+  
                                      $filenamea string filename 
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      string The mimetype according to a file ending. 
                                      
+
 
                                      Referenced by attach_store(), and RedDirectory\createFile().
                                      
 
 
                                      
@@ -575,7 +698,7 @@ Functions
 
                                      Parameters
                                      
   
-    
+    
                                      
     
                                      integer$channel_id
                                      string$observer_hash
                                      string$observer_hashhash of current observer 
                                      
     
                                      string$pathname
                                      
     
                                      string$parent_hash(optional)
                                      
   
                                      
diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html
index ebf980a79..c46e26f27 100644
--- a/doc/html/include_2config_8php.html
+++ b/doc/html/include_2config_8php.html
@@ -256,7 +256,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), get_online_status(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), 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 account_verify_password(), 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(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), RedDirectory\createFile(), detect_language(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feature_enabled(), 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(), get_online_status(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), openid_content(), 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(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), 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().
                                      
 
 
                                      
 
@@ -548,7 +548,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by toggle_safesearch_init().
                                      
+
                                      Referenced by openid_content(), and toggle_safesearch_init().
                                      
 
 
                                      
 
diff --git a/doc/html/item_8php.html b/doc/html/item_8php.html
index d3e24125f..a51318730 100644
--- a/doc/html/item_8php.html
+++ b/doc/html/item_8php.html
@@ -365,9 +365,17 @@ Functions
 
                                      
 
                                      This is the POST destination for most all locally posted text stuff. This function handles status, wall-to-wall status, local comments, and remote coments that are posted on this site (as opposed to being delivered in a feed). Also processed here are posts and comments coming through the statusnet/twitter API. All of these become an "item" which is our basic unit of information. Posts that originate externally or do not fall into the above posting categories go through item_store() instead of this function. 
                                      
 
                                      Is this a reply to something?
                                      
-
                                      fix naked links by passing through a callback to see if this is a red site (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both. First wrap any url which is part of link anchor text already in quotes so we don't double link it. e.g. [url=http://foobar.com]something with http://elsewhere.com in it[/url] becomes [url=http://foobar.com]something with "http://elsewhere.com" in it[/url] otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
                                      
+
                                      fix naked links by passing through a callback to see if this is a red site (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both. First protect any url inside certain bbcode tags so we don't double link it.
                                      
 
                                      When a photo was uploaded into the message using the (profile wall) ajax uploader, The permissions are initially set to disallow anybody but the owner from seeing it. This is because the permissions may not yet have been set for the post. If it's private, the photo permissions should be set appropriately. But we didn't know the final permissions on the post until now. So now we'll look for links of uploaded photos and attachments that are in the post and set them to the same permissions as the post itself.
                                      
 
                                      If the post was end-to-end encrypted we can't find images and attachments in the body, use our media_str input instead which only contains these elements - but only do this when encrypted content exists because the photo/attachment may have been removed from the post and we should keep it private. If it's encrypted we have no way of knowing so we'll set the permissions regardless and realise that the media may not be referenced in the post.
                                      
+
                                      What is preventing us from being able to upload photos into comments is dealing with the photo and attachment permissions, since we don't always know who was in the distribution for the top level post.
                                      
+
                                      We might be able to provide this functionality with a lot of fiddling:
                                      
+
                                        
+
                                      • if the top level post is public (make the photo public)
                                        • 
+
                                      • if the top level post was written by us or a wall post that belongs to us (match the top level post)
                                        • 
+
                                      • if the top level post has privacy mentions, add those to the permissions.
                                        • 
+
                                      • otherwise disallow the photo or make the photo public. This is the part that gets messy.
                                        • 
+
                                      
 
                                      Fold multi-line [code] sequences
                                      
 
                                      Look for any tags and linkify them
                                      
 
diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html
index dbe9f62b0..1ff5877f6 100644
--- a/doc/html/items_8php.html
+++ b/doc/html/items_8php.html
@@ -144,6 +144,8 @@ Functions
  
  import_author_xchan ($x)
  
+ import_author_rss ($x)
+ 
  encode_item ($item)
  
  map_scope ($scope)
@@ -218,8 +220,6 @@ Functions
  
  posted_dates ($uid, $wall)
  
- posted_date_widget ($url, $uid, $wall)
- 
  fetch_post_tags ($items, $link=false)
  
  zot_feed ($uid, $observer_xchan, $mindate)
@@ -1097,6 +1097,24 @@ Functions
 
 
                                      Referenced by fix_private_photos().
                                      
 
+
                                      
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      import_author_rss ( $x)
                                      
+
                                      
+
+
                                      Referenced by import_author_xchan().
                                      
+
 
                                      
 
                                      
 
@@ -1358,38 +1376,6 @@ Functions
 
 
                                      Referenced by api_channel_stream(), poke_init(), tagger_content(), and thing_init().
                                      
 
-
-
-
-
                                      
-
                                      
-      
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
                                      posted_date_widget ( $url, 
                                       $uid, 
                                       $wall 
                                      )
                                      
-
                                      
-
 
                                      
 
                                      
 
@@ -1416,7 +1402,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by posted_date_widget(), and widget_archive().
                                      
+
                                      Referenced by widget_archive().
                                      
 
 
                                      
 
@@ -1481,7 +1467,7 @@ Functions
         
       
 
                                      
-
                                      red_zrl_callback preg_match function when fixing 'naked' links in mod item.php Check if we've got a hubloc for the site and use a zrl if we do, a url if we don't. 
                                      
+
                                      red_zrl_callback preg_match function when fixing 'naked' links in mod item.php Check if we've got a hubloc for the site and use a zrl if we do, a url if we don't. Remove any existing zid= param which may have been pasted by mistake - and will have the author's credentials. zid's are dynamic and can't really be passed around like that. 
                                      
 
 
                                      
 
diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js
index e624f38e6..962a18fe1 100644
--- a/doc/html/items_8php.js
+++ b/doc/html/items_8php.js
@@ -34,6 +34,7 @@ var items_8php =
     [ "get_profile_elements", "items_8php.html#a251343637ff40a50cca93452cd530c26", null ],
     [ "get_public_feed", "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107", null ],
     [ "has_permissions", "items_8php.html#a77051724d1784074ff187e73a4db93fe", null ],
+    [ "import_author_rss", "items_8php.html#a6bee35961f2e32905f20367a9309d627", null ],
     [ "import_author_xchan", "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5", null ],
     [ "item_expire", "items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc", null ],
     [ "item_getfeedattach", "items_8php.html#a09d425596b9f8663472cf7474ad36d96", null ],
@@ -45,7 +46,6 @@ var items_8php =
     [ "mail_store", "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f", null ],
     [ "map_scope", "items_8php.html#ac1fcf621dce7370515b420a7753f4726", null ],
     [ "post_activity_item", "items_8php.html#a410f9c743877c125ca06312373346903", null ],
-    [ "posted_date_widget", "items_8php.html#abe695dd89e1e10ed042c26b80114f0ed", null ],
     [ "posted_dates", "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0", null ],
     [ "red_escape_codeblock", "items_8php.html#a49905ea75adfe8a2d110be344d18d6a6", null ],
     [ "red_escape_zrl_callback", "items_8php.html#a83a349062945d585edb4b3c5d763ab6e", null ],
diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html
index e3e6e1355..6b1775abb 100644
--- a/doc/html/language_8php.html
+++ b/doc/html/language_8php.html
@@ -109,12 +109,17 @@ $(document).ready(function(){initNavTree('language_8php.html','');});
 
                                      language.php File Reference
                                        
 
 
                                      
+
+
                                      translation support  
+More...
                                      
 
+
+
@@ -123,15 +128,23 @@ Functions
+
+
+
+
+
                                      
 
                                      
 Functions
                                      
 
                                       get_browser_language ()
                                       Get the browser's submitted preferred languages.  More...
                                      
 
                                       
                                      
 
                                       get_best_language ()
                                       Returns the best language for which also a translation exists.  More...
                                      
 
                                       
                                      
 
                                       push_lang ($language)
                                      
 
                                       
                                      
 
                                       load_translation_table ($lang, $install=false)
                                      
 
                                       
                                      
 
                                       t ($s)
                                       translate string if translation exists.  More...
                                      
 
                                       
                                      
 
                                       tt ($singular, $plural, $count)
                                      
 
                                       
                                      
 
                                       string_plural_select_default ($n)
                                      
 
                                       
                                      
 
                                       detect_language ($s)
                                       Takes a string and tries to identify the language.  More...
                                      
 
                                       
                                       get_language_name ($s, $l=null)
                                       Returns the display name of a given language code.  More...
                                       
                                      
 
                                      
-
                                      Function Documentation
                                      
+
                                      Detailed Description
                                      
+
                                      translation support 
                                      
+
                                      This file contains functions to work with translations and other language related tasks. 
                                      
+
                                      Function Documentation
                                      
 
 
                                      
 
                                      
@@ -146,6 +159,18 @@ Functions
       
 
                                      
 
+
                                      Takes a string and tries to identify the language. 
                                      
+
                                      It uses the pear library Text_LanguageDetect and it can identify 52 human languages. It returns the identified languges and a confidence score for each.
                                      
+
                                      Strings need to have a min length config['system']['language_detect_min_length'] and you can influence the confidence that must be met before a result will get returned through config['system']['language_detect_min_confidence'].
                                      
+
                                      See Also
                                      http://pear.php.net/package/Text_LanguageDetect 
                                      
+
                                      Parameters
                                      
+  
+    
+  
                                      sA string to examine 
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      Language code in 2-letter ISO 639-1 (en, de, fr) format 
                                      
+
 
                                      Referenced by item_store(), and item_store_update().
                                      
 
 
                                      
@@ -163,6 +188,11 @@ Functions
       
 
                                      
 
+
                                      Returns the best language for which also a translation exists. 
                                      
+
                                      This function takes the results from get_browser_language() and compares it with the available translations and returns the best fitting language for which there exists a translation.
                                      
+
                                      If there is no match fall back to config['system']['language']
                                      
+
                                      Returns
                                      Language code in 2-letter ISO 639-1 (en). 
                                      
+
 
                                      Referenced by create_account().
                                      
 
 
                                      
@@ -179,12 +209,54 @@ Functions
         
       
 
                                      
-
                                      translation support
                                      
+
+
                                      Get the browser's submitted preferred languages. 
                                      
+
                                      This functions parses the HTTP_ACCEPT_LANGUAGE header sent by the browser and extracts the preferred languages and their priority.
                                      
 
                                      Get the language setting directly from system variables, bypassing get_config() as database may not yet be configured.
                                      
-
                                      If possible, we use the value from the browser. 
                                      
+
                                      If possible, we use the value from the browser.
                                      
+
                                      Returns
                                      array with ordered list of preferred languages from browser 
                                      
 
 
                                      Referenced by get_best_language().
                                      
 
+
                                      
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
                                      get_language_name ( $s, 
                                       $l = null 
                                      )
                                      
+
                                      
+
+
                                      Returns the display name of a given language code. 
                                      
+
                                      By default we use the localized language name. You can switch the result to any language with the optional 2nd parameter $l.
                                      
+
                                      $s and $l can be in any format that PHP's Locale understands. We will mostly use the 2-letter ISO 639-1 (en, de, fr) format.
                                      
+
                                      If nothing could be looked up it returns $s.
                                      
+
                                      Parameters
                                      
+  
+    
+    
+  
                                      $sLanguage code to look up 
                                      $l(optional) In which language to return the name 
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      string with the language name, or $s if unrecognized 
                                      
+
 
                                      
 
                                      
 
@@ -280,7 +352,16 @@ Functions
       
 
                                      
 
-
                                      Referenced by achievements_content(), 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(), bbcode(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), 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(), 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_chatroom_list(), 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().
                                      
+
                                      translate string if translation exists. 
                                      
+
                                      Parameters
                                      
+  
+    
+  
                                      sstring that should get translated 
                                      
+  
                                      
+
                                      
+
                                      Returns
                                      translated string if exsists, otherwise s 
                                      
+
+
                                      Referenced by achievements_content(), 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(), bbcode(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_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(), check_store(), cloud_init(), 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(), dirprofile_init(), 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(), filestorage_post(), 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(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), 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(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), 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(), openid_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(), 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(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), 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_chatroom_list(), 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/language_8php.js b/doc/html/language_8php.js
index ed2266957..260cbb417 100644
--- a/doc/html/language_8php.js
+++ b/doc/html/language_8php.js
@@ -3,6 +3,7 @@ var language_8php =
     [ "detect_language", "language_8php.html#a632da17c7ac0d2dc1a00a4706870194b", null ],
     [ "get_best_language", "language_8php.html#a980dee1d8715a98ab02e36b59facf8ed", null ],
     [ "get_browser_language", "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e", null ],
+    [ "get_language_name", "language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7", null ],
     [ "load_translation_table", "language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05", null ],
     [ "pop_lang", "language_8php.html#a78bd204955ec4cc3a9ac651285a1689d", null ],
     [ "push_lang", "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a", null ],
diff --git a/doc/html/navtree.js b/doc/html/navtree.js
index 3b2138fc3..e9b142c1f 100644
--- a/doc/html/navtree.js
+++ b/doc/html/navtree.js
@@ -36,14 +36,14 @@ var NAVTREE =
 var NAVTREEINDEX =
 [
 "BaseObject_8php.html",
-"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8",
-"classConversation.html#a66f121ca4026246f86a732e5faa0682c",
-"classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393",
-"functions_0x68.html",
-"include_2directory_8php.html",
-"namespacemembers_vars.html",
-"setup_8php.html#a267555abd17290e659b4bf44b885e4e0",
-"webpages_8php.html"
+"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866",
+"classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8",
+"classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f",
+"functions_0x63.html",
+"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6",
+"namespaceFriendica.html",
+"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052",
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4"
 ];
 
 var SYNCONMSG = 'click to disable panel synchronisation';
diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js
index 9afe72c2e..7d3fb5a74 100644
--- a/doc/html/navtreeindex0.js
+++ b/doc/html/navtreeindex0.js
@@ -24,15 +24,16 @@ var NAVTREEINDEX0 =
 "__well__known_8php.html":[5,0,1,0],
 "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[5,0,1,0,0],
 "account_8php.html":[5,0,0,2],
-"account_8php.html#a014de2d5d5c9785de5bf547a485822fa":[5,0,0,2,6],
+"account_8php.html#a014de2d5d5c9785de5bf547a485822fa":[5,0,0,2,7],
+"account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9":[5,0,0,2,6],
 "account_8php.html#a141fe579c351c78209d425473f978eb5":[5,0,0,2,5],
 "account_8php.html#a144b4891022567668375b58ea61cfff0":[5,0,0,2,4],
 "account_8php.html#a43e3042b2723d76915a030bac3c668b6":[5,0,0,2,0],
 "account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f":[5,0,0,2,1],
-"account_8php.html#aa9c29c497c17d8f9344dce8631ad8761":[5,0,0,2,7],
+"account_8php.html#aa9c29c497c17d8f9344dce8631ad8761":[5,0,0,2,8],
 "account_8php.html#aaff7720423417a4333697894ffd9ddeb":[5,0,0,2,3],
-"account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[5,0,0,2,9],
-"account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[5,0,0,2,8],
+"account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[5,0,0,2,10],
+"account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[5,0,0,2,9],
 "account_8php.html#ae052bd5558847bd38e89c213561a9771":[5,0,0,2,2],
 "achievements_8php.html":[5,0,1,1],
 "achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e":[5,0,1,1,0],
@@ -74,8 +75,9 @@ var NAVTREEINDEX0 =
 "apw_2php_2theme_8php.html#a42167c539043a39a6b83c252d05f1e89":[5,0,3,2,0,0,2,0],
 "auth_8php.html":[5,0,0,7],
 "auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee":[5,0,0,7,0],
-"auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5":[5,0,0,7,2],
-"auth_8php.html#a2add3a1129ffa4d5515442a9d52a9b1a":[5,0,0,7,1],
+"auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5":[5,0,0,7,3],
+"auth_8php.html#a2add3a1129ffa4d5515442a9d52a9b1a":[5,0,0,7,2],
+"auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38":[5,0,0,7,1],
 "bb2diaspora_8php.html":[5,0,0,9],
 "bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93":[5,0,0,9,7],
 "bb2diaspora_8php.html#a26c09c218413610e62e60754c579f6c6":[5,0,0,9,2],
@@ -92,14 +94,15 @@ var NAVTREEINDEX0 =
 "bbcode_8php.html#a1c69e021d5e0aef97d6966bf3169c86a":[5,0,0,10,4],
 "bbcode_8php.html#a2be26414a367118143cc89e2d58e7377":[5,0,0,10,5],
 "bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd":[5,0,0,10,0],
-"bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322":[5,0,0,10,11],
+"bbcode_8php.html#a39de4de32a9456d1ca914d0dc52bd322":[5,0,0,10,12],
 "bbcode_8php.html#a3a989cbf308a32468d171d83e9c51d1e":[5,0,0,10,3],
-"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,9],
-"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,10],
+"bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7":[5,0,0,10,10],
+"bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,11],
+"bbcode_8php.html#a7cc811ff1939a508cfb54f39c1d584d7":[5,0,0,10,9],
 "bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f":[5,0,0,10,1],
 "bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,6],
 "bbcode_8php.html#a98d0eecc620c19561639f06cfbe8e74c":[5,0,0,10,2],
-"bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8":[5,0,0,10,12],
+"bbcode_8php.html#aa92f119341f4c69dcef2768a013079b8":[5,0,0,10,13],
 "blocks_8php.html":[5,0,1,7],
 "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0],
 "blogga_2php_2theme_8php.html":[5,0,3,2,1,0,2],
@@ -114,7 +117,7 @@ var NAVTREEINDEX0 =
 "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,131],
 "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,35],
 "boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,145],
-"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,243],
+"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,244],
 "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,51],
 "boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,163],
 "boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,43],
@@ -123,14 +126,14 @@ var NAVTREEINDEX0 =
 "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,202],
 "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,65],
 "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,167],
-"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,261],
-"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,257],
-"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,260],
+"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,262],
+"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,258],
+"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,261],
 "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,21],
 "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,57],
 "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15],
 "boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,75],
-"boot_8php.html#a115faf8797718c3165498abbd6895843":[5,0,4,247],
+"boot_8php.html#a115faf8797718c3165498abbd6895843":[5,0,4,248],
 "boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,79],
 "boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,76],
 "boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,193],
@@ -139,42 +142,42 @@ var NAVTREEINDEX0 =
 "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,140],
 "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,166],
 "boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,134],
-"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,268],
-"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,237],
-"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,270],
+"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,269],
+"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,238],
+"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,271],
 "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,170],
 "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,74],
-"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,216],
+"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,217],
 "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,102],
 "boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,151],
 "boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,186],
-"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,239],
+"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,240],
 "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,38],
 "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,20],
 "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,98],
 "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,90],
-"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,250],
+"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,251],
 "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,189],
 "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,81],
 "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,126],
-"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,214],
+"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,215],
 "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,103],
-"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,235],
+"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,236],
 "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,185],
 "boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,123],
 "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,66],
 "boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,71],
-"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,221],
+"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,222],
 "boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,138],
 "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,40],
 "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,116],
 "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,153],
-"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,274],
+"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,275],
 "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,174],
 "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,105],
 "boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,110],
-"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,273],
-"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,212],
+"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,274],
+"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,213],
 "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12],
 "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,58],
 "boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,88],
@@ -187,22 +190,22 @@ var NAVTREEINDEX0 =
 "boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,148],
 "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,69],
 "boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[5,0,4,154],
-"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,258],
+"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,259],
 "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,172],
 "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,101],
-"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,229],
+"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,230],
 "boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,171],
 "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6],
 "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,204],
-"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,225],
+"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,226],
 "boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,196],
 "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,152],
 "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,39],
 "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,80],
 "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,32],
 "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,188],
-"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,224],
-"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,271],
+"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,225],
+"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,272],
 "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,19],
 "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,59],
 "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,178],
@@ -212,32 +215,32 @@ var NAVTREEINDEX0 =
 "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,201],
 "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,18],
 "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,73],
-"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,254],
+"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,255],
 "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,164],
 "boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,136],
 "boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,139],
 "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,42],
 "boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,142],
-"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,241],
-"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,228],
-"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,222],
+"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,242],
+"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,229],
+"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,223],
 "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,99],
 "boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,91],
-"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,210],
+"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,211],
 "boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,125],
 "boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[5,0,4,205],
-"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,240],
+"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,241],
 "boot_8php.html#a718a801b0be6cbaef5e519516da12721":[5,0,4,157],
 "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,27],
 "boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,179],
 "boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,129],
 "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,70],
 "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2],
-"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,262],
+"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,263],
 "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4],
 "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,72],
 "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,85],
-"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,231],
+"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,232],
 "boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,111],
 "boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,63],
 "boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,128],
@@ -246,8 +249,5 @@ var NAVTREEINDEX0 =
 "boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[5,0,4,104],
 "boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[5,0,4,55],
 "boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,161],
-"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,46],
-"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,82],
-"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,114],
-"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,198]
+"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,46]
 };
diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js
index 941a9d3ae..49fa2193d 100644
--- a/doc/html/navtreeindex1.js
+++ b/doc/html/navtreeindex1.js
@@ -1,38 +1,42 @@
 var NAVTREEINDEX1 =
 {
+"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,82],
+"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,114],
+"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,198],
 "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,50],
 "boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,108],
 "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,54],
+"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[5,0,4,209],
 "boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,121],
 "boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[5,0,4,113],
-"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,253],
-"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,252],
+"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,254],
+"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,253],
 "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,177],
 "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,16],
 "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,96],
 "boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b":[5,0,4,206],
-"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,226],
+"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,227],
 "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,124],
 "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,118],
-"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,233],
-"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,269],
+"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,234],
+"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[5,0,4,270],
 "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,30],
 "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11],
 "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,143],
 "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,122],
 "boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,120],
-"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,264],
-"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,238],
+"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,265],
+"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,239],
 "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,17],
 "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,191],
-"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,227],
+"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,228],
 "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,45],
 "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5],
-"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,219],
+"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,220],
 "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,192],
-"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,267],
-"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,255],
-"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,218],
+"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,268],
+"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,256],
+"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,219],
 "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,180],
 "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,24],
 "boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,199],
@@ -43,18 +47,18 @@ var NAVTREEINDEX1 =
 "boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,107],
 "boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,84],
 "boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,93],
-"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,223],
+"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,224],
 "boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,133],
 "boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,208],
 "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,64],
 "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,183],
 "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,112],
-"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,209],
+"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,210],
 "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31],
 "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,203],
-"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,230],
+"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,231],
 "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,176],
-"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,213],
+"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,214],
 "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,106],
 "boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,135],
 "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,52],
@@ -62,21 +66,21 @@ var NAVTREEINDEX1 =
 "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7],
 "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,95],
 "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,36],
-"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,234],
+"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,235],
 "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3],
-"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,259],
+"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,260],
 "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,62],
 "boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,109],
 "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,94],
 "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,119],
 "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,23],
 "boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,162],
-"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,232],
+"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,233],
 "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,92],
 "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[5,0,4,25],
 "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,34],
 "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,53],
-"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,265],
+"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,266],
 "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,115],
 "boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,117],
 "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,190],
@@ -84,8 +88,8 @@ var NAVTREEINDEX1 =
 "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13],
 "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8],
 "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,165],
-"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,266],
-"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,220],
+"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,267],
+"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,221],
 "boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,197],
 "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,61],
 "boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,146],
@@ -94,47 +98,47 @@ var NAVTREEINDEX1 =
 "boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,68],
 "boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,83],
 "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,28],
-"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,215],
-"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,242],
-"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,236],
+"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,216],
+"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,243],
+"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,237],
 "boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,89],
 "boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,130],
-"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,245],
+"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,246],
 "boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,37],
 "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,22],
-"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,251],
+"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,252],
 "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,173],
 "boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,149],
 "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,181],
-"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,263],
+"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,264],
 "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,26],
-"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,256],
+"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,257],
 "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,47],
-"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,217],
-"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,246],
+"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,218],
+"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,247],
 "boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,156],
 "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,97],
 "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,168],
 "boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,182],
 "boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,132],
 "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,29],
-"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,248],
+"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,249],
 "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,175],
 "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,56],
 "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,48],
 "boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,137],
 "boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,195],
 "boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,86],
-"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,244],
+"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,245],
 "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,187],
 "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,169],
-"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,249],
+"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,250],
 "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,44],
 "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,78],
 "boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,141],
 "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14],
-"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,272],
-"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,211],
+"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,273],
+"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,212],
 "cache_8php.html":[5,0,0,12],
 "channel_8php.html":[5,0,1,10],
 "channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,10,0],
@@ -245,9 +249,5 @@ var NAVTREEINDEX1 =
 "classConversation.html#a2a96b7a6573ae53db861624659e831cb":[4,0,8,6],
 "classConversation.html#a2f12724ef0244e9049fe1bb9641b516d":[4,0,8,19],
 "classConversation.html#a41f4a549e6a99f98935c4742addd22c8":[4,0,8,20],
-"classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901":[4,0,8,2],
-"classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8":[4,0,8,7],
-"classConversation.html#a5879199008b96bee7550b576d614e1c1":[4,0,8,10],
-"classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2":[4,0,8,17],
-"classConversation.html#a5effe8ad3007e01333df44b81432b813":[4,0,8,5]
+"classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901":[4,0,8,2]
 };
diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index c7d24977c..99e602486 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -1,5 +1,9 @@
 var NAVTREEINDEX2 =
 {
+"classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8":[4,0,8,7],
+"classConversation.html#a5879199008b96bee7550b576d614e1c1":[4,0,8,10],
+"classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2":[4,0,8,17],
+"classConversation.html#a5effe8ad3007e01333df44b81432b813":[4,0,8,5],
 "classConversation.html#a66f121ca4026246f86a732e5faa0682c":[4,0,8,11],
 "classConversation.html#a8335cdd43f1836e3c255638e61a09e16":[4,0,8,1],
 "classConversation.html#a8748445aa26047ebed5141f3c3cbc244":[4,0,8,16],
@@ -103,10 +107,11 @@ var NAVTREEINDEX2 =
 "classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e":[4,0,23,4],
 "classRedBrowser.html":[4,0,24],
 "classRedBrowser.html#a1f7daf50bb9bfcde7345b3b1908dbd7e":[4,0,24,1],
-"classRedBrowser.html#a40fdbb9d9fe6c1243bbf135dd5b0a06f":[4,0,24,3],
+"classRedBrowser.html#a40fdbb9d9fe6c1243bbf135dd5b0a06f":[4,0,24,4],
 "classRedBrowser.html#a4b76be9ccef0262cf78fffb4129eda93":[4,0,24,0],
-"classRedBrowser.html#a7f6bf0bda07833f4c647557bd172e349":[4,0,24,2],
-"classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35":[4,0,24,4],
+"classRedBrowser.html#a7f6bf0bda07833f4c647557bd172e349":[4,0,24,3],
+"classRedBrowser.html#a87529b4988a7777b49616f5c0a1c55d3":[4,0,24,2],
+"classRedBrowser.html#ab6d6d1e2a67e06b344a4cede1bd00b35":[4,0,24,5],
 "classRedDirectory.html":[4,0,25],
 "classRedDirectory.html#a0f113244cd85c17848df991001d024f4":[4,0,25,12],
 "classRedDirectory.html#a11376aed1963b4471eb1592c13c63976":[4,0,25,10],
@@ -244,10 +249,5 @@ var NAVTREEINDEX2 =
 "classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8":[4,0,21,7],
 "classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4":[4,0,21,0],
 "classphoto__imagick.html#a3047c68bb4de7f66c2893fe451db2b66":[4,0,21,2],
-"classphoto__imagick.html#a70adbef31128c0ac8cbc5dcf34cdb019":[4,0,21,6],
-"classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f":[4,0,21,8],
-"classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc":[4,0,21,5],
-"classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4":[4,0,21,4],
-"classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb":[4,0,21,9],
-"classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207":[4,0,21,1]
+"classphoto__imagick.html#a70adbef31128c0ac8cbc5dcf34cdb019":[4,0,21,6]
 };
diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index e62ec8c6e..9816afbf7 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,5 +1,10 @@
 var NAVTREEINDEX3 =
 {
+"classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f":[4,0,21,8],
+"classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc":[4,0,21,5],
+"classphoto__imagick.html#aef020d929f66f4370e33fc158c8eebd4":[4,0,21,4],
+"classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb":[4,0,21,9],
+"classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207":[4,0,21,1],
 "classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393":[4,0,21,3],
 "cli__startup_8php.html":[5,0,0,15],
 "cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,15,0],
@@ -244,10 +249,5 @@ var NAVTREEINDEX3 =
 "functions.html":[4,3,0,0],
 "functions_0x5f.html":[4,3,0,1],
 "functions_0x61.html":[4,3,0,2],
-"functions_0x62.html":[4,3,0,3],
-"functions_0x63.html":[4,3,0,4],
-"functions_0x64.html":[4,3,0,5],
-"functions_0x65.html":[4,3,0,6],
-"functions_0x66.html":[4,3,0,7],
-"functions_0x67.html":[4,3,0,8]
+"functions_0x62.html":[4,3,0,3]
 };
diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index b75aae4bb..4b882f43c 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,10 @@
 var NAVTREEINDEX4 =
 {
+"functions_0x63.html":[4,3,0,4],
+"functions_0x64.html":[4,3,0,5],
+"functions_0x65.html":[4,3,0,6],
+"functions_0x66.html":[4,3,0,7],
+"functions_0x67.html":[4,3,0,8],
 "functions_0x68.html":[4,3,0,9],
 "functions_0x69.html":[4,3,0,10],
 "functions_0x6c.html":[4,3,0,11],
@@ -32,8 +37,8 @@ var NAVTREEINDEX4 =
 "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],
@@ -60,8 +65,8 @@ var NAVTREEINDEX4 =
 "globals_0x77.html":[5,1,0,24],
 "globals_0x78.html":[5,1,0,25],
 "globals_0x7a.html":[5,1,0,26],
-"globals_func.html":[5,1,1,0],
 "globals_func.html":[5,1,1],
+"globals_func.html":[5,1,1,0],
 "globals_func_0x61.html":[5,1,1,1],
 "globals_func_0x62.html":[5,1,1,2],
 "globals_func_0x63.html":[5,1,1,3],
@@ -134,29 +139,30 @@ var NAVTREEINDEX4 =
 "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,39,1],
 "identity_8php.html":[5,0,0,40],
 "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,40,3],
-"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,40,9],
+"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,40,10],
 "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,40,2],
-"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,40,12],
-"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,40,18],
-"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,40,17],
-"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,40,19],
-"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,40,7],
-"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,40,22],
-"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,40,23],
+"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,40,13],
+"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,40,19],
+"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,40,18],
+"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,40,20],
+"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,40,8],
+"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,40,23],
+"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,40,24],
 "identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,40,1],
-"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,40,20],
-"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,40,15],
-"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,40,8],
+"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,40,21],
+"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,40,16],
+"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,40,9],
 "identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,40,0],
-"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,40,11],
-"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,40,10],
-"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,40,5],
-"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,40,13],
+"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,40,12],
+"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,40,11],
+"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,40,6],
+"identity_8php.html#ac73b3e13778c564c877554517a7f51ba":[5,0,0,40,5],
+"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,40,14],
 "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,40,4],
-"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,40,16],
-"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,40,14],
-"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,40,6],
-"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,40,21],
+"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,40,17],
+"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,40,15],
+"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,40,7],
+"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,40,22],
 "import_8php.html":[5,0,1,42],
 "import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,42,1],
 "import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,42,0],
@@ -243,11 +249,5 @@ var NAVTREEINDEX4 =
 "include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,18,11],
 "include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,18,1],
 "include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,18,2],
-"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,18,6],
-"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,18,8],
-"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,18,5],
-"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,18,10],
-"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,18,3],
-"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,18,4],
-"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,18,12]
+"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,18,6]
 };
diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js
index e23ba560c..59be36460 100644
--- a/doc/html/navtreeindex5.js
+++ b/doc/html/navtreeindex5.js
@@ -1,5 +1,11 @@
 var NAVTREEINDEX5 =
 {
+"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,18,8],
+"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,18,5],
+"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,18,10],
+"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,18,3],
+"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,18,4],
+"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,18,12],
 "include_2directory_8php.html":[5,0,0,29],
 "include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,29,0],
 "include_2follow_8php.html":[5,0,0,34],
@@ -97,29 +103,30 @@ var NAVTREEINDEX5 =
 "items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,43,27],
 "items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,43,7],
 "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,43,32],
-"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,43,36],
+"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,43,37],
 "items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,43,24],
 "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,43,4],
 "items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,43,31],
-"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,43,38],
+"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,43,39],
 "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,43,3],
 "items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,43,13],
 "items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[5,0,0,43,56],
 "items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,43,20],
 "items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,43,0],
-"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,43,44],
+"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,43,45],
 "items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[5,0,0,43,47],
 "items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,43,50],
 "items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,43,29],
 "items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,43,19],
 "items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,43,12],
 "items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,43,17],
-"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,43,37],
+"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,43,38],
 "items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,43,15],
-"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,43,35],
-"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,43,40],
+"items_8php.html#a6bee35961f2e32905f20367a9309d627":[5,0,0,43,34],
+"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,43,36],
+"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,43,41],
 "items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,43,33],
-"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,43,42],
+"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,43,43],
 "items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,43,16],
 "items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[5,0,0,43,48],
 "items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,43,11],
@@ -136,29 +143,29 @@ var NAVTREEINDEX5 =
 "items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,43,51],
 "items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,43,52],
 "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,43,25],
-"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,43,45],
 "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,43,1],
-"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,43,43],
+"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,43,44],
 "items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,43,18],
-"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,43,39],
+"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,43,40],
 "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,43,46],
 "items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,43,53],
 "items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[5,0,0,43,49],
 "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,43,23],
-"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,43,34],
-"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,43,41],
+"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,43,35],
+"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,43,42],
 "items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,43,14],
 "items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,43,22],
 "language_8php.html":[5,0,0,44],
-"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,44,6],
+"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,44,7],
+"language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7":[5,0,0,44,3],
 "language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,44,0],
-"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,44,4],
-"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,44,3],
+"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,44,5],
+"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,44,4],
 "language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,44,1],
-"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,44,7],
-"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,44,5],
+"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,44,8],
+"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,44,6],
 "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,44,2],
-"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,44,8],
+"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,44,9],
 "layouts_8php.html":[5,0,1,45],
 "layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,45,0],
 "like_8php.html":[5,0,1,46],
@@ -230,10 +237,10 @@ var NAVTREEINDEX5 =
 "mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,63,0],
 "mod_2oembed_8php.html":[5,0,1,64],
 "mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,64,0],
-"mod_2photos_8php.html":[5,0,1,71],
-"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,71,2],
-"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,71,0],
-"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,71,1],
+"mod_2photos_8php.html":[5,0,1,72],
+"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,72,2],
+"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,72,0],
+"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,72,1],
 "mod__filestorage_8php.html":[5,0,3,0,0],
 "mod__import_8php.html":[5,0,3,1,3],
 "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,1,3,0],
@@ -242,12 +249,5 @@ var NAVTREEINDEX5 =
 "mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,57,1],
 "msearch_8php.html":[5,0,1,58],
 "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,58,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":[4,0,2],
-"namespacefriendica-to-smarty-tpl.html":[3,0,2],
-"namespacemembers.html":[3,1,0],
-"namespacemembers_func.html":[3,1,1]
+"namespaceFriendica.html":[4,0,1]
 };
diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index 0905f396b..1493d3b2c 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -1,9 +1,16 @@
 var NAVTREEINDEX6 =
 {
+"namespaceFriendica.html":[3,0,1],
+"namespaceacl__selectors.html":[4,0,0],
+"namespaceacl__selectors.html":[3,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],
 "namespaces.html":[3,0],
-"namespaceupdatetpl.html":[3,0,3],
 "namespaceupdatetpl.html":[4,0,3],
+"namespaceupdatetpl.html":[3,0,3],
 "namespaceutil.html":[4,0,4],
 "namespaceutil.html":[3,0,4],
 "nav_8php.html":[5,0,0,47],
@@ -35,20 +42,22 @@ var NAVTREEINDEX6 =
 "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,54,0],
 "online_8php.html":[5,0,1,66],
 "online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[5,0,1,66,0],
-"opensearch_8php.html":[5,0,1,67],
-"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,67,0],
-"page_8php.html":[5,0,1,68],
-"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,68,1],
-"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,68,0],
+"openid_8php.html":[5,0,1,67],
+"openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43":[5,0,1,67,0],
+"opensearch_8php.html":[5,0,1,68],
+"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,68,0],
+"page_8php.html":[5,0,1,69],
+"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,69,1],
+"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,69,0],
 "page__widgets_8php.html":[5,0,0,55],
 "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,55,1],
 "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,55,0],
 "pages.html":[],
-"parse__url_8php.html":[5,0,1,69],
-"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,69,2],
-"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,69,3],
-"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,69,1],
-"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,69,0],
+"parse__url_8php.html":[5,0,1,70],
+"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,70,2],
+"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,70,3],
+"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,70,1],
+"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,70,0],
 "passion_8php.html":[5,0,3,2,0,1,6],
 "passionwide_8php.html":[5,0,3,2,0,1,7],
 "permissions_8php.html":[5,0,0,56],
@@ -57,8 +66,8 @@ var NAVTREEINDEX6 =
 "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,56,3],
 "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,56,4],
 "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,56,1],
-"photo_8php.html":[5,0,1,70],
-"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,70,0],
+"photo_8php.html":[5,0,1,71],
+"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,71,0],
 "photo__driver_8php.html":[5,0,0,1,0],
 "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2],
 "photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[5,0,0,1,0,1],
@@ -79,11 +88,11 @@ var NAVTREEINDEX6 =
 "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,0,0],
 "php_2theme__init_8php.html":[5,0,3,1,5],
 "php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,1,5,0],
-"php_8php.html":[5,0,1,72],
-"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,72,0],
+"php_8php.html":[5,0,1,73],
+"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,73,0],
 "pine_8php.html":[5,0,3,2,0,1,8],
-"ping_8php.html":[5,0,1,73],
-"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,73,0],
+"ping_8php.html":[5,0,1,74],
+"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,74,0],
 "plugin_8php.html":[5,0,0,58],
 "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,58,21],
 "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,58,24],
@@ -117,16 +126,16 @@ var NAVTREEINDEX6 =
 "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,58,5],
 "po2php_8php.html":[5,0,2,7],
 "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0],
-"poco_8php.html":[5,0,1,74],
-"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,74,0],
-"poke_8php.html":[5,0,1,75],
-"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,75,1],
-"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,75,0],
+"poco_8php.html":[5,0,1,75],
+"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,75,0],
+"poke_8php.html":[5,0,1,76],
+"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,76,1],
+"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,76,0],
 "poller_8php.html":[5,0,0,59],
 "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,59,0],
-"post_8php.html":[5,0,1,76],
-"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,76,0],
-"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,76,1],
+"post_8php.html":[5,0,1,77],
+"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,77,0],
+"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,77,1],
 "post__to__red_8php.html":[5,0,2,1,0,0],
 "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823":[5,0,2,1,0,0,16],
 "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,0,12],
@@ -152,36 +161,36 @@ var NAVTREEINDEX6 =
 "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,0,18],
 "post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,0,23],
 "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,0,11],
-"pretheme_8php.html":[5,0,1,77],
-"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,77,0],
-"probe_8php.html":[5,0,1,78],
-"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,78,0],
-"profile_8php.html":[5,0,1,79],
-"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,79,0],
-"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,79,1],
-"profile__photo_8php.html":[5,0,1,80],
-"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,80,0],
-"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,80,1],
+"pretheme_8php.html":[5,0,1,78],
+"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,78,0],
+"probe_8php.html":[5,0,1,79],
+"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,79,0],
+"profile_8php.html":[5,0,1,80],
+"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,80,0],
+"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,80,1],
+"profile__photo_8php.html":[5,0,1,81],
+"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,81,0],
+"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,81,1],
 "profile__selectors_8php.html":[5,0,0,60],
 "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,60,2],
 "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,60,1],
 "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,60,0],
-"profiles_8php.html":[5,0,1,81],
-"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,81,1],
-"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,81,0],
-"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,81,2],
-"profperm_8php.html":[5,0,1,82],
-"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,82,1],
-"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,82,0],
-"pubsites_8php.html":[5,0,1,83],
-"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,83,0],
+"profiles_8php.html":[5,0,1,82],
+"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,82,1],
+"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,82,0],
+"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,82,2],
+"profperm_8php.html":[5,0,1,83],
+"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,83,1],
+"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,83,0],
+"pubsites_8php.html":[5,0,1,84],
+"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,84,0],
 "queue_8php.html":[5,0,0,62],
 "queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,62,0],
 "queue__fn_8php.html":[5,0,0,63],
 "queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,63,1],
 "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,63,0],
-"randprof_8php.html":[5,0,1,84],
-"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,84,0],
+"randprof_8php.html":[5,0,1,85],
+"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,85,0],
 "redbasic_2php_2style_8php.html":[5,0,3,2,2,0,1],
 "redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,2,2,0,1,1],
 "redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,2,2,0,1,0],
@@ -196,28 +205,28 @@ var NAVTREEINDEX6 =
 "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[5,0,0,64,5],
 "reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[5,0,0,64,6],
 "reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[5,0,0,64,4],
-"register_8php.html":[5,0,1,85],
-"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,85,0],
-"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,85,2],
-"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,85,1],
-"regmod_8php.html":[5,0,1,86],
-"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,86,0],
-"removeme_8php.html":[5,0,1,87],
-"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,87,0],
-"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,87,1],
-"rmagic_8php.html":[5,0,1,88],
-"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,88,0],
-"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,88,2],
-"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,88,1],
-"rpost_8php.html":[5,0,1,89],
-"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,89,0],
-"rsd__xml_8php.html":[5,0,1,90],
-"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,90,0],
-"search_8php.html":[5,0,1,91],
-"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,91,0],
-"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,91,1],
-"search__ac_8php.html":[5,0,1,92],
-"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,92,0],
+"register_8php.html":[5,0,1,86],
+"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,86,0],
+"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,86,2],
+"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,86,1],
+"regmod_8php.html":[5,0,1,87],
+"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,87,0],
+"removeme_8php.html":[5,0,1,88],
+"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,88,0],
+"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,88,1],
+"rmagic_8php.html":[5,0,1,89],
+"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,89,0],
+"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,89,2],
+"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,89,1],
+"rpost_8php.html":[5,0,1,90],
+"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,90,0],
+"rsd__xml_8php.html":[5,0,1,91],
+"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,91,0],
+"search_8php.html":[5,0,1,92],
+"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,92,0],
+"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,92,1],
+"search__ac_8php.html":[5,0,1,93],
+"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,93,0],
 "security_8php.html":[5,0,0,65],
 "security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,65,11],
 "security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,65,2],
@@ -240,14 +249,5 @@ var NAVTREEINDEX6 =
 "session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,66,7],
 "session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,66,6],
 "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,66,3],
-"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,66,9],
-"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,66,2],
-"settings_8php.html":[5,0,1,93],
-"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,93,0],
-"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,93,1],
-"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,93,2],
-"setup_8php.html":[5,0,1,94],
-"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,94,2],
-"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,94,14],
-"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,94,5]
+"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,66,9]
 };
diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js
index f5f0b60f1..9ca9e8985 100644
--- a/doc/html/navtreeindex7.js
+++ b/doc/html/navtreeindex7.js
@@ -1,28 +1,37 @@
 var NAVTREEINDEX7 =
 {
-"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,94,13],
-"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,94,10],
-"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,94,3],
-"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,94,1],
-"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,94,8],
-"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,94,12],
-"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,94,4],
-"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,94,7],
-"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,94,11],
-"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,94,9],
-"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,94,16],
-"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,94,0],
-"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,94,15],
-"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,94,6],
-"share_8php.html":[5,0,1,95],
-"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,95,0],
-"siteinfo_8php.html":[5,0,1,96],
-"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,96,1],
-"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,96,0],
-"sitelist_8php.html":[5,0,1,97],
-"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,97,0],
-"smilies_8php.html":[5,0,1,98],
-"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,98,0],
+"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,66,2],
+"settings_8php.html":[5,0,1,94],
+"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,94,0],
+"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,94,1],
+"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,94,2],
+"setup_8php.html":[5,0,1,95],
+"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,95,2],
+"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,95,14],
+"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,95,5],
+"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,95,13],
+"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,95,10],
+"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,95,3],
+"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,95,1],
+"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,95,8],
+"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,95,12],
+"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,95,4],
+"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[5,0,1,95,7],
+"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,95,11],
+"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,95,9],
+"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,95,16],
+"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,95,0],
+"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,95,15],
+"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,95,6],
+"share_8php.html":[5,0,1,96],
+"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,96,0],
+"siteinfo_8php.html":[5,0,1,97],
+"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,97,1],
+"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,97,0],
+"sitelist_8php.html":[5,0,1,98],
+"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,98,0],
+"smilies_8php.html":[5,0,1,99],
+"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,99,0],
 "socgraph_8php.html":[5,0,0,67],
 "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,67,0],
 "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,67,6],
@@ -33,28 +42,28 @@ var NAVTREEINDEX7 =
 "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,67,2],
 "socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,67,5],
 "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,67,3],
-"sources_8php.html":[5,0,1,99],
-"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,99,0],
-"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,99,1],
+"sources_8php.html":[5,0,1,100],
+"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,100,0],
+"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,100,1],
 "spam_8php.html":[5,0,0,68],
 "spam_8php.html#a05861201147b9a538d006f0269255cf9":[5,0,0,68,1],
 "spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[5,0,0,68,0],
-"sslify_8php.html":[5,0,1,100],
-"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,100,0],
-"starred_8php.html":[5,0,1,101],
-"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,101,0],
-"subthread_8php.html":[5,0,1,102],
-"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,102,0],
-"suggest_8php.html":[5,0,1,103],
-"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,103,0],
-"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,103,1],
+"sslify_8php.html":[5,0,1,101],
+"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[5,0,1,101,0],
+"starred_8php.html":[5,0,1,102],
+"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,102,0],
+"subthread_8php.html":[5,0,1,103],
+"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,103,0],
+"suggest_8php.html":[5,0,1,104],
+"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,104,0],
+"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,104,1],
 "system__unavailable_8php.html":[5,0,0,69],
 "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,69,0],
-"tagger_8php.html":[5,0,1,104],
-"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,104,0],
-"tagrm_8php.html":[5,0,1,105],
-"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,105,1],
-"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,105,0],
+"tagger_8php.html":[5,0,1,105],
+"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,105,0],
+"tagrm_8php.html":[5,0,1,106],
+"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,106,1],
+"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,106,0],
 "taxonomy_8php.html":[5,0,0,70],
 "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,70,9],
 "taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,70,0],
@@ -81,89 +90,91 @@ var NAVTREEINDEX7 =
 "text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,72,6],
 "text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,72,16],
 "text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,72,11],
-"text_8php.html#a10dde167249ed5abf190a7a0986878ea":[5,0,0,72,68],
+"text_8php.html#a10dde167249ed5abf190a7a0986878ea":[5,0,0,72,69],
 "text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,72,43],
 "text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,72,5],
-"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,72,77],
+"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,72,79],
 "text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,72,31],
 "text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,72,34],
 "text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,72,48],
-"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,72,50],
+"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,72,51],
 "text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,72,45],
 "text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,72,46],
 "text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,72,41],
-"text_8php.html#a273156a6f5cddc6652ad656821cd5805":[5,0,0,72,69],
+"text_8php.html#a273156a6f5cddc6652ad656821cd5805":[5,0,0,72,70],
 "text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,72,4],
-"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,72,85],
-"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,72,74],
+"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,72,87],
+"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,72,76],
 "text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,72,47],
 "text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,72,10],
-"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,72,87],
+"text_8php.html#a2f2585385530cb935a6325c809d84a4d":[5,0,0,72,74],
+"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,72,89],
 "text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,72,23],
-"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,72,82],
-"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,72,71],
-"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,72,80],
+"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,72,84],
+"text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9":[5,0,0,72,72],
+"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,72,82],
 "text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,72,29],
 "text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,72,40],
-"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,72,70],
+"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,72,71],
 "text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,72,7],
-"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,72,83],
+"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,72,85],
 "text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,72,32],
 "text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,72,30],
 "text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,72,42],
-"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,72,59],
+"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,72,60],
 "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,72,49],
 "text_8php.html#a4e4d42b0a805148d9f9a92bcac89bf91":[5,0,0,72,24],
-"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,72,58],
-"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,72,79],
+"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,72,59],
+"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,72,81],
 "text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,72,9],
 "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,72,14],
-"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,72,78],
+"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,72,80],
 "text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,72,39],
 "text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,72,26],
-"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,72,75],
+"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,72,77],
 "text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,72,1],
 "text_8php.html#a75c326298519ed14ebe762194c8a3f2a":[5,0,0,72,33],
 "text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,72,25],
-"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,72,76],
+"text_8php.html#a8264348059abd1d4d5bb521323d3b19a":[5,0,0,72,78],
 "text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,72,8],
-"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,72,66],
-"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,72,72],
+"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,72,67],
+"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,72,73],
 "text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,72,15],
 "text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,72,20],
-"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,72,57],
+"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,72,58],
 "text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,72,19],
 "text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,72,3],
-"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,72,52],
-"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,72,63],
-"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,72,61],
-"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,72,65],
+"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,72,53],
+"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,72,64],
+"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,72,62],
+"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,72,66],
 "text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,72,28],
 "text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,72,17],
-"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,72,53],
+"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,72,54],
 "text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,72,35],
 "text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[5,0,0,72,27],
-"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,72,86],
-"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,72,67],
-"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,72,81],
-"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,72,84],
-"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,72,54],
+"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,72,88],
+"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[5,0,0,72,68],
+"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,72,83],
+"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,72,86],
+"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,72,55],
 "text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,72,36],
 "text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,72,21],
 "text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,72,2],
 "text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,72,13],
-"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,72,62],
+"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,72,63],
+"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,72,50],
 "text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,72,37],
-"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,72,64],
+"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,72,65],
 "text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,72,18],
-"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,72,55],
+"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,72,56],
 "text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,72,0],
-"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,72,73],
-"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,72,60],
+"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[5,0,0,72,75],
+"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,72,61],
 "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,72,22],
 "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,72,12],
-"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,72,56],
-"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,72,51],
+"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,72,57],
+"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,72,52],
 "theme_2blogga_2php_2default_8php.html":[5,0,3,2,1,0,1],
 "theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[5,0,3,2,1,0,1,2],
 "theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,2,1,0,1,0],
@@ -174,13 +185,13 @@ var NAVTREEINDEX7 =
 "theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539":[5,0,3,2,1,1,0,0,1,1],
 "theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,2,1,1,0,0,1,0],
 "theme_2redbasic_2php_2theme__init_8php.html":[5,0,3,2,2,0,3],
-"thing_8php.html":[5,0,1,106],
-"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,106,0],
-"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,106,1],
-"toggle__mobile_8php.html":[5,0,1,107],
-"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,107,0],
-"toggle__safesearch_8php.html":[5,0,1,108],
-"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,108,0],
+"thing_8php.html":[5,0,1,107],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,107,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,107,1],
+"toggle__mobile_8php.html":[5,0,1,108],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,108,0],
+"toggle__safesearch_8php.html":[5,0,1,109],
+"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,109,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],
@@ -194,18 +205,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,109],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,109,0],
-"update__channel_8php.html":[5,0,1,110],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,110,0],
-"update__community_8php.html":[5,0,1,111],
-"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,111,0],
-"update__display_8php.html":[5,0,1,112],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,112,0],
-"update__network_8php.html":[5,0,1,113],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,113,0],
-"update__search_8php.html":[5,0,1,114],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,114,0],
+"uexport_8php.html":[5,0,1,110],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,110,0],
+"update__channel_8php.html":[5,0,1,111],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,111,0],
+"update__community_8php.html":[5,0,1,112],
+"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,112,0],
+"update__display_8php.html":[5,0,1,113],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,113,0],
+"update__network_8php.html":[5,0,1,114],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,114,0],
+"update__search_8php.html":[5,0,1,115],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,115,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],
@@ -233,21 +244,10 @@ var NAVTREEINDEX7 =
 "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[5,0,3,2,2,0,0,0],
 "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,2,2,0,0,1],
 "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,2,2,0,0,2],
-"view_8php.html":[5,0,1,115],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,115,0],
-"viewconnections_8php.html":[5,0,1,116],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,116,1],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,116,0],
-"viewsrc_8php.html":[5,0,1,117],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,117,0],
-"vote_8php.html":[5,0,1,118],
-"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,118,2],
-"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,118,0],
-"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,118,1],
-"wall__attach_8php.html":[5,0,1,119],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,119,0],
-"wall__upload_8php.html":[5,0,1,120],
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,120,0],
-"webfinger_8php.html":[5,0,1,121],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,121,0]
+"view_8php.html":[5,0,1,116],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,116,0],
+"viewconnections_8php.html":[5,0,1,117],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,117,1],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,117,0],
+"viewsrc_8php.html":[5,0,1,118]
 };
diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js
index eacf68c68..e3484b759 100644
--- a/doc/html/navtreeindex8.js
+++ b/doc/html/navtreeindex8.js
@@ -1,9 +1,20 @@
 var NAVTREEINDEX8 =
 {
-"webpages_8php.html":[5,0,1,122],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,122,0],
-"wfinger_8php.html":[5,0,1,123],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,123,0],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,118,0],
+"vote_8php.html":[5,0,1,119],
+"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,119,2],
+"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,119,0],
+"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,119,1],
+"wall__attach_8php.html":[5,0,1,120],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,120,0],
+"wall__upload_8php.html":[5,0,1,121],
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,121,0],
+"webfinger_8php.html":[5,0,1,122],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,122,0],
+"webpages_8php.html":[5,0,1,123],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,123,0],
+"wfinger_8php.html":[5,0,1,124],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,124,0],
 "widedarkness_8php.html":[5,0,3,2,0,1,10],
 "widgets_8php.html":[5,0,0,73],
 "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[5,0,0,73,8],
@@ -30,14 +41,14 @@ var NAVTREEINDEX8 =
 "widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,73,22],
 "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,73,2],
 "widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,73,13],
-"xchan_8php.html":[5,0,1,124],
-"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,124,0],
-"xrd_8php.html":[5,0,1,125],
-"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,125,0],
-"xref_8php.html":[5,0,1,126],
-"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,126,0],
-"zfinger_8php.html":[5,0,1,127],
-"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,127,0],
+"xchan_8php.html":[5,0,1,125],
+"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,125,0],
+"xrd_8php.html":[5,0,1,126],
+"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,126,0],
+"xref_8php.html":[5,0,1,127],
+"xref_8php.html#a9bee399213b8de8226b0d60834307473":[5,0,1,127,0],
+"zfinger_8php.html":[5,0,1,128],
+"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,128,0],
 "zot_8php.html":[5,0,0,74],
 "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,74,13],
 "zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,74,7],
@@ -67,8 +78,8 @@ var NAVTREEINDEX8 =
 "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,74,20],
 "zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,74,22],
 "zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,74,6],
-"zotfeed_8php.html":[5,0,1,128],
-"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,128,0],
-"zping_8php.html":[5,0,1,129],
-"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,129,0]
+"zotfeed_8php.html":[5,0,1,129],
+"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,129,0],
+"zping_8php.html":[5,0,1,130],
+"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,130,0]
 };
diff --git a/doc/html/openid_8php.html b/doc/html/openid_8php.html
new file mode 100644
index 000000000..ac541c9bc
--- /dev/null
+++ b/doc/html/openid_8php.html
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+The Red Matrix: mod/openid.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                      
+
                                      
+
+ 
+ 
+  
+  
+ 
+ 
+
                                      
+   
                                      The Red Matrix
+   
                                      
+  
                                      
+
                                      
+
+
+
+  
+  
+
                                      
+
                                      
+  
+  
                                      
+  
                                      
+
                                      
+
+
                                      
+
+
+
+
+
                                      
+
+
                                      
+
+
                                      
+  
                                      
+Functions  
                                      
+  
                                      
+
                                      openid.php File Reference
                                        
                                      
+
                                      
+
                                      
+
+
+
+
+
                                      
+Functions
                                       openid_content (&$a)
                                       
                                      
+
                                      Function Documentation
                                      
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      openid_content (& $a)
                                      
+
                                      
+
+
                                      
+
                                      
+
                                      
+
                                      
+
diff --git a/doc/html/openid_8php.js b/doc/html/openid_8php.js
new file mode 100644
index 000000000..f5d89e346
--- /dev/null
+++ b/doc/html/openid_8php.js
@@ -0,0 +1,4 @@
+var openid_8php =
+[
+    [ "openid_content", "openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43", null ]
+];
\ No newline at end of file
diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html
index 86bd00f16..c702588fe 100644
--- a/doc/html/photo__driver_8php.html
+++ b/doc/html/photo__driver_8php.html
@@ -232,7 +232,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by import_post(), import_xchan(), poller_run(), and thing_init().
                                      
+
                                      Referenced by import_author_rss(), import_post(), import_xchan(), openid_content(), poller_run(), and thing_init().
                                      
 
 
                                      
 
diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html
index 3c04c4679..9b1a1a312 100644
--- a/doc/html/php2po_8php.html
+++ b/doc/html/php2po_8php.html
@@ -168,7 +168,7 @@ Variables
       
 
                                      
 
-
                                      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_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(), sslify_init(), startup(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().
                                      
+
                                      Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), bb_sanitize_style(), build_sync_packet(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirprofile_init(), dirsearch_content(), RedBrowser\generateDirectoryIndex(), get_plugin_info(), get_theme_info(), get_things(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), local_dir_update(), mail_post(), mood_content(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), openid_content(), 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(), sslify_init(), startup(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().
                                      
 
 
                                      
 
diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html
index 2a382269b..8f23cfee8 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_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().
                                      
+
                                      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(), downgrade_accounts(), 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(), openid_content(), 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(), rmagic_post(), 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(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), chat_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(), dirprofile_init(), 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(), mail_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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), 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(), chat_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(), dirprofile_init(), 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(), mail_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(), 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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().
                                      
 
 
                                      
 
diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index c7bfb5bb9..e45a44444 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -18,6 +18,7 @@ var searchData=
   ['bb_5funspacefy_5fand_5ftrim',['bb_unspacefy_and_trim',['../bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d',1,'bbcode.php']]],
   ['bbcode',['bbcode',['../bbcode_8php.html#a009f61aaf78771737ed0765c8463911b',1,'bbcode.php']]],
   ['bbcode_2ephp',['bbcode.php',['../bbcode_8php.html',1,'']]],
+  ['bbiframe',['bbiframe',['../bbcode_8php.html#a7cc811ff1939a508cfb54f39c1d584d7',1,'bbcode.php']]],
   ['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]],
   ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]],
   ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]],
@@ -30,8 +31,8 @@ var searchData=
   ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]],
   ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]],
   ['bookmark_5fadd',['bookmark_add',['../include_2bookmarks_8php.html#a88ce7dee6a3dc7465aa9b8eaa45b0087',1,'bookmarks.php']]],
-  ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]],
   ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]],
+  ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]],
   ['bookmarks_5fcontent',['bookmarks_content',['../mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a',1,'bookmarks.php']]],
   ['bookmarks_5finit',['bookmarks_init',['../mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3',1,'bookmarks.php']]],
   ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]],
diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js
index 61fbc8c2e..1a9b8dac7 100644
--- a/doc/html/search/all_64.js
+++ b/doc/html/search/all_64.js
@@ -77,6 +77,7 @@ var searchData=
   ['dob',['dob',['../datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8',1,'datetime.php']]],
   ['docblox_5ferrorchecker_2ephp',['docblox_errorchecker.php',['../docblox__errorchecker_8php.html',1,'']]],
   ['doscaleimage',['doScaleImage',['../classphoto__driver.html#ae18716018afcf362c7c24586b53e9e2f',1,'photo_driver\doScaleImage()'],['../classphoto__gd.html#a2f2e5900e6d8b1667892ac631b1d4754',1,'photo_gd\doScaleImage()'],['../classphoto__imagick.html#a3047c68bb4de7f66c2893fe451db2b66',1,'photo_imagick\doScaleImage()']]],
+  ['downgrade_5faccounts',['downgrade_accounts',['../account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9',1,'account.php']]],
   ['drop_5fitem',['drop_item',['../items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1',1,'items.php']]],
   ['drop_5fitems',['drop_items',['../items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55',1,'items.php']]]
 ];
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index 92ca30551..8901bffa8 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -17,6 +17,7 @@ var searchData=
   ['get_5fbrowser_5flanguage',['get_browser_language',['../language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e',1,'language.php']]],
   ['get_5fcapath',['get_capath',['../include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7',1,'network.php']]],
   ['get_5fchannel',['get_channel',['../classApp.html#a084e03c77686d8c13390fef3f7428a2b',1,'App']]],
+  ['get_5fchannel_5fby_5fnick',['get_channel_by_nick',['../identity_8php.html#ac73b3e13778c564c877554517a7f51ba',1,'identity.php']]],
   ['get_5fchild',['get_child',['../classItem.html#a632185dd25c5caf277067c76230a4320',1,'Item']]],
   ['get_5fchildren',['get_children',['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item']]],
   ['get_5fcipher',['get_cipher',['../classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901',1,'Conversation']]],
@@ -45,6 +46,7 @@ var searchData=
   ['get_5fitem_5fchildren',['get_item_children',['../conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67',1,'conversation.php']]],
   ['get_5fitem_5fcontact',['get_item_contact',['../items_8php.html#aab9c6bae4c40799867596bdaae9829fd',1,'items.php']]],
   ['get_5fitem_5felements',['get_item_elements',['../items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361',1,'items.php']]],
+  ['get_5flanguage_5fname',['get_language_name',['../language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7',1,'language.php']]],
   ['get_5fmail_5felements',['get_mail_elements',['../items_8php.html#a94ddb1d6c8fa21dd7433677e85168037',1,'items.php']]],
   ['get_5fmarkup_5ftemplate',['get_markup_template',['../classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88',1,'FriendicaSmartyEngine\get_markup_template()'],['../interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442',1,'ITemplateEngine\get_markup_template()'],['../classTemplate.html#afd97b4b1e7754a550e67c0ea79159059',1,'Template\get_markup_template()'],['../plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4',1,'get_markup_template(): plugin.php']]],
   ['get_5fmax_5fimport_5fsize',['get_max_import_size',['../boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90',1,'boot.php']]],
@@ -89,6 +91,7 @@ var searchData=
   ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
   ['get_5fwords',['get_words',['../spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6',1,'spam.php']]],
   ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
+  ['getasseturl',['getAssetUrl',['../classRedBrowser.html#a87529b4988a7777b49616f5c0a1c55d3',1,'RedBrowser']]],
   ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]],
   ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]],
   ['getcontenttype',['getContentType',['../classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b',1,'RedFile']]],
@@ -110,8 +113,8 @@ 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_5fbyname',['group_byname',['../include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb',1,'group.php']]],
diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js
index 0a93cba40..3ec2ac6ca 100644
--- a/doc/html/search/all_69.js
+++ b/doc/html/search/all_69.js
@@ -7,6 +7,7 @@ var searchData=
   ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762',1,'if(): default.php'],['../full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db',1,'if(): full.php'],['../apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]],
   ['imagestring',['imageString',['../classphoto__driver.html#abc9f73ad90923772d52b9fcc4eb117dd',1,'photo_driver\imageString()'],['../classphoto__gd.html#a0795fc029be382557ae3f6e285f40e00',1,'photo_gd\imageString()'],['../classphoto__imagick.html#a70adbef31128c0ac8cbc5dcf34cdb019',1,'photo_imagick\imageString()']]],
   ['import_2ephp',['import.php',['../import_8php.html',1,'']]],
+  ['import_5fauthor_5frss',['import_author_rss',['../items_8php.html#a6bee35961f2e32905f20367a9309d627',1,'items.php']]],
   ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]],
   ['import_5fauthor_5fzot',['import_author_zot',['../zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d',1,'zot.php']]],
   ['import_5fchannel_5fphoto',['import_channel_photo',['../photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a',1,'photo_driver.php']]],
diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js
index 3502afdef..ec6e4bbe9 100644
--- a/doc/html/search/all_6d.js
+++ b/doc/html/search/all_6d.js
@@ -21,6 +21,7 @@ var searchData=
   ['marital_5fselector',['marital_selector',['../profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798',1,'profile_selectors.php']]],
   ['match_2ephp',['match.php',['../match_8php.html',1,'']]],
   ['match_5fcontent',['match_content',['../match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d',1,'match.php']]],
+  ['match_5fopenid',['match_openid',['../auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38',1,'auth.php']]],
   ['max_5fimage_5flength',['MAX_IMAGE_LENGTH',['../boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa',1,'boot.php']]],
   ['max_5flikers',['MAX_LIKERS',['../boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd',1,'boot.php']]],
   ['member_5fof',['member_of',['../include_2group_8php.html#a048f6892bfd28852de1b76470df411de',1,'group.php']]],
diff --git a/doc/html/search/all_6e.js b/doc/html/search/all_6e.js
index 08c6e406a..4b343a645 100644
--- a/doc/html/search/all_6e.js
+++ b/doc/html/search/all_6e.js
@@ -55,6 +55,7 @@ var searchData=
   ['node2bbcodesub',['node2bbcodesub',['../html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7',1,'html2bbcode.php']]],
   ['none_2ephp',['none.php',['../none_8php.html',1,'']]],
   ['normalise_5flink',['normalise_link',['../text_8php.html#a4bbb7d00c05cd20b4e043424f322388f',1,'text.php']]],
+  ['normalise_5fopenid',['normalise_openid',['../text_8php.html#adba17ec946f4285285dc100f7860bf51',1,'text.php']]],
   ['notags',['notags',['../text_8php.html#a1af49756c8c71902a66c7e329c462beb',1,'text.php']]],
   ['notes_2ephp',['notes.php',['../notes_8php.html',1,'']]],
   ['notes_5finit',['notes_init',['../notes_8php.html#a4dbd7b1f906440746af48b484d66535a',1,'notes.php']]],
diff --git a/doc/html/search/all_6f.js b/doc/html/search/all_6f.js
index cc701412c..b67ac1b5f 100644
--- a/doc/html/search/all_6f.js
+++ b/doc/html/search/all_6f.js
@@ -25,6 +25,8 @@ var searchData=
   ['onepoll_5frun',['onepoll_run',['../onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d',1,'onepoll.php']]],
   ['online_2ephp',['online.php',['../online_8php.html',1,'']]],
   ['online_5finit',['online_init',['../online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7',1,'online.php']]],
+  ['openid_2ephp',['openid.php',['../openid_8php.html',1,'']]],
+  ['openid_5fcontent',['openid_content',['../openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43',1,'openid.php']]],
   ['opensearch_2ephp',['opensearch.php',['../opensearch_8php.html',1,'']]],
   ['opensearch_5finit',['opensearch_init',['../opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9',1,'opensearch.php']]],
   ['orient',['orient',['../classphoto__driver.html#a4de5bac8daea8f291a33c80788019d0d',1,'photo_driver']]],
diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index fd3a679b1..9172b2f9a 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -32,6 +32,7 @@ var searchData=
   ['perms_5fa_5fbookmark',['PERMS_A_BOOKMARK',['../boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b',1,'boot.php']]],
   ['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']]],
+  ['perms_5fauthed',['PERMS_AUTHED',['../boot_8php.html#a852d4036a3bed66af1534d014c4ecde2',1,'boot.php']]],
   ['perms_5fcontacts',['PERMS_CONTACTS',['../boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6',1,'boot.php']]],
   ['perms_5fnetwork',['PERMS_NETWORK',['../boot_8php.html#a6df1102664f64b274810db85197c2755',1,'boot.php']]],
   ['perms_5fpublic',['PERMS_PUBLIC',['../boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7',1,'boot.php']]],
@@ -131,7 +132,6 @@ var searchData=
   ['post_5fto_5fred_5fpost_5fmeta_5fcontent',['post_to_red_post_meta_content',['../post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901',1,'post_to_red.php']]],
   ['post_5fto_5fred_5fsettings_5flink',['post_to_red_settings_link',['../post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017',1,'post_to_red.php']]],
   ['post_5fto_5fred_5fversion',['post_to_red_version',['../post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a',1,'post_to_red.php']]],
-  ['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
   ['preg_5fcallback_5fhelp_5finclude',['preg_callback_help_include',['../help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4',1,'help.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index e646c70de..4253ba835 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -105,6 +105,7 @@ var searchData=
   ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
   ['string_5fsplitter',['string_splitter',['../spam_8php.html#a05861201147b9a538d006f0269255cf9',1,'spam.php']]],
   ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
+  ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',1,'text.php']]],
   ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]],
   ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]],
   ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
diff --git a/doc/html/search/files_6f.js b/doc/html/search/files_6f.js
index 4d739b50a..28bf1071e 100644
--- a/doc/html/search/files_6f.js
+++ b/doc/html/search/files_6f.js
@@ -8,5 +8,6 @@ var searchData=
   ['onedirsync_2ephp',['onedirsync.php',['../onedirsync_8php.html',1,'']]],
   ['onepoll_2ephp',['onepoll.php',['../onepoll_8php.html',1,'']]],
   ['online_2ephp',['online.php',['../online_8php.html',1,'']]],
+  ['openid_2ephp',['openid.php',['../openid_8php.html',1,'']]],
   ['opensearch_2ephp',['opensearch.php',['../opensearch_8php.html',1,'']]]
 ];
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 3675c92a6..ffdeffab1 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -14,6 +14,7 @@ var searchData=
   ['bb_5ftranslate_5fvideo',['bb_translate_video',['../text_8php.html#a3d2793d66db3345fd290b71e2eadf98e',1,'text.php']]],
   ['bb_5funspacefy_5fand_5ftrim',['bb_unspacefy_and_trim',['../bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d',1,'bbcode.php']]],
   ['bbcode',['bbcode',['../bbcode_8php.html#a009f61aaf78771737ed0765c8463911b',1,'bbcode.php']]],
+  ['bbiframe',['bbiframe',['../bbcode_8php.html#a7cc811ff1939a508cfb54f39c1d584d7',1,'bbcode.php']]],
   ['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]],
   ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]],
   ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]],
diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js
index ef331a740..6fae4722d 100644
--- a/doc/html/search/functions_64.js
+++ b/doc/html/search/functions_64.js
@@ -44,6 +44,7 @@ var searchData=
   ['dlogger',['dlogger',['../text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c',1,'text.php']]],
   ['dob',['dob',['../datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8',1,'datetime.php']]],
   ['doscaleimage',['doScaleImage',['../classphoto__driver.html#ae18716018afcf362c7c24586b53e9e2f',1,'photo_driver\doScaleImage()'],['../classphoto__gd.html#a2f2e5900e6d8b1667892ac631b1d4754',1,'photo_gd\doScaleImage()'],['../classphoto__imagick.html#a3047c68bb4de7f66c2893fe451db2b66',1,'photo_imagick\doScaleImage()']]],
+  ['downgrade_5faccounts',['downgrade_accounts',['../account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9',1,'account.php']]],
   ['drop_5fitem',['drop_item',['../items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1',1,'items.php']]],
   ['drop_5fitems',['drop_items',['../items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55',1,'items.php']]]
 ];
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 14b22673f..7d13c746a 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -17,6 +17,7 @@ var searchData=
   ['get_5fbrowser_5flanguage',['get_browser_language',['../language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e',1,'language.php']]],
   ['get_5fcapath',['get_capath',['../include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7',1,'network.php']]],
   ['get_5fchannel',['get_channel',['../classApp.html#a084e03c77686d8c13390fef3f7428a2b',1,'App']]],
+  ['get_5fchannel_5fby_5fnick',['get_channel_by_nick',['../identity_8php.html#ac73b3e13778c564c877554517a7f51ba',1,'identity.php']]],
   ['get_5fchild',['get_child',['../classItem.html#a632185dd25c5caf277067c76230a4320',1,'Item']]],
   ['get_5fchildren',['get_children',['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item']]],
   ['get_5fcipher',['get_cipher',['../classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901',1,'Conversation']]],
@@ -45,6 +46,7 @@ var searchData=
   ['get_5fitem_5fchildren',['get_item_children',['../conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67',1,'conversation.php']]],
   ['get_5fitem_5fcontact',['get_item_contact',['../items_8php.html#aab9c6bae4c40799867596bdaae9829fd',1,'items.php']]],
   ['get_5fitem_5felements',['get_item_elements',['../items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361',1,'items.php']]],
+  ['get_5flanguage_5fname',['get_language_name',['../language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7',1,'language.php']]],
   ['get_5fmail_5felements',['get_mail_elements',['../items_8php.html#a94ddb1d6c8fa21dd7433677e85168037',1,'items.php']]],
   ['get_5fmarkup_5ftemplate',['get_markup_template',['../classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88',1,'FriendicaSmartyEngine\get_markup_template()'],['../interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442',1,'ITemplateEngine\get_markup_template()'],['../classTemplate.html#afd97b4b1e7754a550e67c0ea79159059',1,'Template\get_markup_template()'],['../plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4',1,'get_markup_template(): plugin.php']]],
   ['get_5fmax_5fimport_5fsize',['get_max_import_size',['../boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90',1,'boot.php']]],
@@ -89,6 +91,7 @@ var searchData=
   ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
   ['get_5fwords',['get_words',['../spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6',1,'spam.php']]],
   ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
+  ['getasseturl',['getAssetUrl',['../classRedBrowser.html#a87529b4988a7777b49616f5c0a1c55d3',1,'RedBrowser']]],
   ['getchild',['getChild',['../classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569',1,'RedDirectory']]],
   ['getchildren',['getChildren',['../classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a',1,'RedDirectory']]],
   ['getcontenttype',['getContentType',['../classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b',1,'RedFile']]],
diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js
index 2c38ca37c..729f2476d 100644
--- a/doc/html/search/functions_69.js
+++ b/doc/html/search/functions_69.js
@@ -4,6 +4,7 @@ var searchData=
   ['identity_5fcheck_5fservice_5fclass',['identity_check_service_class',['../identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633',1,'identity.php']]],
   ['ids_5fto_5fquerystr',['ids_to_querystr',['../text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a',1,'text.php']]],
   ['imagestring',['imageString',['../classphoto__driver.html#abc9f73ad90923772d52b9fcc4eb117dd',1,'photo_driver\imageString()'],['../classphoto__gd.html#a0795fc029be382557ae3f6e285f40e00',1,'photo_gd\imageString()'],['../classphoto__imagick.html#a70adbef31128c0ac8cbc5dcf34cdb019',1,'photo_imagick\imageString()']]],
+  ['import_5fauthor_5frss',['import_author_rss',['../items_8php.html#a6bee35961f2e32905f20367a9309d627',1,'items.php']]],
   ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]],
   ['import_5fauthor_5fzot',['import_author_zot',['../zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d',1,'zot.php']]],
   ['import_5fchannel_5fphoto',['import_channel_photo',['../photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a',1,'photo_driver.php']]],
diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js
index a8909656c..1b238fec5 100644
--- a/doc/html/search/functions_6d.js
+++ b/doc/html/search/functions_6d.js
@@ -11,6 +11,7 @@ var searchData=
   ['map_5fscope',['map_scope',['../items_8php.html#ac1fcf621dce7370515b420a7753f4726',1,'items.php']]],
   ['marital_5fselector',['marital_selector',['../profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798',1,'profile_selectors.php']]],
   ['match_5fcontent',['match_content',['../match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d',1,'match.php']]],
+  ['match_5fopenid',['match_openid',['../auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38',1,'auth.php']]],
   ['member_5fof',['member_of',['../include_2group_8php.html#a048f6892bfd28852de1b76470df411de',1,'group.php']]],
   ['menu_5fadd_5fitem',['menu_add_item',['../include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8',1,'menu.php']]],
   ['menu_5fcontent',['menu_content',['../mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf',1,'menu.php']]],
diff --git a/doc/html/search/functions_6e.js b/doc/html/search/functions_6e.js
index 81768a60f..c51d3673c 100644
--- a/doc/html/search/functions_6e.js
+++ b/doc/html/search/functions_6e.js
@@ -19,6 +19,7 @@ var searchData=
   ['node2bbcode',['node2bbcode',['../html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8',1,'html2bbcode.php']]],
   ['node2bbcodesub',['node2bbcodesub',['../html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7',1,'html2bbcode.php']]],
   ['normalise_5flink',['normalise_link',['../text_8php.html#a4bbb7d00c05cd20b4e043424f322388f',1,'text.php']]],
+  ['normalise_5fopenid',['normalise_openid',['../text_8php.html#adba17ec946f4285285dc100f7860bf51',1,'text.php']]],
   ['notags',['notags',['../text_8php.html#a1af49756c8c71902a66c7e329c462beb',1,'text.php']]],
   ['notes_5finit',['notes_init',['../notes_8php.html#a4dbd7b1f906440746af48b484d66535a',1,'notes.php']]],
   ['notice',['notice',['../boot_8php.html#a9255af5ae9c887520091ea04763c1a88',1,'boot.php']]],
diff --git a/doc/html/search/functions_6f.js b/doc/html/search/functions_6f.js
index f88e8a3f3..8497d0358 100644
--- a/doc/html/search/functions_6f.js
+++ b/doc/html/search/functions_6f.js
@@ -17,6 +17,7 @@ var searchData=
   ['onedirsync_5frun',['onedirsync_run',['../onedirsync_8php.html#a411aedd47c57476099647961e6a86691',1,'onedirsync.php']]],
   ['onepoll_5frun',['onepoll_run',['../onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d',1,'onepoll.php']]],
   ['online_5finit',['online_init',['../online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7',1,'online.php']]],
+  ['openid_5fcontent',['openid_content',['../openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43',1,'openid.php']]],
   ['opensearch_5finit',['opensearch_init',['../opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9',1,'opensearch.php']]],
   ['orient',['orient',['../classphoto__driver.html#a4de5bac8daea8f291a33c80788019d0d',1,'photo_driver']]]
 ];
diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js
index acb3abbec..0802f705b 100644
--- a/doc/html/search/functions_70.js
+++ b/doc/html/search/functions_70.js
@@ -58,7 +58,6 @@ var searchData=
   ['post_5fto_5fred_5fpost_5ffield_5fdata',['post_to_red_post_field_data',['../post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6',1,'post_to_red.php']]],
   ['post_5fto_5fred_5fpost_5fmeta_5fcontent',['post_to_red_post_meta_content',['../post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901',1,'post_to_red.php']]],
   ['post_5fto_5fred_5fsettings_5flink',['post_to_red_settings_link',['../post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017',1,'post_to_red.php']]],
-  ['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
   ['preg_5fcallback_5fhelp_5finclude',['preg_callback_help_include',['../help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4',1,'help.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index 21a1be476..1448351cc 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -86,6 +86,7 @@ var searchData=
   ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
   ['string_5fsplitter',['string_splitter',['../spam_8php.html#a05861201147b9a538d006f0269255cf9',1,'spam.php']]],
   ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
+  ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',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_5fcontent',['suggest_content',['../suggest_8php.html#a58748a8235d4523f8333847f3e42dd91',1,'suggest.php']]],
diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js
index 763c94e39..4951dfb53 100644
--- a/doc/html/search/variables_70.js
+++ b/doc/html/search/variables_70.js
@@ -14,6 +14,7 @@ var searchData=
   ['perms_5fa_5fbookmark',['PERMS_A_BOOKMARK',['../boot_8php.html#a8b2af16eaee9e7768a88d0e437877f3b',1,'boot.php']]],
   ['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']]],
+  ['perms_5fauthed',['PERMS_AUTHED',['../boot_8php.html#a852d4036a3bed66af1534d014c4ecde2',1,'boot.php']]],
   ['perms_5fcontacts',['PERMS_CONTACTS',['../boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6',1,'boot.php']]],
   ['perms_5fnetwork',['PERMS_NETWORK',['../boot_8php.html#a6df1102664f64b274810db85197c2755',1,'boot.php']]],
   ['perms_5fpublic',['PERMS_PUBLIC',['../boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7',1,'boot.php']]],
diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html
index 260e30623..d9f31f484 100644
--- a/doc/html/security_8php.html
+++ b/doc/html/security_8php.html
@@ -180,7 +180,7 @@ Functions
       
 
                                      
 
-
                                      Referenced by api_login(), and register_post().
                                      
+
                                      Referenced by api_login(), openid_content(), and register_post().
                                      
 
 
                                      
 
diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html
index 3ba8cecd8..a26cbae9f 100644
--- a/doc/html/text_8php.html
+++ b/doc/html/text_8php.html
@@ -157,6 +157,8 @@ Functions
  
  get_tags ($s)
  
+ strip_zids ($s)
+ 
  qp ($s)
  
  get_mentions ($item, $tags)
@@ -285,6 +287,8 @@ Functions
  
  in_arrayi ($needle, $haystack)
  
+ normalise_openid ($s)
+ 
 
@@ -684,7 +688,7 @@ Variables
                                      Returns
                                      string 
                                      
 
-
                                      Referenced by admin_page_logs(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), item_store(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().
                                      
+
                                      Referenced by admin_page_logs(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), printable(), profiles_post(), thing_init(), and z_input_filter().
                                      
@@ -1270,7 +1274,7 @@ Variables
                                      
 
                                      
 Variables
                                      
 
 
 
 
 
       
                                      
 
                                      
 
-
                                      Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), 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(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedChannelList(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), 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 RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), 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(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), dirprofile_init(), downgrade_accounts(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_rss(), 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(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), 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(), openid_content(), 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(), profile_sidebar(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), RedChannelList(), RedCollectionData(), RedFileData(), 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(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), 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().
                                      
 
 
                                      
 
@@ -1408,6 +1412,24 @@ Variables
 
 
                                      Referenced by best_link_url(), conversation(), delegate_content(), item_photo_menu(), link_compare(), tag_deliver(), and tgroup_check().
                                      
 
+
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      normalise_openid ( $s)
                                      
+
                                      
+
+
                                      Referenced by openid_content().
                                      
+
 
                                      
 
                                      
 
@@ -1435,7 +1457,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(), filestorage_post(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_post(), mail_store(), 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().
                                      
+
                                      Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), community_content(), connections_content(), conversation(), create_account(), directory_content(), filestorage_post(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_post(), mail_store(), mood_init(), network_content(), oexchange_content(), openid_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().
                                      
 
 
 
@@ -1739,7 +1761,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(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), chat_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(), dirprofile_init(), 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(), mail_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(), 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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), 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(), chat_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(), dirprofile_init(), 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(), mail_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(), 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_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().
                                      
 
 
 
@@ -1973,6 +1995,24 @@ Variables
 
 
                                      Referenced by expand_groups(), get_things(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().
                                      
 
+
+
+
+
                                      
+
                                      
+      
+        
+          
+          
+          
+          
+          
+        
+      
                                      strip_zids ( $s)
                                      
+
                                      
+
+
                                      Referenced by cloud_init(), and red_zrl_callback().
                                      
+
 
                                      
 
                                      
 
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js
index be6fbeab3..e742132d5 100644
--- a/doc/html/text_8php.js
+++ b/doc/html/text_8php.js
@@ -50,6 +50,7 @@ var text_8php =
     [ "micropro", "text_8php.html#a2a902f5fdba8646333e997898ac45ea3", null ],
     [ "mimetype_select", "text_8php.html#a1633412120f52bdce5f43e0a127d9293", null ],
     [ "normalise_link", "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f", null ],
+    [ "normalise_openid", "text_8php.html#adba17ec946f4285285dc100f7860bf51", null ],
     [ "notags", "text_8php.html#a1af49756c8c71902a66c7e329c462beb", null ],
     [ "paginate", "text_8php.html#afe9f178d264d44a94dc1292aaf0fd585", null ],
     [ "perms2str", "text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee", null ],
@@ -73,6 +74,7 @@ var text_8php =
     [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ],
     [ "sslify", "text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9", null ],
     [ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ],
+    [ "strip_zids", "text_8php.html#a2f2585385530cb935a6325c809d84a4d", null ],
     [ "theme_attachments", "text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53", null ],
     [ "unamp", "text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7", null ],
     [ "undo_post_tagging", "text_8php.html#a740ad03e00459039a2c0992246c4e727", null ],
diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html
index cc608bdfb..24a480775 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(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), bb_sanitize_style(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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_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(), 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(), tryzrlvideo(), 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_chatroom_list(), 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().
                                      
+
                                      Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), 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(), bb_sanitize_style(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), 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(), cloud_init(), 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_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(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), 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(), openid_content(), 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_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(), 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(), tryzrlvideo(), 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_chatroom_list(), 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().
                                      
 
 
                                      
 
-- 
cgit v1.2.3


From 9e2ea6b5d43d581e3857fa3fffd249b7fa53c092 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Fri, 21 Feb 2014 23:51:57 -0800
Subject: strings/version update

---
 util/messages.po | 3537 +++++++++++++++++++++++++++---------------------------
 version.inc      |    2 +-
 2 files changed, 1789 insertions(+), 1750 deletions(-)

diff --git a/util/messages.po b/util/messages.po
index da8ce5868..11820f853 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-02-14.588\n"
+"Project-Id-Version: 2014-02-21.595\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-14 00:02-0800\n"
+"POT-Creation-Date: 2014-02-21 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -22,7 +22,7 @@ msgid "Categories"
 msgstr ""
 
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../include/Contact.php:107 ../../include/identity.php:632
 #: ../../mod/directory.php:184 ../../mod/match.php:62
 #: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
 msgid "Connect"
@@ -61,8 +61,8 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: ../../include/widgets.php:173 ../../include/text.php:754
-#: ../../include/text.php:768 ../../mod/filer.php:36
+#: ../../include/widgets.php:173 ../../include/text.php:759
+#: ../../include/text.php:773 ../../mod/filer.php:36
 msgid "Save"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 msgid "Everything"
 msgstr ""
 
-#: ../../include/widgets.php:318 ../../include/items.php:3636
+#: ../../include/widgets.php:318
 msgid "Archives"
 msgstr ""
 
@@ -104,7 +104,7 @@ msgstr ""
 msgid "Best Friends"
 msgstr ""
 
-#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/widgets.php:373 ../../include/identity.php:314
 #: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
 msgid "Friends"
 msgstr ""
@@ -167,7 +167,7 @@ msgid "Channel Sources"
 msgstr ""
 
 #: ../../include/widgets.php:487 ../../include/nav.php:181
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+#: ../../mod/admin.php:838 ../../mod/admin.php:1043
 msgid "Settings"
 msgstr ""
 
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1423
+#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1425
 msgid "Logout"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Your webpages"
 msgstr ""
 
-#: ../../include/nav.php:89 ../../boot.php:1424
+#: ../../include/nav.php:89 ../../boot.php:1426
 msgid "Login"
 msgstr ""
 
@@ -323,7 +323,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1400
+#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1402
 msgid "Register"
 msgstr ""
 
@@ -347,8 +347,8 @@ msgstr ""
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/nav.php:139 ../../include/text.php:752
-#: ../../include/text.php:766 ../../mod/search.php:29
+#: ../../include/nav.php:139 ../../include/text.php:757
+#: ../../include/text.php:771 ../../mod/search.php:29
 msgid "Search"
 msgstr ""
 
@@ -508,320 +508,320 @@ msgstr ""
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:670
+#: ../../include/text.php:675
 msgid "No connections"
 msgstr ""
 
-#: ../../include/text.php:681
+#: ../../include/text.php:686
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:693
+#: ../../include/text.php:698
 msgid "View Connections"
 msgstr ""
 
-#: ../../include/text.php:834
+#: ../../include/text.php:839
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:834 ../../include/conversation.php:240
+#: ../../include/text.php:839 ../../include/conversation.php:240
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:840
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:840
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:836
+#: ../../include/text.php:841
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:836
+#: ../../include/text.php:841
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:837
+#: ../../include/text.php:842
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:837
+#: ../../include/text.php:842
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:838
+#: ../../include/text.php:843
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:838
+#: ../../include/text.php:843
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:844
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:839
+#: ../../include/text.php:844
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:851
+#: ../../include/text.php:856
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:852
+#: ../../include/text.php:857
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:853
+#: ../../include/text.php:858
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:854
+#: ../../include/text.php:859
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:855
+#: ../../include/text.php:860
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:856
+#: ../../include/text.php:861
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:857
+#: ../../include/text.php:862
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:858
+#: ../../include/text.php:863
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:859
+#: ../../include/text.php:864
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:860
+#: ../../include/text.php:865
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:861
+#: ../../include/text.php:866
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:862
+#: ../../include/text.php:867
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:863
+#: ../../include/text.php:868
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:864
+#: ../../include/text.php:869
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:865
+#: ../../include/text.php:870
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:866
+#: ../../include/text.php:871
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:867
+#: ../../include/text.php:872
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/text.php:873
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:869
+#: ../../include/text.php:874
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:870
+#: ../../include/text.php:875
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1118
 msgid "unknown.???"
 msgstr ""
 
-#: ../../include/text.php:1114
+#: ../../include/text.php:1119
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1154
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1171
+#: ../../include/text.php:1176
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1229 ../../include/text.php:1241
+#: ../../include/text.php:1234 ../../include/text.php:1246
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1417 ../../mod/events.php:332
+#: ../../include/text.php:1401 ../../mod/events.php:332
 msgid "link to source"
 msgstr ""
 
-#: ../../include/text.php:1436
+#: ../../include/text.php:1420
 msgid "Select a page layout: "
 msgstr ""
 
-#: ../../include/text.php:1439 ../../include/text.php:1504
+#: ../../include/text.php:1423 ../../include/text.php:1488
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1475
+#: ../../include/text.php:1459
 msgid "Page content type: "
 msgstr ""
 
-#: ../../include/text.php:1516
+#: ../../include/text.php:1500
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1637 ../../include/conversation.php:117
+#: ../../include/text.php:1621 ../../include/conversation.php:117
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr ""
 
-#: ../../include/text.php:1640 ../../include/conversation.php:120
+#: ../../include/text.php:1624 ../../include/conversation.php:120
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr ""
 
-#: ../../include/text.php:1643 ../../include/conversation.php:145
+#: ../../include/text.php:1627 ../../include/conversation.php:145
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr ""
 
-#: ../../include/text.php:1645 ../../include/conversation.php:147
+#: ../../include/text.php:1629 ../../include/conversation.php:147
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1650
+#: ../../include/text.php:1634
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1907
+#: ../../include/text.php:1891
 msgid "Design"
 msgstr ""
 
-#: ../../include/text.php:1909
+#: ../../include/text.php:1893
 msgid "Blocks"
 msgstr ""
 
-#: ../../include/text.php:1910
+#: ../../include/text.php:1894
 msgid "Menus"
 msgstr ""
 
-#: ../../include/text.php:1911
+#: ../../include/text.php:1895
 msgid "Layouts"
 msgstr ""
 
-#: ../../include/text.php:1912
+#: ../../include/text.php:1896
 msgid "Pages"
 msgstr ""
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
-#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
-#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
-#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
-#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
-#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
-#: ../../include/bbcode.php:633
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:601
+#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
+#: ../../include/bbcode.php:612 ../../include/bbcode.php:615
+#: ../../include/bbcode.php:618 ../../include/bbcode.php:623
+#: ../../include/bbcode.php:626 ../../include/bbcode.php:631
+#: ../../include/bbcode.php:634 ../../include/bbcode.php:637
+#: ../../include/bbcode.php:640
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:651
 msgid "Encrypted content"
 msgstr ""
 
@@ -838,15 +838,15 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+#: ../../include/bbcode.php:569 ../../include/bbcode.php:589
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/Contact.php:120
+#: ../../include/Contact.php:123
 msgid "New window"
 msgstr ""
 
-#: ../../include/Contact.php:121
+#: ../../include/Contact.php:124
 msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
@@ -1119,8 +1119,8 @@ msgstr ""
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
-#: ../../mod/admin.php:750 ../../boot.php:1426
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:742
+#: ../../mod/admin.php:751 ../../boot.php:1428
 msgid "Email"
 msgstr ""
 
@@ -1238,7 +1238,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/identity.php:679
+#: ../../include/event.php:40 ../../include/identity.php:683
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
 #: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
 msgid "Location:"
@@ -1255,7 +1255,7 @@ msgstr ""
 msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/group.php:242 ../../mod/admin.php:750
+#: ../../include/group.php:242 ../../mod/admin.php:751
 msgid "All Channels"
 msgstr ""
 
@@ -1406,39 +1406,40 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../include/photo/photo_driver.php:643 ../../include/photos.php:51
 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
 #: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
 #: ../../mod/photos.php:656 ../../mod/photos.php:678
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/attach.php:98 ../../include/attach.php:129
-#: ../../include/attach.php:185 ../../include/attach.php:200
-#: ../../include/attach.php:233 ../../include/attach.php:247
-#: ../../include/attach.php:268 ../../include/attach.php:463
-#: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../include/attach.php:119 ../../include/attach.php:166
+#: ../../include/attach.php:229 ../../include/attach.php:243
+#: ../../include/attach.php:283 ../../include/attach.php:297
+#: ../../include/attach.php:322 ../../include/attach.php:513
+#: ../../include/attach.php:585 ../../include/chat.php:113
+#: ../../include/photos.php:15 ../../include/items.php:3575
 #: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
 #: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
-#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
-#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
-#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/invite.php:104 ../../mod/settings.php:493 ../../mod/menu.php:44
+#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/bookmarks.php:46 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/chat.php:87 ../../mod/chat.php:92
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
+#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
+#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/network.php:12 ../../mod/profiles.php:152
 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/settings.php:493
-#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
-#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
-#: ../../mod/connections.php:169 ../../mod/notifications.php:66
-#: ../../mod/blocks.php:29 ../../mod/blocks.php:44
-#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
-#: ../../mod/poke.php:128 ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
 #: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
 #: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
@@ -1449,61 +1450,61 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: ../../include/attach.php:180 ../../include/attach.php:228
+#: ../../include/attach.php:224 ../../include/attach.php:278
 msgid "Item was not found."
 msgstr ""
 
-#: ../../include/attach.php:281
+#: ../../include/attach.php:335
 msgid "No source file."
 msgstr ""
 
-#: ../../include/attach.php:298
+#: ../../include/attach.php:352
 msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/attach.php:316
+#: ../../include/attach.php:370
 msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/attach.php:327
+#: ../../include/attach.php:381
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/attach.php:339
+#: ../../include/attach.php:393
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/attach.php:423
+#: ../../include/attach.php:475
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/attach.php:435
+#: ../../include/attach.php:487
 msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/attach.php:479 ../../include/attach.php:496
+#: ../../include/attach.php:528 ../../include/attach.php:545
 msgid "Path not available."
 msgstr ""
 
-#: ../../include/attach.php:546
+#: ../../include/attach.php:590
 msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/attach.php:564
+#: ../../include/attach.php:606
 msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/attach.php:589
+#: ../../include/attach.php:630
 msgid "Path not found."
 msgstr ""
 
-#: ../../include/attach.php:634
+#: ../../include/attach.php:674
 msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/attach.php:638
+#: ../../include/attach.php:678
 msgid "database storage failed."
 msgstr ""
 
@@ -1546,8 +1547,8 @@ msgid "Select"
 msgstr ""
 
 #: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
-#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/thing.php:236 ../../mod/settings.php:579 ../../mod/group.php:176
+#: ../../mod/admin.php:746 ../../mod/connedit.php:359
 #: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
 msgid "Delete"
 msgstr ""
@@ -1589,7 +1590,7 @@ msgid "View in context"
 msgstr ""
 
 #: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:121
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
 #: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
 #: ../../mod/photos.php:975
@@ -1720,7 +1721,7 @@ msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
 #: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
-#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
+#: ../../mod/webpages.php:122 ../../mod/editpost.php:141
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
 #: ../../mod/editblock.php:151 ../../mod/photos.php:995
 msgid "Preview"
@@ -1734,7 +1735,7 @@ msgstr ""
 msgid "Page link title"
 msgstr ""
 
-#: ../../include/conversation.php:1101 ../../mod/editpost.php:104
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:113
 #: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/editlayout.php:107
 #: ../../mod/editwebpage.php:145 ../../mod/editblock.php:121
 msgid "Upload photo"
@@ -1744,7 +1745,7 @@ msgstr ""
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1103 ../../mod/editpost.php:105
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:114
 #: ../../mod/mail.php:220 ../../mod/mail.php:333 ../../mod/editlayout.php:108
 #: ../../mod/editwebpage.php:146 ../../mod/editblock.php:122
 msgid "Attach file"
@@ -1754,7 +1755,7 @@ msgstr ""
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1105 ../../mod/editpost.php:106
+#: ../../include/conversation.php:1105 ../../mod/editpost.php:115
 #: ../../mod/mail.php:221 ../../mod/mail.php:334 ../../mod/editlayout.php:109
 #: ../../mod/editwebpage.php:147 ../../mod/editblock.php:123
 msgid "Insert web link"
@@ -1780,7 +1781,7 @@ msgstr ""
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1111 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:119
 #: ../../mod/editlayout.php:113 ../../mod/editwebpage.php:151
 #: ../../mod/editblock.php:127
 msgid "Set your location"
@@ -1790,7 +1791,7 @@ msgstr ""
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1113 ../../mod/editpost.php:111
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:120
 #: ../../mod/editlayout.php:114 ../../mod/editwebpage.php:152
 #: ../../mod/editblock.php:128
 msgid "Clear browser location"
@@ -1800,19 +1801,19 @@ msgstr ""
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1116 ../../mod/editpost.php:124
+#: ../../include/conversation.php:1116 ../../mod/editpost.php:133
 #: ../../mod/editlayout.php:127 ../../mod/editwebpage.php:169
 #: ../../mod/editblock.php:142
 msgid "Set title"
 msgstr ""
 
-#: ../../include/conversation.php:1119 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:135
 #: ../../mod/editlayout.php:130 ../../mod/editwebpage.php:171
 #: ../../mod/editblock.php:145
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1121 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1121 ../../mod/editpost.php:122
 #: ../../mod/editlayout.php:116 ../../mod/editwebpage.php:154
 #: ../../mod/editblock.php:130
 msgid "Permission settings"
@@ -1822,37 +1823,37 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1130 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1130 ../../mod/editpost.php:130
 #: ../../mod/editlayout.php:124 ../../mod/editwebpage.php:164
 #: ../../mod/editblock.php:139
 msgid "Public post"
 msgstr ""
 
-#: ../../include/conversation.php:1132 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1132 ../../mod/editpost.php:136
 #: ../../mod/editlayout.php:131 ../../mod/editwebpage.php:172
 #: ../../mod/editblock.php:146
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:138
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:147
 #: ../../mod/mail.php:226 ../../mod/mail.php:339 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:182 ../../mod/editblock.php:156
 msgid "Set expiration date"
 msgstr ""
 
 #: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
-#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
+#: ../../mod/editpost.php:149 ../../mod/mail.php:228 ../../mod/mail.php:341
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:151
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/settings.php:517
+#: ../../mod/settings.php:543 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:152 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr ""
 
@@ -1945,238 +1946,238 @@ msgstr ""
 msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/identity.php:29 ../../mod/item.php:1177
+#: ../../include/identity.php:30 ../../mod/item.php:1187
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/identity.php:62
+#: ../../include/identity.php:63
 msgid "Empty name"
 msgstr ""
 
-#: ../../include/identity.php:64
+#: ../../include/identity.php:65
 msgid "Name too long"
 msgstr ""
 
-#: ../../include/identity.php:143
+#: ../../include/identity.php:147
 msgid "No account identifier"
 msgstr ""
 
-#: ../../include/identity.php:153
+#: ../../include/identity.php:157
 msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/identity.php:167
+#: ../../include/identity.php:171
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/identity.php:226
+#: ../../include/identity.php:230
 msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/identity.php:285
+#: ../../include/identity.php:289
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:477
+#: ../../include/identity.php:481
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:489
+#: ../../include/identity.php:493
 msgid " Sorry, you don't have the permission to view this profile. "
 msgstr ""
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../include/identity.php:528 ../../mod/webpages.php:8
 #: ../../mod/connect.php:13 ../../mod/layouts.php:8
 #: ../../mod/achievements.php:8 ../../mod/blocks.php:10
 #: ../../mod/profile.php:16 ../../mod/filestorage.php:40
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:642 ../../mod/profiles.php:603
+#: ../../include/identity.php:646 ../../mod/profiles.php:603
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:648
+#: ../../include/identity.php:652
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:648
+#: ../../include/identity.php:652
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:649 ../../mod/profiles.php:604
+#: ../../include/identity.php:653 ../../mod/profiles.php:604
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:652
+#: ../../include/identity.php:656
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:615
+#: ../../include/identity.php:667 ../../mod/profiles.php:615
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:666 ../../mod/profiles.php:618
+#: ../../include/identity.php:670 ../../mod/profiles.php:618
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:667 ../../mod/profiles.php:619
+#: ../../include/identity.php:671 ../../mod/profiles.php:619
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../include/identity.php:685 ../../include/identity.php:912
 #: ../../mod/directory.php:159
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../include/identity.php:686 ../../include/identity.php:932
 #: ../../mod/directory.php:161
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../include/identity.php:687 ../../include/identity.php:943
 #: ../../mod/directory.php:163
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+#: ../../include/identity.php:688 ../../mod/dirprofile.php:157
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../include/identity.php:756 ../../include/identity.php:836
 #: ../../mod/ping.php:262
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:753 ../../include/identity.php:833
+#: ../../include/identity.php:757 ../../include/identity.php:837
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../include/identity.php:802 ../../include/identity.php:877
 #: ../../mod/ping.php:284
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:810
+#: ../../include/identity.php:814
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:811
+#: ../../include/identity.php:815
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:866
+#: ../../include/identity.php:870
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:884
+#: ../../include/identity.php:888
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:885
+#: ../../include/identity.php:889
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../include/identity.php:902 ../../include/identity.php:986
 #: ../../mod/profperm.php:107
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:906 ../../mod/settings.php:924
+#: ../../include/identity.php:910 ../../mod/settings.php:937
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:913
+#: ../../include/identity.php:917
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:914
+#: ../../include/identity.php:918
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:921
+#: ../../include/identity.php:925
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:925
+#: ../../include/identity.php:929
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:934
+#: ../../include/identity.php:938
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:937 ../../mod/profiles.php:526
+#: ../../include/identity.php:941 ../../mod/profiles.php:526
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:941 ../../mod/profiles.php:528
+#: ../../include/identity.php:945 ../../mod/profiles.php:528
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:943
+#: ../../include/identity.php:947
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:945 ../../mod/profiles.php:529
+#: ../../include/identity.php:949 ../../mod/profiles.php:529
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:947
+#: ../../include/identity.php:951
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:949 ../../mod/directory.php:165
+#: ../../include/identity.php:953 ../../mod/directory.php:165
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:951
+#: ../../include/identity.php:955
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:532
+#: ../../include/identity.php:957 ../../mod/profiles.php:532
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:955 ../../mod/profiles.php:533
+#: ../../include/identity.php:959 ../../mod/profiles.php:533
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:958
+#: ../../include/identity.php:962
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:964
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:962
+#: ../../include/identity.php:966
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:964
+#: ../../include/identity.php:968
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:966
+#: ../../include/identity.php:970
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:970
+#: ../../include/identity.php:974
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:976
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:974
+#: ../../include/identity.php:978
 msgid "School/education:"
 msgstr ""
 
@@ -2185,11 +2186,12 @@ msgid "Private Message"
 msgstr ""
 
 #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
-#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
-#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
-#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
+#: ../../include/menu.php:41 ../../mod/thing.php:235
+#: ../../mod/settings.php:578 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:112 ../../mod/layouts.php:102
+#: ../../mod/editlayout.php:106 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
+#: ../../mod/filestorage.php:170
 msgid "Edit"
 msgstr ""
 
@@ -2280,15 +2282,15 @@ msgstr ""
 
 #: ../../include/ItemObject.php:548 ../../mod/events.php:469
 #: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/settings.php:516 ../../mod/settings.php:628
+#: ../../mod/settings.php:656 ../../mod/settings.php:680
+#: ../../mod/settings.php:752 ../../mod/settings.php:929
 #: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
-#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
-#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
+#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:739
+#: ../../mod/admin.php:879 ../../mod/admin.php:1078 ../../mod/admin.php:1165
 #: ../../mod/connedit.php:437 ../../mod/profiles.php:506
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/settings.php:516
-#: ../../mod/settings.php:628 ../../mod/settings.php:656
-#: ../../mod/settings.php:680 ../../mod/settings.php:752
-#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
 #: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
 #: ../../mod/filestorage.php:131 ../../mod/photos.php:566
 #: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
@@ -2637,7 +2639,7 @@ msgstr ""
 msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/auth.php:203
+#: ../../include/auth.php:203 ../../mod/openid.php:185
 msgid "Login failed."
 msgstr ""
 
@@ -3004,35 +3006,31 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/follow.php:21
+#: ../../include/follow.php:23
 msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/follow.php:26
+#: ../../include/follow.php:28
 msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr ""
-
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
+#: ../../include/follow.php:54
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
+#: ../../include/follow.php:126
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/follow.php:129
+#: ../../include/follow.php:143
 msgid "local account not found."
 msgstr ""
 
-#: ../../include/follow.php:138
+#: ../../include/follow.php:152
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/security.php:280
+#: ../../include/security.php:291
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -3135,36 +3133,40 @@ msgstr ""
 msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../include/items.php:240 ../../mod/like.php:55 ../../mod/profperm.php:23
 #: ../../mod/group.php:68 ../../index.php:350
 msgid "Permission denied"
 msgstr ""
 
-#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
-#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../include/items.php:756 ../../mod/connedit.php:395
+msgid "Unknown"
+msgstr ""
+
+#: ../../include/items.php:3513 ../../mod/thing.php:78 ../../mod/admin.php:151
+#: ../../mod/admin.php:783 ../../mod/admin.php:986 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3849 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:3824
+#: ../../include/items.php:3864
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:3831
+#: ../../include/items.php:3871
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:3842
+#: ../../include/items.php:3882
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:3845
+#: ../../include/items.php:3885
 msgid "Connection not found."
 msgstr ""
 
@@ -3400,2788 +3402,2821 @@ msgid ""
 "com"
 msgstr ""
 
-#: ../../mod/item.php:145
-msgid "Unable to locate original post."
+#: ../../mod/settings.php:71
+msgid "Name is required"
 msgstr ""
 
-#: ../../mod/item.php:346
-msgid "Empty post discarded."
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/item.php:388
-msgid "Executable content type not permitted to this channel."
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
 msgstr ""
 
-#: ../../mod/item.php:835
-msgid "System error. Post not saved."
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
-msgid "Wall Photos"
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/item.php:1182
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../mod/settings.php:212
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/item.php:1188
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/menu.php:21
-msgid "Menu updated."
+#: ../../mod/settings.php:228
+msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/menu.php:25
-msgid "Unable to update menu."
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/menu.php:30
-msgid "Menu created."
+#: ../../mod/settings.php:240
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/menu.php:34
-msgid "Unable to create menu."
+#: ../../mod/settings.php:444
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/menu.php:57
-msgid "Manage Menus"
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
 msgstr ""
 
-#: ../../mod/menu.php:60
-msgid "Drop"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
 msgstr ""
 
-#: ../../mod/menu.php:62
-msgid "Create a new menu"
+#: ../../mod/settings.php:518
+msgid "Name of application"
 msgstr ""
 
-#: ../../mod/menu.php:63
-msgid "Delete this menu"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/menu.php:64 ../../mod/menu.php:109
-msgid "Edit menu contents"
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/menu.php:65
-msgid "Edit this menu"
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/menu.php:80
-msgid "New Menu"
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
 msgstr ""
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
-msgid "Menu name"
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
-msgid "Must be unique, only seen by you"
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
-msgid "Menu title"
+#: ../../mod/settings.php:522
+msgid "Optional"
 msgstr ""
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
-msgid "Menu title as seen by others"
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
-msgid "Allow bookmarks"
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
-msgid "Menu may be used to store saved bookmarks"
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
-msgid "Create"
+#: ../../mod/settings.php:581
+msgid "No name"
 msgstr ""
 
-#: ../../mod/menu.php:92 ../../mod/mitem.php:14
-msgid "Menu not found."
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/menu.php:98
-msgid "Menu deleted."
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/menu.php:100
-msgid "Menu could not be deleted."
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/menu.php:106
-msgid "Edit Menu"
+#: ../../mod/settings.php:624
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/menu.php:108
-msgid "Add or remove entries to this menu"
+#: ../../mod/settings.php:625
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/menu.php:114 ../../mod/mitem.php:186
-msgid "Modify"
+#: ../../mod/settings.php:626
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
-#: ../../mod/dirprofile.php:181
-msgid "Not found."
+#: ../../mod/settings.php:627
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
-#: ../../mod/blocks.php:96
-msgid "View"
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/settings.php:629 ../../mod/settings.php:938
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/settings.php:630
+msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../mod/settings.php:647
+msgid "Off"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
-#: ../../mod/settings.php:883
-msgid "Yes"
+#: ../../mod/settings.php:647
+msgid "On"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
-#: ../../mod/settings.php:883
-msgid "No"
+#: ../../mod/settings.php:654
+msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/apps.php:8
-msgid "No installed applications."
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/apps.php:13
-msgid "Applications"
+#: ../../mod/settings.php:709 ../../mod/admin.php:379
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
-msgid "Edit post"
+#: ../../mod/settings.php:750
+msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/cloud.php:112
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/bookmarks.php:38
-msgid "Bookmark added"
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/bookmarks.php:53
-msgid "My Bookmarks"
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/bookmarks.php:64
-msgid "My Connections Bookmarks"
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/subthread.php:105
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
-#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
-#: ../../mod/update_community.php:18
-msgid "[Embedded content - reload page to view]"
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/chanview.php:93
-msgid "toggle full screen mode"
+#: ../../mod/settings.php:761
+msgid "Do not view remote profiles in frames"
 msgstr ""
 
-#: ../../mod/tagger.php:98
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
 msgstr ""
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/chat.php:163
-msgid "Leave Room"
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/chat.php:164
-msgid "I am away right now"
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
 msgstr ""
 
-#: ../../mod/chat.php:165
-msgid "I am online"
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/chat.php:189 ../../mod/chat.php:209
-msgid "New Chatroom"
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/chat.php:190
-msgid "Chatroom Name"
+#: ../../mod/settings.php:801
+msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../mod/chat.php:205
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../mod/settings.php:802
+msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/directory.php:15 ../../mod/display.php:9
-#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:443
-msgid "Public access denied."
+#: ../../mod/settings.php:879
+msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/viewconnections.php:43
-msgid "No connections."
+#: ../../mod/settings.php:879 ../../mod/settings.php:884
+#: ../../mod/settings.php:955 ../../mod/api.php:106 ../../mod/profiles.php:484
+msgid "No"
 msgstr ""
 
-#: ../../mod/viewconnections.php:55
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: ../../mod/settings.php:879 ../../mod/settings.php:884
+#: ../../mod/settings.php:955 ../../mod/api.php:105 ../../mod/profiles.php:483
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/viewconnections.php:70
-msgid "View Connnections"
+#: ../../mod/settings.php:884
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../mod/settings.php:888 ../../mod/profile_photo.php:288
+msgid "or"
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../mod/settings.php:893
+msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../mod/settings.php:927
+msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
-msgid "Remove"
+#: ../../mod/settings.php:936
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/connect.php:55 ../../mod/connect.php:103
-msgid "Continue"
+#: ../../mod/settings.php:939
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/connect.php:84
-msgid "Premium Channel Setup"
+#: ../../mod/settings.php:940
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/connect.php:86
-msgid "Enable premium channel connection restrictions"
+#: ../../mod/settings.php:941
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/connect.php:87
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../mod/settings.php:943
+msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/connect.php:89 ../../mod/connect.php:109
+#: ../../mod/settings.php:943
 msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/connect.php:90
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../mod/settings.php:945
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/connect.php:91 ../../mod/connect.php:112
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
+#: ../../mod/settings.php:947
+msgid "Hide my online presence"
 msgstr ""
 
-#: ../../mod/connect.php:100
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../mod/settings.php:947
+msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../mod/connect.php:108
-msgid "Restricted or Premium Channel"
+#: ../../mod/settings.php:949
+msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
+#: ../../mod/settings.php:950
+msgid ""
+"Very Public - extremely permissive (should be used with caution)"
 msgstr ""
 
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
+#: ../../mod/settings.php:951
+msgid ""
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
 msgstr ""
 
-#: ../../mod/delegate.php:123
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
+#: ../../mod/settings.php:952
+msgid "Private - default private, never open or public"
 msgstr ""
 
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
+#: ../../mod/settings.php:953
+msgid "Blocked - default blocked to/from everybody"
 msgstr ""
 
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
+#: ../../mod/settings.php:955
+msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
+#: ../../mod/settings.php:955
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../mod/delegate.php:131
-msgid "Add"
+#: ../../mod/settings.php:957
+msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
+#: ../../mod/settings.php:959
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/chatsvc.php:102
-msgid "Away"
+#: ../../mod/settings.php:959
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/chatsvc.php:106
-msgid "Online"
+#: ../../mod/settings.php:960
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
+#: ../../mod/settings.php:961 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
+#: ../../mod/settings.php:972
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
+#: ../../mod/settings.php:972
+msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
+#: ../../mod/settings.php:975
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
+#: ../../mod/settings.php:976
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
+#: ../../mod/settings.php:977
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
+#: ../../mod/settings.php:978
+msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/mitem.php:102
-msgid "Edit element"
+#: ../../mod/settings.php:979
+msgid "making an interesting profile change"
 msgstr ""
 
-#: ../../mod/mitem.php:103
-msgid "Drop element"
+#: ../../mod/settings.php:980
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/mitem.php:104
-msgid "New element"
+#: ../../mod/settings.php:981
+msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
+#: ../../mod/settings.php:982
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
+#: ../../mod/settings.php:983
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
+#: ../../mod/settings.php:984
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
+#: ../../mod/settings.php:985
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
+#: ../../mod/settings.php:986
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
+#: ../../mod/settings.php:987
+msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
-msgid "(click to open/close)"
+#: ../../mod/settings.php:988
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
+#: ../../mod/settings.php:991
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
+#: ../../mod/settings.php:992
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
+#: ../../mod/settings.php:995
+msgid ""
+"Please enable expert mode (in Settings > "
+"Additional features) to adjust!"
 msgstr ""
 
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
+#: ../../mod/settings.php:996
+msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
+#: ../../mod/settings.php:998
+msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
+#: ../../mod/menu.php:21
+msgid "Menu updated."
 msgstr ""
 
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
 msgstr ""
 
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
+#: ../../mod/menu.php:30
+msgid "Menu created."
 msgstr ""
 
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
 msgstr ""
 
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
 msgstr ""
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
+#: ../../mod/menu.php:60
+msgid "Drop"
 msgstr ""
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
 msgstr ""
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
 msgstr ""
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
 msgstr ""
 
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
 msgstr ""
 
-#: ../../mod/group.php:20
-msgid "Collection created."
+#: ../../mod/menu.php:80
+msgid "New Menu"
 msgstr ""
 
-#: ../../mod/group.php:26
-msgid "Could not create collection."
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
 msgstr ""
 
-#: ../../mod/group.php:54
-msgid "Collection updated."
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
 msgstr ""
 
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/group.php:107
-msgid "Collection removed."
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
+#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
+msgid "Create"
 msgstr ""
 
-#: ../../mod/group.php:182
-msgid "Collection Editor"
+#: ../../mod/menu.php:92 ../../mod/mitem.php:14
+msgid "Menu not found."
 msgstr ""
 
-#: ../../mod/group.php:196
-msgid "Members"
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
 msgstr ""
 
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
 msgstr ""
 
-#: ../../mod/admin.php:48
-msgid "Theme settings updated."
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:430
-msgid "Site"
+#: ../../mod/menu.php:114 ../../mod/mitem.php:186
+msgid "Modify"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
-msgid "Users"
+#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
+#: ../../mod/dirprofile.php:181
+msgid "Not found."
 msgstr ""
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
-msgid "Plugins"
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
+#: ../../mod/blocks.php:96
+msgid "View"
 msgstr ""
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
-msgid "Themes"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/admin.php:92 ../../mod/admin.php:529
-msgid "Server"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/admin.php:93
-msgid "DB updates"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
-msgid "Logs"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/admin.php:113
-msgid "Plugin Features"
+#: ../../mod/apps.php:8
+msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/admin.php:115
-msgid "User registrations waiting for confirmation"
+#: ../../mod/apps.php:13
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/admin.php:189
-msgid "Message queues"
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
-#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
-#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
-msgid "Administration"
+#: ../../mod/cloud.php:112
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
 msgstr ""
 
-#: ../../mod/admin.php:195
-msgid "Summary"
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
 msgstr ""
 
-#: ../../mod/admin.php:197
-msgid "Registered users"
+#: ../../mod/bookmarks.php:53
+msgid "My Bookmarks"
 msgstr ""
 
-#: ../../mod/admin.php:199 ../../mod/admin.php:532
-msgid "Pending registrations"
+#: ../../mod/bookmarks.php:64
+msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/admin.php:200
-msgid "Version"
+#: ../../mod/item.php:145
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/admin.php:202 ../../mod/admin.php:533
-msgid "Active plugins"
+#: ../../mod/item.php:346
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/admin.php:350
-msgid "Site settings updated."
+#: ../../mod/item.php:388
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/admin.php:379 ../../mod/settings.php:709
-msgid "No special theme for mobile devices"
+#: ../../mod/item.php:845
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/admin.php:381
-msgid "No special theme for accessibility"
+#: ../../mod/item.php:1112 ../../mod/wall_upload.php:34
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/admin.php:409
-msgid "Closed"
+#: ../../mod/item.php:1192
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/admin.php:410
-msgid "Requires approval"
+#: ../../mod/item.php:1198
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../mod/admin.php:411
-msgid "Open"
+#: ../../mod/subthread.php:105
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/admin.php:416
-msgid "Private"
+#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
+#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
+#: ../../mod/update_community.php:18
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/admin.php:417
-msgid "Paid Access"
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:28
+msgid "Channel not found."
 msgstr ""
 
-#: ../../mod/admin.php:418
-msgid "Free Access"
+#: ../../mod/chanview.php:93
+msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../mod/admin.php:419
-msgid "Tiered Access"
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/admin.php:432 ../../mod/register.php:189
-msgid "Registration"
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../mod/admin.php:433
-msgid "File upload"
+#: ../../mod/chat.php:163
+msgid "Leave Room"
 msgstr ""
 
-#: ../../mod/admin.php:434
-msgid "Policies"
+#: ../../mod/chat.php:164
+msgid "I am away right now"
 msgstr ""
 
-#: ../../mod/admin.php:435
-msgid "Advanced"
+#: ../../mod/chat.php:165
+msgid "I am online"
 msgstr ""
 
-#: ../../mod/admin.php:439
-msgid "Site name"
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
+msgid "New Chatroom"
 msgstr ""
 
-#: ../../mod/admin.php:440
-msgid "Banner/Logo"
+#: ../../mod/chat.php:190
+msgid "Chatroom Name"
 msgstr ""
 
-#: ../../mod/admin.php:441
-msgid "Administrator Information"
+#: ../../mod/chat.php:205
+#, php-format
+msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../mod/admin.php:441
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
+#: ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:443
+msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/admin.php:442
-msgid "System language"
+#: ../../mod/viewconnections.php:43
+msgid "No connections."
 msgstr ""
 
-#: ../../mod/admin.php:443
-msgid "System theme"
+#: ../../mod/viewconnections.php:55
+#, php-format
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/admin.php:443
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
+#: ../../mod/viewconnections.php:70
+msgid "View Connnections"
 msgstr ""
 
-#: ../../mod/admin.php:444
-msgid "Mobile system theme"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../mod/admin.php:444
-msgid "Theme for mobile devices"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../mod/admin.php:445
-msgid "Accessibility system theme"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/admin.php:445
-msgid "Accessibility theme"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
+msgid "Remove"
 msgstr ""
 
-#: ../../mod/admin.php:446
-msgid "Channel to use for this website's static pages"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
 msgstr ""
 
-#: ../../mod/admin.php:446
-msgid "Site Channel"
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../mod/admin.php:448
-msgid "Maximum image size"
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/connect.php:87
 msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../mod/admin.php:449
-msgid "Register policy"
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../mod/admin.php:450
-msgid "Access policy"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../mod/admin.php:451
-msgid "Register text"
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../mod/admin.php:451
-msgid "Will be displayed prominently on the registration page."
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../mod/admin.php:452
-msgid "Accounts abandoned after x days"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../mod/admin.php:452
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/admin.php:453
-msgid "Allowed friend domains"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/delegate.php:123
 msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/admin.php:454
-msgid "Allowed email domains"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/admin.php:454
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/admin.php:455
-msgid "Block public"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
 msgstr ""
 
-#: ../../mod/admin.php:455
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
+#: ../../mod/delegate.php:131
+msgid "Add"
 msgstr ""
 
-#: ../../mod/admin.php:456
-msgid "Force publish"
+#: ../../mod/delegate.php:132
+msgid "No entries."
 msgstr ""
 
-#: ../../mod/admin.php:456
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: ../../mod/chatsvc.php:102
+msgid "Away"
 msgstr ""
 
-#: ../../mod/admin.php:457
-msgid "No login on Homepage"
+#: ../../mod/chatsvc.php:106
+msgid "Online"
 msgstr ""
 
-#: ../../mod/admin.php:457
-msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
+#: ../../mod/attach.php:9
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/admin.php:459
-msgid "Proxy user"
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
 msgstr ""
 
-#: ../../mod/admin.php:460
-msgid "Proxy URL"
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../mod/admin.php:461
-msgid "Network timeout"
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
 msgstr ""
 
-#: ../../mod/admin.php:461
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../mod/admin.php:462
-msgid "Delivery interval"
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
 msgstr ""
 
-#: ../../mod/admin.php:462
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
 msgstr ""
 
-#: ../../mod/admin.php:463
-msgid "Poll interval"
+#: ../../mod/mitem.php:102
+msgid "Edit element"
 msgstr ""
 
-#: ../../mod/admin.php:463
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
+#: ../../mod/mitem.php:103
+msgid "Drop element"
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid "Maximum Load Average"
+#: ../../mod/mitem.php:104
+msgid "New element"
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
 msgstr ""
 
-#: ../../mod/admin.php:520
-msgid "No server found"
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
 msgstr ""
 
-#: ../../mod/admin.php:527 ../../mod/admin.php:750
-msgid "ID"
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
 msgstr ""
 
-#: ../../mod/admin.php:527
-msgid "for channel"
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
 msgstr ""
 
-#: ../../mod/admin.php:527
-msgid "on server"
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
 msgstr ""
 
-#: ../../mod/admin.php:527
-msgid "Status"
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../mod/admin.php:548
-msgid "Update has been marked successful"
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
 msgstr ""
 
-#: ../../mod/admin.php:558
-#, php-format
-msgid "Executing %s failed. Check system logs."
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
 msgstr ""
 
-#: ../../mod/admin.php:561
-#, php-format
-msgid "Update %s was successfully applied."
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
 msgstr ""
 
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
 msgstr ""
 
-#: ../../mod/admin.php:568
-#, php-format
-msgid "Update function %s could not be found."
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
 msgstr ""
 
-#: ../../mod/admin.php:583
-msgid "No failed updates."
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../mod/admin.php:587
-msgid "Failed Updates"
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
 msgstr ""
 
-#: ../../mod/admin.php:589
-msgid "Mark success (if update was manually applied)"
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
 msgstr ""
 
-#: ../../mod/admin.php:590
-msgid "Attempt to execute this update step automatically"
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../mod/admin.php:616
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/admin.php:623
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr ""
 
-#: ../../mod/admin.php:654
-msgid "Account not found"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/admin.php:665
-#, php-format
-msgid "User '%s' deleted"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' unblocked"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' blocked"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/admin.php:739
-msgid "select all"
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
 msgstr ""
 
-#: ../../mod/admin.php:740
-msgid "User registrations waiting for confirm"
+#: ../../mod/group.php:20
+msgid "Collection created."
 msgstr ""
 
-#: ../../mod/admin.php:741
-msgid "Request date"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
 msgstr ""
 
-#: ../../mod/admin.php:742
-msgid "No registrations."
+#: ../../mod/group.php:54
+msgid "Collection updated."
 msgstr ""
 
-#: ../../mod/admin.php:743
-msgid "Approve"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
 msgstr ""
 
-#: ../../mod/admin.php:744
-msgid "Deny"
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
 msgstr ""
 
-#: ../../mod/admin.php:746 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Block"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../mod/admin.php:747 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Unblock"
+#: ../../mod/group.php:107
+msgid "Collection removed."
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Register date"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Last login"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Expires"
+#: ../../mod/group.php:196
+msgid "Members"
 msgstr ""
 
-#: ../../mod/admin.php:750
-msgid "Service Class"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../mod/admin.php:752
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/admin.php:753
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../mod/admin.php:48
+msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:794
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
+msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:798
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../mod/admin.php:89 ../../mod/admin.php:738 ../../mod/admin.php:750
+msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:808 ../../mod/admin.php:1010
-msgid "Disable"
+#: ../../mod/admin.php:90 ../../mod/admin.php:836 ../../mod/admin.php:878
+msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:810 ../../mod/admin.php:1012
-msgid "Enable"
+#: ../../mod/admin.php:91 ../../mod/admin.php:1041 ../../mod/admin.php:1077
+msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:836 ../../mod/admin.php:1041
-msgid "Toggle"
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
+msgid "Server"
 msgstr ""
 
-#: ../../mod/admin.php:844 ../../mod/admin.php:1051
-msgid "Author: "
+#: ../../mod/admin.php:93
+msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:845 ../../mod/admin.php:1052
-msgid "Maintainer: "
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1164
+msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:974
-msgid "No themes found."
+#: ../../mod/admin.php:113
+msgid "Plugin Features"
 msgstr ""
 
-#: ../../mod/admin.php:1033
-msgid "Screenshot"
+#: ../../mod/admin.php:115
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:1081
-msgid "[Experimental]"
+#: ../../mod/admin.php:189
+msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:1082
-msgid "[Unsupported]"
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:737 ../../mod/admin.php:835 ../../mod/admin.php:877
+#: ../../mod/admin.php:1040 ../../mod/admin.php:1076 ../../mod/admin.php:1163
+msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:1109
-msgid "Log settings updated."
+#: ../../mod/admin.php:195
+msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:1165
-msgid "Clear"
+#: ../../mod/admin.php:197
+msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:1171
-msgid "Debugging"
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:1172
-msgid "Log file"
+#: ../../mod/admin.php:200
+msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:1172
-msgid ""
-"Must be writable by web server. Relative to your Red top-level directory."
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
+msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:1173
-msgid "Log level"
+#: ../../mod/admin.php:350
+msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/filer.php:35
-msgid "- select -"
+#: ../../mod/admin.php:381
+msgid "No special theme for accessibility"
 msgstr ""
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/admin.php:409
+msgid "Closed"
 msgstr ""
 
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
+#: ../../mod/admin.php:410
+msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/admin.php:411
+msgid "Open"
 msgstr ""
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/admin.php:416
+msgid "Private"
 msgstr ""
 
-#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
+#: ../../mod/admin.php:417
+msgid "Paid Access"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/admin.php:418
+msgid "Free Access"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/admin.php:419
+msgid "Tiered Access"
 msgstr ""
 
-#: ../../mod/directory.php:144 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
+#: ../../mod/admin.php:432 ../../mod/register.php:189
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
-msgid "Gender: "
+#: ../../mod/admin.php:433
+msgid "File upload"
 msgstr ""
 
-#: ../../mod/directory.php:208
-msgid "Finding:"
+#: ../../mod/admin.php:434
+msgid "Policies"
 msgstr ""
 
-#: ../../mod/directory.php:216
-msgid "next page"
+#: ../../mod/admin.php:435
+msgid "Advanced"
 msgstr ""
 
-#: ../../mod/directory.php:216
-msgid "previous page"
+#: ../../mod/admin.php:439
+msgid "Site name"
 msgstr ""
 
-#: ../../mod/directory.php:223
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/admin.php:440
+msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/connedit.php:63 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
 
-#: ../../mod/connedit.php:107 ../../mod/connections.php:94
-msgid "Connection updated."
+#: ../../mod/admin.php:442
+msgid "System language"
 msgstr ""
 
-#: ../../mod/connedit.php:109 ../../mod/connections.php:96
-msgid "Failed to update connection record."
+#: ../../mod/admin.php:443
+msgid "System theme"
 msgstr ""
 
-#: ../../mod/connedit.php:204
-msgid "Could not access address book record."
+#: ../../mod/admin.php:443
+msgid ""
+"Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr ""
 
-#: ../../mod/connedit.php:218
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../mod/admin.php:444
+msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/connedit.php:225
-msgid "Channel has been unblocked"
+#: ../../mod/admin.php:444
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/connedit.php:226
-msgid "Channel has been blocked"
+#: ../../mod/admin.php:445
+msgid "Accessibility system theme"
 msgstr ""
 
-#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
-#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
-#: ../../mod/connedit.php:281
-msgid "Unable to set address book parameters."
+#: ../../mod/admin.php:445
+msgid "Accessibility theme"
 msgstr ""
 
-#: ../../mod/connedit.php:237
-msgid "Channel has been unignored"
+#: ../../mod/admin.php:446
+msgid "Channel to use for this website's static pages"
 msgstr ""
 
-#: ../../mod/connedit.php:238
-msgid "Channel has been ignored"
+#: ../../mod/admin.php:446
+msgid "Site Channel"
 msgstr ""
 
-#: ../../mod/connedit.php:249
-msgid "Channel has been unarchived"
+#: ../../mod/admin.php:448
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/connedit.php:250
-msgid "Channel has been archived"
+#: ../../mod/admin.php:448
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: ../../mod/connedit.php:261
-msgid "Channel has been unhidden"
+#: ../../mod/admin.php:449
+msgid "Register policy"
 msgstr ""
 
-#: ../../mod/connedit.php:262
-msgid "Channel has been hidden"
+#: ../../mod/admin.php:450
+msgid "Access policy"
 msgstr ""
 
-#: ../../mod/connedit.php:276
-msgid "Channel has been approved"
+#: ../../mod/admin.php:451
+msgid "Register text"
 msgstr ""
 
-#: ../../mod/connedit.php:277
-msgid "Channel has been unapproved"
+#: ../../mod/admin.php:451
+msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/connedit.php:295
-msgid "Contact has been removed."
+#: ../../mod/admin.php:452
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/connedit.php:315
-#, php-format
-msgid "View %s's profile"
+#: ../../mod/admin.php:452
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/connedit.php:319
-msgid "Refresh Permissions"
+#: ../../mod/admin.php:453
+msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/connedit.php:322
-msgid "Fetch updated permissions"
+#: ../../mod/admin.php:453
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/connedit.php:326
-msgid "Recent Activity"
+#: ../../mod/admin.php:454
+msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/connedit.php:329
-msgid "View recent posts and comments"
+#: ../../mod/admin.php:454
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
 msgstr ""
 
-#: ../../mod/connedit.php:336
-msgid "Block or Unblock this connection"
+#: ../../mod/admin.php:455
+msgid "Block public"
 msgstr ""
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-msgid "Unignore"
+#: ../../mod/admin.php:455
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-#: ../../mod/notifications.php:51
-msgid "Ignore"
+#: ../../mod/admin.php:456
+msgid "Force publish"
 msgstr ""
 
-#: ../../mod/connedit.php:343
-msgid "Ignore or Unignore this connection"
+#: ../../mod/admin.php:456
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/connedit.php:346
-msgid "Unarchive"
+#: ../../mod/admin.php:457
+msgid "No login on Homepage"
 msgstr ""
 
-#: ../../mod/connedit.php:346
-msgid "Archive"
-msgstr ""
-
-#: ../../mod/connedit.php:349
-msgid "Archive or Unarchive this connection"
+#: ../../mod/admin.php:457
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
 msgstr ""
 
-#: ../../mod/connedit.php:352
-msgid "Unhide"
+#: ../../mod/admin.php:459
+msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/connedit.php:352
-msgid "Hide"
+#: ../../mod/admin.php:460
+msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/connedit.php:355
-msgid "Hide or Unhide this connection"
+#: ../../mod/admin.php:461
+msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/connedit.php:362
-msgid "Delete this connection"
+#: ../../mod/admin.php:461
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/connedit.php:395
-msgid "Unknown"
+#: ../../mod/admin.php:462
+msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
-msgid "Approve this connection"
+#: ../../mod/admin.php:462
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
 msgstr ""
 
-#: ../../mod/connedit.php:405
-msgid "Accept connection to allow communication"
+#: ../../mod/admin.php:463
+msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/connedit.php:421
-msgid "Automatic Permissions Settings"
+#: ../../mod/admin.php:463
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/connedit.php:421
-#, php-format
-msgid "Connections: settings for %s"
+#: ../../mod/admin.php:464
+msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/connedit.php:425
+#: ../../mod/admin.php:464
 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."
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: ../../mod/connedit.php:427
-msgid "Slide to adjust your degree of friendship"
+#: ../../mod/admin.php:520
+msgid "No server found"
 msgstr ""
 
-#: ../../mod/connedit.php:433
-msgid "inherited"
+#: ../../mod/admin.php:527 ../../mod/admin.php:751
+msgid "ID"
 msgstr ""
 
-#: ../../mod/connedit.php:435
-msgid "Connection has no individual permissions!"
+#: ../../mod/admin.php:527
+msgid "for channel"
 msgstr ""
 
-#: ../../mod/connedit.php:436
-msgid ""
-"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."
+#: ../../mod/admin.php:527
+msgid "on server"
 msgstr ""
 
-#: ../../mod/connedit.php:438
-msgid "Profile Visibility"
+#: ../../mod/admin.php:527
+msgid "Status"
 msgstr ""
 
-#: ../../mod/connedit.php:439
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../mod/admin.php:548
+msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/connedit.php:440
-msgid "Contact Information / Notes"
+#: ../../mod/admin.php:558
+#, php-format
+msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/connedit.php:441
-msgid "Edit contact notes"
+#: ../../mod/admin.php:561
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/connedit.php:443
-msgid "Their Settings"
+#: ../../mod/admin.php:565
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/connedit.php:444
-msgid "My Settings"
+#: ../../mod/admin.php:568
+#, php-format
+msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/connedit.php:446
-msgid "Forum Members"
+#: ../../mod/admin.php:583
+msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/connedit.php:447
-msgid "Soapbox"
+#: ../../mod/admin.php:587
+msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/connedit.php:448
-msgid "Full Sharing (typical social network permissions)"
+#: ../../mod/admin.php:589
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/connedit.php:449
-msgid "Cautious Sharing "
+#: ../../mod/admin.php:590
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/connedit.php:450
-msgid "Follow Only"
-msgstr ""
+#: ../../mod/admin.php:616
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/connedit.php:451
-msgid "Individual Permissions"
-msgstr ""
+#: ../../mod/admin.php:623
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/connedit.php:452
-msgid ""
-"Some permissions may be inherited from your channel privacy settings, which have higher priority than individual "
-"settings. Changing those inherited settings on this page will have no effect."
+#: ../../mod/admin.php:654
+msgid "Account not found"
 msgstr ""
 
-#: ../../mod/connedit.php:453
-msgid "Advanced Permissions"
+#: ../../mod/admin.php:665
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/connedit.php:454
-msgid "Simple Permissions (select one and submit)"
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/connedit.php:458
+#: ../../mod/admin.php:674
 #, php-format
-msgid "Visit %s's profile - %s"
+msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/connedit.php:459
-msgid "Block/Unblock contact"
+#: ../../mod/admin.php:740
+msgid "select all"
 msgstr ""
 
-#: ../../mod/connedit.php:460
-msgid "Ignore contact"
+#: ../../mod/admin.php:741
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/connedit.php:461
-msgid "Repair URL settings"
+#: ../../mod/admin.php:742
+msgid "Request date"
 msgstr ""
 
-#: ../../mod/connedit.php:462
-msgid "View conversations"
+#: ../../mod/admin.php:743
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/connedit.php:464
-msgid "Delete contact"
+#: ../../mod/admin.php:744
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/connedit.php:467
-msgid "Last update:"
+#: ../../mod/admin.php:745
+msgid "Deny"
 msgstr ""
 
-#: ../../mod/connedit.php:469
-msgid "Update public posts"
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
 msgstr ""
 
-#: ../../mod/connedit.php:471
-msgid "Update now"
+#: ../../mod/admin.php:748 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:477
-msgid "Currently blocked"
+#: ../../mod/admin.php:751
+msgid "Register date"
 msgstr ""
 
-#: ../../mod/connedit.php:478
-msgid "Currently ignored"
+#: ../../mod/admin.php:751
+msgid "Last login"
 msgstr ""
 
-#: ../../mod/connedit.php:479
-msgid "Currently archived"
+#: ../../mod/admin.php:751
+msgid "Expires"
 msgstr ""
 
-#: ../../mod/connedit.php:480
-msgid "Currently pending"
+#: ../../mod/admin.php:751
+msgid "Service Class"
 msgstr ""
 
-#: ../../mod/connedit.php:481
-msgid "Hide this contact from others"
+#: ../../mod/admin.php:753
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/connedit.php:481
+#: ../../mod/admin.php:754
 msgid ""
-"Replies/likes to your public posts may still be visible"
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/layouts.php:52
-msgid "Layout Help"
+#: ../../mod/admin.php:795
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/layouts.php:55
-msgid "Help with this feature"
+#: ../../mod/admin.php:799
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/layouts.php:74
-msgid "Layout Name"
+#: ../../mod/admin.php:809 ../../mod/admin.php:1011
+msgid "Disable"
 msgstr ""
 
-#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
-msgid "Help:"
+#: ../../mod/admin.php:811 ../../mod/admin.php:1013
+msgid "Enable"
 msgstr ""
 
-#: ../../mod/help.php:68 ../../index.php:223
-msgid "Not Found"
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Toggle"
 msgstr ""
 
-#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
+msgid "Author: "
 msgstr ""
 
-#: ../../mod/rmagic.php:56
-msgid "Remote Authentication"
+#: ../../mod/admin.php:846 ../../mod/admin.php:1053
+msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/rmagic.php:57
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../mod/admin.php:975
+msgid "No themes found."
 msgstr ""
 
-#: ../../mod/rmagic.php:58
-msgid "Authenticate"
+#: ../../mod/admin.php:1034
+msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
+#: ../../mod/admin.php:1082
+msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/network.php:79
-msgid "No such group"
+#: ../../mod/admin.php:1083
+msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
+#: ../../mod/admin.php:1110
+msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
+#: ../../mod/admin.php:1166
+msgid "Clear"
 msgstr ""
 
-#: ../../mod/network.php:180
-msgid "Collection: "
+#: ../../mod/admin.php:1172
+msgid "Debugging"
 msgstr ""
 
-#: ../../mod/network.php:193
-msgid "Connection: "
+#: ../../mod/admin.php:1173
+msgid "Log file"
 msgstr ""
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
+#: ../../mod/admin.php:1173
+msgid ""
+"Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
-msgid "Profile not found."
+#: ../../mod/admin.php:1174
+msgid "Log level"
 msgstr ""
 
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
+#: ../../mod/filer.php:35
+msgid "- select -"
 msgstr ""
 
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../mod/profiles.php:178
-msgid "Profile Name is required."
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
 msgstr ""
 
-#: ../../mod/profiles.php:294
-msgid "Marital Status"
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/profiles.php:298
-msgid "Romantic Partner"
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/profiles.php:302
-msgid "Likes"
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/profiles.php:306
-msgid "Dislikes"
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:310
-msgid "Work/Employment"
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/profiles.php:313
-msgid "Religion"
+#: ../../mod/directory.php:208
+msgid "Finding:"
 msgstr ""
 
-#: ../../mod/profiles.php:317
-msgid "Political Views"
+#: ../../mod/directory.php:216
+msgid "next page"
 msgstr ""
 
-#: ../../mod/profiles.php:321
-msgid "Gender"
+#: ../../mod/directory.php:216
+msgid "previous page"
 msgstr ""
 
-#: ../../mod/profiles.php:325
-msgid "Sexual Preference"
+#: ../../mod/directory.php:223
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/profiles.php:329
-msgid "Homepage"
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/profiles.php:333
-msgid "Interests"
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/profiles.php:337
-msgid "Address"
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
-msgid "Location"
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/profiles.php:427
-msgid "Profile updated."
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/profiles.php:482
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/profiles.php:505
-msgid "Edit Profile Details"
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
 msgstr ""
 
-#: ../../mod/profiles.php:507
-msgid "View this profile"
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
 msgstr ""
 
-#: ../../mod/profiles.php:508
-msgid "Change Profile Photo"
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/profiles.php:509
-msgid "Create a new profile using these settings"
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
 msgstr ""
 
-#: ../../mod/profiles.php:510
-msgid "Clone this profile"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
 msgstr ""
 
-#: ../../mod/profiles.php:511
-msgid "Delete this profile"
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
 msgstr ""
 
-#: ../../mod/profiles.php:512
-msgid "Profile Name:"
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
 msgstr ""
 
-#: ../../mod/profiles.php:513
-msgid "Your Full Name:"
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
 msgstr ""
 
-#: ../../mod/profiles.php:514
-msgid "Title/Description:"
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
 msgstr ""
 
-#: ../../mod/profiles.php:515
-msgid "Your Gender:"
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
 msgstr ""
 
-#: ../../mod/profiles.php:516
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
 msgstr ""
 
-#: ../../mod/profiles.php:517
-msgid "Street Address:"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/profiles.php:518
-msgid "Locality/City:"
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/profiles.php:519
-msgid "Postal/Zip Code:"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/profiles.php:520
-msgid "Country:"
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/profiles.php:521
-msgid "Region/State:"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/profiles.php:522
-msgid "♥ Marital Status:"
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/profiles.php:523
-msgid "Who: (if applicable)"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
 msgstr ""
 
-#: ../../mod/profiles.php:524
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
 msgstr ""
 
-#: ../../mod/profiles.php:525
-msgid "Since [date]:"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/profiles.php:527
-msgid "Homepage URL:"
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
 msgstr ""
 
-#: ../../mod/profiles.php:530
-msgid "Religious Views:"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/profiles.php:531
-msgid "Keywords:"
+#: ../../mod/connedit.php:346
+msgid "Archive"
 msgstr ""
 
-#: ../../mod/profiles.php:534
-msgid "Example: fishing photography software"
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
 msgstr ""
 
-#: ../../mod/profiles.php:535
-msgid "Used in directory listings"
+#: ../../mod/connedit.php:352
+msgid "Unhide"
 msgstr ""
 
-#: ../../mod/profiles.php:536
-msgid "Tell us about yourself..."
+#: ../../mod/connedit.php:352
+msgid "Hide"
 msgstr ""
 
-#: ../../mod/profiles.php:537
-msgid "Hobbies/Interests"
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
 msgstr ""
 
-#: ../../mod/profiles.php:538
-msgid "Contact information and Social Networks"
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/profiles.php:539
-msgid "My other channels"
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/profiles.php:540
-msgid "Musical interests"
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/profiles.php:541
-msgid "Books, literature"
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
 msgstr ""
 
-#: ../../mod/profiles.php:542
-msgid "Television"
+#: ../../mod/connedit.php:421
+#, php-format
+msgid "Connections: settings for %s"
 msgstr ""
 
-#: ../../mod/profiles.php:543
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/connedit.php:425
+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/profiles.php:544
-msgid "Love/romance"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/profiles.php:545
-msgid "Work/employment"
+#: ../../mod/connedit.php:433
+msgid "inherited"
 msgstr ""
 
-#: ../../mod/profiles.php:546
-msgid "School/education"
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
 msgstr ""
 
-#: ../../mod/profiles.php:551
+#: ../../mod/connedit.php:436
 msgid ""
-"This is your public profile.
                                      It may "
-"be visible to anybody using the internet."
-msgstr ""
-
-#: ../../mod/profiles.php:600
-msgid "Edit/Manage Profiles"
+"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."
 msgstr ""
 
-#: ../../mod/profiles.php:601
-msgid "Add profile things"
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/profiles.php:602
-msgid "Include desirable objects in your profile"
+#: ../../mod/connedit.php:439
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/post.php:226
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/post.php:256
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
+#: ../../mod/connedit.php:444
+msgid "My Settings"
 msgstr ""
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
 msgstr ""
 
-#: ../../mod/sources.php:45
-msgid "Source created."
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
 msgstr ""
 
-#: ../../mod/sources.php:57
-msgid "Source updated."
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
 msgstr ""
 
-#: ../../mod/sources.php:82
-msgid "*"
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
 msgstr ""
 
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
 msgstr ""
 
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
+#: ../../mod/connedit.php:452
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than individual "
+"settings. Changing those inherited settings on this page will have no effect."
 msgstr ""
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
 msgstr ""
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
 msgstr ""
 
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
 msgstr ""
 
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/sources.php:130
-msgid "Edit Source"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/sources.php:131
-msgid "Delete Source"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
+#: ../../mod/connedit.php:462
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
+#: ../../mod/connedit.php:467
+msgid "Last update:"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
+#: ../../mod/connedit.php:471
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/setup.php:171
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
 msgstr ""
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/setup.php:187
+#: ../../mod/connedit.php:481
 msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
+"Replies/likes to your public posts may still be visible"
 msgstr ""
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
 msgstr ""
 
-#: ../../mod/setup.php:254
-msgid "System check"
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
 msgstr ""
 
-#: ../../mod/setup.php:259
-msgid "Check again"
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/setup.php:281
-msgid "Database connection"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
 msgstr ""
 
-#: ../../mod/setup.php:282
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/setup.php:284
+#: ../../mod/rmagic.php:38
 msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
+#: ../../mod/rmagic.php:38
+msgid "The error message was:"
 msgstr ""
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
+#: ../../mod/rmagic.php:42
+msgid "Authentication failed."
 msgstr ""
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
+#: ../../mod/rmagic.php:78
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
+#: ../../mod/rmagic.php:79
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
+#: ../../mod/rmagic.php:80
+msgid "Authenticate"
 msgstr ""
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
+#: ../../mod/page.php:35
+msgid "Invalid item."
 msgstr ""
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
+#: ../../mod/network.php:79
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: ../../mod/network.php:172
+msgid "Collection is empty"
 msgstr ""
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
+#: ../../mod/network.php:180
+msgid "Collection: "
 msgstr ""
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
+#: ../../mod/network.php:193
+msgid "Connection: "
 msgstr ""
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
+#: ../../mod/network.php:196
+msgid "Invalid connection."
 msgstr ""
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/setup.php:384
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/setup.php:385
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/setup.php:389
-msgid "PHP executable path"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/setup.php:389
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/setup.php:394
-msgid "Command line PHP"
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/setup.php:403
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/profiles.php:294
+msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/setup.php:404
-msgid "This is required for message delivery to work."
+#: ../../mod/profiles.php:298
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/setup.php:406
-msgid "PHP register_argc_argv"
+#: ../../mod/profiles.php:302
+msgid "Likes"
 msgstr ""
 
-#: ../../mod/setup.php:427
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/profiles.php:306
+msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/setup.php:428
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/profiles.php:310
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/setup.php:430
-msgid "Generate encryption keys"
+#: ../../mod/profiles.php:313
+msgid "Religion"
 msgstr ""
 
-#: ../../mod/setup.php:437
-msgid "libCurl PHP module"
+#: ../../mod/profiles.php:317
+msgid "Political Views"
 msgstr ""
 
-#: ../../mod/setup.php:438
-msgid "GD graphics PHP module"
+#: ../../mod/profiles.php:321
+msgid "Gender"
 msgstr ""
 
-#: ../../mod/setup.php:439
-msgid "OpenSSL PHP module"
+#: ../../mod/profiles.php:325
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/setup.php:440
-msgid "mysqli PHP module"
+#: ../../mod/profiles.php:329
+msgid "Homepage"
 msgstr ""
 
-#: ../../mod/setup.php:441
-msgid "mb_string PHP module"
+#: ../../mod/profiles.php:333
+msgid "Interests"
 msgstr ""
 
-#: ../../mod/setup.php:442
-msgid "mcrypt PHP module"
+#: ../../mod/profiles.php:337
+msgid "Address"
 msgstr ""
 
-#: ../../mod/setup.php:447 ../../mod/setup.php:449
-msgid "Apache mod_rewrite module"
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
+msgid "Location"
 msgstr ""
 
-#: ../../mod/setup.php:447
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/profiles.php:427
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/setup.php:453 ../../mod/setup.php:456
-msgid "proc_open"
+#: ../../mod/profiles.php:482
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/setup.php:453
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../mod/profiles.php:505
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/setup.php:461
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/profiles.php:507
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/setup.php:465
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/profiles.php:508
+msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/setup.php:469
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/profiles.php:509
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/setup.php:473
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/profiles.php:510
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/setup.php:477
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/profiles.php:511
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/setup.php:481
-msgid "Error: mcrypt PHP module required but not installed."
+#: ../../mod/profiles.php:512
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/setup.php:497
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../mod/profiles.php:513
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/setup.php:498
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../mod/profiles.php:514
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/setup.php:499
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
+#: ../../mod/profiles.php:515
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/setup.php:500
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
+#: ../../mod/profiles.php:516
+#, php-format
+msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/setup.php:503
-msgid ".htconfig.php is writable"
+#: ../../mod/profiles.php:517
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/setup.php:513
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: ../../mod/profiles.php:518
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/setup.php:514
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
+#: ../../mod/profiles.php:519
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/setup.php:515 ../../mod/setup.php:533
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../mod/profiles.php:520
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/setup.php:516
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+#: ../../mod/profiles.php:521
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/setup.php:519
-msgid "view/tpl/smarty3 is writable"
+#: ../../mod/profiles.php:522
+msgid "♥ Marital Status:"
 msgstr ""
 
-#: ../../mod/setup.php:532
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to "
-"have write access to the store directory under the Red top level folder"
+#: ../../mod/profiles.php:523
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/setup.php:536
-msgid "store is writable"
+#: ../../mod/profiles.php:524
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/setup.php:551
-msgid "SSL certificate validation"
+#: ../../mod/profiles.php:525
+msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/setup.php:551
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../mod/profiles.php:527
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/setup.php:558
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+#: ../../mod/profiles.php:530
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/setup.php:560
-msgid "Url rewrite is working"
+#: ../../mod/profiles.php:531
+msgid "Keywords:"
 msgstr ""
 
-#: ../../mod/setup.php:570
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
+#: ../../mod/profiles.php:534
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/setup.php:594
-msgid "Errors encountered creating database tables."
+#: ../../mod/profiles.php:535
+msgid "Used in directory listings"
 msgstr ""
 
-#: ../../mod/setup.php:607
-msgid "
                                      What next
                                      "
+#: ../../mod/profiles.php:536
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/setup.php:608
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/profiles.php:537
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
+#: ../../mod/profiles.php:538
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
+#: ../../mod/profiles.php:539
+msgid "My other channels"
 msgstr ""
 
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
+#: ../../mod/profiles.php:540
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/siteinfo.php:93
-msgid "Project Donations"
+#: ../../mod/profiles.php:541
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/siteinfo.php:94
-msgid ""
-"
                                      The Red Matrix is provided for you by volunteers working in their spare "
-"time. Your support will help us to build a better web. Select the following "
-"option for a one-time donation of your choosing
                                      "
+#: ../../mod/profiles.php:542
+msgid "Television"
 msgstr ""
 
-#: ../../mod/siteinfo.php:95
-msgid "
                                      or
                                      "
+#: ../../mod/profiles.php:543
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/siteinfo.php:96
-msgid "Recurring Donation Options"
+#: ../../mod/profiles.php:544
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/siteinfo.php:115
-msgid "Red"
+#: ../../mod/profiles.php:545
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/siteinfo.php:116
+#: ../../mod/profiles.php:546
+msgid "School/education"
+msgstr ""
+
+#: ../../mod/profiles.php:551
 msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
+"This is your public profile.
                                      It may "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/siteinfo.php:119
-msgid "Running at web location"
+#: ../../mod/profiles.php:600
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/siteinfo.php:120
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
+#: ../../mod/profiles.php:601
+msgid "Add profile things"
 msgstr ""
 
-#: ../../mod/siteinfo.php:121
-msgid "Bug reports and issues: please visit"
+#: ../../mod/profiles.php:602
+msgid "Include desirable objects in your profile"
 msgstr ""
 
-#: ../../mod/siteinfo.php:124
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr ""
+
+#: ../../mod/post.php:226
 msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
 msgstr ""
 
-#: ../../mod/siteinfo.php:126
-msgid "Site Administrators"
+#: ../../mod/post.php:256 ../../mod/openid.php:70 ../../mod/openid.php:175
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../mod/new_channel.php:108
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used "
-"to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../mod/new_channel.php:111
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\" "
+#: ../../mod/sources.php:45
+msgid "Source created."
 msgstr ""
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
+#: ../../mod/sources.php:57
+msgid "Source updated."
 msgstr ""
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
+#: ../../mod/sources.php:82
+msgid "*"
 msgstr ""
 
-#: ../../mod/new_channel.php:114
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr ""
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr ""
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
 msgid ""
-"Or import an existing channel from another location"
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr ""
+
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr ""
+
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
+msgstr ""
+
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr ""
+
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr ""
+
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr ""
+
+#: ../../mod/sources.php:158
+msgid "Source removed"
 msgstr ""
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
 msgstr ""
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../mod/magic.php:70
+msgid "Hub not found."
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1434
-msgid "Password Reset"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
 msgstr ""
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
+#: ../../mod/setup.php:171
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/setup.php:187
 msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
 msgstr ""
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
+#: ../../mod/setup.php:254
+msgid "System check"
 msgstr ""
 
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/setup.php:259
+msgid "Check again"
 msgstr ""
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
+#: ../../mod/setup.php:281
+msgid "Database connection"
 msgstr ""
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:542
-msgid "Update"
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/settings.php:195
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
 msgstr ""
 
-#: ../../mod/settings.php:199
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/setup.php:289
+msgid "Database Port"
 msgstr ""
 
-#: ../../mod/settings.php:212
-msgid "Password changed."
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../mod/settings.php:214
-msgid "Password update failed. Please try again."
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/settings.php:228
-msgid "Not valid email."
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/settings.php:231
-msgid "Protected email address. Cannot change to that email."
+#: ../../mod/setup.php:292
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/settings.php:240
-msgid "System failure storing new email. Please try again."
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/settings.php:444
-msgid "Settings updated."
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-#: ../../mod/settings.php:577
-msgid "Add application"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
 msgstr ""
 
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Name"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../mod/settings.php:518
-msgid "Name of application"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
-msgid "Consumer Key"
+#: ../../mod/setup.php:325
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:520
-msgid "Automatically generated - change if desired. Max length 20"
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/settings.php:520 ../../mod/settings.php:546
-msgid "Consumer Secret"
+#: ../../mod/setup.php:385
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../mod/settings.php:521 ../../mod/settings.php:547
-msgid "Redirect"
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/settings.php:521
+#: ../../mod/setup.php:389
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../mod/settings.php:522 ../../mod/settings.php:548
-msgid "Icon url"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/settings.php:522
-msgid "Optional"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/settings.php:533
-msgid "You can't edit this application."
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/settings.php:576
-msgid "Connected Apps"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/settings.php:580
-msgid "Client key starts with"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/settings.php:581
-msgid "No name"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/settings.php:582
-msgid "Remove authorization"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/settings.php:593
-msgid "No feature settings configured"
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:601
-msgid "Feature Settings"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:624
-msgid "Account Settings"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:625
-msgid "Password Settings"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:626
-msgid "New Password:"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:627
-msgid "Confirm:"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:627
-msgid "Leave password fields blank unless changing"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/settings.php:629 ../../mod/settings.php:925
-msgid "Email Address:"
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:630
-msgid "Remove Account"
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
 msgstr ""
 
-#: ../../mod/settings.php:631
-msgid "Warning: This action is permanent and cannot be reversed."
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
 
-#: ../../mod/settings.php:647
-msgid "Off"
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:647
-msgid "On"
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:654
-msgid "Additional Features"
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:679
-msgid "Connector Settings"
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:750
-msgid "Display Settings"
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:756
-msgid "Display Theme:"
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:757
-msgid "Mobile Theme:"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/settings.php:758
-msgid "Update browser every xx seconds"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/settings.php:758
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../mod/settings.php:759
-msgid "Maximum number of conversations to load at any time:"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/settings.php:759
-msgid "Maximum of 100 items"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/settings.php:760
-msgid "Don't show emoticons"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/settings.php:761
-msgid "Do not view remote profiles in frames"
+#: ../../mod/setup.php:514
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
 msgstr ""
 
-#: ../../mod/settings.php:761
-msgid "By default open in a sub-window of your own site"
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../mod/settings.php:796
-msgid "Nobody except yourself"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../mod/settings.php:797
-msgid "Only those you specifically allow"
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
 msgstr ""
 
-#: ../../mod/settings.php:798
-msgid "Anybody in your address book"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to "
+"have write access to the store directory under the Red top level folder"
 msgstr ""
 
-#: ../../mod/settings.php:799
-msgid "Anybody on this website"
+#: ../../mod/setup.php:536
+msgid "store is writable"
 msgstr ""
 
-#: ../../mod/settings.php:800
-msgid "Anybody in this network"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../mod/settings.php:801
-msgid "Anybody on the internet"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../mod/settings.php:878
-msgid "Publish your default profile in the network directory"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: ../../mod/settings.php:883
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288
-msgid "or"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/settings.php:892
-msgid "Your channel address is"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/settings.php:914
-msgid "Channel Settings"
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
 msgstr ""
 
-#: ../../mod/settings.php:923
-msgid "Basic Settings"
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/settings.php:926
-msgid "Your Timezone:"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
 msgstr ""
 
-#: ../../mod/settings.php:927
-msgid "Default Post Location:"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/settings.php:928
-msgid "Use Browser Location:"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/settings.php:930
-msgid "Adult Content"
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
 msgstr ""
 
-#: ../../mod/settings.php:930
+#: ../../mod/siteinfo.php:94
 msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
+"
                                      The Red Matrix is provided for you by volunteers working in their spare "
+"time. Your support will help us to build a better, freer, and privacy "
+"respecting web. Select the following option for a one-time donation of your "
+"choosing
                                      "
 msgstr ""
 
-#: ../../mod/settings.php:932
-msgid "Security and Privacy Settings"
+#: ../../mod/siteinfo.php:95
+msgid "
                                      or
                                      "
 msgstr ""
 
-#: ../../mod/settings.php:934
-msgid "Hide my online presence"
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
 msgstr ""
 
-#: ../../mod/settings.php:934
-msgid "Prevents displaying in your profile that you are online"
+#: ../../mod/siteinfo.php:115
+msgid "Red"
 msgstr ""
 
-#: ../../mod/settings.php:936
-msgid "Simple Privacy Settings:"
+#: ../../mod/siteinfo.php:116
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
 msgstr ""
 
-#: ../../mod/settings.php:937
-msgid ""
-"Very Public - extremely permissive (should be used with caution)"
+#: ../../mod/siteinfo.php:119
+msgid "Running at web location"
 msgstr ""
 
-#: ../../mod/settings.php:938
+#: ../../mod/siteinfo.php:120
 msgid ""
-"Typical - default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)"
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
 msgstr ""
 
-#: ../../mod/settings.php:939
-msgid "Private - default private, never open or public"
+#: ../../mod/siteinfo.php:121
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/settings.php:940
-msgid "Blocked - default blocked to/from everybody"
+#: ../../mod/siteinfo.php:124
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../mod/settings.php:943
-msgid "Advanced Privacy Settings"
+#: ../../mod/siteinfo.php:126
+msgid "Site Administrators"
 msgstr ""
 
-#: ../../mod/settings.php:945
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
 msgstr ""
 
-#: ../../mod/settings.php:945
-msgid "May reduce spam activity"
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used "
+"to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
 msgstr ""
 
-#: ../../mod/settings.php:946
-msgid "Default Post Permissions"
+#: ../../mod/new_channel.php:111
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\" "
 msgstr ""
 
-#: ../../mod/settings.php:958
-msgid "Maximum private messages per day from unknown people:"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../mod/settings.php:958
-msgid "Useful to reduce spamming"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
 msgstr ""
 
-#: ../../mod/settings.php:961
-msgid "Notification Settings"
+#: ../../mod/new_channel.php:114
+msgid ""
+"Or import an existing channel from another location"
 msgstr ""
 
-#: ../../mod/settings.php:962
-msgid "By default post a status message when:"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/settings.php:963
-msgid "accepting a friend request"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/settings.php:964
-msgid "joining a forum/community"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../mod/settings.php:965
-msgid "making an interesting profile change"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/settings.php:966
-msgid "Send a notification email when:"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/settings.php:967
-msgid "You receive an introduction"
+#: ../../mod/lostpass.php:85 ../../boot.php:1436
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/settings.php:968
-msgid "Your introductions are confirmed"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/settings.php:969
-msgid "Someone writes on your profile wall"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/settings.php:970
-msgid "Someone writes a followup comment"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/settings.php:971
-msgid "You receive a private message"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/settings.php:972
-msgid "You receive a friend suggestion"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/settings.php:973
-msgid "You are tagged in a post"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
 msgstr ""
 
-#: ../../mod/settings.php:974
-msgid "You are poked/prodded/etc. in a post"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/settings.php:977
-msgid "Advanced Account/Page Type Settings"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/settings.php:978
-msgid "Change the behaviour of this account for special situations"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
 msgstr ""
 
-#: ../../mod/settings.php:981
-msgid ""
-"Please enable expert mode (in Settings > Additional features) to adjust!"
+#: ../../mod/lostpass.php:125
+msgid "Reset"
 msgstr ""
 
 #: ../../mod/import.php:36
@@ -6261,32 +6296,32 @@ msgstr ""
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../mod/manage.php:63
+#: ../../mod/manage.php:64
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../mod/manage.php:71
+#: ../../mod/manage.php:72
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../mod/manage.php:76
+#: ../../mod/manage.php:77
 msgid "Channel Manager"
 msgstr ""
 
-#: ../../mod/manage.php:77
+#: ../../mod/manage.php:78
 msgid "Current Channel"
 msgstr ""
 
-#: ../../mod/manage.php:79
+#: ../../mod/manage.php:80
 msgid "Attach to one of your channels by selecting it."
 msgstr ""
 
-#: ../../mod/manage.php:80
+#: ../../mod/manage.php:81
 msgid "Default Channel"
 msgstr ""
 
-#: ../../mod/manage.php:81
+#: ../../mod/manage.php:82
 msgid "Make Default"
 msgstr ""
 
@@ -6392,6 +6427,10 @@ msgstr ""
 msgid "Send Reply"
 msgstr ""
 
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
 #: ../../mod/editlayout.php:72
 msgid "Edit Layout"
 msgstr ""
@@ -7272,41 +7311,41 @@ msgstr ""
 msgid "Header image only on profile pages"
 msgstr ""
 
-#: ../../boot.php:1232
+#: ../../boot.php:1234
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1235
+#: ../../boot.php:1237
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1399
+#: ../../boot.php:1401
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1427
+#: ../../boot.php:1429
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1428
+#: ../../boot.php:1430
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1433
+#: ../../boot.php:1435
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1498
+#: ../../boot.php:1500
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1499
+#: ../../boot.php:1501
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:1899
+#: ../../boot.php:1906
 msgid "toggle mobile"
 msgstr ""
diff --git a/version.inc b/version.inc
index 12484d724..ffddcbc66 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-20.594
+2014-02-21.595
-- 
cgit v1.2.3


From 9c4c0e6d2313fc7d09e315f2bb39711af4a2774a Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 22 Feb 2014 03:38:23 -0800
Subject: prevent mod/cloud looping (ping gets a new session on each call
 [wtf?] which triggers our "changed uid" detector)

---
 mod/ping.php | 2 +-
 version.inc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index b9d9a9c77..390613d7a 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -28,7 +28,7 @@ function ping_init(&$a) {
 
 	header("content-type: application/json");
 
-	$result['invalid'] = ((intval($_GET['uid'])) && (intval($_GET['uid']) != local_user()) ? 1 : 0);
+	$result['invalid'] = ((local_user()) && (intval($_GET['uid'])) && (intval($_GET['uid']) != local_user()) ? 1 : 0);
 
 	if(x($_SESSION,'sysmsg')){
 		foreach ($_SESSION['sysmsg'] as $m){
diff --git a/version.inc b/version.inc
index ffddcbc66..ad4b11889 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-21.595
+2014-02-22.596
-- 
cgit v1.2.3


From 65d5fae3240cc5c17486712fd2995589b03ace2a Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff 
Date: Sat, 22 Feb 2014 14:10:21 +0100
Subject: DE: update to the strings

---
 view/de/messages.po | 4833 ++++++++++++++++++++++++++-------------------------
 view/de/strings.php |  236 +--
 2 files changed, 2558 insertions(+), 2511 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index f98726f4d..fe7074d5a 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-14 00:02-0800\n"
-"PO-Revision-Date: 2014-02-16 07:16+0000\n"
+"POT-Creation-Date: 2014-02-21 00:03-0800\n"
+"PO-Revision-Date: 2014-02-22 12:04+0000\n"
 "Last-Translator: bavatar \n"
 "Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../include/Contact.php:107 ../../include/identity.php:632
 #: ../../mod/directory.php:184 ../../mod/match.php:62
 #: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
 msgid "Connect"
@@ -73,8 +73,8 @@ msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../../include/widgets.php:173 ../../include/text.php:754
-#: ../../include/text.php:768 ../../mod/filer.php:36
+#: ../../include/widgets.php:173 ../../include/text.php:759
+#: ../../include/text.php:773 ../../mod/filer.php:36
 msgid "Save"
 msgstr "Speichern"
 
@@ -100,7 +100,7 @@ msgstr "Gesicherte Ordner"
 msgid "Everything"
 msgstr "Alles"
 
-#: ../../include/widgets.php:318 ../../include/items.php:3636
+#: ../../include/widgets.php:318
 msgid "Archives"
 msgstr "Archive"
 
@@ -116,7 +116,7 @@ msgstr "Ich"
 msgid "Best Friends"
 msgstr "Beste Freunde"
 
-#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/widgets.php:373 ../../include/identity.php:314
 #: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
 msgid "Friends"
 msgstr "Freunde"
@@ -179,7 +179,7 @@ msgid "Channel Sources"
 msgstr "Kanal-Quellen"
 
 #: ../../include/widgets.php:487 ../../include/nav.php:181
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+#: ../../mod/admin.php:838 ../../mod/admin.php:1043
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -230,7 +230,7 @@ msgstr "Besuche %1$s's %2$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 
-#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1423
+#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1425
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -314,7 +314,7 @@ msgstr "Webseiten"
 msgid "Your webpages"
 msgstr "Deine Webseiten"
 
-#: ../../include/nav.php:89 ../../boot.php:1424
+#: ../../include/nav.php:89 ../../boot.php:1426
 msgid "Login"
 msgstr "Anmelden"
 
@@ -335,7 +335,7 @@ msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1400
+#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1402
 msgid "Register"
 msgstr "Registrieren"
 
@@ -359,8 +359,8 @@ msgstr "Apps"
 msgid "Addon applications, utilities, games"
 msgstr "Addon Programme, Helferlein, Spiele"
 
-#: ../../include/nav.php:139 ../../include/text.php:752
-#: ../../include/text.php:766 ../../mod/search.php:29
+#: ../../include/nav.php:139 ../../include/text.php:757
+#: ../../include/text.php:771 ../../mod/search.php:29
 msgid "Search"
 msgstr "Suche"
 
@@ -520,320 +520,320 @@ msgstr "älter"
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:670
+#: ../../include/text.php:675
 msgid "No connections"
 msgstr "Keine Verbindungen"
 
-#: ../../include/text.php:681
+#: ../../include/text.php:686
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: ../../include/text.php:693
+#: ../../include/text.php:698
 msgid "View Connections"
 msgstr "Verbindungen anzeigen"
 
-#: ../../include/text.php:834
+#: ../../include/text.php:839
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:834 ../../include/conversation.php:240
+#: ../../include/text.php:839 ../../include/conversation.php:240
 msgid "poked"
 msgstr "stupste"
 
-#: ../../include/text.php:835
+#: ../../include/text.php:840
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:835
+#: ../../include/text.php:840
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:836
+#: ../../include/text.php:841
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:836
+#: ../../include/text.php:841
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:842
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:842
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:838
+#: ../../include/text.php:843
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:838
+#: ../../include/text.php:843
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:839
+#: ../../include/text.php:844
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:839
+#: ../../include/text.php:844
 msgid "rebuffed"
 msgstr "abfuhrerteilte"
 
-#: ../../include/text.php:851
+#: ../../include/text.php:856
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:852
+#: ../../include/text.php:857
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:853
+#: ../../include/text.php:858
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:854
+#: ../../include/text.php:859
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:855
+#: ../../include/text.php:860
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:856
+#: ../../include/text.php:861
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:857
+#: ../../include/text.php:862
 msgid "stupified"
 msgstr "verblüfft"
 
-#: ../../include/text.php:858
+#: ../../include/text.php:863
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:859
+#: ../../include/text.php:864
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:860
+#: ../../include/text.php:865
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:861
+#: ../../include/text.php:866
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:862
+#: ../../include/text.php:867
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:863
+#: ../../include/text.php:868
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:864
+#: ../../include/text.php:869
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:865
+#: ../../include/text.php:870
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:866
+#: ../../include/text.php:871
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:867
+#: ../../include/text.php:872
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:868
+#: ../../include/text.php:873
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:869
+#: ../../include/text.php:874
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:870
+#: ../../include/text.php:875
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1118
 msgid "unknown.???"
 msgstr "unbekannt.???"
 
-#: ../../include/text.php:1114
+#: ../../include/text.php:1119
 msgid "bytes"
 msgstr "Bytes"
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1154
 msgid "remove category"
 msgstr "Kategorie entfernen"
 
-#: ../../include/text.php:1171
+#: ../../include/text.php:1176
 msgid "remove from file"
 msgstr "aus der Datei entfernen"
 
-#: ../../include/text.php:1229 ../../include/text.php:1241
+#: ../../include/text.php:1234 ../../include/text.php:1246
 msgid "Click to open/close"
 msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/text.php:1417 ../../mod/events.php:332
+#: ../../include/text.php:1401 ../../mod/events.php:332
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../include/text.php:1436
+#: ../../include/text.php:1420
 msgid "Select a page layout: "
 msgstr "Ein Seiten-Layout auswählen:"
 
-#: ../../include/text.php:1439 ../../include/text.php:1504
+#: ../../include/text.php:1423 ../../include/text.php:1488
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1475
+#: ../../include/text.php:1459
 msgid "Page content type: "
 msgstr "Content-Typ der Seite:"
 
-#: ../../include/text.php:1516
+#: ../../include/text.php:1500
 msgid "Select an alternate language"
 msgstr "Wähle eine alternative Sprache"
 
-#: ../../include/text.php:1637 ../../include/conversation.php:117
+#: ../../include/text.php:1621 ../../include/conversation.php:117
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr "Foto"
 
-#: ../../include/text.php:1640 ../../include/conversation.php:120
+#: ../../include/text.php:1624 ../../include/conversation.php:120
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr "Ereignis"
 
-#: ../../include/text.php:1643 ../../include/conversation.php:145
+#: ../../include/text.php:1627 ../../include/conversation.php:145
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr "Status"
 
-#: ../../include/text.php:1645 ../../include/conversation.php:147
+#: ../../include/text.php:1629 ../../include/conversation.php:147
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../include/text.php:1650
+#: ../../include/text.php:1634
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1907
+#: ../../include/text.php:1891
 msgid "Design"
 msgstr "Design"
 
-#: ../../include/text.php:1909
+#: ../../include/text.php:1893
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: ../../include/text.php:1910
+#: ../../include/text.php:1894
 msgid "Menus"
 msgstr "Menüs"
 
-#: ../../include/text.php:1911
+#: ../../include/text.php:1895
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../include/text.php:1912
+#: ../../include/text.php:1896
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
-#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
-#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
-#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
-#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
-#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
-#: ../../include/bbcode.php:633
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:601
+#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
+#: ../../include/bbcode.php:612 ../../include/bbcode.php:615
+#: ../../include/bbcode.php:618 ../../include/bbcode.php:623
+#: ../../include/bbcode.php:626 ../../include/bbcode.php:631
+#: ../../include/bbcode.php:634 ../../include/bbcode.php:637
+#: ../../include/bbcode.php:640
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:651
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
@@ -850,15 +850,15 @@ msgstr "%1$s schrieb den folgenden %2$s %3$s"
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+#: ../../include/bbcode.php:569 ../../include/bbcode.php:589
 msgid "$1 wrote:"
 msgstr "$1 schrieb:"
 
-#: ../../include/Contact.php:120
+#: ../../include/Contact.php:123
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../../include/Contact.php:121
+#: ../../include/Contact.php:124
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
 
@@ -1131,8 +1131,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
-#: ../../mod/admin.php:750 ../../boot.php:1426
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:742
+#: ../../mod/admin.php:751 ../../boot.php:1428
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1250,7 +1250,7 @@ msgstr "Beginnt:"
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/event.php:40 ../../include/identity.php:679
+#: ../../include/event.php:40 ../../include/identity.php:683
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
 #: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
 msgid "Location:"
@@ -1267,7 +1267,7 @@ msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zuga
 msgid "Default privacy group for new contacts"
 msgstr "Standard-Privatsphärengruppe für neue Kontakte"
 
-#: ../../include/group.php:242 ../../mod/admin.php:750
+#: ../../include/group.php:242 ../../mod/admin.php:751
 msgid "All Channels"
 msgstr "Alle Kanäle"
 
@@ -1418,39 +1418,40 @@ msgstr "Kann Absender nicht bestimmen."
 msgid "Stored post could not be verified."
 msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../include/photo/photo_driver.php:643 ../../include/photos.php:51
 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
 #: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
 #: ../../mod/photos.php:656 ../../mod/photos.php:678
 msgid "Profile Photos"
 msgstr "Profilfotos"
 
-#: ../../include/attach.php:98 ../../include/attach.php:129
-#: ../../include/attach.php:185 ../../include/attach.php:200
-#: ../../include/attach.php:233 ../../include/attach.php:247
-#: ../../include/attach.php:268 ../../include/attach.php:463
-#: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../include/attach.php:119 ../../include/attach.php:166
+#: ../../include/attach.php:229 ../../include/attach.php:243
+#: ../../include/attach.php:283 ../../include/attach.php:297
+#: ../../include/attach.php:322 ../../include/attach.php:513
+#: ../../include/attach.php:585 ../../include/chat.php:113
+#: ../../include/photos.php:15 ../../include/items.php:3575
 #: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
 #: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
-#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
-#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
-#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/invite.php:104 ../../mod/settings.php:493 ../../mod/menu.php:44
+#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/bookmarks.php:46 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/chat.php:87 ../../mod/chat.php:92
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
+#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
+#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/network.php:12 ../../mod/profiles.php:152
 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/settings.php:493
-#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
-#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
-#: ../../mod/connections.php:169 ../../mod/notifications.php:66
-#: ../../mod/blocks.php:29 ../../mod/blocks.php:44
-#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
-#: ../../mod/poke.php:128 ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
 #: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
 #: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
@@ -1461,61 +1462,61 @@ msgstr "Profilfotos"
 msgid "Permission denied."
 msgstr "Zugang verweigert"
 
-#: ../../include/attach.php:180 ../../include/attach.php:228
+#: ../../include/attach.php:224 ../../include/attach.php:278
 msgid "Item was not found."
 msgstr "Beitrag wurde nicht gefunden."
 
-#: ../../include/attach.php:281
+#: ../../include/attach.php:335
 msgid "No source file."
 msgstr "Keine Quelldatei."
 
-#: ../../include/attach.php:298
+#: ../../include/attach.php:352
 msgid "Cannot locate file to replace"
 msgstr "Kann Datei zum Ersetzen nicht finden"
 
-#: ../../include/attach.php:316
+#: ../../include/attach.php:370
 msgid "Cannot locate file to revise/update"
 msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
 
-#: ../../include/attach.php:327
+#: ../../include/attach.php:381
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Datei überschreitet das Größen-Limit von %d"
 
-#: ../../include/attach.php:339
+#: ../../include/attach.php:393
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
 
-#: ../../include/attach.php:423
+#: ../../include/attach.php:475
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
 
-#: ../../include/attach.php:435
+#: ../../include/attach.php:487
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
 
-#: ../../include/attach.php:479 ../../include/attach.php:496
+#: ../../include/attach.php:528 ../../include/attach.php:545
 msgid "Path not available."
 msgstr "Pfad nicht verfügbar."
 
-#: ../../include/attach.php:546
+#: ../../include/attach.php:590
 msgid "Empty pathname"
 msgstr "Leere Pfadangabe"
 
-#: ../../include/attach.php:564
+#: ../../include/attach.php:606
 msgid "duplicate filename or path"
 msgstr "doppelter Dateiname oder Pfad"
 
-#: ../../include/attach.php:589
+#: ../../include/attach.php:630
 msgid "Path not found."
 msgstr "Pfad nicht gefunden."
 
-#: ../../include/attach.php:634
+#: ../../include/attach.php:674
 msgid "mkdir failed."
 msgstr "mkdir fehlgeschlagen."
 
-#: ../../include/attach.php:638
+#: ../../include/attach.php:678
 msgid "database storage failed."
 msgstr "Speichern in der Datenbank fehlgeschlagen."
 
@@ -1558,8 +1559,8 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
-#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/thing.php:236 ../../mod/settings.php:579 ../../mod/group.php:176
+#: ../../mod/admin.php:746 ../../mod/connedit.php:359
 #: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
 msgid "Delete"
 msgstr "Löschen"
@@ -1601,7 +1602,7 @@ msgid "View in context"
 msgstr "Im Zusammenhang anschauen"
 
 #: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:121
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
 #: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
 #: ../../mod/photos.php:975
@@ -1732,7 +1733,7 @@ msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
 #: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
-#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
+#: ../../mod/webpages.php:122 ../../mod/editpost.php:141
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
 #: ../../mod/editblock.php:151 ../../mod/photos.php:995
 msgid "Preview"
@@ -1746,7 +1747,7 @@ msgstr "Teilen"
 msgid "Page link title"
 msgstr "Seitentitel-Link"
 
-#: ../../include/conversation.php:1101 ../../mod/editpost.php:104
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:113
 #: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/editlayout.php:107
 #: ../../mod/editwebpage.php:145 ../../mod/editblock.php:121
 msgid "Upload photo"
@@ -1756,7 +1757,7 @@ msgstr "Foto hochladen"
 msgid "upload photo"
 msgstr "Foto hochladen"
 
-#: ../../include/conversation.php:1103 ../../mod/editpost.php:105
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:114
 #: ../../mod/mail.php:220 ../../mod/mail.php:333 ../../mod/editlayout.php:108
 #: ../../mod/editwebpage.php:146 ../../mod/editblock.php:122
 msgid "Attach file"
@@ -1766,7 +1767,7 @@ msgstr "Datei anhängen"
 msgid "attach file"
 msgstr "Datei anfügen"
 
-#: ../../include/conversation.php:1105 ../../mod/editpost.php:106
+#: ../../include/conversation.php:1105 ../../mod/editpost.php:115
 #: ../../mod/mail.php:221 ../../mod/mail.php:334 ../../mod/editlayout.php:109
 #: ../../mod/editwebpage.php:147 ../../mod/editblock.php:123
 msgid "Insert web link"
@@ -1792,7 +1793,7 @@ msgstr "Audio-Link einfügen"
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1111 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:119
 #: ../../mod/editlayout.php:113 ../../mod/editwebpage.php:151
 #: ../../mod/editblock.php:127
 msgid "Set your location"
@@ -1802,7 +1803,7 @@ msgstr "Standort"
 msgid "set location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1113 ../../mod/editpost.php:111
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:120
 #: ../../mod/editlayout.php:114 ../../mod/editwebpage.php:152
 #: ../../mod/editblock.php:128
 msgid "Clear browser location"
@@ -1812,19 +1813,19 @@ msgstr "Browser-Standort löschen"
 msgid "clear location"
 msgstr "Standort löschen"
 
-#: ../../include/conversation.php:1116 ../../mod/editpost.php:124
+#: ../../include/conversation.php:1116 ../../mod/editpost.php:133
 #: ../../mod/editlayout.php:127 ../../mod/editwebpage.php:169
 #: ../../mod/editblock.php:142
 msgid "Set title"
 msgstr "Titel"
 
-#: ../../include/conversation.php:1119 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:135
 #: ../../mod/editlayout.php:130 ../../mod/editwebpage.php:171
 #: ../../mod/editblock.php:145
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../include/conversation.php:1121 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1121 ../../mod/editpost.php:122
 #: ../../mod/editlayout.php:116 ../../mod/editwebpage.php:154
 #: ../../mod/editblock.php:130
 msgid "Permission settings"
@@ -1834,37 +1835,37 @@ msgstr "Berechtigungs-Einstellungen"
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: ../../include/conversation.php:1130 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1130 ../../mod/editpost.php:130
 #: ../../mod/editlayout.php:124 ../../mod/editwebpage.php:164
 #: ../../mod/editblock.php:139
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../include/conversation.php:1132 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1132 ../../mod/editpost.php:136
 #: ../../mod/editlayout.php:131 ../../mod/editwebpage.php:172
 #: ../../mod/editblock.php:146
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Beispiel: bob@example.com, mary@example.com"
 
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:138
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:147
 #: ../../mod/mail.php:226 ../../mod/mail.php:339 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:182 ../../mod/editblock.php:156
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
 #: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
-#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
+#: ../../mod/editpost.php:149 ../../mod/mail.php:228 ../../mod/mail.php:341
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
-#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:151
 msgid "OK"
 msgstr "Ok"
 
-#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/settings.php:517
+#: ../../mod/settings.php:543 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:152 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1957,238 +1958,238 @@ msgstr "Gespeicherte Lesezeichen"
 msgid "Manage Webpages"
 msgstr "Webseiten verwalten"
 
-#: ../../include/identity.php:29 ../../mod/item.php:1177
+#: ../../include/identity.php:30 ../../mod/item.php:1187
 msgid "Unable to obtain identity information from database"
 msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
-#: ../../include/identity.php:62
+#: ../../include/identity.php:63
 msgid "Empty name"
 msgstr "Namensfeld leer"
 
-#: ../../include/identity.php:64
+#: ../../include/identity.php:65
 msgid "Name too long"
 msgstr "Name ist zu lang"
 
-#: ../../include/identity.php:143
+#: ../../include/identity.php:147
 msgid "No account identifier"
 msgstr "Keine Account-Kennung"
 
-#: ../../include/identity.php:153
+#: ../../include/identity.php:157
 msgid "Nickname is required."
 msgstr "Spitzname ist erforderlich."
 
-#: ../../include/identity.php:167
+#: ../../include/identity.php:171
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/identity.php:226
+#: ../../include/identity.php:230
 msgid "Unable to retrieve created identity"
 msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/identity.php:285
+#: ../../include/identity.php:289
 msgid "Default Profile"
 msgstr "Standard-Profil"
 
-#: ../../include/identity.php:477
+#: ../../include/identity.php:481
 msgid "Requested channel is not available."
 msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../include/identity.php:489
+#: ../../include/identity.php:493
 msgid " Sorry, you don't have the permission to view this profile. "
 msgstr "Entschuldigung, Du besitzt nicht die nötigen Rechte, um dieses Profil zu betrachten."
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../include/identity.php:528 ../../mod/webpages.php:8
 #: ../../mod/connect.php:13 ../../mod/layouts.php:8
 #: ../../mod/achievements.php:8 ../../mod/blocks.php:10
 #: ../../mod/profile.php:16 ../../mod/filestorage.php:40
 msgid "Requested profile is not available."
 msgstr "Erwünschte Profil ist nicht verfügbar."
 
-#: ../../include/identity.php:642 ../../mod/profiles.php:603
+#: ../../include/identity.php:646 ../../mod/profiles.php:603
 msgid "Change profile photo"
 msgstr "Profilfoto ändern"
 
-#: ../../include/identity.php:648
+#: ../../include/identity.php:652
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/identity.php:648
+#: ../../include/identity.php:652
 msgid "Manage/edit profiles"
 msgstr "Verwalte/Bearbeite Profile"
 
-#: ../../include/identity.php:649 ../../mod/profiles.php:604
+#: ../../include/identity.php:653 ../../mod/profiles.php:604
 msgid "Create New Profile"
 msgstr "Neues Profil erstellen"
 
-#: ../../include/identity.php:652
+#: ../../include/identity.php:656
 msgid "Edit Profile"
 msgstr "Profile bearbeiten"
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:615
+#: ../../include/identity.php:667 ../../mod/profiles.php:615
 msgid "Profile Image"
 msgstr "Profilfoto:"
 
-#: ../../include/identity.php:666 ../../mod/profiles.php:618
+#: ../../include/identity.php:670 ../../mod/profiles.php:618
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../include/identity.php:667 ../../mod/profiles.php:619
+#: ../../include/identity.php:671 ../../mod/profiles.php:619
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../include/identity.php:685 ../../include/identity.php:912
 #: ../../mod/directory.php:159
 msgid "Gender:"
 msgstr "Geschlecht:"
 
-#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../include/identity.php:686 ../../include/identity.php:932
 #: ../../mod/directory.php:161
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../include/identity.php:687 ../../include/identity.php:943
 #: ../../mod/directory.php:163
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+#: ../../include/identity.php:688 ../../mod/dirprofile.php:157
 msgid "Online Now"
 msgstr "gerade online"
 
-#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../include/identity.php:756 ../../include/identity.php:836
 #: ../../mod/ping.php:262
 msgid "g A l F d"
 msgstr "l, d. F G \\\\U\\\\h\\\\r"
 
-#: ../../include/identity.php:753 ../../include/identity.php:833
+#: ../../include/identity.php:757 ../../include/identity.php:837
 msgid "F d"
 msgstr "d. F"
 
-#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../include/identity.php:802 ../../include/identity.php:877
 #: ../../mod/ping.php:284
 msgid "[today]"
 msgstr "[Heute]"
 
-#: ../../include/identity.php:810
+#: ../../include/identity.php:814
 msgid "Birthday Reminders"
 msgstr "Geburtstags Erinnerungen"
 
-#: ../../include/identity.php:811
+#: ../../include/identity.php:815
 msgid "Birthdays this week:"
 msgstr "Geburtstage in dieser Woche:"
 
-#: ../../include/identity.php:866
+#: ../../include/identity.php:870
 msgid "[No description]"
 msgstr "[Keine Beschreibung]"
 
-#: ../../include/identity.php:884
+#: ../../include/identity.php:888
 msgid "Event Reminders"
 msgstr "Veranstaltungs- Erinnerungen"
 
-#: ../../include/identity.php:885
+#: ../../include/identity.php:889
 msgid "Events this week:"
 msgstr "Veranstaltungen in dieser Woche:"
 
-#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../include/identity.php:902 ../../include/identity.php:986
 #: ../../mod/profperm.php:107
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../include/identity.php:906 ../../mod/settings.php:924
+#: ../../include/identity.php:910 ../../mod/settings.php:937
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../../include/identity.php:913
+#: ../../include/identity.php:917
 msgid "j F, Y"
 msgstr "j F, Y"
 
-#: ../../include/identity.php:914
+#: ../../include/identity.php:918
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:921
+#: ../../include/identity.php:925
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: ../../include/identity.php:925
+#: ../../include/identity.php:929
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../include/identity.php:934
+#: ../../include/identity.php:938
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "seit %1$d %2$s"
 
-#: ../../include/identity.php:937 ../../mod/profiles.php:526
+#: ../../include/identity.php:941 ../../mod/profiles.php:526
 msgid "Sexual Preference:"
 msgstr "Sexuelle Orientierung:"
 
-#: ../../include/identity.php:941 ../../mod/profiles.php:528
+#: ../../include/identity.php:945 ../../mod/profiles.php:528
 msgid "Hometown:"
 msgstr "Heimatstadt:"
 
-#: ../../include/identity.php:943
+#: ../../include/identity.php:947
 msgid "Tags:"
 msgstr "Schlagworte:"
 
-#: ../../include/identity.php:945 ../../mod/profiles.php:529
+#: ../../include/identity.php:949 ../../mod/profiles.php:529
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../include/identity.php:947
+#: ../../include/identity.php:951
 msgid "Religion:"
 msgstr "Religion:"
 
-#: ../../include/identity.php:949 ../../mod/directory.php:165
+#: ../../include/identity.php:953 ../../mod/directory.php:165
 msgid "About:"
 msgstr "Über:"
 
-#: ../../include/identity.php:951
+#: ../../include/identity.php:955
 msgid "Hobbies/Interests:"
 msgstr "Hobbys/Interessen:"
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:532
+#: ../../include/identity.php:957 ../../mod/profiles.php:532
 msgid "Likes:"
 msgstr "Gefällt:"
 
-#: ../../include/identity.php:955 ../../mod/profiles.php:533
+#: ../../include/identity.php:959 ../../mod/profiles.php:533
 msgid "Dislikes:"
 msgstr "Gefällt nicht:"
 
-#: ../../include/identity.php:958
+#: ../../include/identity.php:962
 msgid "Contact information and Social Networks:"
 msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:964
 msgid "My other channels:"
 msgstr "Meine anderen Kanäle:"
 
-#: ../../include/identity.php:962
+#: ../../include/identity.php:966
 msgid "Musical interests:"
 msgstr "Musikalische Interessen:"
 
-#: ../../include/identity.php:964
+#: ../../include/identity.php:968
 msgid "Books, literature:"
 msgstr "Bücher, Literatur:"
 
-#: ../../include/identity.php:966
+#: ../../include/identity.php:970
 msgid "Television:"
 msgstr "Fernsehen:"
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/identity.php:970
+#: ../../include/identity.php:974
 msgid "Love/Romance:"
 msgstr "Liebe/Romantik:"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:976
 msgid "Work/employment:"
 msgstr "Arbeit/Anstellung:"
 
-#: ../../include/identity.php:974
+#: ../../include/identity.php:978
 msgid "School/education:"
 msgstr "Schule/Ausbildung:"
 
@@ -2197,11 +2198,12 @@ msgid "Private Message"
 msgstr "Private Nachricht"
 
 #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
-#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
-#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
-#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
+#: ../../include/menu.php:41 ../../mod/thing.php:235
+#: ../../mod/settings.php:578 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:112 ../../mod/layouts.php:102
+#: ../../mod/editlayout.php:106 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
+#: ../../mod/filestorage.php:170
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -2292,15 +2294,15 @@ msgstr "Das bist Du"
 
 #: ../../include/ItemObject.php:548 ../../mod/events.php:469
 #: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/settings.php:516 ../../mod/settings.php:628
+#: ../../mod/settings.php:656 ../../mod/settings.php:680
+#: ../../mod/settings.php:752 ../../mod/settings.php:929
 #: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
-#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
-#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
+#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:739
+#: ../../mod/admin.php:879 ../../mod/admin.php:1078 ../../mod/admin.php:1165
 #: ../../mod/connedit.php:437 ../../mod/profiles.php:506
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/settings.php:516
-#: ../../mod/settings.php:628 ../../mod/settings.php:656
-#: ../../mod/settings.php:680 ../../mod/settings.php:752
-#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
 #: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
 #: ../../mod/filestorage.php:131 ../../mod/photos.php:566
 #: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
@@ -2649,7 +2651,7 @@ msgstr "Ausgeloggt."
 msgid "Failed authentication"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../../include/auth.php:203
+#: ../../include/auth.php:203 ../../mod/openid.php:185
 msgid "Login failed."
 msgstr "Login fehlgeschlagen."
 
@@ -3017,35 +3019,31 @@ msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
 
-#: ../../include/follow.php:21
+#: ../../include/follow.php:23
 msgid "Channel is blocked on this site."
 msgstr "Der Kanal ist auf dieser Seite blockiert "
 
-#: ../../include/follow.php:26
+#: ../../include/follow.php:28
 msgid "Channel location missing."
 msgstr "Adresse des Kanals fehlt."
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein."
-
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
-msgstr "Antwort des entfernten Kanals war unverständlich."
-
-#: ../../include/follow.php:58
+#: ../../include/follow.php:54
 msgid "Response from remote channel was incomplete."
 msgstr "Antwort des entfernten Kanals war unvollständig."
 
-#: ../../include/follow.php:129
+#: ../../include/follow.php:126
+msgid "Channel discovery failed."
+msgstr ""
+
+#: ../../include/follow.php:143
 msgid "local account not found."
 msgstr "Lokales Konto nicht gefunden."
 
-#: ../../include/follow.php:138
+#: ../../include/follow.php:152
 msgid "Cannot connect to yourself."
 msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
 
-#: ../../include/security.php:280
+#: ../../include/security.php:291
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -3149,36 +3147,40 @@ msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
 
-#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../include/items.php:240 ../../mod/like.php:55 ../../mod/profperm.php:23
 #: ../../mod/group.php:68 ../../index.php:350
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
 
-#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
-#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../include/items.php:756 ../../mod/connedit.php:395
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../../include/items.php:3513 ../../mod/thing.php:78 ../../mod/admin.php:151
+#: ../../mod/admin.php:783 ../../mod/admin.php:986 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
 msgid "Item not found."
 msgstr "Element nicht gefunden."
 
-#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3849 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr "Sammlung nicht gefunden"
 
-#: ../../include/items.php:3824
+#: ../../include/items.php:3864
 msgid "Collection is empty."
 msgstr "Sammlung ist leer."
 
-#: ../../include/items.php:3831
+#: ../../include/items.php:3871
 #, php-format
 msgid "Collection: %s"
 msgstr "Sammlung: %s"
 
-#: ../../include/items.php:3842
+#: ../../include/items.php:3882
 #, php-format
 msgid "Connection: %s"
 msgstr "Verbindung: %s"
 
-#: ../../include/items.php:3845
+#: ../../include/items.php:3885
 msgid "Connection not found."
 msgstr "Die Verbindung wurde nicht gefunden."
 
@@ -3414,2790 +3416,2823 @@ msgid ""
 "http://getzot.com"
 msgstr "Für weitere Informationen über das Red-Matrix-Projekt und warum es das Potential hat, das Internet, wie wir es kennen, grundlegend zu verändern, besuche http://getzot.com"
 
-#: ../../mod/item.php:145
-msgid "Unable to locate original post."
-msgstr "Originalbeitrag nicht gefunden."
-
-#: ../../mod/item.php:346
-msgid "Empty post discarded."
-msgstr "Leeren Beitrag verworfen."
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "Name ist erforderlich"
 
-#: ../../mod/item.php:388
-msgid "Executable content type not permitted to this channel."
-msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../mod/item.php:835
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag nicht gespeichert."
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
+msgstr "Aktualisieren"
 
-#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
-msgid "Wall Photos"
-msgstr "Wall Fotos"
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
+msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../mod/item.php:1182
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../mod/item.php:1188
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
+#: ../../mod/settings.php:212
+msgid "Password changed."
+msgstr "Kennwort geändert."
 
-#: ../../mod/menu.php:21
-msgid "Menu updated."
-msgstr "Menü aktualisiert."
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
+msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../mod/menu.php:25
-msgid "Unable to update menu."
-msgstr "Kann Menü nicht aktualisieren."
+#: ../../mod/settings.php:228
+msgid "Not valid email."
+msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../mod/menu.php:30
-msgid "Menu created."
-msgstr "Menü erstellt."
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
+msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../mod/menu.php:34
-msgid "Unable to create menu."
-msgstr "Kann Menü nicht erstellen."
+#: ../../mod/settings.php:240
+msgid "System failure storing new email. Please try again."
+msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../mod/menu.php:57
-msgid "Manage Menus"
-msgstr "Menüs verwalten"
+#: ../../mod/settings.php:444
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/menu.php:60
-msgid "Drop"
-msgstr "Löschen"
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
+msgstr "Anwendung hinzufügen"
 
-#: ../../mod/menu.php:62
-msgid "Create a new menu"
-msgstr "Neues Menü erstellen"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
+msgstr "Name"
 
-#: ../../mod/menu.php:63
-msgid "Delete this menu"
-msgstr "Lösche dieses Menü"
+#: ../../mod/settings.php:518
+msgid "Name of application"
+msgstr "Name der Anwendung"
 
-#: ../../mod/menu.php:64 ../../mod/menu.php:109
-msgid "Edit menu contents"
-msgstr "Bearbeite Menü Inhalte"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
+msgstr "Consumer Key"
 
-#: ../../mod/menu.php:65
-msgid "Edit this menu"
-msgstr "Dieses Menü bearbeiten"
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../mod/menu.php:80
-msgid "New Menu"
-msgstr "Neues Menü"
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
-msgid "Menu name"
-msgstr "Menü Name"
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
+msgstr "Umleitung"
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
-msgid "Must be unique, only seen by you"
-msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert"
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
-msgid "Menu title"
-msgstr "Menü Titel"
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
+msgstr "Symbol-URL"
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
-msgid "Menu title as seen by others"
-msgstr "Menü Titel wie er von anderen gesehen wird"
+#: ../../mod/settings.php:522
+msgid "Optional"
+msgstr "Optional"
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
-msgid "Allow bookmarks"
-msgstr "Erlaube Lesezeichen"
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
+msgstr "Diese Anwendung kann nicht bearbeitet werden."
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
+msgstr "Verbundene Apps"
 
-#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
-msgid "Create"
-msgstr "Erstelle"
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
+msgstr "Client key beginnt mit"
 
-#: ../../mod/menu.php:92 ../../mod/mitem.php:14
-msgid "Menu not found."
-msgstr "Menü nicht gefunden"
+#: ../../mod/settings.php:581
+msgid "No name"
+msgstr "Kein Name"
 
-#: ../../mod/menu.php:98
-msgid "Menu deleted."
-msgstr "Menü gelöscht."
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
+msgstr "Authorisierung aufheben"
 
-#: ../../mod/menu.php:100
-msgid "Menu could not be deleted."
-msgstr "Menü konnte nicht gelöscht werden."
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
+msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../mod/menu.php:106
-msgid "Edit Menu"
-msgstr "Menü bearbeiten"
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
+msgstr "Funktions-Einstellungen"
 
-#: ../../mod/menu.php:108
-msgid "Add or remove entries to this menu"
-msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
+#: ../../mod/settings.php:624
+msgid "Account Settings"
+msgstr "Konto-Einstellungen"
 
-#: ../../mod/menu.php:114 ../../mod/mitem.php:186
-msgid "Modify"
-msgstr "Ändern"
+#: ../../mod/settings.php:625
+msgid "Password Settings"
+msgstr "Kennwort-Einstellungen"
 
-#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
-#: ../../mod/dirprofile.php:181
-msgid "Not found."
-msgstr "Nicht gefunden."
+#: ../../mod/settings.php:626
+msgid "New Password:"
+msgstr "Neues Passwort:"
 
-#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
-#: ../../mod/blocks.php:96
-msgid "View"
-msgstr "Ansicht"
+#: ../../mod/settings.php:627
+msgid "Confirm:"
+msgstr "Bestätigen:"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Zugriff für die Anwendung autorisieren"
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
+msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
+#: ../../mod/settings.php:629 ../../mod/settings.php:938
+msgid "Email Address:"
+msgstr "Email Adresse:"
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Zum Weitermachen, bitte einloggen."
+#: ../../mod/settings.php:630
+msgid "Remove Account"
+msgstr "Konto entfernen"
 
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden."
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
-#: ../../mod/settings.php:883
-msgid "Yes"
-msgstr "Ja"
+#: ../../mod/settings.php:647
+msgid "Off"
+msgstr "Aus"
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
-#: ../../mod/settings.php:883
-msgid "No"
-msgstr "Nein"
+#: ../../mod/settings.php:647
+msgid "On"
+msgstr "An"
 
-#: ../../mod/apps.php:8
-msgid "No installed applications."
-msgstr "Keine installierten Anwendungen."
+#: ../../mod/settings.php:654
+msgid "Additional Features"
+msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/apps.php:13
-msgid "Applications"
-msgstr "Anwendungen"
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
+msgstr "Connector-Einstellungen"
 
-#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
+#: ../../mod/settings.php:709 ../../mod/admin.php:379
+msgid "No special theme for mobile devices"
+msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../mod/cloud.php:112
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
-msgstr "Red-Matrix-Gäste: Nutzername: {Deine E-Mail-Adresse}; Passwort: +++"
+#: ../../mod/settings.php:750
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/bookmarks.php:38
-msgid "Bookmark added"
-msgstr "Lesezeichen hinzugefügt"
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
+msgstr "Anzeige-Theme:"
 
-#: ../../mod/bookmarks.php:53
-msgid "My Bookmarks"
-msgstr "Meine Lesezeichen"
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
+msgstr "Mobile Theme:"
 
-#: ../../mod/bookmarks.php:64
-msgid "My Connections Bookmarks"
-msgstr "Lesezeichen meiner Kontakte"
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/subthread.php:105
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt nun %2$ss %3$s"
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
-#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
-#: ../../mod/update_community.php:18
-msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
 
-#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
+msgstr "Maximum: 100 Beiträge"
 
-#: ../../mod/chanview.php:93
-msgid "toggle full screen mode"
-msgstr "auf Vollbildmodus umschalten"
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
+msgstr "Emoticons nicht zeigen"
 
-#: ../../mod/tagger.php:98
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
+#: ../../mod/settings.php:761
+msgid "Do not view remote profiles in frames"
+msgstr "Profile/Kanäle direkt anzeigen"
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
+msgstr "Wenn dieser Haken nicht gesetzt ist, werden Profile in einem Unterfenster auf Deinem eigenen Server angezeigt."
 
-#: ../../mod/chat.php:163
-msgid "Leave Room"
-msgstr "Raum verlassen"
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
+msgstr "Niemand außer Dir selbst"
 
-#: ../../mod/chat.php:164
-msgid "I am away right now"
-msgstr "Ich bin gerade nicht da"
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
+msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../mod/chat.php:165
-msgid "I am online"
-msgstr "Ich bin online"
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
+msgstr "Jeder aus Ihrem Adressbuch"
 
-#: ../../mod/chat.php:189 ../../mod/chat.php:209
-msgid "New Chatroom"
-msgstr "Neuer Chatraum"
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
+msgstr "Jeder auf dieser Website"
 
-#: ../../mod/chat.php:190
-msgid "Chatroom Name"
-msgstr "Name des Chatraums"
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
+msgstr "Jeder in diesem Netzwerk"
 
-#: ../../mod/chat.php:205
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$ss Chaträume"
+#: ../../mod/settings.php:801
+msgid "Anybody authenticated"
+msgstr "Jeder authentifizierte"
 
-#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/directory.php:15 ../../mod/display.php:9
-#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:443
-msgid "Public access denied."
-msgstr "Öffentlicher Zugang verweigert."
+#: ../../mod/settings.php:802
+msgid "Anybody on the internet"
+msgstr "Jeder im Internet"
 
-#: ../../mod/viewconnections.php:43
-msgid "No connections."
-msgstr "Keine Verbindungen."
+#: ../../mod/settings.php:879
+msgid "Publish your default profile in the network directory"
+msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../mod/viewconnections.php:55
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "%ss Profil [%s] besuchen"
+#: ../../mod/settings.php:879 ../../mod/settings.php:884
+#: ../../mod/settings.php:955 ../../mod/api.php:106 ../../mod/profiles.php:484
+msgid "No"
+msgstr "Nein"
 
-#: ../../mod/viewconnections.php:70
-msgid "View Connnections"
-msgstr "Zeige Verbindungen"
+#: ../../mod/settings.php:879 ../../mod/settings.php:884
+#: ../../mod/settings.php:955 ../../mod/api.php:105 ../../mod/profiles.php:483
+msgid "Yes"
+msgstr "Ja"
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Schlagwort entfernt"
+#: ../../mod/settings.php:884
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Schlagwort entfernen"
+#: ../../mod/settings.php:888 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "oder"
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Schlagwort zum Entfernen auswählen:"
+#: ../../mod/settings.php:893
+msgid "Your channel address is"
+msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
-msgid "Remove"
-msgstr "Entferne"
+#: ../../mod/settings.php:927
+msgid "Channel Settings"
+msgstr "Kanal-Einstellungen"
 
-#: ../../mod/connect.php:55 ../../mod/connect.php:103
-msgid "Continue"
-msgstr "Fortfahren"
+#: ../../mod/settings.php:936
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
 
-#: ../../mod/connect.php:84
-msgid "Premium Channel Setup"
-msgstr "Premium-Kanal-Einrichtung"
+#: ../../mod/settings.php:939
+msgid "Your Timezone:"
+msgstr "Ihre Zeitzone:"
 
-#: ../../mod/connect.php:86
-msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
+#: ../../mod/settings.php:940
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
 
-#: ../../mod/connect.php:87
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
+#: ../../mod/settings.php:941
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/connect.php:89 ../../mod/connect.php:109
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
+#: ../../mod/settings.php:943
+msgid "Adult Content"
+msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../mod/connect.php:90
+#: ../../mod/settings.php:943
 msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../mod/connect.php:91 ../../mod/connect.php:112
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite."
+#: ../../mod/settings.php:945
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../mod/connect.php:100
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
+#: ../../mod/settings.php:947
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../mod/connect.php:108
-msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Premium-Kanal"
+#: ../../mod/settings.php:947
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
+#: ../../mod/settings.php:949
+msgid "Simple Privacy Settings:"
+msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
-msgstr "Delegiere das Management für diese Seite"
+#: ../../mod/settings.php:950
+msgid ""
+"Very Public - extremely permissive (should be used with caution)"
+msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)"
 
-#: ../../mod/delegate.php:123
+#: ../../mod/settings.php:951
 msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
+msgstr "Typisch – Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)"
 
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr "Vorhandene Seitenmanager"
+#: ../../mod/settings.php:952
+msgid "Private - default private, never open or public"
+msgstr "Private – Default privat, nie offen oder öffentlich"
 
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr "Vorhandene Bevollmächtigte für die Seite"
+#: ../../mod/settings.php:953
+msgid "Blocked - default blocked to/from everybody"
+msgstr "Blockiert – Alle per Default blockiert"
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr "Potentielle Bevollmächtigte"
+#: ../../mod/settings.php:955
+msgid "Allow others to tag your posts"
+msgstr "Erlaube anderen deine Beiträge mit Schlagwörtern zu versehen"
 
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../../mod/settings.php:955
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr ""
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr "Keine Einträge."
+#: ../../mod/settings.php:957
+msgid "Advanced Privacy Settings"
+msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
 
-#: ../../mod/chatsvc.php:102
-msgid "Away"
-msgstr "Abwesend"
+#: ../../mod/settings.php:959
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../mod/chatsvc.php:106
-msgid "Online"
-msgstr "Online"
+#: ../../mod/settings.php:959
+msgid "May reduce spam activity"
+msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Element nicht verfügbar."
+#: ../../mod/settings.php:960
+msgid "Default Post Permissions"
+msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
 
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
-msgstr "Menü-Element aktualisiert."
+#: ../../mod/settings.php:961 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
 
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
+#: ../../mod/settings.php:972
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
-msgstr "Menü-Bestandteil hinzugefügt."
+#: ../../mod/settings.php:972
+msgid "Useful to reduce spamming"
+msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
+#: ../../mod/settings.php:975
+msgid "Notification Settings"
+msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
-msgstr "Menü-Bestandteile verwalten"
+#: ../../mod/settings.php:976
+msgid "By default post a status message when:"
+msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
+#: ../../mod/settings.php:977
+msgid "accepting a friend request"
+msgstr "Du eine Kontaktanfrage annimmst"
 
-#: ../../mod/mitem.php:102
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
+#: ../../mod/settings.php:978
+msgid "joining a forum/community"
+msgstr "Du einem Forum beitrittst"
 
-#: ../../mod/mitem.php:103
-msgid "Drop element"
-msgstr "Bestandteil löschen"
+#: ../../mod/settings.php:979
+msgid "making an interesting profile change"
+msgstr "Du eine interessante Änderung an Deinem Profil vornimmst"
 
-#: ../../mod/mitem.php:104
-msgid "New element"
-msgstr "Neues Bestandteil"
+#: ../../mod/settings.php:980
+msgid "Send a notification email when:"
+msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
+#: ../../mod/settings.php:981
+msgid "You receive an introduction"
+msgstr "Du eine Vorstellung erhältst"
 
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
+#: ../../mod/settings.php:982
+msgid "Your introductions are confirmed"
+msgstr "Deine Vorstellung bestätigt wurde."
 
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
+#: ../../mod/settings.php:983
+msgid "Someone writes on your profile wall"
+msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
+#: ../../mod/settings.php:984
+msgid "Someone writes a followup comment"
+msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
-msgstr "Neues Menü-Bestandteil"
+#: ../../mod/settings.php:985
+msgid "You receive a private message"
+msgstr "Du eine private Nachricht erhältst"
 
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
-msgstr "Zugriffsrechte des Menü-Elements"
+#: ../../mod/settings.php:986
+msgid "You receive a friend suggestion"
+msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
+#: ../../mod/settings.php:987
+msgid "You are tagged in a post"
+msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
-msgstr "Link Text"
+#: ../../mod/settings.php:988
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
-msgstr "URL des Links"
+#: ../../mod/settings.php:991
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
-msgstr "Verwende Red Magic-Auth wenn verfügbar"
+#: ../../mod/settings.php:992
+msgid "Change the behaviour of this account for special situations"
+msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
+#: ../../mod/settings.php:995
+msgid ""
+"Please enable expert mode (in Settings > "
+"Additional features) to adjust!"
+msgstr "Aktiviere den Expertenmodus (unter Settings > Zusätzliche Funktionen), um hier Einstellungen vorzunehmen!"
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
+#: ../../mod/settings.php:996
+msgid "Miscellaneous Settings"
+msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
+#: ../../mod/settings.php:998
+msgid "Personal menu to display in your channel pages"
+msgstr "Persönliches Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
+#: ../../mod/menu.php:21
+msgid "Menu updated."
+msgstr "Menü aktualisiert."
 
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
+msgstr "Kann Menü nicht aktualisieren."
 
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+#: ../../mod/menu.php:30
+msgid "Menu created."
+msgstr "Menü erstellt."
 
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
+msgstr "Kann Menü nicht erstellen."
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil-Identifikator"
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
+msgstr "Menüs verwalten"
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits-Editor"
+#: ../../mod/menu.php:60
+msgid "Drop"
+msgstr "Löschen"
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
-msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
+msgstr "Neues Menü erstellen"
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
-msgstr "Sichtbar für"
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
+msgstr "Lösche dieses Menü"
 
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
-msgstr "Alle Verbindungen"
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
+msgstr "Bearbeite Menü Inhalte"
 
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Sammlung erstellt."
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
+msgstr "Dieses Menü bearbeiten"
 
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Sammlung kann nicht erstellt werden."
+#: ../../mod/menu.php:80
+msgid "New Menu"
+msgstr "Neues Menü"
 
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Sammlung aktualisiert."
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
+msgstr "Menü Name"
 
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Erstelle eine Sammlung von Kanälen."
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
+msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
 
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr "Name der Sammlung:"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
+msgstr "Menü Titel"
 
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr "Mitglieder sind sichtbar für andere Kanäle"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
+msgstr "Menü Titel wie er von anderen gesehen wird"
 
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Sammlung gelöscht."
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
+msgstr "Erlaube Lesezeichen"
 
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Löschen der Sammlung nicht möglich."
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr "Sammlung-Editor"
+#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
+msgid "Create"
+msgstr "Erstelle"
 
-#: ../../mod/group.php:196
-msgid "Members"
-msgstr "Mitglieder"
+#: ../../mod/menu.php:92 ../../mod/mitem.php:14
+msgid "Menu not found."
+msgstr "Menü nicht gefunden"
 
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
-msgstr "Alle verbundenen Kanäle"
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
+msgstr "Menü gelöscht."
 
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
-msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
+msgstr "Menü konnte nicht gelöscht werden."
 
-#: ../../mod/admin.php:48
-msgid "Theme settings updated."
-msgstr "Theme-Einstellungen aktualisiert."
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
+msgstr "Menü bearbeiten"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:430
-msgid "Site"
-msgstr "Seite"
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
+msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
-msgid "Users"
-msgstr "Benutzer"
+#: ../../mod/menu.php:114 ../../mod/mitem.php:186
+msgid "Modify"
+msgstr "Ändern"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
-msgid "Plugins"
-msgstr "Plug-Ins"
+#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
+#: ../../mod/dirprofile.php:181
+msgid "Not found."
+msgstr "Nicht gefunden."
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
-msgid "Themes"
-msgstr "Themes"
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
+#: ../../mod/blocks.php:96
+msgid "View"
+msgstr "Ansicht"
 
-#: ../../mod/admin.php:92 ../../mod/admin.php:529
-msgid "Server"
-msgstr "Server"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Zugriff für die Anwendung autorisieren"
 
-#: ../../mod/admin.php:93
-msgid "DB updates"
-msgstr "DB-Aktualisierungen"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
-msgid "Logs"
-msgstr "Protokolle"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Zum Weitermachen, bitte einloggen."
 
-#: ../../mod/admin.php:113
-msgid "Plugin Features"
-msgstr "Plug-In Funktionen"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
 
-#: ../../mod/admin.php:115
-msgid "User registrations waiting for confirmation"
-msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+#: ../../mod/apps.php:8
+msgid "No installed applications."
+msgstr "Keine installierten Anwendungen."
 
-#: ../../mod/admin.php:189
-msgid "Message queues"
-msgstr "Nachrichten-Warteschlangen"
+#: ../../mod/apps.php:13
+msgid "Applications"
+msgstr "Anwendungen"
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
-#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
-#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
-msgid "Administration"
-msgstr "Administration"
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
 
-#: ../../mod/admin.php:195
-msgid "Summary"
-msgstr "Zusammenfassung"
+#: ../../mod/cloud.php:112
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgstr "Red-Matrix-Gäste: Nutzername: {Deine E-Mail-Adresse}; Passwort: +++"
 
-#: ../../mod/admin.php:197
-msgid "Registered users"
-msgstr "Registrierte Benutzer"
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
+msgstr "Lesezeichen hinzugefügt"
 
-#: ../../mod/admin.php:199 ../../mod/admin.php:532
-msgid "Pending registrations"
-msgstr "Ausstehende Registrierungen"
+#: ../../mod/bookmarks.php:53
+msgid "My Bookmarks"
+msgstr "Meine Lesezeichen"
 
-#: ../../mod/admin.php:200
-msgid "Version"
-msgstr "Version"
+#: ../../mod/bookmarks.php:64
+msgid "My Connections Bookmarks"
+msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../mod/admin.php:202 ../../mod/admin.php:533
-msgid "Active plugins"
-msgstr "Aktive Plug-Ins"
+#: ../../mod/item.php:145
+msgid "Unable to locate original post."
+msgstr "Originalbeitrag nicht gefunden."
 
-#: ../../mod/admin.php:350
-msgid "Site settings updated."
-msgstr "Site-Einstellungen aktualisiert."
+#: ../../mod/item.php:346
+msgid "Empty post discarded."
+msgstr "Leeren Beitrag verworfen."
 
-#: ../../mod/admin.php:379 ../../mod/settings.php:709
-msgid "No special theme for mobile devices"
-msgstr "Keine spezielle Theme für mobile Geräte"
+#: ../../mod/item.php:388
+msgid "Executable content type not permitted to this channel."
+msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
 
-#: ../../mod/admin.php:381
-msgid "No special theme for accessibility"
-msgstr "Kein spezielles Accessibility-Theme vorhanden"
+#: ../../mod/item.php:845
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../mod/admin.php:409
-msgid "Closed"
-msgstr "Geschlossen"
+#: ../../mod/item.php:1112 ../../mod/wall_upload.php:34
+msgid "Wall Photos"
+msgstr "Wall Fotos"
 
-#: ../../mod/admin.php:410
-msgid "Requires approval"
-msgstr "Genehmigung erforderlich"
+#: ../../mod/item.php:1192
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../mod/admin.php:411
-msgid "Open"
-msgstr "Offen"
+#: ../../mod/item.php:1198
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../mod/admin.php:416
-msgid "Private"
-msgstr "Privat"
+#: ../../mod/subthread.php:105
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt nun %2$ss %3$s"
 
-#: ../../mod/admin.php:417
-msgid "Paid Access"
-msgstr "Kostenpflichtiger Zugang"
+#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
+#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
+#: ../../mod/update_community.php:18
+msgid "[Embedded content - reload page to view]"
+msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
 
-#: ../../mod/admin.php:418
-msgid "Free Access"
-msgstr "Kostenloser Zugang"
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:28
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
 
-#: ../../mod/admin.php:419
-msgid "Tiered Access"
-msgstr "Abgestufter Zugang"
+#: ../../mod/chanview.php:93
+msgid "toggle full screen mode"
+msgstr "auf Vollbildmodus umschalten"
 
-#: ../../mod/admin.php:432 ../../mod/register.php:189
-msgid "Registration"
-msgstr "Registrierung"
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
 
-#: ../../mod/admin.php:433
-msgid "File upload"
-msgstr "Dateiupload"
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../mod/admin.php:434
-msgid "Policies"
-msgstr "Richtlinien"
+#: ../../mod/chat.php:163
+msgid "Leave Room"
+msgstr "Raum verlassen"
 
-#: ../../mod/admin.php:435
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: ../../mod/chat.php:164
+msgid "I am away right now"
+msgstr "Ich bin gerade nicht da"
 
-#: ../../mod/admin.php:439
-msgid "Site name"
-msgstr "Seitenname"
+#: ../../mod/chat.php:165
+msgid "I am online"
+msgstr "Ich bin online"
 
-#: ../../mod/admin.php:440
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
+msgid "New Chatroom"
+msgstr "Neuer Chatraum"
 
-#: ../../mod/admin.php:441
-msgid "Administrator Information"
-msgstr "Administrator-Informationen"
+#: ../../mod/chat.php:190
+msgid "Chatroom Name"
+msgstr "Name des Chatraums"
 
-#: ../../mod/admin.php:441
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
+#: ../../mod/chat.php:205
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$ss Chaträume"
 
-#: ../../mod/admin.php:442
-msgid "System language"
-msgstr "System-Sprache"
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
+#: ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:443
+msgid "Public access denied."
+msgstr "Öffentlicher Zugang verweigert."
 
-#: ../../mod/admin.php:443
-msgid "System theme"
-msgstr "System-Theme"
+#: ../../mod/viewconnections.php:43
+msgid "No connections."
+msgstr "Keine Verbindungen."
 
-#: ../../mod/admin.php:443
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
-msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern"
+#: ../../mod/viewconnections.php:55
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "%ss Profil [%s] besuchen"
 
-#: ../../mod/admin.php:444
-msgid "Mobile system theme"
-msgstr "Mobile System-Theme:"
+#: ../../mod/viewconnections.php:70
+msgid "View Connnections"
+msgstr "Zeige Verbindungen"
 
-#: ../../mod/admin.php:444
-msgid "Theme for mobile devices"
-msgstr "Theme für mobile Geräte"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Schlagwort entfernt"
 
-#: ../../mod/admin.php:445
-msgid "Accessibility system theme"
-msgstr "Accessibility-System-Theme"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Schlagwort entfernen"
 
-#: ../../mod/admin.php:445
-msgid "Accessibility theme"
-msgstr "Accessibility-Theme"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Schlagwort zum Entfernen auswählen:"
 
-#: ../../mod/admin.php:446
-msgid "Channel to use for this website's static pages"
-msgstr "Kanal für die statischen Seiten dieser Webseite verwenden"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
+msgid "Remove"
+msgstr "Entferne"
 
-#: ../../mod/admin.php:446
-msgid "Site Channel"
-msgstr "Seiten Kanal"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
+msgstr "Fortfahren"
 
-#: ../../mod/admin.php:448
-msgid "Maximum image size"
-msgstr "Maximale Bildgröße"
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
+msgstr "Premium-Kanal-Einrichtung"
 
-#: ../../mod/admin.php:448
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
+
+#: ../../mod/connect.php:87
 msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
 
-#: ../../mod/admin.php:449
-msgid "Register policy"
-msgstr "Registrierungsrichtlinie"
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
 
-#: ../../mod/admin.php:450
-msgid "Access policy"
-msgstr "Zugangsrichtlinien"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
 
-#: ../../mod/admin.php:451
-msgid "Register text"
-msgstr "Registrierungstext"
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite."
 
-#: ../../mod/admin.php:451
-msgid "Will be displayed prominently on the registration page."
-msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
 
-#: ../../mod/admin.php:452
-msgid "Accounts abandoned after x days"
-msgstr "Konten gelten nach X Tagen als unbenutzt"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
+msgstr "Eingeschränkter oder Premium-Kanal"
 
-#: ../../mod/admin.php:452
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
 
-#: ../../mod/admin.php:453
-msgid "Allowed friend domains"
-msgstr "Erlaubte Domains für Kontakte"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Delegiere das Management für diese Seite"
 
-#: ../../mod/admin.php:453
+#: ../../mod/delegate.php:123
 msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-
-#: ../../mod/admin.php:454
-msgid "Allowed email domains"
-msgstr "Erlaubte Domains für E-Mails"
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
 
-#: ../../mod/admin.php:454
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Vorhandene Seitenmanager"
 
-#: ../../mod/admin.php:455
-msgid "Block public"
-msgstr "Öffentlichen Zugriff blockieren"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Vorhandene Bevollmächtigte für die Seite"
 
-#: ../../mod/admin.php:455
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potentielle Bevollmächtigte"
 
-#: ../../mod/admin.php:456
-msgid "Force publish"
-msgstr "Veröffentlichung erzwingen"
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: ../../mod/admin.php:456
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Keine Einträge."
 
-#: ../../mod/admin.php:457
-msgid "No login on Homepage"
-msgstr "Kein Login auf der Homepage"
+#: ../../mod/chatsvc.php:102
+msgid "Away"
+msgstr "Abwesend"
 
-#: ../../mod/admin.php:457
-msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
-msgstr "Ktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört."
+#: ../../mod/chatsvc.php:106
+msgid "Online"
+msgstr "Online"
 
-#: ../../mod/admin.php:459
-msgid "Proxy user"
-msgstr "Proxy Benutzer"
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Element nicht verfügbar."
 
-#: ../../mod/admin.php:460
-msgid "Proxy URL"
-msgstr "Proxy URL"
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr "Menü-Element aktualisiert."
 
-#: ../../mod/admin.php:461
-msgid "Network timeout"
-msgstr "Netzwerk-Timeout"
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
 
-#: ../../mod/admin.php:461
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr "Menü-Bestandteil hinzugefügt."
 
-#: ../../mod/admin.php:462
-msgid "Delivery interval"
-msgstr "Auslieferung Intervall"
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
 
-#: ../../mod/admin.php:462
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr "Menü-Bestandteile verwalten"
 
-#: ../../mod/admin.php:463
-msgid "Poll interval"
-msgstr "Abfrageintervall"
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
 
-#: ../../mod/admin.php:463
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
 
-#: ../../mod/admin.php:464
-msgid "Maximum Load Average"
-msgstr "Maximales Load Average"
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr "Bestandteil löschen"
 
-#: ../../mod/admin.php:464
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr "Neues Bestandteil"
 
-#: ../../mod/admin.php:520
-msgid "No server found"
-msgstr "Kein Server gefunden"
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
 
-#: ../../mod/admin.php:527 ../../mod/admin.php:750
-msgid "ID"
-msgstr "ID"
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
 
-#: ../../mod/admin.php:527
-msgid "for channel"
-msgstr "für Kanal"
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
 
-#: ../../mod/admin.php:527
-msgid "on server"
-msgstr "auf Server"
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
 
-#: ../../mod/admin.php:527
-msgid "Status"
-msgstr "Status"
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr "Neues Menü-Bestandteil"
 
-#: ../../mod/admin.php:548
-msgid "Update has been marked successful"
-msgstr "Update wurde als erfolgreich markiert"
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr "Zugriffsrechte des Menü-Elements"
 
-#: ../../mod/admin.php:558
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr "Link Text"
 
-#: ../../mod/admin.php:561
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Update %s wurde erfolgreich ausgeführt."
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr "URL des Links"
 
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr "Verwende Red Magic-Auth wenn verfügbar"
 
-#: ../../mod/admin.php:568
-#, php-format
-msgid "Update function %s could not be found."
-msgstr "Update-Funktion %s konnte nicht gefunden werden."
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
 
-#: ../../mod/admin.php:583
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Aktualisierungen."
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
 
-#: ../../mod/admin.php:587
-msgid "Failed Updates"
-msgstr "Fehlgeschlagene Aktualisierungen"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
 
-#: ../../mod/admin.php:589
-msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
 
-#: ../../mod/admin.php:590
-msgid "Attempt to execute this update step automatically"
-msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
 
-#: ../../mod/admin.php:616
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s Nutzer blockiert/freigegeben"
-msgstr[1] "%s Nutzer blockiert/freigegeben"
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
 
-#: ../../mod/admin.php:623
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s Nutzer gelöscht"
-msgstr[1] "%s Nutzer gelöscht"
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
 
-#: ../../mod/admin.php:654
-msgid "Account not found"
-msgstr "Konto nicht gefunden"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Identifikator"
 
-#: ../../mod/admin.php:665
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Benutzer '%s' gelöscht"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Benutzer '%s' freigegeben"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Benutzer '%s' blockiert"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Sichtbar für"
 
-#: ../../mod/admin.php:739
-msgid "select all"
-msgstr "Alle auswählen"
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Alle Verbindungen"
 
-#: ../../mod/admin.php:740
-msgid "User registrations waiting for confirm"
-msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Sammlung erstellt."
 
-#: ../../mod/admin.php:741
-msgid "Request date"
-msgstr "Antragsdatum"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Sammlung kann nicht erstellt werden."
 
-#: ../../mod/admin.php:742
-msgid "No registrations."
-msgstr "Keine Registrierungen."
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Sammlung aktualisiert."
 
-#: ../../mod/admin.php:743
-msgid "Approve"
-msgstr "Genehmigen"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Erstelle eine Sammlung von Kanälen."
 
-#: ../../mod/admin.php:744
-msgid "Deny"
-msgstr "Verweigern"
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
+msgstr "Name der Sammlung:"
 
-#: ../../mod/admin.php:746 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Block"
-msgstr "Blockieren"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
+msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../mod/admin.php:747 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Unblock"
-msgstr "Freigeben"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Sammlung gelöscht."
 
-#: ../../mod/admin.php:750
-msgid "Register date"
-msgstr "Registrierungs-Datum"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Löschen der Sammlung nicht möglich."
 
-#: ../../mod/admin.php:750
-msgid "Last login"
-msgstr "Letzte Anmeldung"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
+msgstr "Sammlung-Editor"
 
-#: ../../mod/admin.php:750
-msgid "Expires"
-msgstr "Verfällt"
+#: ../../mod/group.php:196
+msgid "Members"
+msgstr "Mitglieder"
 
-#: ../../mod/admin.php:750
-msgid "Service Class"
-msgstr "Service-Klasse"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
+msgstr "Alle verbundenen Kanäle"
 
-#: ../../mod/admin.php:752
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
+msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../mod/admin.php:753
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
+#: ../../mod/admin.php:48
+msgid "Theme settings updated."
+msgstr "Theme-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:794
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Plug-In %s deaktiviert."
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
+msgid "Site"
+msgstr "Seite"
 
-#: ../../mod/admin.php:798
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Plug-In %s aktiviert."
+#: ../../mod/admin.php:89 ../../mod/admin.php:738 ../../mod/admin.php:750
+msgid "Users"
+msgstr "Benutzer"
 
-#: ../../mod/admin.php:808 ../../mod/admin.php:1010
-msgid "Disable"
-msgstr "Deaktivieren"
+#: ../../mod/admin.php:90 ../../mod/admin.php:836 ../../mod/admin.php:878
+msgid "Plugins"
+msgstr "Plug-Ins"
 
-#: ../../mod/admin.php:810 ../../mod/admin.php:1012
-msgid "Enable"
-msgstr "Aktivieren"
+#: ../../mod/admin.php:91 ../../mod/admin.php:1041 ../../mod/admin.php:1077
+msgid "Themes"
+msgstr "Themes"
 
-#: ../../mod/admin.php:836 ../../mod/admin.php:1041
-msgid "Toggle"
-msgstr "Umschalten"
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
+msgid "Server"
+msgstr "Server"
 
-#: ../../mod/admin.php:844 ../../mod/admin.php:1051
-msgid "Author: "
-msgstr "Autor: "
+#: ../../mod/admin.php:93
+msgid "DB updates"
+msgstr "DB-Aktualisierungen"
 
-#: ../../mod/admin.php:845 ../../mod/admin.php:1052
-msgid "Maintainer: "
-msgstr "Betreuer:"
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1164
+msgid "Logs"
+msgstr "Protokolle"
 
-#: ../../mod/admin.php:974
-msgid "No themes found."
-msgstr "Keine Theme gefunden."
+#: ../../mod/admin.php:113
+msgid "Plugin Features"
+msgstr "Plug-In Funktionen"
 
-#: ../../mod/admin.php:1033
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
-
-#: ../../mod/admin.php:1081
-msgid "[Experimental]"
-msgstr "[Experimentell]"
+#: ../../mod/admin.php:115
+msgid "User registrations waiting for confirmation"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
 
-#: ../../mod/admin.php:1082
-msgid "[Unsupported]"
-msgstr "[Nicht unterstützt]"
+#: ../../mod/admin.php:189
+msgid "Message queues"
+msgstr "Nachrichten-Warteschlangen"
 
-#: ../../mod/admin.php:1109
-msgid "Log settings updated."
-msgstr "Protokoll-Einstellungen aktualisiert."
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:737 ../../mod/admin.php:835 ../../mod/admin.php:877
+#: ../../mod/admin.php:1040 ../../mod/admin.php:1076 ../../mod/admin.php:1163
+msgid "Administration"
+msgstr "Administration"
 
-#: ../../mod/admin.php:1165
-msgid "Clear"
-msgstr "Leeren"
+#: ../../mod/admin.php:195
+msgid "Summary"
+msgstr "Zusammenfassung"
 
-#: ../../mod/admin.php:1171
-msgid "Debugging"
-msgstr "Debugging"
+#: ../../mod/admin.php:197
+msgid "Registered users"
+msgstr "Registrierte Benutzer"
 
-#: ../../mod/admin.php:1172
-msgid "Log file"
-msgstr "Protokolldatei"
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
+msgid "Pending registrations"
+msgstr "Ausstehende Registrierungen"
 
-#: ../../mod/admin.php:1172
-msgid ""
-"Must be writable by web server. Relative to your Red top-level directory."
-msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."
+#: ../../mod/admin.php:200
+msgid "Version"
+msgstr "Version"
 
-#: ../../mod/admin.php:1173
-msgid "Log level"
-msgstr "Protokollstufe"
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
+msgid "Active plugins"
+msgstr "Aktive Plug-Ins"
 
-#: ../../mod/filer.php:35
-msgid "- select -"
-msgstr "– auswählen –"
+#: ../../mod/admin.php:350
+msgid "Site settings updated."
+msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
+#: ../../mod/admin.php:381
+msgid "No special theme for accessibility"
+msgstr "Kein spezielles Accessibility-Theme vorhanden"
 
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
-msgstr "Element nicht gefunden"
+#: ../../mod/admin.php:409
+msgid "Closed"
+msgstr "Geschlossen"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
+#: ../../mod/admin.php:410
+msgid "Requires approval"
+msgstr "Genehmigung erforderlich"
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Eintrag löschen?"
+#: ../../mod/admin.php:411
+msgid "Open"
+msgstr "Offen"
 
-#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
-msgstr "YouTube-Video einfügen"
+#: ../../mod/admin.php:416
+msgid "Private"
+msgstr "Privat"
 
-#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis [.ogg]-Video einfügen"
+#: ../../mod/admin.php:417
+msgid "Paid Access"
+msgstr "Kostenpflichtiger Zugang"
 
-#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis [.ogg]-Audio einfügen"
+#: ../../mod/admin.php:418
+msgid "Free Access"
+msgstr "Kostenloser Zugang"
 
-#: ../../mod/directory.php:144 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
-msgstr "Alter:"
+#: ../../mod/admin.php:419
+msgid "Tiered Access"
+msgstr "Abgestufter Zugang"
 
-#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
-msgid "Gender: "
-msgstr "Geschlecht:"
+#: ../../mod/admin.php:432 ../../mod/register.php:189
+msgid "Registration"
+msgstr "Registrierung"
 
-#: ../../mod/directory.php:208
-msgid "Finding:"
-msgstr "Ergebnisse:"
+#: ../../mod/admin.php:433
+msgid "File upload"
+msgstr "Dateiupload"
 
-#: ../../mod/directory.php:216
-msgid "next page"
-msgstr "nächste Seite"
+#: ../../mod/admin.php:434
+msgid "Policies"
+msgstr "Richtlinien"
 
-#: ../../mod/directory.php:216
-msgid "previous page"
-msgstr "vorige Seite"
+#: ../../mod/admin.php:435
+msgid "Advanced"
+msgstr "Fortgeschritten"
 
-#: ../../mod/directory.php:223
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
+#: ../../mod/admin.php:439
+msgid "Site name"
+msgstr "Seitenname"
 
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
-msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
+#: ../../mod/admin.php:440
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
 
-#: ../../mod/connedit.php:63 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
-msgstr "Gewähltes Profil nicht gefunden."
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr "Administrator-Informationen"
 
-#: ../../mod/connedit.php:107 ../../mod/connections.php:94
-msgid "Connection updated."
-msgstr "Verbindung aktualisiert."
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../mod/connedit.php:109 ../../mod/connections.php:96
-msgid "Failed to update connection record."
-msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
+#: ../../mod/admin.php:442
+msgid "System language"
+msgstr "System-Sprache"
 
-#: ../../mod/connedit.php:204
-msgid "Could not access address book record."
-msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
+#: ../../mod/admin.php:443
+msgid "System theme"
+msgstr "System-Theme"
 
-#: ../../mod/connedit.php:218
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
+#: ../../mod/admin.php:443
+msgid ""
+"Default system theme - may be over-ridden by user profiles - change theme settings"
+msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – Theme-Einstellungen ändern"
 
-#: ../../mod/connedit.php:225
-msgid "Channel has been unblocked"
-msgstr "Kanal nicht mehr blockiert"
+#: ../../mod/admin.php:444
+msgid "Mobile system theme"
+msgstr "Mobile System-Theme:"
 
-#: ../../mod/connedit.php:226
-msgid "Channel has been blocked"
-msgstr "Kanal blockiert"
+#: ../../mod/admin.php:444
+msgid "Theme for mobile devices"
+msgstr "Theme für mobile Geräte"
 
-#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
-#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
-#: ../../mod/connedit.php:281
-msgid "Unable to set address book parameters."
-msgstr "Konnte die Adressbuch-Parameter nicht setzen."
+#: ../../mod/admin.php:445
+msgid "Accessibility system theme"
+msgstr "Accessibility-System-Theme"
 
-#: ../../mod/connedit.php:237
-msgid "Channel has been unignored"
-msgstr "Kanal wird nicht mehr ignoriert"
+#: ../../mod/admin.php:445
+msgid "Accessibility theme"
+msgstr "Accessibility-Theme"
 
-#: ../../mod/connedit.php:238
-msgid "Channel has been ignored"
-msgstr "Kanal wird ignoriert"
+#: ../../mod/admin.php:446
+msgid "Channel to use for this website's static pages"
+msgstr "Kanal für die statischen Seiten dieser Webseite verwenden"
 
-#: ../../mod/connedit.php:249
-msgid "Channel has been unarchived"
-msgstr "Kanal wurde aus dem Archiv zurück geholt"
+#: ../../mod/admin.php:446
+msgid "Site Channel"
+msgstr "Seiten Kanal"
 
-#: ../../mod/connedit.php:250
-msgid "Channel has been archived"
-msgstr "Kanal wurde archiviert"
+#: ../../mod/admin.php:448
+msgid "Maximum image size"
+msgstr "Maximale Bildgröße"
 
-#: ../../mod/connedit.php:261
-msgid "Channel has been unhidden"
-msgstr "Kanal wird nicht mehr versteckt"
+#: ../../mod/admin.php:448
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../mod/connedit.php:262
-msgid "Channel has been hidden"
-msgstr "Kanal wurde versteckt"
+#: ../../mod/admin.php:449
+msgid "Register policy"
+msgstr "Registrierungsrichtlinie"
 
-#: ../../mod/connedit.php:276
-msgid "Channel has been approved"
-msgstr "Kanal wurde zugelassen"
+#: ../../mod/admin.php:450
+msgid "Access policy"
+msgstr "Zugangsrichtlinien"
 
-#: ../../mod/connedit.php:277
-msgid "Channel has been unapproved"
-msgstr "Zulassung des Kanals entfernt"
+#: ../../mod/admin.php:451
+msgid "Register text"
+msgstr "Registrierungstext"
 
-#: ../../mod/connedit.php:295
-msgid "Contact has been removed."
-msgstr "Kontakt wurde entfernt."
+#: ../../mod/admin.php:451
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../mod/connedit.php:315
-#, php-format
-msgid "View %s's profile"
-msgstr "%ss Profil ansehen"
+#: ../../mod/admin.php:452
+msgid "Accounts abandoned after x days"
+msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../mod/connedit.php:319
-msgid "Refresh Permissions"
-msgstr "Zugriffsrechte neu laden"
+#: ../../mod/admin.php:452
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../mod/connedit.php:322
-msgid "Fetch updated permissions"
-msgstr "Aktualisierte Zugriffsrechte abfragen"
+#: ../../mod/admin.php:453
+msgid "Allowed friend domains"
+msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/connedit.php:326
-msgid "Recent Activity"
-msgstr "Kürzliche Aktivitäten"
+#: ../../mod/admin.php:453
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/connedit.php:329
-msgid "View recent posts and comments"
-msgstr "Betrachte die neuesten Beiträge und Kommentare"
+#: ../../mod/admin.php:454
+msgid "Allowed email domains"
+msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../mod/connedit.php:336
-msgid "Block or Unblock this connection"
-msgstr "Verbindung blockieren oder freigeben"
+#: ../../mod/admin.php:454
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-msgid "Unignore"
-msgstr "Nicht ignorieren"
+#: ../../mod/admin.php:455
+msgid "Block public"
+msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-#: ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorieren"
+#: ../../mod/admin.php:455
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/connedit.php:343
-msgid "Ignore or Unignore this connection"
-msgstr "Verbindung ignorieren oder wieder beachten"
+#: ../../mod/admin.php:456
+msgid "Force publish"
+msgstr "Veröffentlichung erzwingen"
 
-#: ../../mod/connedit.php:346
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
+#: ../../mod/admin.php:456
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../mod/connedit.php:346
-msgid "Archive"
-msgstr "Archivieren"
+#: ../../mod/admin.php:457
+msgid "No login on Homepage"
+msgstr "Kein Login auf der Homepage"
 
-#: ../../mod/connedit.php:349
-msgid "Archive or Unarchive this connection"
-msgstr "Verbindung archivieren oder aus dem Archiv zurückholen"
+#: ../../mod/admin.php:457
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
+msgstr "Ktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört."
 
-#: ../../mod/connedit.php:352
-msgid "Unhide"
-msgstr "Wieder sichtbar machen"
+#: ../../mod/admin.php:459
+msgid "Proxy user"
+msgstr "Proxy Benutzer"
 
-#: ../../mod/connedit.php:352
-msgid "Hide"
-msgstr "Verstecken"
+#: ../../mod/admin.php:460
+msgid "Proxy URL"
+msgstr "Proxy URL"
 
-#: ../../mod/connedit.php:355
-msgid "Hide or Unhide this connection"
-msgstr "Diese Verbindung verstecken oder wieder sichtbar machen"
+#: ../../mod/admin.php:461
+msgid "Network timeout"
+msgstr "Netzwerk-Timeout"
 
-#: ../../mod/connedit.php:362
-msgid "Delete this connection"
-msgstr "Verbindung löschen"
+#: ../../mod/admin.php:461
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/connedit.php:395
-msgid "Unknown"
-msgstr "Unbekannt"
+#: ../../mod/admin.php:462
+msgid "Delivery interval"
+msgstr "Auslieferung Intervall"
 
-#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
-msgid "Approve this connection"
-msgstr "Verbindung genehmigen"
+#: ../../mod/admin.php:462
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../mod/connedit.php:405
-msgid "Accept connection to allow communication"
-msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
+#: ../../mod/admin.php:463
+msgid "Poll interval"
+msgstr "Abfrageintervall"
 
-#: ../../mod/connedit.php:421
-msgid "Automatic Permissions Settings"
-msgstr "Automatische Berechtigungs-Einstellungen"
+#: ../../mod/admin.php:463
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../mod/connedit.php:421
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Verbindungseinstellungen für %s"
+#: ../../mod/admin.php:464
+msgid "Maximum Load Average"
+msgstr "Maximales Load Average"
 
-#: ../../mod/connedit.php:425
+#: ../../mod/admin.php:464
 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 "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest."
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../mod/connedit.php:427
-msgid "Slide to adjust your degree of friendship"
-msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
+#: ../../mod/admin.php:520
+msgid "No server found"
+msgstr "Kein Server gefunden"
 
-#: ../../mod/connedit.php:433
-msgid "inherited"
-msgstr "geerbt"
+#: ../../mod/admin.php:527 ../../mod/admin.php:751
+msgid "ID"
+msgstr "ID"
 
-#: ../../mod/connedit.php:435
-msgid "Connection has no individual permissions!"
-msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!"
+#: ../../mod/admin.php:527
+msgid "for channel"
+msgstr "für Kanal"
 
-#: ../../mod/connedit.php:436
-msgid ""
-"This may be appropriate based on your privacy "
-"settings, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Abhängig von Deinen Privatsphäre-Einstellungen könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen."
+#: ../../mod/admin.php:527
+msgid "on server"
+msgstr "auf Server"
 
-#: ../../mod/connedit.php:438
-msgid "Profile Visibility"
-msgstr "Sichtbarkeit des Profils"
+#: ../../mod/admin.php:527
+msgid "Status"
+msgstr "Status"
 
-#: ../../mod/connedit.php:439
+#: ../../mod/admin.php:548
+msgid "Update has been marked successful"
+msgstr "Update wurde als erfolgreich markiert"
+
+#: ../../mod/admin.php:558
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
+msgid "Executing %s failed. Check system logs."
+msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
 
-#: ../../mod/connedit.php:440
-msgid "Contact Information / Notes"
-msgstr "Kontaktinformationen / Notizen"
+#: ../../mod/admin.php:561
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Update %s wurde erfolgreich ausgeführt."
 
-#: ../../mod/connedit.php:441
-msgid "Edit contact notes"
-msgstr "Kontaktnotizen bearbeiten"
+#: ../../mod/admin.php:565
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
 
-#: ../../mod/connedit.php:443
-msgid "Their Settings"
-msgstr "Deren Einstellungen"
+#: ../../mod/admin.php:568
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "Update-Funktion %s konnte nicht gefunden werden."
 
-#: ../../mod/connedit.php:444
-msgid "My Settings"
-msgstr "Meine Einstellungen"
+#: ../../mod/admin.php:583
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../mod/connedit.php:446
-msgid "Forum Members"
-msgstr "Forum Mitglieder"
+#: ../../mod/admin.php:587
+msgid "Failed Updates"
+msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../mod/connedit.php:447
-msgid "Soapbox"
-msgstr "Marktschreier"
+#: ../../mod/admin.php:589
+msgid "Mark success (if update was manually applied)"
+msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
 
-#: ../../mod/connedit.php:448
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)"
+#: ../../mod/admin.php:590
+msgid "Attempt to execute this update step automatically"
+msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 
-#: ../../mod/connedit.php:449
-msgid "Cautious Sharing "
-msgstr "Vorsichtiges Teilen"
+#: ../../mod/admin.php:616
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s Nutzer blockiert/freigegeben"
+msgstr[1] "%s Nutzer blockiert/freigegeben"
 
-#: ../../mod/connedit.php:450
-msgid "Follow Only"
-msgstr "Nur folgen"
+#: ../../mod/admin.php:623
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s Nutzer gelöscht"
+msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/connedit.php:451
-msgid "Individual Permissions"
-msgstr "Individuelle Zugriffsrechte"
-
-#: ../../mod/connedit.php:452
-msgid ""
-"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
-"individual settings. Changing those inherited settings on this page will "
-"have no effect."
-msgstr "Einige Berechtigungen werden von den Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen."
-
-#: ../../mod/connedit.php:453
-msgid "Advanced Permissions"
-msgstr "Zugriffsrechte für Fortgeschrittene"
+#: ../../mod/admin.php:654
+msgid "Account not found"
+msgstr "Konto nicht gefunden"
 
-#: ../../mod/connedit.php:454
-msgid "Simple Permissions (select one and submit)"
-msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)"
+#: ../../mod/admin.php:665
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Benutzer '%s' gelöscht"
 
-#: ../../mod/connedit.php:458
+#: ../../mod/admin.php:674
 #, php-format
-msgid "Visit %s's profile - %s"
-msgstr "%ss Profil besuchen - %s"
+msgid "User '%s' unblocked"
+msgstr "Benutzer '%s' freigegeben"
 
-#: ../../mod/connedit.php:459
-msgid "Block/Unblock contact"
-msgstr "Kontakt blockieren/freigeben"
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Benutzer '%s' blockiert"
 
-#: ../../mod/connedit.php:460
-msgid "Ignore contact"
-msgstr "Kontakt ignorieren"
+#: ../../mod/admin.php:740
+msgid "select all"
+msgstr "Alle auswählen"
 
-#: ../../mod/connedit.php:461
-msgid "Repair URL settings"
-msgstr "URL-Einstellungen reparieren"
+#: ../../mod/admin.php:741
+msgid "User registrations waiting for confirm"
+msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
 
-#: ../../mod/connedit.php:462
-msgid "View conversations"
-msgstr "Unterhaltungen anzeigen"
+#: ../../mod/admin.php:742
+msgid "Request date"
+msgstr "Antragsdatum"
 
-#: ../../mod/connedit.php:464
-msgid "Delete contact"
-msgstr "Kontakt löschen"
+#: ../../mod/admin.php:743
+msgid "No registrations."
+msgstr "Keine Registrierungen."
 
-#: ../../mod/connedit.php:467
-msgid "Last update:"
-msgstr "Letzte Aktualisierung:"
+#: ../../mod/admin.php:744
+msgid "Approve"
+msgstr "Genehmigen"
 
-#: ../../mod/connedit.php:469
-msgid "Update public posts"
-msgstr "Öffentliche Beiträge aktualisieren"
+#: ../../mod/admin.php:745
+msgid "Deny"
+msgstr "Verweigern"
 
-#: ../../mod/connedit.php:471
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
+msgstr "Blockieren"
 
-#: ../../mod/connedit.php:477
-msgid "Currently blocked"
-msgstr "Derzeit blockiert"
+#: ../../mod/admin.php:748 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
+msgstr "Freigeben"
 
-#: ../../mod/connedit.php:478
-msgid "Currently ignored"
-msgstr "Derzeit ignoriert"
+#: ../../mod/admin.php:751
+msgid "Register date"
+msgstr "Registrierungs-Datum"
 
-#: ../../mod/connedit.php:479
-msgid "Currently archived"
-msgstr "Derzeit archiviert"
+#: ../../mod/admin.php:751
+msgid "Last login"
+msgstr "Letzte Anmeldung"
 
-#: ../../mod/connedit.php:480
-msgid "Currently pending"
-msgstr "Derzeit anstehend"
+#: ../../mod/admin.php:751
+msgid "Expires"
+msgstr "Verfällt"
 
-#: ../../mod/connedit.php:481
-msgid "Hide this contact from others"
-msgstr "Diese Verbindung vor den anderen verbergen."
+#: ../../mod/admin.php:751
+msgid "Service Class"
+msgstr "Service-Klasse"
 
-#: ../../mod/connedit.php:481
+#: ../../mod/admin.php:753
 msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../mod/layouts.php:52
-msgid "Layout Help"
-msgstr "Layout-Hilfe"
+#: ../../mod/admin.php:754
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
 
-#: ../../mod/layouts.php:55
-msgid "Help with this feature"
-msgstr "Hilfe zu dieser Funktion"
+#: ../../mod/admin.php:795
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plug-In %s deaktiviert."
 
-#: ../../mod/layouts.php:74
-msgid "Layout Name"
-msgstr "Layout-Name"
+#: ../../mod/admin.php:799
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plug-In %s aktiviert."
 
-#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
-msgid "Help:"
-msgstr "Hilfe:"
+#: ../../mod/admin.php:809 ../../mod/admin.php:1011
+msgid "Disable"
+msgstr "Deaktivieren"
 
-#: ../../mod/help.php:68 ../../index.php:223
-msgid "Not Found"
-msgstr "Nicht gefunden"
+#: ../../mod/admin.php:811 ../../mod/admin.php:1013
+msgid "Enable"
+msgstr "Aktivieren"
 
-#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Toggle"
+msgstr "Umschalten"
 
-#: ../../mod/rmagic.php:56
-msgid "Remote Authentication"
-msgstr "Entfernte Authentifizierung"
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
+msgid "Author: "
+msgstr "Autor: "
 
-#: ../../mod/rmagic.php:57
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+#: ../../mod/admin.php:846 ../../mod/admin.php:1053
+msgid "Maintainer: "
+msgstr "Betreuer:"
 
-#: ../../mod/rmagic.php:58
-msgid "Authenticate"
-msgstr "Authentifizieren"
+#: ../../mod/admin.php:975
+msgid "No themes found."
+msgstr "Keine Theme gefunden."
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
-msgstr "Ungültiges Element."
+#: ../../mod/admin.php:1034
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
 
-#: ../../mod/network.php:79
-msgid "No such group"
-msgstr "Gruppe existiert nicht"
+#: ../../mod/admin.php:1082
+msgid "[Experimental]"
+msgstr "[Experimentell]"
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
-msgstr "Suchergebnisse für:"
+#: ../../mod/admin.php:1083
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
-msgstr "Sammlung ist leer"
+#: ../../mod/admin.php:1110
+msgid "Log settings updated."
+msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../mod/network.php:180
-msgid "Collection: "
-msgstr "Sammlung:"
+#: ../../mod/admin.php:1166
+msgid "Clear"
+msgstr "Leeren"
 
-#: ../../mod/network.php:193
-msgid "Connection: "
-msgstr "Verbindung:"
+#: ../../mod/admin.php:1172
+msgid "Debugging"
+msgstr "Debugging"
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
+#: ../../mod/admin.php:1173
+msgid "Log file"
+msgstr "Protokolldatei"
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
-msgid "Profile not found."
-msgstr "Profil nicht gefunden."
+#: ../../mod/admin.php:1173
+msgid ""
+"Must be writable by web server. Relative to your Red top-level directory."
+msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."
 
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profil gelöscht."
+#: ../../mod/admin.php:1174
+msgid "Log level"
+msgstr "Protokollstufe"
 
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Profil-"
+#: ../../mod/filer.php:35
+msgid "- select -"
+msgstr "– auswählen –"
 
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Neues Profil erstellt."
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Profil kann nicht geklont werden."
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
+msgstr "Element nicht gefunden"
 
-#: ../../mod/profiles.php:178
-msgid "Profile Name is required."
-msgstr "Profil-Name erforderlich."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../mod/profiles.php:294
-msgid "Marital Status"
-msgstr "Familienstand"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr "Eintrag löschen?"
 
-#: ../../mod/profiles.php:298
-msgid "Romantic Partner"
-msgstr "Romantische Partner"
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
+msgstr "YouTube-Video einfügen"
 
-#: ../../mod/profiles.php:302
-msgid "Likes"
-msgstr "Gefällt"
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis [.ogg]-Video einfügen"
 
-#: ../../mod/profiles.php:306
-msgid "Dislikes"
-msgstr "Gefällt nicht"
-
-#: ../../mod/profiles.php:310
-msgid "Work/Employment"
-msgstr "Arbeit/Anstellung"
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis [.ogg]-Audio einfügen"
 
-#: ../../mod/profiles.php:313
-msgid "Religion"
-msgstr "Religion"
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
+msgstr "Alter:"
 
-#: ../../mod/profiles.php:317
-msgid "Political Views"
-msgstr "Politische Ansichten"
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
+msgid "Gender: "
+msgstr "Geschlecht:"
 
-#: ../../mod/profiles.php:321
-msgid "Gender"
-msgstr "Geschlecht"
+#: ../../mod/directory.php:208
+msgid "Finding:"
+msgstr "Ergebnisse:"
 
-#: ../../mod/profiles.php:325
-msgid "Sexual Preference"
-msgstr "Sexuelle Orientierung"
+#: ../../mod/directory.php:216
+msgid "next page"
+msgstr "nächste Seite"
 
-#: ../../mod/profiles.php:329
-msgid "Homepage"
-msgstr "Webseite"
+#: ../../mod/directory.php:216
+msgid "previous page"
+msgstr "vorige Seite"
 
-#: ../../mod/profiles.php:333
-msgid "Interests"
-msgstr "Hobbys/Interessen"
+#: ../../mod/directory.php:223
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../mod/profiles.php:337
-msgid "Address"
-msgstr "Adresse"
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
 
-#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
-msgid "Location"
-msgstr "Ort"
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
+msgstr "Gewähltes Profil nicht gefunden."
 
-#: ../../mod/profiles.php:427
-msgid "Profile updated."
-msgstr "Profil aktualisiert."
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
+msgstr "Verbindung aktualisiert."
 
-#: ../../mod/profiles.php:482
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
+msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../mod/profiles.php:505
-msgid "Edit Profile Details"
-msgstr "Bearbeite Profil-Details"
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
+msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
 
-#: ../../mod/profiles.php:507
-msgid "View this profile"
-msgstr "Dieses Profil ansehen"
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../mod/profiles.php:508
-msgid "Change Profile Photo"
-msgstr "Profilfoto ändern"
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
+msgstr "Kanal nicht mehr blockiert"
 
-#: ../../mod/profiles.php:509
-msgid "Create a new profile using these settings"
-msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
+msgstr "Kanal blockiert"
 
-#: ../../mod/profiles.php:510
-msgid "Clone this profile"
-msgstr "Dieses Profil klonen"
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
+msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 
-#: ../../mod/profiles.php:511
-msgid "Delete this profile"
-msgstr "Dieses Profil löschen"
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
+msgstr "Kanal wird nicht mehr ignoriert"
 
-#: ../../mod/profiles.php:512
-msgid "Profile Name:"
-msgstr "Profilname:"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
+msgstr "Kanal wird ignoriert"
 
-#: ../../mod/profiles.php:513
-msgid "Your Full Name:"
-msgstr "Dein voller Name:"
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
+msgstr "Kanal wurde aus dem Archiv zurück geholt"
 
-#: ../../mod/profiles.php:514
-msgid "Title/Description:"
-msgstr "Titel/Stellenbeschreibung:"
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
+msgstr "Kanal wurde archiviert"
 
-#: ../../mod/profiles.php:515
-msgid "Your Gender:"
-msgstr "Dein Geschlecht:"
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
+msgstr "Kanal wird nicht mehr versteckt"
 
-#: ../../mod/profiles.php:516
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Geburtstag (%s):"
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
+msgstr "Kanal wurde versteckt"
 
-#: ../../mod/profiles.php:517
-msgid "Street Address:"
-msgstr "Straße und Hausnummer:"
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
+msgstr "Kanal wurde zugelassen"
 
-#: ../../mod/profiles.php:518
-msgid "Locality/City:"
-msgstr "Wohnort:"
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
+msgstr "Zulassung des Kanals entfernt"
 
-#: ../../mod/profiles.php:519
-msgid "Postal/Zip Code:"
-msgstr "Postleitzahl:"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
+msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/profiles.php:520
-msgid "Country:"
-msgstr "Land:"
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
+msgstr "%ss Profil ansehen"
 
-#: ../../mod/profiles.php:521
-msgid "Region/State:"
-msgstr "Region/Bundesstaat:"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
+msgstr "Zugriffsrechte neu laden"
 
-#: ../../mod/profiles.php:522
-msgid "♥ Marital Status:"
-msgstr "♥ Beziehungsstatus:"
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
+msgstr "Aktualisierte Zugriffsrechte abfragen"
 
-#: ../../mod/profiles.php:523
-msgid "Who: (if applicable)"
-msgstr "Wer: (falls anwendbar)"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
+msgstr "Kürzliche Aktivitäten"
 
-#: ../../mod/profiles.php:524
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
+msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../mod/profiles.php:525
-msgid "Since [date]:"
-msgstr "Seit [Datum]:"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
+msgstr "Verbindung blockieren oder freigeben"
 
-#: ../../mod/profiles.php:527
-msgid "Homepage URL:"
-msgstr "Homepage URL:"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
+msgstr "Nicht ignorieren"
 
-#: ../../mod/profiles.php:530
-msgid "Religious Views:"
-msgstr "Religiöse Ansichten:"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorieren"
 
-#: ../../mod/profiles.php:531
-msgid "Keywords:"
-msgstr "Schlüsselwörter:"
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
+msgstr "Verbindung ignorieren oder wieder beachten"
 
-#: ../../mod/profiles.php:534
-msgid "Example: fishing photography software"
-msgstr "Beispiel: Angeln Fotografie Software"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/profiles.php:535
-msgid "Used in directory listings"
-msgstr "Wird in Verzeichnis-Auflistungen verwendet"
+#: ../../mod/connedit.php:346
+msgid "Archive"
+msgstr "Archivieren"
 
-#: ../../mod/profiles.php:536
-msgid "Tell us about yourself..."
-msgstr "Erzähle uns ein wenig von Dir …"
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
+msgstr "Verbindung archivieren oder aus dem Archiv zurückholen"
 
-#: ../../mod/profiles.php:537
-msgid "Hobbies/Interests"
-msgstr "Hobbys/Interessen"
+#: ../../mod/connedit.php:352
+msgid "Unhide"
+msgstr "Wieder sichtbar machen"
 
-#: ../../mod/profiles.php:538
-msgid "Contact information and Social Networks"
-msgstr "Kontaktinformation und soziale Netzwerke"
+#: ../../mod/connedit.php:352
+msgid "Hide"
+msgstr "Verstecken"
 
-#: ../../mod/profiles.php:539
-msgid "My other channels"
-msgstr "Meine anderen Kanäle"
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
+msgstr "Diese Verbindung verstecken oder wieder sichtbar machen"
 
-#: ../../mod/profiles.php:540
-msgid "Musical interests"
-msgstr "Musikalische Interessen"
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
+msgstr "Verbindung löschen"
 
-#: ../../mod/profiles.php:541
-msgid "Books, literature"
-msgstr "Bücher, Literatur"
-
-#: ../../mod/profiles.php:542
-msgid "Television"
-msgstr "Fernsehen"
-
-#: ../../mod/profiles.php:543
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/Tanz/Kultur/Unterhaltung"
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
+msgstr "Verbindung genehmigen"
 
-#: ../../mod/profiles.php:544
-msgid "Love/romance"
-msgstr "Liebe/Romantik"
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
+msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
 
-#: ../../mod/profiles.php:545
-msgid "Work/employment"
-msgstr "Arbeit/Anstellung"
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
+msgstr "Automatische Berechtigungs-Einstellungen"
 
-#: ../../mod/profiles.php:546
-msgid "School/education"
-msgstr "Schule/Ausbildung"
+#: ../../mod/connedit.php:421
+#, php-format
+msgid "Connections: settings for %s"
+msgstr "Verbindungseinstellungen für %s"
 
-#: ../../mod/profiles.php:551
+#: ../../mod/connedit.php:425
 msgid ""
-"This is your public profile.
                                      It may "
-"be visible to anybody using the internet."
-msgstr "Das ist Dein öffentliches Profil.
                                      Es könnte für jeden im Internet sichtbar sein."
-
-#: ../../mod/profiles.php:600
-msgid "Edit/Manage Profiles"
-msgstr "Bearbeite/Verwalte Profile"
+"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 "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest."
 
-#: ../../mod/profiles.php:601
-msgid "Add profile things"
-msgstr "Profil-Dinge hinzufügen"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
+msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../mod/profiles.php:602
-msgid "Include desirable objects in your profile"
-msgstr "Binde begehrenswerte Dinge in Dein Profil ein"
+#: ../../mod/connedit.php:433
+msgid "inherited"
+msgstr "geerbt"
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
+msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!"
 
-#: ../../mod/post.php:226
+#: ../../mod/connedit.php:436
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
+"This may be appropriate based on your privacy "
+"settings, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Abhängig von Deinen Privatsphäre-Einstellungen könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen."
+
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
+msgstr "Sichtbarkeit des Profils"
 
-#: ../../mod/post.php:256
+#: ../../mod/connedit.php:439
 #, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Diese Website ist kein Verzeichnis-Server"
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
+msgstr "Kontaktinformationen / Notizen"
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
+msgstr "Kontaktnotizen bearbeiten"
 
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "Quelle erstellt."
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
+msgstr "Deren Einstellungen"
 
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "Quelle aktualisiert."
+#: ../../mod/connedit.php:444
+msgid "My Settings"
+msgstr "Meine Einstellungen"
 
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
+msgstr "Forum Mitglieder"
 
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "Quellen von Inhalten Deines Kanals verwalten."
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
+msgstr "Marktschreier"
 
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Neue Quelle"
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
+msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)"
 
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
+msgstr "Vorsichtiges Teilen"
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
+msgstr "Nur folgen"
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
+msgstr "Individuelle Zugriffsrechte"
 
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
-msgstr "Name des Kanals"
+#: ../../mod/connedit.php:452
+msgid ""
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
+"individual settings. Changing those inherited settings on this page will "
+"have no effect."
+msgstr "Einige Berechtigungen werden von den Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen."
 
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "Quelle nicht gefunden."
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
+msgstr "Zugriffsrechte für Fortgeschrittene"
 
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Quelle bearbeiten"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
+msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)"
 
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Quelle löschen"
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "%ss Profil besuchen - %s"
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "Quelle gelöscht"
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
+msgstr "Kontakt blockieren/freigeben"
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Konnte die Quelle nicht löschen."
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
+msgstr "Kontakt ignorieren"
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
-msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
+msgstr "URL-Einstellungen reparieren"
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Sichtbar für:"
+#: ../../mod/connedit.php:462
+msgid "View conversations"
+msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
-msgstr "Server nicht gefunden."
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
+msgstr "Kontakt löschen"
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
-msgstr "Red Matrix Server - Installation"
+#: ../../mod/connedit.php:467
+msgid "Last update:"
+msgstr "Letzte Aktualisierung:"
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
-msgstr "Kann nicht mit der Datenbank verbinden."
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
+msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/setup.php:171
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
+#: ../../mod/connedit.php:471
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
-msgstr "Kann Tabelle nicht erstellen."
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
+msgstr "Derzeit blockiert"
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
-msgstr "Die Datenbank Deines Servers wurde installiert."
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
 
-#: ../../mod/setup.php:187
-msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
-msgstr "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren."
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
+msgstr "Derzeit archiviert"
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Lies die Datei \"install/INSTALL.txt\"."
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
+msgstr "Derzeit anstehend"
 
-#: ../../mod/setup.php:254
-msgid "System check"
-msgstr "Systemprüfung"
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
+msgstr "Diese Verbindung vor den anderen verbergen."
 
-#: ../../mod/setup.php:259
-msgid "Check again"
-msgstr "Bitte nochmal prüfen"
-
-#: ../../mod/setup.php:281
-msgid "Database connection"
-msgstr "Datenbank Verbindung"
-
-#: ../../mod/setup.php:282
+#: ../../mod/connedit.php:481
 msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
-msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
+"Replies/likes to your public posts may still be visible"
+msgstr "Antworten/Likes auf deine öffentlichen Beiträge können immer noch sichtbar sein"
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
+msgstr "Layout-Hilfe"
 
-#: ../../mod/setup.php:284
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
+msgstr "Hilfe zu dieser Funktion"
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
-msgstr "Datenbank-Servername"
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
+msgstr "Layout-Name"
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
-msgstr "Standard ist localhost"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
+msgstr "Hilfe:"
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
-msgstr "Datenbank-Port"
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
+msgstr "Nicht gefunden"
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
-msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
-msgstr "Datenbank-Benutzername"
+#: ../../mod/rmagic.php:38
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der du dich anmelden wolltest. Bitte überprüfe die Schreibweise der ID noch einmal."
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
-msgstr "Datenbank-Kennwort"
+#: ../../mod/rmagic.php:38
+msgid "The error message was:"
+msgstr "Die Fehlermeldung lautet:"
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
-msgstr "Datenbank-Name"
+#: ../../mod/rmagic.php:42
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen."
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
-msgstr "E-Mail Adresse des Seiten-Administrators"
+#: ../../mod/rmagic.php:78
+msgid "Remote Authentication"
+msgstr "Entfernte Authentifizierung"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
+#: ../../mod/rmagic.php:79
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
-msgstr "Server-URL"
+#: ../../mod/rmagic.php:80
+msgid "Authenticate"
+msgstr "Authentifizieren"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
-msgstr "Nutze wenn möglich eine SSL-URL (https)."
+#: ../../mod/page.php:35
+msgid "Invalid item."
+msgstr "Ungültiges Element."
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
-msgstr "Standard-Zeitzone für Deinen Server"
+#: ../../mod/network.php:79
+msgid "No such group"
+msgstr "Gruppe existiert nicht"
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
-msgstr "Seiteneinstellungen"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
+msgstr "Suchergebnisse für:"
 
-#: ../../mod/setup.php:384
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "Sammlung ist leer"
 
-#: ../../mod/setup.php:385
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
+#: ../../mod/network.php:180
+msgid "Collection: "
+msgstr "Sammlung:"
 
-#: ../../mod/setup.php:389
-msgid "PHP executable path"
-msgstr "PHP Pfad zu ausführbarer Datei"
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr "Verbindung:"
 
-#: ../../mod/setup.php:389
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
+#: ../../mod/network.php:196
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
 
-#: ../../mod/setup.php:394
-msgid "Command line PHP"
-msgstr "PHP Befehlszeile"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
+msgid "Profile not found."
+msgstr "Profil nicht gefunden."
 
-#: ../../mod/setup.php:403
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
 
-#: ../../mod/setup.php:404
-msgid "This is required for message delivery to work."
-msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Profil-"
 
-#: ../../mod/setup.php:406
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "Neues Profil erstellt."
 
-#: ../../mod/setup.php:427
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
+msgstr "Profil kann nicht geklont werden."
 
-#: ../../mod/setup.php:428
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
+msgstr "Profil-Name erforderlich."
 
-#: ../../mod/setup.php:430
-msgid "Generate encryption keys"
-msgstr "Verschlüsselungsschlüssel  generieren"
+#: ../../mod/profiles.php:294
+msgid "Marital Status"
+msgstr "Familienstand"
 
-#: ../../mod/setup.php:437
-msgid "libCurl PHP module"
-msgstr "libCurl-PHP-Modul"
+#: ../../mod/profiles.php:298
+msgid "Romantic Partner"
+msgstr "Romantische Partner"
 
-#: ../../mod/setup.php:438
-msgid "GD graphics PHP module"
-msgstr "GD-Grafik-PHP-Modul"
+#: ../../mod/profiles.php:302
+msgid "Likes"
+msgstr "Gefällt"
 
-#: ../../mod/setup.php:439
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL-PHP-Modul"
+#: ../../mod/profiles.php:306
+msgid "Dislikes"
+msgstr "Gefällt nicht"
 
-#: ../../mod/setup.php:440
-msgid "mysqli PHP module"
-msgstr "mysqli-PHP-Modul"
+#: ../../mod/profiles.php:310
+msgid "Work/Employment"
+msgstr "Arbeit/Anstellung"
 
-#: ../../mod/setup.php:441
-msgid "mb_string PHP module"
-msgstr "mb_string-PHP-Modul"
+#: ../../mod/profiles.php:313
+msgid "Religion"
+msgstr "Religion"
 
-#: ../../mod/setup.php:442
-msgid "mcrypt PHP module"
-msgstr "mcrypt-PHP-Modul"
+#: ../../mod/profiles.php:317
+msgid "Political Views"
+msgstr "Politische Ansichten"
 
-#: ../../mod/setup.php:447 ../../mod/setup.php:449
-msgid "Apache mod_rewrite module"
-msgstr "Apache-mod_rewrite-Modul"
+#: ../../mod/profiles.php:321
+msgid "Gender"
+msgstr "Geschlecht"
 
-#: ../../mod/setup.php:447
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:325
+msgid "Sexual Preference"
+msgstr "Sexuelle Orientierung"
 
-#: ../../mod/setup.php:453 ../../mod/setup.php:456
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/profiles.php:329
+msgid "Homepage"
+msgstr "Webseite"
 
-#: ../../mod/setup.php:453
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+#: ../../mod/profiles.php:333
+msgid "Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../mod/setup.php:461
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:337
+msgid "Address"
+msgstr "Adresse"
 
-#: ../../mod/setup.php:465
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
+msgid "Location"
+msgstr "Ort"
 
-#: ../../mod/setup.php:469
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:427
+msgid "Profile updated."
+msgstr "Profil aktualisiert."
 
-#: ../../mod/setup.php:473
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:482
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/setup.php:477
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:505
+msgid "Edit Profile Details"
+msgstr "Bearbeite Profil-Details"
 
-#: ../../mod/setup.php:481
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
+#: ../../mod/profiles.php:507
+msgid "View this profile"
+msgstr "Dieses Profil ansehen"
 
-#: ../../mod/setup.php:497
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
+#: ../../mod/profiles.php:508
+msgid "Change Profile Photo"
+msgstr "Profilfoto ändern"
 
-#: ../../mod/setup.php:498
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
+#: ../../mod/profiles.php:509
+msgid "Create a new profile using these settings"
+msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../mod/setup.php:499
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst."
+#: ../../mod/profiles.php:510
+msgid "Clone this profile"
+msgstr "Dieses Profil klonen"
 
-#: ../../mod/setup.php:500
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
+#: ../../mod/profiles.php:511
+msgid "Delete this profile"
+msgstr "Dieses Profil löschen"
 
-#: ../../mod/setup.php:503
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php ist beschreibbar"
+#: ../../mod/profiles.php:512
+msgid "Profile Name:"
+msgstr "Profilname:"
 
-#: ../../mod/setup.php:513
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
+#: ../../mod/profiles.php:513
+msgid "Your Full Name:"
+msgstr "Dein voller Name:"
 
-#: ../../mod/setup.php:514
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
-msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver Schreibzugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red-Stammverzeichnisses haben."
+#: ../../mod/profiles.php:514
+msgid "Title/Description:"
+msgstr "Titel/Stellenbeschreibung:"
 
-#: ../../mod/setup.php:515 ../../mod/setup.php:533
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
+#: ../../mod/profiles.php:515
+msgid "Your Gender:"
+msgstr "Dein Geschlecht:"
 
-#: ../../mod/setup.php:516
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: Als Sicherheitsvorkehrung solltest Du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht auf die Vorlagen (.tpl-Dateien) in view/tpl/ ."
+#: ../../mod/profiles.php:516
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Geburtstag (%s):"
 
-#: ../../mod/setup.php:519
-msgid "view/tpl/smarty3 is writable"
-msgstr "view/tpl/smarty3 ist beschreibbar"
+#: ../../mod/profiles.php:517
+msgid "Street Address:"
+msgstr "Straße und Hausnummer:"
 
-#: ../../mod/setup.php:532
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
+#: ../../mod/profiles.php:518
+msgid "Locality/City:"
+msgstr "Wohnort:"
 
-#: ../../mod/setup.php:536
-msgid "store is writable"
-msgstr "store ist schreibbar"
+#: ../../mod/profiles.php:519
+msgid "Postal/Zip Code:"
+msgstr "Postleitzahl:"
 
-#: ../../mod/setup.php:551
-msgid "SSL certificate validation"
-msgstr "SSL Zertifikatverifizierung"
+#: ../../mod/profiles.php:520
+msgid "Country:"
+msgstr "Land:"
 
-#: ../../mod/setup.php:551
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
+#: ../../mod/profiles.php:521
+msgid "Region/State:"
+msgstr "Region/Bundesstaat:"
 
-#: ../../mod/setup.php:558
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration."
+#: ../../mod/profiles.php:522
+msgid "♥ Marital Status:"
+msgstr "♥ Beziehungsstatus:"
 
-#: ../../mod/setup.php:560
-msgid "Url rewrite is working"
-msgstr "Url rewrite funktioniert"
+#: ../../mod/profiles.php:523
+msgid "Who: (if applicable)"
+msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/setup.php:570
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
+#: ../../mod/profiles.php:524
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/setup.php:594
-msgid "Errors encountered creating database tables."
-msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
+#: ../../mod/profiles.php:525
+msgid "Since [date]:"
+msgstr "Seit [Datum]:"
 
-#: ../../mod/setup.php:607
-msgid "
                                      What next
                                      "
-msgstr "
                                      Was als Nächstes
                                      "
+#: ../../mod/profiles.php:527
+msgid "Homepage URL:"
+msgstr "Homepage URL:"
 
-#: ../../mod/setup.php:608
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
+#: ../../mod/profiles.php:530
+msgid "Religious Views:"
+msgstr "Religiöse Ansichten:"
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr "Version %s"
+#: ../../mod/profiles.php:531
+msgid "Keywords:"
+msgstr "Schlüsselwörter:"
 
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
+#: ../../mod/profiles.php:534
+msgid "Example: fishing photography software"
+msgstr "Beispiel: Angeln Fotografie Software"
 
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
+#: ../../mod/profiles.php:535
+msgid "Used in directory listings"
+msgstr "Wird in Verzeichnis-Auflistungen verwendet"
 
-#: ../../mod/siteinfo.php:93
-msgid "Project Donations"
-msgstr "Projekt Spenden"
+#: ../../mod/profiles.php:536
+msgid "Tell us about yourself..."
+msgstr "Erzähle uns ein wenig von Dir …"
 
-#: ../../mod/siteinfo.php:94
-msgid ""
-"
                                      The Red Matrix is provided for you by volunteers working in their spare "
-"time. Your support will help us to build a better web. Select the following "
-"option for a one-time donation of your choosing
                                      "
-msgstr ""
+#: ../../mod/profiles.php:537
+msgid "Hobbies/Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../mod/siteinfo.php:95
-msgid "
                                      or
                                      "
-msgstr "
                                      oder
                                      "
+#: ../../mod/profiles.php:538
+msgid "Contact information and Social Networks"
+msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../mod/siteinfo.php:96
-msgid "Recurring Donation Options"
-msgstr ""
+#: ../../mod/profiles.php:539
+msgid "My other channels"
+msgstr "Meine anderen Kanäle"
 
-#: ../../mod/siteinfo.php:115
-msgid "Red"
-msgstr "Red"
+#: ../../mod/profiles.php:540
+msgid "Musical interests"
+msgstr "Musikalische Interessen"
 
-#: ../../mod/siteinfo.php:116
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
+#: ../../mod/profiles.php:541
+msgid "Books, literature"
+msgstr "Bücher, Literatur"
 
-#: ../../mod/siteinfo.php:119
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
+#: ../../mod/profiles.php:542
+msgid "Television"
+msgstr "Fernsehen"
 
-#: ../../mod/siteinfo.php:120
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren."
+#: ../../mod/profiles.php:543
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../mod/siteinfo.php:121
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+#: ../../mod/profiles.php:544
+msgid "Love/romance"
+msgstr "Liebe/Romantik"
 
-#: ../../mod/siteinfo.php:124
+#: ../../mod/profiles.php:545
+msgid "Work/employment"
+msgstr "Arbeit/Anstellung"
+
+#: ../../mod/profiles.php:546
+msgid "School/education"
+msgstr "Schule/Ausbildung"
+
+#: ../../mod/profiles.php:551
 msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
+"This is your public profile.
                                      It may "
+"be visible to anybody using the internet."
+msgstr "Das ist Dein öffentliches Profil.
                                      Es könnte für jeden im Internet sichtbar sein."
 
-#: ../../mod/siteinfo.php:126
-msgid "Site Administrators"
-msgstr "Administratoren"
+#: ../../mod/profiles.php:600
+msgid "Edit/Manage Profiles"
+msgstr "Bearbeite/Verwalte Profile"
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
-msgstr "Kanal hinzufügen"
+#: ../../mod/profiles.php:601
+msgid "Add profile things"
+msgstr "Profil-Dinge hinzufügen"
 
-#: ../../mod/new_channel.php:108
+#: ../../mod/profiles.php:602
+msgid "Include desirable objects in your profile"
+msgstr "Binde begehrenswerte Dinge in Dein Profil ein"
+
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
+
+#: ../../mod/post.php:226
 msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt."
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
 
-#: ../../mod/new_channel.php:111
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
+#: ../../mod/post.php:256 ../../mod/openid.php:70 ../../mod/openid.php:175
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznamen"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Diese Website ist kein Verzeichnis-Server"
+
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
+
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Quelle erstellt."
+
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Quelle aktualisiert."
+
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
+
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Quellen von Inhalten Deines Kanals verwalten."
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Neue Quelle"
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
+
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
 
-#: ../../mod/new_channel.php:114
-msgid "Or import an existing channel from another location"
-msgstr "Oder importiere einen bestehenden Kanal von einem anderen Server"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
+msgstr "Name des Kanals"
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Kein gültiges Konto gefunden."
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Quelle nicht gefunden."
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Quelle bearbeiten"
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Nutzer (%s)"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Quelle löschen"
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Passwort-Rücksetzung auf %s angefordert"
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Quelle gelöscht"
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Konnte die Quelle nicht löschen."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1434
-msgid "Password Reset"
-msgstr "Zurücksetzen des Kennworts"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie angefordert neu erstellt."
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Sichtbar für:"
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
-msgstr "Dein neues Passwort lautet"
+#: ../../mod/magic.php:70
+msgid "Hub not found."
+msgstr "Server nicht gefunden."
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
+msgstr "Red Matrix Server - Installation"
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
-msgstr "Klicke hier, um dich anzumelden"
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
+msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/setup.php:171
 msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
-msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Auf %s wurde Dein Passwort geändert"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
+msgstr "Kann Tabelle nicht erstellen."
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr "Kennwort vergessen?"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
+msgstr "Die Datenbank Deines Servers wurde installiert."
 
-#: ../../mod/lostpass.php:123
+#: ../../mod/setup.php:187
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
+msgstr "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren."
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
-msgstr "E-Mail Adresse"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: ../../mod/setup.php:254
+msgid "System check"
+msgstr "Systemprüfung"
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
-msgstr "Name ist erforderlich"
+#: ../../mod/setup.php:259
+msgid "Check again"
+msgstr "Bitte nochmal prüfen"
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
-msgstr "Schlüssel und Geheimnis werden benötigt"
+#: ../../mod/setup.php:281
+msgid "Database connection"
+msgstr "Datenbank Verbindung"
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:542
-msgid "Update"
-msgstr "Aktualisieren"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
+msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
 
-#: ../../mod/settings.php:195
-msgid "Passwords do not match. Password unchanged."
-msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
 
-#: ../../mod/settings.php:199
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
 
-#: ../../mod/settings.php:212
-msgid "Password changed."
-msgstr "Kennwort geändert."
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
+msgstr "Datenbank-Servername"
 
-#: ../../mod/settings.php:214
-msgid "Password update failed. Please try again."
-msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
+msgstr "Standard ist localhost"
 
-#: ../../mod/settings.php:228
-msgid "Not valid email."
-msgstr "Keine gültige E-Mail Adresse."
+#: ../../mod/setup.php:289
+msgid "Database Port"
+msgstr "Datenbank-Port"
 
-#: ../../mod/settings.php:231
-msgid "Protected email address. Cannot change to that email."
-msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
+msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
 
-#: ../../mod/settings.php:240
-msgid "System failure storing new email. Please try again."
-msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
+msgstr "Datenbank-Benutzername"
 
-#: ../../mod/settings.php:444
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
+msgstr "Datenbank-Kennwort"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-#: ../../mod/settings.php:577
-msgid "Add application"
-msgstr "Anwendung hinzufügen"
+#: ../../mod/setup.php:292
+msgid "Database Name"
+msgstr "Datenbank-Name"
 
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Name"
-msgstr "Name"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
+msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../mod/settings.php:518
-msgid "Name of application"
-msgstr "Name der Anwendung"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
-msgid "Consumer Key"
-msgstr "Consumer Key"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
+msgstr "Server-URL"
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:520
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
+msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../mod/settings.php:520 ../../mod/settings.php:546
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
+msgstr "Standard-Zeitzone für Deinen Server"
 
-#: ../../mod/settings.php:521 ../../mod/settings.php:547
-msgid "Redirect"
-msgstr "Umleitung"
+#: ../../mod/setup.php:325
+msgid "Site settings"
+msgstr "Seiteneinstellungen"
 
-#: ../../mod/settings.php:521
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
+
+#: ../../mod/setup.php:385
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert"
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
+
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
+msgstr "PHP Pfad zu ausführbarer Datei"
+
+#: ../../mod/setup.php:389
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../mod/settings.php:522 ../../mod/settings.php:548
-msgid "Icon url"
-msgstr "Symbol-URL"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
+msgstr "PHP Befehlszeile"
 
-#: ../../mod/settings.php:522
-msgid "Optional"
-msgstr "Optional"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../mod/settings.php:533
-msgid "You can't edit this application."
-msgstr "Diese Anwendung kann nicht bearbeitet werden."
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
+msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../mod/settings.php:576
-msgid "Connected Apps"
-msgstr "Verbundene Apps"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/settings.php:580
-msgid "Client key starts with"
-msgstr "Client key beginnt mit"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../mod/settings.php:581
-msgid "No name"
-msgstr "Kein Name"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../mod/settings.php:582
-msgid "Remove authorization"
-msgstr "Authorisierung aufheben"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
+msgstr "Verschlüsselungsschlüssel  generieren"
 
-#: ../../mod/settings.php:593
-msgid "No feature settings configured"
-msgstr "Keine Funktions-Einstellungen konfiguriert"
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
+msgstr "libCurl-PHP-Modul"
 
-#: ../../mod/settings.php:601
-msgid "Feature Settings"
-msgstr "Funktions-Einstellungen"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
+msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../mod/settings.php:624
-msgid "Account Settings"
-msgstr "Konto-Einstellungen"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL-PHP-Modul"
 
-#: ../../mod/settings.php:625
-msgid "Password Settings"
-msgstr "Kennwort-Einstellungen"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
+msgstr "mysqli-PHP-Modul"
 
-#: ../../mod/settings.php:626
-msgid "New Password:"
-msgstr "Neues Passwort:"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
+msgstr "mb_string-PHP-Modul"
 
-#: ../../mod/settings.php:627
-msgid "Confirm:"
-msgstr "Bestätigen:"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
+msgstr "mcrypt-PHP-Modul"
 
-#: ../../mod/settings.php:627
-msgid "Leave password fields blank unless changing"
-msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
+msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../mod/settings.php:629 ../../mod/settings.php:925
-msgid "Email Address:"
-msgstr "Email Adresse:"
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:630
-msgid "Remove Account"
-msgstr "Konto entfernen"
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../mod/settings.php:631
-msgid "Warning: This action is permanent and cannot be reversed."
-msgstr "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden."
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../mod/settings.php:647
-msgid "Off"
-msgstr "Aus"
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:647
-msgid "On"
-msgstr "An"
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:654
-msgid "Additional Features"
-msgstr "Zusätzliche Funktionen"
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:679
-msgid "Connector Settings"
-msgstr "Connector-Einstellungen"
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:750
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:756
-msgid "Display Theme:"
-msgstr "Anzeige-Theme:"
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
 
-#: ../../mod/settings.php:757
-msgid "Mobile Theme:"
-msgstr "Mobile Theme:"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../mod/settings.php:758
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../mod/settings.php:758
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimum 10 Sekunden, kein Maximum"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst."
 
-#: ../../mod/settings.php:759
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../mod/settings.php:759
-msgid "Maximum of 100 items"
-msgstr "Maximum: 100 Beiträge"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../mod/settings.php:760
-msgid "Don't show emoticons"
-msgstr "Emoticons nicht zeigen"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../mod/settings.php:761
-msgid "Do not view remote profiles in frames"
-msgstr ""
+#: ../../mod/setup.php:514
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
+msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver Schreibzugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red-Stammverzeichnisses haben."
 
-#: ../../mod/settings.php:761
-msgid "By default open in a sub-window of your own site"
-msgstr ""
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../mod/settings.php:796
-msgid "Nobody except yourself"
-msgstr "Niemand außer Dir selbst"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: Als Sicherheitsvorkehrung solltest Du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht auf die Vorlagen (.tpl-Dateien) in view/tpl/ ."
 
-#: ../../mod/settings.php:797
-msgid "Only those you specifically allow"
-msgstr "Nur die, denen Du es explizit erlaubst"
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
+msgstr "view/tpl/smarty3 ist beschreibbar"
 
-#: ../../mod/settings.php:798
-msgid "Anybody in your address book"
-msgstr "Jeder aus Ihrem Adressbuch"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
 
-#: ../../mod/settings.php:799
-msgid "Anybody on this website"
-msgstr "Jeder auf dieser Website"
+#: ../../mod/setup.php:536
+msgid "store is writable"
+msgstr "store ist schreibbar"
 
-#: ../../mod/settings.php:800
-msgid "Anybody in this network"
-msgstr "Jeder in diesem Netzwerk"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
+msgstr "SSL Zertifikatverifizierung"
 
-#: ../../mod/settings.php:801
-msgid "Anybody on the internet"
-msgstr "Jeder im Internet"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../mod/settings.php:878
-msgid "Publish your default profile in the network directory"
-msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration."
 
-#: ../../mod/settings.php:883
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
+msgstr "Url rewrite funktioniert"
 
-#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288
-msgid "or"
-msgstr "oder"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../mod/settings.php:892
-msgid "Your channel address is"
-msgstr "Deine Kanal-Adresse lautet"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../mod/settings.php:914
-msgid "Channel Settings"
-msgstr "Kanal-Einstellungen"
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
+msgstr "
                                      Was als Nächstes
                                      "
 
-#: ../../mod/settings.php:923
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
 
-#: ../../mod/settings.php:926
-msgid "Your Timezone:"
-msgstr "Ihre Zeitzone:"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
 
-#: ../../mod/settings.php:927
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
 
-#: ../../mod/settings.php:928
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
 
-#: ../../mod/settings.php:930
-msgid "Adult Content"
-msgstr "Nicht jugendfreie Inhalte"
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
+msgstr "Projekt Spenden"
 
-#: ../../mod/settings.php:930
+#: ../../mod/siteinfo.php:94
 msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
-
-#: ../../mod/settings.php:932
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Datenschutz-Einstellungen"
+"
                                      The Red Matrix is provided for you by volunteers working in their spare "
+"time. Your support will help us to build a better, freer, and privacy "
+"respecting web. Select the following option for a one-time donation of your "
+"choosing
                                      "
+msgstr ""
 
-#: ../../mod/settings.php:934
-msgid "Hide my online presence"
-msgstr "Meine Online-Präsenz verbergen"
+#: ../../mod/siteinfo.php:95
+msgid "
                                      or
                                      "
+msgstr "
                                      oder
                                      "
 
-#: ../../mod/settings.php:934
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
+msgstr "Optionen für regelmäßige Spenden"
 
-#: ../../mod/settings.php:936
-msgid "Simple Privacy Settings:"
-msgstr "Einfache Privatsphäre-Einstellungen"
+#: ../../mod/siteinfo.php:115
+msgid "Red"
+msgstr "Red"
 
-#: ../../mod/settings.php:937
+#: ../../mod/siteinfo.php:116
 msgid ""
-"Very Public - extremely permissive (should be used with caution)"
-msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)"
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
 
-#: ../../mod/settings.php:938
+#: ../../mod/siteinfo.php:119
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
+
+#: ../../mod/siteinfo.php:120
 msgid ""
-"Typical - default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)"
-msgstr "Typisch – Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)"
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Besuche GetZot.com, um mehr über die Red-Matrix zu erfahren."
 
-#: ../../mod/settings.php:939
-msgid "Private - default private, never open or public"
-msgstr "Private – Default privat, nie offen oder öffentlich"
+#: ../../mod/siteinfo.php:121
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
-#: ../../mod/settings.php:940
-msgid "Blocked - default blocked to/from everybody"
-msgstr "Blockiert – Alle per Default blockiert"
+#: ../../mod/siteinfo.php:124
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
 
-#: ../../mod/settings.php:943
-msgid "Advanced Privacy Settings"
-msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
+#: ../../mod/siteinfo.php:126
+msgid "Site Administrators"
+msgstr "Administratoren"
 
-#: ../../mod/settings.php:945
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Kontaktanfragen pro Tag:"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr "Kanal hinzufügen"
 
-#: ../../mod/settings.php:945
-msgid "May reduce spam activity"
-msgstr "Kann die Spam-Aktivität verringern"
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt."
 
-#: ../../mod/settings.php:946
-msgid "Default Post Permissions"
-msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
+#: ../../mod/new_channel.php:111
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
 
-#: ../../mod/settings.php:958
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr "Wähle einen kurzen Spitznamen"
 
-#: ../../mod/settings.php:958
-msgid "Useful to reduce spamming"
-msgstr "Nützlich, um Spam zu verringern"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
 
-#: ../../mod/settings.php:961
-msgid "Notification Settings"
-msgstr "Benachrichtigungs-Einstellungen"
+#: ../../mod/new_channel.php:114
+msgid "Or import an existing channel from another location"
+msgstr "Oder importiere einen bestehenden Kanal von einem anderen Server"
 
-#: ../../mod/settings.php:962
-msgid "By default post a status message when:"
-msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Kein gültiges Konto gefunden."
 
-#: ../../mod/settings.php:963
-msgid "accepting a friend request"
-msgstr "Du eine Kontaktanfrage annimmst"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
 
-#: ../../mod/settings.php:964
-msgid "joining a forum/community"
-msgstr "Du einem Forum beitrittst"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Nutzer (%s)"
 
-#: ../../mod/settings.php:965
-msgid "making an interesting profile change"
-msgstr "Du eine interessante Änderung an Deinem Profil vornimmst"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Passwort-Rücksetzung auf %s angefordert"
 
-#: ../../mod/settings.php:966
-msgid "Send a notification email when:"
-msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../mod/settings.php:967
-msgid "You receive an introduction"
-msgstr "Du eine Vorstellung erhältst"
+#: ../../mod/lostpass.php:85 ../../boot.php:1436
+msgid "Password Reset"
+msgstr "Zurücksetzen des Kennworts"
 
-#: ../../mod/settings.php:968
-msgid "Your introductions are confirmed"
-msgstr "Deine Vorstellung bestätigt wurde."
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie angefordert neu erstellt."
 
-#: ../../mod/settings.php:969
-msgid "Someone writes on your profile wall"
-msgstr "Jemand auf Deine Pinnwand schreibt"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/settings.php:970
-msgid "Someone writes a followup comment"
-msgstr "Jemand einen Beitrag kommentiert"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
 
-#: ../../mod/settings.php:971
-msgid "You receive a private message"
-msgstr "Du eine private Nachricht erhältst"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
+msgstr "Klicke hier, um dich anzumelden"
 
-#: ../../mod/settings.php:972
-msgid "You receive a friend suggestion"
-msgstr "Du einen Kontaktvorschlag erhältst"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
+msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
 
-#: ../../mod/settings.php:973
-msgid "You are tagged in a post"
-msgstr "Du in einem Beitrag erwähnt wurdest"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Auf %s wurde Dein Passwort geändert"
 
-#: ../../mod/settings.php:974
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Kennwort vergessen?"
 
-#: ../../mod/settings.php:977
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Account- und Seitenart-Einstellungen"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
 
-#: ../../mod/settings.php:978
-msgid "Change the behaviour of this account for special situations"
-msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr "E-Mail Adresse"
 
-#: ../../mod/settings.php:981
-msgid ""
-"Please enable expert mode (in Settings > Additional features) to adjust!"
-msgstr ""
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Zurücksetzen"
 
 #: ../../mod/import.php:36
 msgid "Nothing to import."
@@ -6276,32 +6311,32 @@ msgstr "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neu
 msgid "Make this hub my primary location"
 msgstr "Dieser Red-Server ist mein primärer Server."
 
-#: ../../mod/manage.php:63
+#: ../../mod/manage.php:64
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../mod/manage.php:71
+#: ../../mod/manage.php:72
 msgid "Create a new channel"
 msgstr "Erzeuge neues Kanal"
 
-#: ../../mod/manage.php:76
+#: ../../mod/manage.php:77
 msgid "Channel Manager"
 msgstr "Kanal-Manager"
 
-#: ../../mod/manage.php:77
+#: ../../mod/manage.php:78
 msgid "Current Channel"
 msgstr "Aktueller Kanal"
 
-#: ../../mod/manage.php:79
+#: ../../mod/manage.php:80
 msgid "Attach to one of your channels by selecting it."
 msgstr "Wähle einen Deiner Kanäle aus, um ihn zu verwenden."
 
-#: ../../mod/manage.php:80
+#: ../../mod/manage.php:81
 msgid "Default Channel"
 msgstr "Standard Kanal"
 
-#: ../../mod/manage.php:81
+#: ../../mod/manage.php:82
 msgid "Make Default"
 msgstr "Zum Standard machen"
 
@@ -6407,6 +6442,10 @@ msgstr "Keine sichere Kommunikation verfügbar. Eventuell kanns
 msgid "Send Reply"
 msgstr "Antwort senden"
 
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
+
 #: ../../mod/editlayout.php:72
 msgid "Edit Layout"
 msgstr "Layout bearbeiten"
@@ -7289,41 +7328,41 @@ msgstr "Titelbild"
 msgid "Header image only on profile pages"
 msgstr "Titelbild nur auf Profil-Seiten anzeigen"
 
-#: ../../boot.php:1232
+#: ../../boot.php:1234
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../boot.php:1235
+#: ../../boot.php:1237
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../boot.php:1399
+#: ../../boot.php:1401
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."
 
-#: ../../boot.php:1427
+#: ../../boot.php:1429
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1428
+#: ../../boot.php:1430
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1433
+#: ../../boot.php:1435
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1498
+#: ../../boot.php:1500
 msgid "permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../../boot.php:1499
+#: ../../boot.php:1501
 msgid "Got Zot?"
 msgstr "Haste schon Zot?"
 
-#: ../../boot.php:1899
+#: ../../boot.php:1906
 msgid "toggle mobile"
 msgstr "auf/von mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index 4001d78be..ee694c324 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -714,9 +714,8 @@ $a->strings["This action exceeds the limits set by your subscription plan."] = "
 $a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
 $a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
 $a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
-$a->strings["Channel discovery failed. Website may be down or misconfigured."] = "Auffinden des Kanals schlug fehl. Die Webseite könnte falsch konfiguriert oder abgeschaltet sein.";
-$a->strings["Response from remote channel was not understood."] = "Antwort des entfernten Kanals war unverständlich.";
 $a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
+$a->strings["Channel discovery failed."] = "";
 $a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
 $a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
@@ -745,6 +744,7 @@ $a->strings["Can send me bookmarks"] = "Darf mir Lesezeichen senden";
 $a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
 $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
 $a->strings["Permission denied"] = "Keine Berechtigung";
+$a->strings["Unknown"] = "Unbekannt";
 $a->strings["Item not found."] = "Element nicht gefunden.";
 $a->strings["Collection not found."] = "Sammlung nicht gefunden";
 $a->strings["Collection is empty."] = "Sammlung ist leer.";
@@ -808,13 +808,113 @@ $a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf";
 $a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn Du Dich registriert hast (egal auf welchem Server in der Red-Matrix, sie sind alle miteinander verbunden) verbinde Dich bitte mit meinem Kanal in der Matrix. Adresse:";
 $a->strings["Click the [Register] link on the following page to join."] = "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden.";
 $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Für weitere Informationen über das Red-Matrix-Projekt und warum es das Potential hat, das Internet, wie wir es kennen, grundlegend zu verändern, besuche http://getzot.com";
-$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
-$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
-$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
-$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
-$a->strings["Wall Photos"] = "Wall Fotos";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
+$a->strings["Name is required"] = "Name ist erforderlich";
+$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
+$a->strings["Update"] = "Aktualisieren";
+$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
+$a->strings["Password changed."] = "Kennwort geändert.";
+$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
+$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
+$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
+$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Add application"] = "Anwendung hinzufügen";
+$a->strings["Name"] = "Name";
+$a->strings["Name of application"] = "Name der Anwendung";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Umleitung";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert";
+$a->strings["Icon url"] = "Symbol-URL";
+$a->strings["Optional"] = "Optional";
+$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
+$a->strings["Connected Apps"] = "Verbundene Apps";
+$a->strings["Client key starts with"] = "Client key beginnt mit";
+$a->strings["No name"] = "Kein Name";
+$a->strings["Remove authorization"] = "Authorisierung aufheben";
+$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
+$a->strings["Feature Settings"] = "Funktions-Einstellungen";
+$a->strings["Account Settings"] = "Konto-Einstellungen";
+$a->strings["Password Settings"] = "Kennwort-Einstellungen";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
+$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
+$a->strings["Email Address:"] = "Email Adresse:";
+$a->strings["Remove Account"] = "Konto entfernen";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden.";
+$a->strings["Off"] = "Aus";
+$a->strings["On"] = "An";
+$a->strings["Additional Features"] = "Zusätzliche Funktionen";
+$a->strings["Connector Settings"] = "Connector-Einstellungen";
+$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
+$a->strings["Display Theme:"] = "Anzeige-Theme:";
+$a->strings["Mobile Theme:"] = "Mobile Theme:";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
+$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
+$a->strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
+$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
+$a->strings["Do not view remote profiles in frames"] = "Profile/Kanäle direkt anzeigen";
+$a->strings["By default open in a sub-window of your own site"] = "Wenn dieser Haken nicht gesetzt ist, werden Profile in einem Unterfenster auf Deinem eigenen Server angezeigt.";
+$a->strings["Nobody except yourself"] = "Niemand außer Dir selbst";
+$a->strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
+$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
+$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
+$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
+$a->strings["Anybody authenticated"] = "Jeder authentifizierte";
+$a->strings["Anybody on the internet"] = "Jeder im Internet";
+$a->strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
+$a->strings["No"] = "Nein";
+$a->strings["Yes"] = "Ja";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+$a->strings["or"] = "oder";
+$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
+$a->strings["Channel Settings"] = "Kanal-Einstellungen";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
+$a->strings["Default Post Location:"] = "Standardstandort:";
+$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
+$a->strings["Adult Content"] = "Nicht jugendfreie Inhalte";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
+$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige Deines Online-Status in deinem Profil";
+$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphäre-Einstellungen";
+$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)";
+$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Typisch – Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)";
+$a->strings["Private - default private, never open or public"] = "Private – Default privat, nie offen oder öffentlich";
+$a->strings["Blocked - default blocked to/from everybody"] = "Blockiert – Alle per Default blockiert";
+$a->strings["Allow others to tag your posts"] = "Erlaube anderen deine Beiträge mit Schlagwörtern zu versehen";
+$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "";
+$a->strings["Advanced Privacy Settings"] = "Fortgeschrittene Privatsphäre-Einstellungen";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
+$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
+$a->strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte";
+$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
+$a->strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
+$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
+$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten, wenn:";
+$a->strings["accepting a friend request"] = "Du eine Kontaktanfrage annimmst";
+$a->strings["joining a forum/community"] = "Du einem Forum beitrittst";
+$a->strings["making an interesting profile change"] = "Du eine interessante Änderung an Deinem Profil vornimmst";
+$a->strings["Send a notification email when:"] = "Eine E-Mail-Benachrichtigung senden, wenn:";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
+$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
+$a->strings["Someone writes on your profile wall"] = "Jemand auf Deine Pinnwand schreibt";
+$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
+$a->strings["You are tagged in a post"] = "Du in einem Beitrag erwähnt wurdest";
+$a->strings["You are poked/prodded/etc. in a post"] = "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest";
+$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
+$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
+$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Aktiviere den Expertenmodus (unter Settings > Zusätzliche Funktionen), um hier Einstellungen vorzunehmen!";
+$a->strings["Miscellaneous Settings"] = "";
+$a->strings["Personal menu to display in your channel pages"] = "Persönliches Menü zur Anzeige auf den Seiten deines Kanals";
 $a->strings["Menu updated."] = "Menü aktualisiert.";
 $a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
 $a->strings["Menu created."] = "Menü erstellt.";
@@ -845,8 +945,6 @@ $a->strings["Authorize application connection"] = "Zugriff für die Anwendung au
 $a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
 $a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
-$a->strings["Yes"] = "Ja";
-$a->strings["No"] = "Nein";
 $a->strings["No installed applications."] = "Keine installierten Anwendungen.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["Edit post"] = "Bearbeite Beitrag";
@@ -854,6 +952,13 @@ $a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"
 $a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
 $a->strings["My Bookmarks"] = "Meine Lesezeichen";
 $a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
+$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
+$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
+$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+$a->strings["Wall Photos"] = "Wall Fotos";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]";
 $a->strings["Channel not found."] = "Kanal nicht gefunden.";
@@ -909,7 +1014,6 @@ $a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
 $a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
 $a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
 $a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
-$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
 $a->strings["Link text"] = "Link Text";
 $a->strings["URL of link"] = "URL des Links";
 $a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar";
@@ -955,7 +1059,6 @@ $a->strings["Pending registrations"] = "Ausstehende Registrierungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plug-Ins";
 $a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
-$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
 $a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility-Theme vorhanden";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Genehmigung erforderlich";
@@ -1114,7 +1217,6 @@ $a->strings["Unhide"] = "Wieder sichtbar machen";
 $a->strings["Hide"] = "Verstecken";
 $a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder wieder sichtbar machen";
 $a->strings["Delete this connection"] = "Verbindung löschen";
-$a->strings["Unknown"] = "Unbekannt";
 $a->strings["Approve this connection"] = "Verbindung genehmigen";
 $a->strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
 $a->strings["Automatic Permissions Settings"] = "Automatische Berechtigungs-Einstellungen";
@@ -1160,6 +1262,9 @@ $a->strings["Layout Name"] = "Layout-Name";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Page not found."] = "Seite nicht gefunden.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der du dich anmelden wolltest. Bitte überprüfe die Schreibweise der ID noch einmal.";
+$a->strings["The error message was:"] = "Die Fehlermeldung lautet:";
+$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
 $a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
 $a->strings["Authenticate"] = "Authentifizieren";
@@ -1330,9 +1435,9 @@ $a->strings["Version %s"] = "Version %s";
 $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
 $a->strings["Project Donations"] = "Projekt Spenden";
-$a->strings["
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
                                      "] = "";
+$a->strings["
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better, freer, and privacy respecting web. Select the following option for a one-time donation of your choosing
                                      "] = "";
 $a->strings["
                                      or
                                      "] = "
                                      oder
                                      ";
-$a->strings["Recurring Donation Options"] = "";
+$a->strings["Recurring Donation Options"] = "Optionen für regelmäßige Spenden";
 $a->strings["Red"] = "Red";
 $a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
 $a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
@@ -1362,104 +1467,6 @@ $a->strings["Forgot your Password?"] = "Kennwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
 $a->strings["Email Address"] = "E-Mail Adresse";
 $a->strings["Reset"] = "Zurücksetzen";
-$a->strings["Name is required"] = "Name ist erforderlich";
-$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
-$a->strings["Update"] = "Aktualisieren";
-$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
-$a->strings["Password changed."] = "Kennwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
-$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
-$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
-$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Add application"] = "Anwendung hinzufügen";
-$a->strings["Name"] = "Name";
-$a->strings["Name of application"] = "Name der Anwendung";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Umleitung";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert";
-$a->strings["Icon url"] = "Symbol-URL";
-$a->strings["Optional"] = "Optional";
-$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
-$a->strings["Connected Apps"] = "Verbundene Apps";
-$a->strings["Client key starts with"] = "Client key beginnt mit";
-$a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Authorisierung aufheben";
-$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
-$a->strings["Feature Settings"] = "Funktions-Einstellungen";
-$a->strings["Account Settings"] = "Konto-Einstellungen";
-$a->strings["Password Settings"] = "Kennwort-Einstellungen";
-$a->strings["New Password:"] = "Neues Passwort:";
-$a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
-$a->strings["Email Address:"] = "Email Adresse:";
-$a->strings["Remove Account"] = "Konto entfernen";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden.";
-$a->strings["Off"] = "Aus";
-$a->strings["On"] = "An";
-$a->strings["Additional Features"] = "Zusätzliche Funktionen";
-$a->strings["Connector Settings"] = "Connector-Einstellungen";
-$a->strings["Display Settings"] = "Anzeige-Einstellungen";
-$a->strings["Display Theme:"] = "Anzeige-Theme:";
-$a->strings["Mobile Theme:"] = "Mobile Theme:";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
-$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
-$a->strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
-$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
-$a->strings["Do not view remote profiles in frames"] = "";
-$a->strings["By default open in a sub-window of your own site"] = "";
-$a->strings["Nobody except yourself"] = "Niemand außer Dir selbst";
-$a->strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
-$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
-$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
-$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
-$a->strings["Anybody on the internet"] = "Jeder im Internet";
-$a->strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-$a->strings["or"] = "oder";
-$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
-$a->strings["Channel Settings"] = "Kanal-Einstellungen";
-$a->strings["Basic Settings"] = "Grundeinstellungen";
-$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
-$a->strings["Default Post Location:"] = "Standardstandort:";
-$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
-$a->strings["Adult Content"] = "Nicht jugendfreie Inhalte";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
-$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
-$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
-$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige Deines Online-Status in deinem Profil";
-$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphäre-Einstellungen";
-$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)";
-$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Typisch – Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)";
-$a->strings["Private - default private, never open or public"] = "Private – Default privat, nie offen oder öffentlich";
-$a->strings["Blocked - default blocked to/from everybody"] = "Blockiert – Alle per Default blockiert";
-$a->strings["Advanced Privacy Settings"] = "Fortgeschrittene Privatsphäre-Einstellungen";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
-$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
-$a->strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
-$a->strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
-$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
-$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten, wenn:";
-$a->strings["accepting a friend request"] = "Du eine Kontaktanfrage annimmst";
-$a->strings["joining a forum/community"] = "Du einem Forum beitrittst";
-$a->strings["making an interesting profile change"] = "Du eine interessante Änderung an Deinem Profil vornimmst";
-$a->strings["Send a notification email when:"] = "Eine E-Mail-Benachrichtigung senden, wenn:";
-$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
-$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
-$a->strings["Someone writes on your profile wall"] = "Jemand auf Deine Pinnwand schreibt";
-$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
-$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
-$a->strings["You are tagged in a post"] = "Du in einem Beitrag erwähnt wurdest";
-$a->strings["You are poked/prodded/etc. in a post"] = "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest";
-$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
-$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
-$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "";
 $a->strings["Nothing to import."] = "Nichts zu importieren.";
 $a->strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
 $a->strings["Imported file is empty."] = "Die importierte Datei ist leer.";
@@ -1509,6 +1516,7 @@ $a->strings["Private Conversation"] = "Private Unterhaltung";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Edit Layout"] = "Layout bearbeiten";
 $a->strings["Delete layout?"] = "Layout löschen?";
 $a->strings["Delete Layout"] = "Layout löschen";
-- 
cgit v1.2.3


From f9eddb89eff2601f8ef4318f16a8360296613935 Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Sat, 22 Feb 2014 16:10:46 +0100
Subject: Add option for narrow navbar instead of the bootstrap default

thick version
---
 view/theme/redbasic/css/narrow_navbar.css  | 27 +++++++++++++++++++++++++++
 view/theme/redbasic/php/config.php         |  3 +++
 view/theme/redbasic/php/style.php          |  4 ++++
 view/theme/redbasic/tpl/theme_settings.tpl |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 view/theme/redbasic/css/narrow_navbar.css

diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
new file mode 100644
index 000000000..51a0ec196
--- /dev/null
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -0,0 +1,27 @@
+.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
+.navbar {min-height:18px !important;}
+nav img {
+height: 25px;
+width: 25px;
+margin: 2px 0px 1px 10px;
+border-radius: 0px;
+}
+.navbar-left{height: 30px;}
+.container-fluid {min-height:30px;}
+.collapse .navbar-collapse {min-height:30px; max-height:30px;}
+#nav-search-text {margin:5px;}
+header #banner {margin-top:5px;}
+nav .dropdown-menu {
+top: 30px;}
+nav .badge {
+    position: relative;
+    top: -30px;
+    float: right;
+    font-size: 10px;
+    padding: 2px 6px;
+    cursor: pointer;
+}
+#jGrowl.top-right {
+	top: 30px;
+	right: 15px;
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 68a72fffd..2235a9742 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -6,6 +6,7 @@ function theme_content(&$a) {
 	$arr = array();
 
 	$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
+    $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' );
 	$arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' );
 	$arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' );
 	$arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' );
@@ -33,6 +34,7 @@ function theme_post(&$a) {
 
 	if (isset($_POST['redbasic-settings-submit'])) {
 		set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
+		set_pconfig(local_user(), 'redbasic', 'narrow_navbar', $_POST['redbasic_narrow_navbar']);
 		set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']);
 		set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
 		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
@@ -97,6 +99,7 @@ if(feature_enabled(local_user(),'expert'))
 		'$expert' => $expert,
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
+		'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']),		
 		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours),
 		'$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours),
 		'$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 8d5c23a03..901d06af7 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -14,6 +14,7 @@ if(! $a->install) {
 	    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");	
 
 // Load the owners pconfig
+		$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
 		$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
 	    $link_colour = get_pconfig($uid, "redbasic", "link_colour");	
 		$schema = get_pconfig($uid,'redbasic','schema');
@@ -213,3 +214,6 @@ echo str_replace(array_keys($options), array_values($options), $x);
 if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) {
 	echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css');
 } 
+if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
+	echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
+} 
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index cc573d99e..af2969397 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -5,6 +5,7 @@
 
 {{if $expert}}
 {{* include file="field_select.tpl" field=$nav_colour *}}
+{{include file="field_checkbox.tpl" field=$narrow_navbar}}
 {{include file="field_input.tpl" field=$banner_colour}}
 {{include file="field_input.tpl" field=$link_colour}}
 {{include file="field_input.tpl" field=$bgcolour}}
-- 
cgit v1.2.3


From a5f70f6c10705c655ad31e906626ac3513da00fe Mon Sep 17 00:00:00 2001
From: Christian Vogeley 
Date: Sat, 22 Feb 2014 20:30:41 +0100
Subject: little tweaks

---
 view/theme/redbasic/css/narrow_navbar.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 51a0ec196..b05f46797 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -1,5 +1,5 @@
 .navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
-.navbar {min-height:18px !important;}
+.navbar {min-height:25px !important;}
 nav img {
 height: 25px;
 width: 25px;
@@ -8,7 +8,7 @@ border-radius: 0px;
 }
 .navbar-left{height: 30px;}
 .container-fluid {min-height:30px;}
-.collapse .navbar-collapse {min-height:30px; max-height:30px;}
+.collapse .navbar-collapse {min-height:30px;}
 #nav-search-text {margin:5px;}
 header #banner {margin-top:5px;}
 nav .dropdown-menu {
-- 
cgit v1.2.3


From 075b7fa9c82d5b0663528d2cf5e6f28dd1c5f4ab Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 22 Feb 2014 13:33:18 -0800
Subject: This should resolve the dav authentication loop (correctly)

---
 include/auth.php     | 21 +++++++++++++++------
 include/reddav.php   |  2 ++
 include/security.php |  7 +++++--
 mod/ping.php         |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/include/auth.php b/include/auth.php
index a3b028c73..c21705c99 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -58,14 +58,17 @@ function account_verify_password($email,$pass) {
 }
 
 
-// login/logout 
-
+/**
+ * Inline - not a function
+ * look for auth parameters or re-validate an existing session
+ * also handles logout
+ */
 
 
+if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
 
 
-
-if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
+	// process a logout request
 
 	if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
 	
@@ -77,6 +80,8 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		goaway(z_root());
 	}
 
+	// re-validate a visitor, optionally invoke "su" if permitted to do so
+
 	if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
 		// if our authenticated guest is allowed to take control of the admin channel, make it so.
 		$admins = get_config('system','remote_admin');
@@ -106,9 +111,11 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		$a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
 	}
 
+	// already logged in user returning
+
 	if(x($_SESSION,'uid') || x($_SESSION,'account_id')) {
 
-		// already logged in user returning
+		// first check if we're enforcing that sessions can't change IP address
 
 		$check = get_config('system','paranoia');
 		// extra paranoia - if the IP changed, log them out
@@ -150,6 +157,8 @@ else {
 		nuke_session();
 	}
 
+	// handle a fresh login request
+
 	if((x($_POST,'password')) && strlen($_POST['password']))
 		$encrypted = hash('whirlpool',trim($_POST['password']));
 
@@ -188,7 +197,7 @@ else {
 				notice( t('Failed authentication') . EOL);
 			}
 
-			logger('authenticate: ' . print_r(get_app()->account,true));
+			logger('authenticate: ' . print_r(get_app()->account,true), LOGGER_DEBUG);
 
 		}
 
diff --git a/include/reddav.php b/include/reddav.php
index 6182aeacd..2a26ac42a 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -792,6 +792,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 				$this->channel_id = $r[0]['channel_id'];
 				$this->channel_hash = $this->observer = $r[0]['channel_hash'];
 				$_SESSION['uid'] = $r[0]['channel_id'];
+				$_SESSION['account_id'] = $r[0]['channel_account_id'];
 				$_SESSION['authenticated'] = true;
 				return true;
 			}
@@ -813,6 +814,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
 						$this->channel_id = $r[0]['channel_id'];
 						$this->channel_hash = $this->observer = $r[0]['channel_hash'];
 						$_SESSION['uid'] = $r[0]['channel_id'];
+						$_SESSION['account_id'] = $r[0]['channel_account_id'];
 						$_SESSION['authenticated'] = true;
             			return true;
         			}
diff --git a/include/security.php b/include/security.php
index 68dd573f7..f52615357 100644
--- a/include/security.php
+++ b/include/security.php
@@ -32,9 +32,12 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
 	}
 
-	if($login_initial)
+	if($login_initial) {
+
 		call_hooks('logged_in', $user_record);
-	
+
+		// might want to log success here
+	}
 
 	if($return || x($_SESSION,'workflow')) {
 		unset($_SESSION['workflow']);
diff --git a/mod/ping.php b/mod/ping.php
index 390613d7a..b9d9a9c77 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -28,7 +28,7 @@ function ping_init(&$a) {
 
 	header("content-type: application/json");
 
-	$result['invalid'] = ((local_user()) && (intval($_GET['uid'])) && (intval($_GET['uid']) != local_user()) ? 1 : 0);
+	$result['invalid'] = ((intval($_GET['uid'])) && (intval($_GET['uid']) != local_user()) ? 1 : 0);
 
 	if(x($_SESSION,'sysmsg')){
 		foreach ($_SESSION['sysmsg'] as $m){
-- 
cgit v1.2.3


From 5b4e3f46bca2def72fd2df2651eacdd853892a23 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sat, 22 Feb 2014 14:58:12 -0800
Subject: minor stuff, some doco, auth cleanup, and make "unknown" more
 translateable by context.

---
 include/items.php | 2 +-
 include/zot.php   | 4 ----
 mod/openid.php    | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/items.php b/include/items.php
index 1217616d7..d380a7939 100755
--- a/include/items.php
+++ b/include/items.php
@@ -753,7 +753,7 @@ function import_author_rss($x) {
 		values ( '%s', '%s', '%s', '%s' )",
 		dbesc($x['url']),
 		dbesc($x['url']),
-		dbesc(($name) ? $name : t('Unknown')),
+		dbesc(($name) ? $name : t('(Unknown)')),
 		dbesc('rss')
 	);
 	if($r) {
diff --git a/include/zot.php b/include/zot.php
index 298abb178..d7d7eb419 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1370,8 +1370,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
 			// remove_community_tag is a no-op if this isn't a community tag activity
 			remove_community_tag($sender,$arr,$channel['channel_id']);
 
-
-
 			$item_id = delete_imported_item($sender,$arr,$channel['channel_id']);
 			$result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
 
@@ -1414,8 +1412,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
 			}
 		}
 
-
-
 		$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
 			dbesc($arr['mid']),
 			intval($channel['channel_id'])
diff --git a/mod/openid.php b/mod/openid.php
index 1ab8749ee..b0d4008d4 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -42,6 +42,7 @@ function openid_content(&$a) {
 					        if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) {
 			            		logger('mod_openid: openid success for ' . $x[0]['channel_name']);
 								$_SESSION['uid'] = $r[0]['channel_id'];
+								$_SESSION['account_id'] = $r[0]['channel_account_id'];
 								$_SESSION['authenticated'] = true;
 								authenticate_success($record,true,true,true,true);
 								goaway(z_root());
-- 
cgit v1.2.3


From 2ccff45221905981c6942f1f3064d477113e959e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Sun, 23 Feb 2014 18:40:43 -0800
Subject: In case a page has overloaded a module, see if we already have a
 layout defined. Otherwise, if a pdl file exists for this module, use it.

---
 boot.php    | 5 ++++-
 version.inc | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index fb029c44e..be6b5c84b 100755
--- a/boot.php
+++ b/boot.php
@@ -1804,7 +1804,10 @@ function construct_page(&$a) {
 
 	require_once('include/comanche.php');
 
-	if(($p = theme_include('mod_' . $a->module . '.pdl')) != '')
+	// in case a page has overloaded a module, see if we already have a layout defined
+	// otherwise, if a pdl file exists for this module, use it
+
+	if((! count($a->layout)) && ($p = theme_include('mod_' . $a->module . '.pdl')) != '')
 		comanche_parser($a,@file_get_contents($p));
 
 	$comanche = ((count($a->layout)) ? true : false);
diff --git a/version.inc b/version.inc
index ad4b11889..490208526 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-22.596
+2014-02-23.597
-- 
cgit v1.2.3


From 8284901f9eda97457da1d4d5a74a0e24ee9249b3 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Mon, 24 Feb 2014 05:11:56 +0000
Subject: Make bbcode the default doco ready for the next commit

---
 mod/help.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/help.php b/mod/help.php
index a4ccd1cfe..bbfeb9a6c 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -60,7 +60,8 @@ function help_content(&$a) {
 		$a->page['title'] = t('Help');
 	}
 	if(! $text) {
-		$text = load_doc_file('doc/Home.md');
+		$doctype = 'bbcode';
+		$text = load_doc_file('doc/main.bb');
 		$a->page['title'] = t('Help');
 	}
 	
-- 
cgit v1.2.3


From 29f6975715b20597c6e19945ca5095f1e60dad42 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Mon, 24 Feb 2014 05:13:28 +0000
Subject: Import doco from docs@friendicared.net

---
 doc/about.bb                        |  24 +++
 doc/account_basics.bb               |  33 ++++
 doc/api_functions.bb                | 130 ++++++++++++++
 doc/campaign.bb                     | 234 ++++++++++++++++++++++++
 doc/channels.bb                     |  27 +++
 doc/checking_account_quota_usage.bb |  26 +++
 doc/cloud.bb                        |  25 +++
 doc/cloud_desktop_clients.bb        |  16 ++
 doc/comanche.bb                     | 146 +++++++++++++++
 doc/connecting_to_channels.bb       |  17 ++
 doc/dav_dolphin.bb                  |   9 +
 doc/dav_konqueror.bb                |  11 ++
 doc/dav_mount.bb                    |  63 +++++++
 doc/dav_nautilus.bb                 |   9 +
 doc/dav_nemo.bb                     |  19 ++
 doc/dav_windows.bb                  |  11 ++
 doc/debian_install.bb               |  29 +++
 doc/developer_function_primer.bb    |  45 +++++
 doc/developers.bb                   |  52 ++++++
 doc/external-resource-links.bb      |  22 +++
 doc/extra_features.bb               | 103 +++++++++++
 doc/features.bb                     | 111 ++++++++++++
 doc/git_for_non_developers.bb       |  46 +++++
 doc/install.bb                      | 103 +++++++++++
 doc/intro_for_developers.bb         |  99 ++++++++++
 doc/main.bb                         |  59 ++++++
 doc/permissions.bb                  |  97 ++++++++++
 doc/plugins.bb                      | 257 ++++++++++++++++++++++++++
 doc/problems-following-an-update.bb |  37 ++++
 doc/profiles.bb                     |  33 ++++
 doc/red2pi.bb                       | 349 ++++++++++++++++++++++++++++++++++++
 doc/remove_account.bb               |  17 ++
 doc/schema_development.bb           |  74 ++++++++
 doc/tags_and_mentions.bb            |  23 +++
 doc/to_do_code.bb                   |  51 ++++++
 doc/to_do_doco.bb                   |  21 +++
 doc/troubleshooting.bb              |   5 +
 doc/webpages.bb                     |  13 ++
 doc/what_is_zot.bb                  |  61 +++++++
 39 files changed, 2507 insertions(+)
 create mode 100644 doc/about.bb
 create mode 100644 doc/account_basics.bb
 create mode 100644 doc/api_functions.bb
 create mode 100644 doc/campaign.bb
 create mode 100644 doc/channels.bb
 create mode 100644 doc/checking_account_quota_usage.bb
 create mode 100644 doc/cloud.bb
 create mode 100644 doc/cloud_desktop_clients.bb
 create mode 100644 doc/comanche.bb
 create mode 100644 doc/connecting_to_channels.bb
 create mode 100644 doc/dav_dolphin.bb
 create mode 100644 doc/dav_konqueror.bb
 create mode 100644 doc/dav_mount.bb
 create mode 100644 doc/dav_nautilus.bb
 create mode 100644 doc/dav_nemo.bb
 create mode 100644 doc/dav_windows.bb
 create mode 100644 doc/debian_install.bb
 create mode 100644 doc/developer_function_primer.bb
 create mode 100644 doc/developers.bb
 create mode 100644 doc/external-resource-links.bb
 create mode 100644 doc/extra_features.bb
 create mode 100644 doc/features.bb
 create mode 100644 doc/git_for_non_developers.bb
 create mode 100644 doc/install.bb
 create mode 100644 doc/intro_for_developers.bb
 create mode 100644 doc/main.bb
 create mode 100644 doc/permissions.bb
 create mode 100644 doc/plugins.bb
 create mode 100644 doc/problems-following-an-update.bb
 create mode 100644 doc/profiles.bb
 create mode 100644 doc/red2pi.bb
 create mode 100644 doc/remove_account.bb
 create mode 100644 doc/schema_development.bb
 create mode 100644 doc/tags_and_mentions.bb
 create mode 100644 doc/to_do_code.bb
 create mode 100644 doc/to_do_doco.bb
 create mode 100644 doc/troubleshooting.bb
 create mode 100644 doc/webpages.bb
 create mode 100644 doc/what_is_zot.bb

diff --git a/doc/about.bb b/doc/about.bb
new file mode 100644
index 000000000..90992b925
--- /dev/null
+++ b/doc/about.bb
@@ -0,0 +1,24 @@
+[b]About[/b]
+
+The Red Matrix is a decentralized communication network, which aims to provide communication that is censorship-resistant, privacy-respecting, and thus free from the oppressive claws of contemporary corporate communication giants. These giants function primarily as spy networks for paying clients of all sorts and types, in addition to monopolizing and centralizing the Internet; a feature that was not part of the original and revolutionary goals that produced the World Wide Web. 
+
+The Red Matrix is free and open source.  It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers.  It can be used to support communication between a few individuals, or scale to many thousands and more.
+
+Red aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers. 
+
+How you use it depends on how you want to use it. 
+
+It is written in the PHP scripting language, thus making it trivial to install on any hosting platform in use today. This includes self-hosting at home, at hosting providers such as [url=http://mediatemple.com/]Media Temple[/url] and [url=http://www.dreamhost.com/]Dreamhost[/url], or on virtual and dedicated servers, offered by the likes of [url=https://www.linode.com]Linode[/url],  [url=http://greenqloud.com]GreenQloud[/url] or [url=https://aws.amazon.com]Amazon AWS[/url].
+
+In other words, the Red Matrix can run on any computing platform that comes with a web server, a MySQL-compatible database, and the PHP scripting language. 
+
+Along the way, Red offers a number of unique goodies: 
+
+[b][color= grey]Single-click user identification:[/color][/b] meaning you can access sites on the Red Matrix simply by clicking on links to remote sites. Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.
+
+[b][color= grey]Cloning:[/color][/b] of online identities. Your online presence no longer has to be tied to a single server, domain name or IP address.  You can clone and import your identity to another server (or, a hub as servers are known in the Red Matrix).  Now, should your primary hub go down, no worries, your contacts, posts, messages, and content will automagically continue to be available and accessible under your cloned identity. 
+
+[b][color= grey]Privacy:[/color][/b]  Red identities (Zot IDs) can be deleted, backed up/downloaded, and cloned.  The user is in full control of their data. Should you decide to delete all your content and erase your Zot ID, all you have to do is click on a link and it's immediately deleted from the hub.  No questions, no fuss. 
+
+Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+
diff --git a/doc/account_basics.bb b/doc/account_basics.bb
new file mode 100644
index 000000000..902ff8bd0
--- /dev/null
+++ b/doc/account_basics.bb
@@ -0,0 +1,33 @@
+[b]Account Basics[/b]
+
+[b]Registration[/b]
+
+Not all Red Matrix sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Red Matrix sites are linked, it does not matter where your account resides.
+
+[b]Your Email Address[/b]
+
+Please provide a valid email address. Your email address is never published. This address will be used to (optionally) send email notifications for incoming messages or items, and used to recover lost passwords.
+
+[b]Password[/b]
+
+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Red Matrix offers a decentralised identity, your account can log you in to many other websites.
+
+[b]Terms Of Service[/b]
+
+Click the link to read the site's terms of service. Once you've read them, tick the box in the register form to confirm.
+
+[b]Register[/b]
+
+Once you have provided the necessary details, click the 'Register' button. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval.
+
+[b]Create a Channel[/b]
+
+Next, you will be presented with the "Add a channel" screen. Normally, your first channel will be one that represents you - so using your own name (or psuedonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. The "choose a short nickname" box is similar to a "username" field. We will use whatever you enter here to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This looks like an email address, and takes the form nickname@siteyouregisteredat.xyz
+
+When your channel is created you will be taken straight to your settings page where you can define permissions, enable features, etc. All these things are covered in the appropriate section of the helpfiles.
+
+See Also
+
+[zrl=[baseurl]/help/permissions]Permissions[/zrl]
+[zrl=[baseurl]/help/profiles]Profiles[/zrl]
+[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
\ No newline at end of file
diff --git a/doc/api_functions.bb b/doc/api_functions.bb
new file mode 100644
index 000000000..13460c1b9
--- /dev/null
+++ b/doc/api_functions.bb
@@ -0,0 +1,130 @@
+[b]Red Twitter API[/b]
+
+The "basic" Red web API is based on the Twitter API, as this provides instant compatibility with a huge number of third-party clients and applications without requiring any code changes on their part. It is also a super-set of the StatusNet version of the Twitter API, as this also has existing wide support.
+
+Red has a lot more capability that isn't exposed in the Twitter interfaces or where we are forced to "dumb-down" the API functions to work with the primitive Twitter/StatusNet communications and privacy model. So we plan to extend the Twitter API in ways that will allow Red-specific clients to make full use of Red features without being crippled.
+
+A dedicated Red API is also being developed to work with native data structures and permissions and which do not require translating to different privacy and permission models and storage formats. This will be described in other documents. The prefix for all of the native endpoints is 'api/red'.
+
+Red provides multiple channels accesible via the same login account. With Red, any API function which requires authentication will accept a parameter &channel={channel_nickname} - and will select that channel and make it current before executing the API command. By default, the default channel associated with an account is selected.
+
+Red also provides an extended permission model. In the absence of any Red specific API calls to set permissions, they will be set to the default permissions settings which are associated with the current channel.
+
+Red will probably never be able to support the Twitter 'api/friendships' functions fully because Red is not a social network and has no concept of "friendships" - it only recognises permissions to do stuff (or not do stuff as the case may be).
+
+Legend: T= Twitter, S= StatusNet, F= Friendica, R= Red, ()=Not yet working, J= JSON only (XML formats deprecated)
+
+Twitter API compatible functions:
+
+    api/account/verify_credentials T,S,F,R
+    api/statuses/update T,S,F,R
+    api/users/show T,S,F,R
+    api/statuses/home_timeline T,S,F,R
+    api/statuses/friends_timeline T,S,F,R
+    api/statuses/public_timeline T,S,F,R
+    api/statuses/show T,S,F,R
+    api/statuses/retweet T,S,F,R
+    api/statuses/destroy T,S,F,(R)
+    api/statuses/mentions T,S,F,(R)
+    api/statuses/replies T,S,F,(R)
+    api/statuses/user_timeline T,S,F,(R)
+    api/favorites T,S,F,(R)
+    api/account/rate_limit_status T,S,F,R
+    api/help/test T,S,F,R
+    api/statuses/friends T,S,F,R
+    api/statuses/followers T,S,F,R
+    api/friends/ids T,S,F,R
+    api/followers/ids T,S,F,R
+    api/direct_messages/new T,S,F,(R)
+    api/direct_messages/conversation T,S,F,(R)
+    api/direct_messages/all T,S,F,(R)
+    api/direct_messages/sent T,S,F,(R)
+    api/direct_messages T,S,F,(R)
+    api/oauth/request_token T,S,F,R
+    api/oauth/access_token T,S,F,R
+
+Twitter API functions supported by StatusNet but not currently by Friendica or Red
+
+    api/favorites T,S
+    api/favorites/create T,S
+    api/favorites/destroy T,S
+    api/statuses/retweets_of_me T,S
+    api/friendships/create T,S
+    api/friendships/destroy T,S
+    api/friendships/exists T,S
+    api/friendships/show T,S
+    api/account/update_location T,S
+    api/account/update_profile_background_image T,S
+    api/account/update_profile_image T,S
+    api/blocks/create T,S
+    api/blocks/destroy T,S
+
+Twitter API functions not currently supported by StatusNet
+
+    api/statuses/retweeted_to_me T
+    api/statuses/retweeted_by_me T
+    api/direct_messages/destroy T
+    api/account/end_session T,(R)
+    api/account/update_delivery_device T
+    api/notifications/follow T
+    api/notifications/leave T
+    api/blocks/exists T
+    api/blocks/blocking T
+    api/lists T
+
+Statusnet compatible extensions to the Twitter API supported in both Friendica and Red
+
+    api/statusnet/version S,F,R
+    api/statusnet/config S,F,R
+
+Friendica API extensions to the Twitter API supported in both Friendica and Red
+
+    api/statuses/mediap F,R
+
+Red specific API extensions to the Twitter API not supported in Friendica
+
+    api/account/logout R
+    api/export/basic R,J
+    api/friendica/config R
+    api/red/config R
+    api/friendica/version R
+
+    api/red/version R
+
+    api/red/channel/export/basic R,J
+    api/red/channel/stream R,J (currently post only)
+    api/red/albums R,J
+    api/red/photos R,J (option album=xxxx)
+
+Red proposed API extensions to the Twitter API
+
+    api/statuses/edit (R),J
+    api/statuses/permissions (R),J
+    api/statuses/permissions/update (R),J
+    api/statuses/ids (R),J # search for existing message_id before importing a foreign post
+    api/files/show (R),J
+    api/files/destroy (R),J
+    api/files/update (R),J
+    api/files/permissions (R),J
+    api/files/permissions/update (R),J
+    api/pages/show (R),J
+    api/pages/destroy (R),J
+    api/pages/update (R),J
+    api/pages/permissions (R),J
+    api/pages/permissions/update (R),J
+    api/events/show (R),J
+    api/events/update (R),J
+    api/events/permissions (R),J
+    api/events/permissions/update (R),J
+    api/events/destroy (R),J
+    api/photos/show (R),J
+    api/photos/update (R),J
+    api/photos/permissions (R),J
+    api/photos/permissions/update (R),J
+    api/albums/destroy (R),J
+    api/albums/show (R),J
+    api/albums/update (R),J
+    api/albums/permissions (R),J
+    api/albums/permissions/update (R),J
+    api/albums/destroy (R),J
+    api/friends/permissions (R),J
\ No newline at end of file
diff --git a/doc/campaign.bb b/doc/campaign.bb
new file mode 100644
index 000000000..63a072d42
--- /dev/null
+++ b/doc/campaign.bb
@@ -0,0 +1,234 @@
+[b]Initial Indiegg pitch[/b]
+
+[b][color= grey][size=20]What have we done, and what we hope to achieve[/size][/color][/b]
+
+[b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b]
+
+We started the Red Matrix project by asking ourselves a few questions: 
+
+- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site.  Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites. 
+Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online. 
+
+We liked this idea and went ahead with coding it immediately. Today, single-click sign is in alpha state.  It needs more love, which means a solid three months of full-time development efforts.
+
+- Think of your Facebook, Twitter, WordPress, or any other website where you currently have an account. Now imagine being able to clone your account, to make an exact duplicate of it (with all of your friends, posts and settings), then export your cloned account into another server that is part of this communication network.  After you're done, both of your accounts are synced from the time they were cloned.  It doesn't matter where you log in (at your original location, or where you imported your clone). You see the same content, the same friends, posts, and account settings.  
+At that point, it is more appropriate to call your account an identity that is nomadic (it is not tied to one home, unless you choose to do so!).  
+It's 2013, our online presence no longer has to be tied to a single server, domain name or IP address.  We should be able to clone and import our identities to other servers.  In such a network, it should only matter who you are, not where you are.  
+
+We're very intrigued by the possibilities nomadic identities open up for freedom, censorship-resistance, and identity resilience.  Consider the following scenarios:
+
+  -- Should a repressive government or corporation decide to delete your account, your cloned identity lives on, because it is located on another server, across the world, which is part of the same communication network.  You can't be silenced!  
+
+  -- What if there is a server meltdown, and your identity goes off line.  No problem, you log into your clone and all is good.
+
+  -- Your server administrator can no longer afford to keep paying to support a free service (a labor love and principle, which all of us have participating in as system administrators of Friendica sites!). She notifies you that you must clone your account before the shutoff date.  Rather than loose all your friends, and start from scratch by creating a new identity somewhere, you clone and move to another server.  
+We feel this is especially helpful for the free web, where administrators of FOSS community sites are often faced with difficult financial decisions.  Since many of them rely on donations, sometimes servers have to be taken offline, when costs become prohibitive for the brave DIY souls running those server.  Nomadic identities should relieve some of the pressures associated with such situations.
+
+At the same time, we are also thinking of solutions that would make it possible for people running Red hubs to be financially sustainable.  To that end, we're starting to implement service classes in our code, which would allow administrators to structure paid levels of service, if they choose to do so.
+
+Today, nomadic identity is currently in alpha state.  It also needs more love, which means a solid three months of full-time development efforts.
+
+- Imagine a social network that is censorship-resistant, and privacy-respecting by design.  It is not controlled by one mega-corporation, and where users cannot be easily censored by oppressive governments.  So, in addition to nomadic identities, we are talking about decentralization, open source, freely software, that can run on any hardware that supports a database and a modern web browser.  And we mean "any hardware", from a self-hosted $35 Raspberry Pi, to the very latest Intel Xeon and AMD Bulldozer-powered server behemoths.
+
+We've realized that privacy requires full control over content.  We should be able to delete, backup and download all of our content, as well as associated account/identity information.  To this end, we have already implemented the initial version of account export and backup.
+
+Concerned about pages and pages of posts from months and years past?  The solution should be simple: visit your settings page, specify that all content older than 7 days, with the exception of starred posts, should be automatically deleted.  Done, the clutter is gone! (Consider also the privacy and anti-mass surveillance implications of this feature.  PRISM disclosures have hinted that three-letter spying agencies around the world are recording all internet traffic and storing it for a few days at a time.  We feel that automatic post expiration becomes a rather useful feature in this context, and implementing it is one of our near future priorities.)  
+
+[b][color= grey][size=18]The Affinity Slider and Access Control Lists[/size][/color][/b]
+
+- What if the permissions and access control lists that help secure modern operating systems were extended into a communication network that lived on the internet? This means somebody could log into this network from their home site, and with the simple click of a few buttons dynamically sort who can have access to their online content on a very fine level: from restricting others from seeing your latest blog post, to sharing your bookmarks with the world.
+
+We've coded the initial version of such a new feature. It is called the "Affinity Slider", and in our very-alpha user interface it looks like this.  
+[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img]
+
+{INSERT SCREENSHOT OF A MATRIX PAGE}
+
+Think of it as an easy way to filter content that you see, based on the degree of "closeness" to you.  Move the slider to Friends, and only content coming from contacts you've tagged as friends is displayed on your home page.  Uncluttering thousands of contacts, friends, RSS feeds, and other content should be a basic feature of modern communication on the web, but not at the expense of ease of use.  
+
+In addition to the Affinity Slider, we also have the ACL (Access Control List). Say you want to share something with only 5 of your contacts (a blog, two friends from college, and two forums).  You click on the padlock, choose the recipients, and that's it.  Only those identities will recieve their posts.  Furthermore, the post will be encrypted via PKI (pulic key encryption) to help maintain privacy.  In the age of PRISM, we don't know all the details on what's safe out there, but we still think that privacy by design should be automatically present, invisible to the user, and easy to use.
+Attaching permissions to any data that lives on this network, potentially solves a great many headaches, while achieving simplicity in communication.
+
+Think of it this way: the internet is nothing, but a bunch of permissions and a folder of data.  You, the user controls the permissions and thus the data that is relevant to you.
+
+[b][color= grey][size=20]The Matrix is Born![/size][/color][/b]
+
+After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features.  We called it the Red Matrix and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API.  The sum of the matrix is greater than it's parts.  We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.
+
+It's a lot of work, for anyone.  So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot.  We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication. 
+
+We need your help to finish it and release it to the world!
+
+[b][color= grey][size=20]What have we written so far[/size][/color][/b]
+
+As of the today, the Red Matrix is in developer preview (alpha) state.  It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state).  These include: 
+
+- Zot, the protocol powering the matrix
+- Single-signon logins.
+- Nomadic identities
+- Basic content manipulation: creation, deletion, rudimentary handling of photos, and media files
+- A bare-bones outline of the API and user documentation.
+
+
+[b][color= grey][size=20]Our TO-DO List[/size][/color][/b]
+
+However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make the Red Matrix ready for daily use.  If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: 
+
+- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git. 
+
+- Comanche, our new markup language, similar to BBCode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly.  You can read more about it on our github wiki: https://github.com/friendica/red/wiki/Comanche
+
+- A unique help system that lives in the matrix, but is not based on the principles of a search engine.  We have some interesting ideas about decentralizing help documentation, without going down the road of distributed search engines.  Here's a hint:  We shouldn't be searching at all, we should just be filtering what's already there in new, and cunning ways.
+
+- An appropriate logo, along with professionally done documentation system, both for our API, as well as users.
+
+- WordPress-like single button software upgrades
+
+- A built-in development environment, using an integrated web-based code editor such as Ace9
+
+[b][color= grey][size=20]What will the money be used for[/size][/color][/b]
+
+If we raise our targeted amount of funds, we plan to use it as follows: 
+
+1) Fund 6 months {OR WHATEVER} of full time work for our current core  developers, Mike, Thomas, and Tobias {ANYONE ELSE?]
+
+2) Pay a professional web developer to design an kick ass reference theme, along with a project logo.  
+
+3) {WHAT ELSE?}
+
+[b][color= grey][size=20]Deadlines[/size][/color][/b]
+
+[b]March, 2014: Red Matrix Beta with the following features[/b]
+
+- {LIST FEATURES}
+
+[b][color= grey][size=20]Who We Are[/size][/color][/b]
+
+Mike: {FILL IN BIO, reference Friendica, etc.}
+
+Thomas: {bio blurb}
+
+Tobias: {bio blurb}
+
+Arto: {documentation, etc.}
+
+{WHO ELSE?  WE NEED A TEAM, AT LEAST 3-4 PEOPLE}
+
+[b][color= grey][size=20]What Do I Get as a Supporter?[/size][/color][/b]
+
+Our ability to reach 1.0 stable release depends on your generosity and support. We appreciate your help, regardless of the amount!  Here's what we're thinking as far as different contribution levels go:
+
+[b]$1: {CATCHY TAGLINE}[/b]
+
+We'll list your name on our initial supporters list, a Hall of Fame of the matrix!
+
+[b]$5:[/b]
+
+[b]$10: [/b]
+
+[b]$16: [/b]
+
+You get one of your Red Matrix t-shirts, as well as our undying gratitude.  
+
+[b]$32:  [/b]
+
+[b]$64 [/b]
+
+[b]128 [/b]
+
+[b]$256: [/b]
+
+[b]$512: [/b]
+
+[b]$1024 [/b]
+
+[b]$2048[/b]
+
+Each contributor at this level gets their own Red Matrix virtual private server, installed, hosted and supported by us for a period of 1 year. 
+
+[b][color= grey][size=20]Why are we so excited about the Red Matrix?[/size][/color][/b]
+
+{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC>
+
+[b][color= grey][size=20]Other Ways to Help[/size][/color][/b]
+
+We're a handful of volunteers, and we understand that not everyone can contribute by donating money.  There are many other ways you can in getting the Matrix to version 1.0!
+
+First, you can checkout our source code on github: https://github.com/friendica/red  
+
+Maybe you can dive in and help us out with some development.
+
+Second, you can install the current developer preview on a server and start  compiling bug reports.
+
+Third, register at one of the public alpha Red hubs, and get a feel for what Red is trying to do!
+
+Perhaps you're good at writing and documenting stuff.  Grab an account at one of the public alphas and give us a hand.
+
+[b][color= grey][size=20]Frequently Asked Questions[/size][/color][/b]
+
+[b]1. Is Red a social network?[/b]
+
+The Red Matrix is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.
+
+[b]2. What is the difference between Red and Friendica?[/b]
+
+What's the difference between a passport, and a postcard?
+
+Friendica is really, really good at sending postcards. It can do all sorts of things with postcards.  It can send them to your friends.  It can send them to people you don't know.  It can put them in an envelope and send them privately.  It can run them through a photocopier and plaster them all over the internet.  It can even take postcards in one language and convert them to many others so your friends who speak a different language can read them.
+
+What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are.  Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity.
+
+The Red Matrix offers a passport.
+
+You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity.  No longer do you need to register at every single site you use.  You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead. 
+
+Once you've proven your identity, a Red hub lets you use our services, as though you'd registered with directly, and we'd verified your credentials as would have happened in the olden days.  These resources can, of course, be anything at all.
+
+[b]2. Why did you choose PHP, instead of Ruby or Python?[/b]
+
+The reference implementation is in PHP.  We chose PHP, because it is available everywhere, and is easily configurable.  We understand the debates between proponents and opponents of PHP, Ruby and Python.  Nothing prevents implementations of Zot and the matrix in those languages. In fact, people on the matrix have already started developing a version of Red in Python [SOURCE?], and there is talk about future implementations in C (aiming for blazing native performance) and Java.  It's free and open source, so we feel it's only a matter of time, once Red is initially completed.
+
+[b]4. Other than PHP, what other technology does Red use?[/b]
+
+We use MySQL as our database (this include any forks such as, MariaDB or Percona), and any modern webserver (Apache, nginx, etc.).
+
+[b]5. How is the Affinity Slider different from Mozilla's Persona?[/b]
+{COMPLETE}
+
+[b]6. Does the Red Matrix use encryption?  Details please![/b]
+
+Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance.
+
+Communication between web browsers and Red hubs is encrypted using SSL certificates.
+
+Private communication on the matrix  is protected by AES symmetric encryption, which is itself protected by RSA PKI (public key encryption). By default, we use AES-256-CBC, and our RSA keys are set to 4096-bits.
+
+For more info on our initial implementation of encrypted communication, check out our source code at Github: https://github.com/friendica/red/blob/master/include/crypto.php
+
+[b]7. What do you mean by decentralization? [/b]
+
+
+[b]8. Can I build my own website with in the Red Matrix?[/b]
+
+Yes.  The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix.  The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix.
+
+The longer explanation: Comanche is a markup language, similar to bbcode, with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Description Language file (".pdl", pronounced "puddle") to create these pages. Bbcode is not a requirement; an XML PDL file could also be used. The tag delimiters would be different. Usage is the same.
+
+Additional information is available on our Github project wiki: https://github.com/friendica/red/wiki/Comanche
+
+Comanche is another one of our priorities for the next six months.
+
+[b]9. Where can I see some technical description of Zot?[/b]
+
+Our github wiki contains a number of high-level and technical descriptions of Zot, Comanche, and Red in general: https://github.com/friendica/red/wiki
+
+[b]10. What happens if you raise more than {TARGETED NUMBER}?[/b]
+
+Raising more than our initial goal of funds, will speed up our development efforts.  More developers will be able to take time off from other jobs, and concentrate efforts on finishing Red.
+
+[b]11 Can I make a contribution via Bitcoin?[/b]
+
+{YES/NO}
+
+[b]12. I have additional Questions[/]
+
+Awesome. We'd be more than happy to chat. You can find us {HERE}
\ No newline at end of file
diff --git a/doc/channels.bb b/doc/channels.bb
new file mode 100644
index 000000000..3be1211a6
--- /dev/null
+++ b/doc/channels.bb
@@ -0,0 +1,27 @@
+[b]Channels[/b]
+
+Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be "Me".
+
+The most important features for a channel that represents "me" are:
+
+Secure and private "spam free" communications
+
+Identity and "single-signon" across the entire network
+
+Privacy controls and permissions which extend to the entire network
+
+Directory services (like a phone book)
+
+In short, a channel that represents yourself is "me, on the internet".
+
+You will be required to create your first channel as part of the sign up process. You can also create additonal channels from the "Select channel" link.
+
+You will be asked to provide a channel name, and a short nick name. For a channel that represents yourself, it is a good idea to use your real name here to ensure your friends can find you, and connect to your channel. The short nickname will be used to generate a "webbie". This is a bit like a username, and will look like an email address, taking the form nickname@domain. You should put a little thought into what you want to use here. Imagine somebody asking for your webbie and having to tell them it is "llamas-are_kewl.123". "llamasarecool" would be a much better choice.
+
+Once you have created your channel, you will be taken to the settings page, where you can configure your channel, and set your default permissions.
+
+Once you have done this, your channel is ready to use. At [observer.url] you will find your channel "stream". This is where your recent activity will appear, in reverse chronological order. If you post in the box marked "share", the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The "About" tab contains your "profile", the photos page contain photo albums, and the events page contains events share by both yourself and your contacts.
+
+The "Matrix" page contains all recent posts from across the matrix, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.
+
+As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the permissions section.
\ No newline at end of file
diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb
new file mode 100644
index 000000000..198b15bfd
--- /dev/null
+++ b/doc/checking_account_quota_usage.bb
@@ -0,0 +1,26 @@
+[b]Checking your account quota usage (service limits usage)[/b]
+
+Your hub might implement service class limits, assigning limits to the total size of file, photo, channels, top-level posts, etc., that can be created by an account holder for a specific service level.
+
+Here's how you can quickly check how much of your assigned quota you're currently using:
+ 
+[b][color= grey]Check file storage quota levels[/color][/b]
+Visit the following URL in your browser:
+[code]
+https://{Red-domain}/filestorage/{your_username}
+[/code]
+
+Example:
+[code]https://friendicared.net/filestorage/test2
+[/code]
+
+[b][color= grey]Check uploaded photos storage quota levels[/color][/b]
+[code]
+https://{Red-domain}photos/{your_username}/upload/
+[/code]
+
+Example:
+[code]https://friendicared.net/photos/test2/upload/
+[/code]
+
+Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
diff --git a/doc/cloud.bb b/doc/cloud.bb
new file mode 100644
index 000000000..8997b88fe
--- /dev/null
+++ b/doc/cloud.bb
@@ -0,0 +1,25 @@
+[b]Personal Cloud Storage[/b]
+
+The Red Matrix provides an ability to store privately and/or share arbitrary files with friends.
+
+You may either upload files from your computer into your storage area, or copy them directly from the operating system using the WebDAV protocol.
+
+On many public servers there may be limits on disk usage.
+
+[b]File Attachments[/b]
+
+The quickest and easiest way to share files is through file attachments. In the row of icons below the status post editor is a tool to upload attachments. Click the tool, select a file and submit. After the file is uploaded, you will see an attachment code placed inside the text region. Do not edit this line or it may break the ability for your friends to see the attachment. You can use the post permissions dialogue box or privacy hashtags to restrict the visibility of the file - which will be set to match the permissions of the post your are sending.
+
+To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/filestorage/{{username}}" replacing {{username}} with the nickname you provided during channel creation.
+
+[b]Web Access[/b]
+
+Your files are visible on the web at the location "cloud/{{username}}" to anybody who is allowed to view them. If the viewer has sufficient privileges, they may also have the ability to create new files and folders/directories.
+
+[b]WebDAV access[/b]
+
+See: [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl]
+
+[b]Permissions[/b]
+
+When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit "filestorage/{{username}}"; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate collections of channels.
\ No newline at end of file
diff --git a/doc/cloud_desktop_clients.bb b/doc/cloud_desktop_clients.bb
new file mode 100644
index 000000000..b715678d9
--- /dev/null
+++ b/doc/cloud_desktop_clients.bb
@@ -0,0 +1,16 @@
+[b]Cloud Desktop Clients[/b]
+
+[b]Windows Clients[/b]
+
+[li][zrl=[baseurl]/help/dav_windows]Windows Internal Client[/zrl][/li]
+
+
+[b]Linux Clients[/b]
+
+[li][zrl=[baseurl]/help/dav_mount]Command Line as a Filesystem[/zrl][/li]
+[li][zrl=[baseurl]/help/dav_dolphin]Dolphin[/zrl][/li]
+[li][zrl=[baseurl]/help/dav_konqueror]Konqueror[/zrl][/li]
+[li][zrl=[baseurl]/help/dav_nautilus]Nautilus[/zrl][/li]
+[li][zrl=[baseurl]/help/dav_nemo]Nemo[/zrl][/li]
+
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/comanche.bb b/doc/comanche.bb
new file mode 100644
index 000000000..ea2069b35
--- /dev/null
+++ b/doc/comanche.bb
@@ -0,0 +1,146 @@
+[b]Comanche Page Description Language[/b]
+
+Comanche is a markup language similar to bbcode with which to create elaborate and complex web pages by assembling them from a series of components - some of which are pre-built and others which can be defined on the fly. Comanche uses a Page Decription Language to create these pages.
+
+Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose.
+
+Currently there are two layout templates, unless your site provides additional layouts (TODO list all templates)
+
+[code]
+	default
+
+	The default template defines a "nav" region across the top, "aside" as a fixed width sidebar, 
+	"content" for the main content region, and "footer" for a page footer.
+
+
+	full
+
+	The full template defines the same as the default template with the exception that there is no "aside" region.
+[/code]
+
+To choose a layout template, use the 'layout' tag.
+
+[code]
+	[layout]full[/layout]
+[/code]
+
+The default template will be used if no other template is specified. The template can use any names it desires for content regions. You will be using 'region' tags to decide what content to place in the respective regions.
+
+
+Two "macros" have been defined for your use.
+[code]
+	$nav - replaced with the site navigation bar content.
+	$content - replaced with the main page content.
+[/code]
+
+By default, $nav is placed in the "nav" page region and $content is placed in the "content" region. You only need to use these macros if you wish to re-arrange where these items appear, either to change the order or to move them to other regions.
+
+
+To select a theme for your page, use the 'theme' tag.
+[code]
+	[theme]apw[/theme]
+[/code]
+This will select the theme named "apw". By default your channel's preferred theme will be used.
+
+
+[b]Regions[/b]
+
+Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag.
+
+[code]
+	[region=aside]....content goes here....[/region]
+	[region=nav]....content goes here....[/region]
+[/code]
+
+
+[b]Menus and Blocks[/b]
+
+Your webpage creation tools allow you to create menus and blocks, in addition to page content. These provide a chunk of existing content to be placed in whatever regions and whatever order you specify. Each of these has a name which you define when the menu or block is created.
+[code]
+	[menu]mymenu[/menu]
+[/code]
+This places the menu called "mymenu" at this location on the page, which must be inside a region. 
+[code]
+	[block]contributors[/block]
+[/code]
+This places a block named "contributors" in this region.
+
+
+[b]Widgets[/b]
+
+Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. (TODO: list available widgets and arguments). The base system provides
+[code]
+	profile - widget which duplicates the profile sidebar of your channel page. This widget takes no arguments
+	tagcloud - provides a tag cloud of categories
+		count - maximum number of category tags to list	
+[/code]
+
+
+Widgets and arguments are specified with the 'widget' and 'arg' tags.
+[code]
+	[widget=recent_visitors][arg=count]24[/arg][/widget]
+[/code]
+
+This loads the "recent_visitors" widget and supplies it with the argument "count" set to "24". 
+ 
+
+[b]Comments[/b]
+
+The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page.
+
+[code]
+	[comment]This is a comment[/comment] 
+[/code]
+ 
+
+[b]Complex Example[/b]
+
+[code]
+	[comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment]
+
+	[layout]3-column-with-header[/layout]
+
+	[comment]Use the "darknight" theme[/comment]
+
+	[theme]darkknight[/theme]
+
+	[comment]Use the existing site navigation menu[/comment]
+
+	[region=nav]$nav[/region]
+
+	[region=side]
+
+		[comment]Use my chosen menu and a couple of widgets[/comment]
+
+		[menu]myfavouritemenu[/menu]
+
+		[widget=recent_visitors]
+			[arg=count]24[/arg]
+			[arg=names_only]1[/arg]
+		[/widget]
+
+		[widget=tagcloud][/widget]
+		[block]donate[/block]
+
+	[/region]
+
+
+
+	[region=middle]
+
+		[comment]Show the normal page content[/comment]
+
+		$content
+
+	[/region]
+
+
+
+	[region=right]
+
+		[comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment]
+
+		[widget]channel[/widget]
+
+	[/region]
+[/code]
\ No newline at end of file
diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb
new file mode 100644
index 000000000..b81abc7bd
--- /dev/null
+++ b/doc/connecting_to_channels.bb
@@ -0,0 +1,17 @@
+[b]Connecting To Channels[/b]
+
+Connections in the Red Matrix can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
+
+First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.
+
+The next thing you can do is look at the Directory. The directory is available on every Red Matrix website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later.
+
+To connect with other Red Matrix channels:
+
+Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called "connect". Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel. If you don't allow any permissions, communication will be very limited. There are some quick links which you can use to avoid setting individual permissions. To provide a social network environment, "Full Sharing" is recommended. You may review the settings that are applied with the quick links to ensure they are suitable for the channel you are connecting with and adjust if necessary. Then scroll to the bottom of the page and click "Submit".
+
+You may also connect with any channel by visiting the "Connections" page of your site or the Directory and typing their "webbie" into the "Add New Connection" field. Use this method if somebody tells you their webbie and you wish to connect with them. A webbie looks like an email address; for example "bob@example.com". The process is the same as connecting via the "Connect" button - you will then be taken to the connection editor to set permissions.
+
+[b]Premium Channels[/b]
+
+Some channels are designated "Premium Channels" and may require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel.
\ No newline at end of file
diff --git a/doc/dav_dolphin.bb b/doc/dav_dolphin.bb
new file mode 100644
index 000000000..4429303d3
--- /dev/null
+++ b/doc/dav_dolphin.bb
@@ -0,0 +1,9 @@
+[b]Using The Cloud - Dolphin[/b]
+
+Visit webdavs://example.com/cloud where "example.com" is the URL of your hub.
+
+When prompted for a username and password, enter your username (the first part of your webbie - no @ or domain name) and password for your normal account.
+
+Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication.
+
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/dav_konqueror.bb b/doc/dav_konqueror.bb
new file mode 100644
index 000000000..f44c11fb2
--- /dev/null
+++ b/doc/dav_konqueror.bb
@@ -0,0 +1,11 @@
+[b]Using The Cloud - Konqueror[/b]
+
+Simply visit webdavs://example.com/cloud after logging in to your hub, where "example.com" is the URL of your hub.
+
+No further authentication is required if you are logged in to your hub in the normal manner.  
+
+Additionally, if one has authenticated at a different hub during their normal browser session, your identity will be passed to the cloud for these hubs too - meaning you can access any private files on any server, as long as you have permissions to see them, as long as you have visited that site earlier in your session.
+
+This functionality is normally restricted to the web interface, and is not available to any desktop software other than KDE.
+
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb
new file mode 100644
index 000000000..f86e2a6e5
--- /dev/null
+++ b/doc/dav_mount.bb
@@ -0,0 +1,63 @@
+[b]Mounting As A Filesystem[/b]
+
+To install your cloud directory as a filesystem, you first need davfs2 installed.  99% of the time, this will be included in your distributions repositories.  In Debian
+
+[code]apt-get install davfs2[/code]
+
+If you want to let normal users mount the filesystem
+
+[code] dpkg-reconfigure davfs2[/code]
+
+and select "yes" at the prompt.
+
+Now you need to add any user you want to be able to mount dav to the davfs2 group
+
+[code]usermod -aG davfs2 <DesktopUser>[/code]
+
+Edit /etc/fstab
+
+[code]nano /etc/fstab[/code]
+
+ to include your cloud directory by adding
+
+[code]
+example.com/cloud/ /mount/point davfs user,noauto,uid=<DesktopUser>,file_mode=600,dir_mode=700 0 1
+[/code]
+
+Where example.com is the URL of your hub, /mount/point is the location you want to mount the cloud, and <DesktopUser> is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.
+
+For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be 
+
+[code]example.com/cloud/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1[/code]
+
+Now, create the mount point.
+
+[code]mkdir /home/bob/cloud[/code]
+
+and also create a directory file to store your credentials
+
+[code]mkdir /home/bob/.davfs2[/code]
+
+Create a file called 'secrets'
+
+[code]nano /home/bob/.davfs2/secrets[/code]
+
+and add your cloud login credentials
+
+[code]
+example.com/cloud <username> <password>
+[/code]
+
+Where <username> and <password> are the username and password [i]for your hub[/i].
+
+Don't let this file be writeable by anyone who doesn't need it with
+
+[code]chmod 600 /home/bob/.davfs2/secrets[/code]
+
+Finally, mount the drive.
+
+[code]mount example.com/cloud[/code]
+
+You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves.
+
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/dav_nautilus.bb b/doc/dav_nautilus.bb
new file mode 100644
index 000000000..d3c478aa0
--- /dev/null
+++ b/doc/dav_nautilus.bb
@@ -0,0 +1,9 @@
+[b]Using The Cloud - Nautilus[/b]
+
+1. Open a File browsing window (that's Nautilus)
+2. Select File > Connect to server from the menu
+3. Type davs://<domain_name>/cloud/<your_username> and click Connect
+4. You will be prompted for your username (same as above) and password
+5. Your personal DAV directory will be shown in the window
+
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/dav_nemo.bb b/doc/dav_nemo.bb
new file mode 100644
index 000000000..a2553c1d5
--- /dev/null
+++ b/doc/dav_nemo.bb
@@ -0,0 +1,19 @@
+[b]Using The Cloud - Nemo[/b]
+
+For (file browser) Nemo 1.8.2 under Linux Mint 15, Cinnamon 1.8.8. Nemo ist the standard file browser there.
+
+1st way
+type "davs://yourusername@friendicared.net/cloud" in the address bar
+
+2nd way
+Menu > file > connect to server
+Fill the dialog
+- Server: friendicared.net
+- Type: Secure WebDAV (https)
+- Folder: /cloud
+- Username: yourusername
+- Passwort: yourpasswort
+
+Once open you can set a bookmark.
+ 
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/dav_windows.bb b/doc/dav_windows.bb
new file mode 100644
index 000000000..600944b68
--- /dev/null
+++ b/doc/dav_windows.bb
@@ -0,0 +1,11 @@
+[b]Using The Cloud - Windows Internal Client[/b]
+
+RedDav using Windows 7 graphical user interface wizard:
+1. Left-click the Start-button to open the start menu.
+2. Right-click the My computer icon to access its menu.
+3. Left-click Map network drive... to open the connection dialog wizard.
+4. Type #^[url=https://example.net/cloud/your_user_name]https://example.net/cloud/your_user_name[/url] in the textbox and click the Complete button where "example.net" is the URL of your hub.
+5. Type your Red account's user name. IMPORTANT - NO at-sign or domain name.
+6. Type your Red password
+
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
diff --git a/doc/debian_install.bb b/doc/debian_install.bb
new file mode 100644
index 000000000..b2e74fdde
--- /dev/null
+++ b/doc/debian_install.bb
@@ -0,0 +1,29 @@
+[b]Installing On Debian[/b]
+
+While following the instructions for any other installation will work on Debian, for this platform we also provide an install script which can be [zrl=https://friendicared.net/cloud/docs/debian-setup.sh]downloaded here[/zrl]
+
+[b]THIS SCRIPT IS MEANT TO BE RUN ON A NEW OR JUST REINSTALLED SERVER[/b]
+
+Some programs such as Apache & Samba are removed by this script.
+
+Note, this script will use Nginx as the webserver, and dropbear for ssh.  It will also install PHP and MySQL from the DotDeb repository.  The DotDeb is not an official Debian repository, though it is maintained by Debian developers.
+
+The file setup-debian.sh has to be on your server.
+
+For the initial setup git may not be installed on your server, to install git:
+
+[code]apt-get install git[/code]
+
+If wget is installed try
+
+[code]wget --no-check-certificate --timestamping [zrl=https://friendicared.net/cloud/docs/setup-debian.sh]https://friendicared.net/cloud/docs/debian-setup.sh[/zrl][/code]
+
+To install wget:
+[code]apt-get install wget[/code]
+
+For intitial server setup run
+[code]bash setup-debian.sh all[/code]
+
+To install Red for domain example.com, after the initial server setup run
+
+[code]bash setup-debian.sh red example.com[/code]
\ No newline at end of file
diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb
new file mode 100644
index 000000000..8a41c81f4
--- /dev/null
+++ b/doc/developer_function_primer.bb
@@ -0,0 +1,45 @@
+[b]Red development - some useful basic functions[/b]
+
+[b]get_account_id()[/b]
+
+Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel.
+
+[b]local_user()[/b]
+
+Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code.
+
+[b]remote_user()[/b]
+
+Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string.
+
+[b]get_app()[/b]
+
+Returns the global app structure ($a).
+
+[b]App::get_observer()[/b]
+
+(App:: is usually assigned to the global $a), so $a->get_observer() or get_app()->get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
+
+[b]get_config($family,$key), get_pconfig($uid,$family,$key)[/b]
+
+Returns the config setting for $family and $key or false if unset.
+
+[b]    set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b]
+
+Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id).
+
+[b]dbesc()[/b]
+
+Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval()
+
+[b]q($sql,$var1...)[/b]
+
+Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't.
+
+[b]t($string)[/b]
+
+Returns the translated variant of $string for the current language or $string (default 'en' language) if the language is unrecognised or a translated version of the string does not exist.
+
+[b]x($var), $x($array,$key)[/b]
+
+Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0;
\ No newline at end of file
diff --git a/doc/developers.bb b/doc/developers.bb
new file mode 100644
index 000000000..b925d31fb
--- /dev/null
+++ b/doc/developers.bb
@@ -0,0 +1,52 @@
+[b]Red Developer Guide[/b]
+
+[b]Here is how you can join us.[/b]
+
+First, get yourself a working git package on the system where you will be
+doing development.
+
+Create your own github account.
+
+You may fork/clone the Red repository from [url=https://github.com/friendica/red.git]https://github.com/friendica/red.git[/url]
+
+Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url]
+to create and use your own tracking fork on github
+
+Then go to your github page and create a "Pull request" when you are ready
+to notify us to merge your work.
+
+[b]Translations[/b]
+
+Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.   
+
+[zrl=https://friendicared.net/pages/doc/translations]Translations - More Info[/zrl]
+
+[b]Important[/b]
+
+Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
+
+Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. 
+
+Further documentation can be found at the Github wiki pages at: [url=https://github.com/friendica/red/wiki]https://github.com/friendica/red/wiki[/url]
+
+[b]Licensing[/b]
+
+All code contributed to the project falls under the MIT license, unless otherwise specified. We will accept third-party code which falls under MIT, BSD and LGPL, but copyleft licensing (GPL, and AGPL) is only permitted in addons. It must be possible to completely remove the GPL (copyleft) code from the main project without breaking anything.
+
+[b]Coding Style[/b]
+
+In the interests of consistency we adopt the following code styling. We may accept patches using other styles, but where possible please try to provide a consistent code style. We aren't going to argue or debate the merits of this style, and it is irrelevant what project 'xyz' uses. This is not project 'xyz'. This is a baseline to try and keep the code readable now and in the future. 
+
+[li] All comments should be in English.[/li]
+
+[li] We use doxygen to generate documentation. This hasn't been consistently applied, but learning it and using it are highly encouraged.[/li]
+
+[li] Indentation is accomplished primarily with tabs using a tab-width of 4.[/li]
+
+[li] String concatenation and operators should be separated by whitespace. e.g. "$foo = $bar . 'abc';" instead of "$foo=$bar.'abc';"[/li]
+
+[li] Generally speaking, we use single quotes for string variables and double quotes for SQL statements. "Here documents" should be avoided. Sometimes using double quoted strings with variable replacement is the most efficient means of creating the string. In most cases, you should be using single quotes.[/li]
+
+[li] Use whitespace liberally to enhance readability. When creating arrays with many elements, we will often set one key/value pair per line, indented from the parent line appropriately. Lining up the assignment operators takes a bit more work, but also increases readability.[/li]
+
+[li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li]
\ No newline at end of file
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
new file mode 100644
index 000000000..09ac48a47
--- /dev/null
+++ b/doc/external-resource-links.bb
@@ -0,0 +1,22 @@
+[b]External Resource Links[/b]
+
+[b][color= grey][size=24]External Links[/size][/color][/b]
+[b]Third-Party Themes[/b]
+
+[*][url=https://github.com/beardy-unixer/apw]APW[/url]
+[*][url=https://github.com/omigeot/redstrap3]Redstrap[/url]
+[*][url=https://github.com/23n/Pluto]Pluto[/url]
+[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]
+
+[b]Third-Party Addons[/b]
+[*][url=https://github.com/beardy-unixer/red-addons-extra]BBCode Extensions for Webpages/Wikis[/url]
+[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url]
+
+[b]Related Projects[/b]
+
+[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url]
+[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url]
+[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]
+
+[b]Utilities[/b]
+[*][url=https://github.com/beardy-unixer/lowendscript-ng]Debian Install Script[/url]
\ No newline at end of file
diff --git a/doc/extra_features.bb b/doc/extra_features.bb
new file mode 100644
index 000000000..91a16d365
--- /dev/null
+++ b/doc/extra_features.bb
@@ -0,0 +1,103 @@
+[b]Features[/b]
+
+The default interface of the Red Matrix was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.
+
+[b]Content Expiration[/b]
+
+Remove posts/comments and/or private messages at a future time. An extra button is added to the post editor which asks you for an expiration. Typically this in "yyyy-mm-dd hh:mm" format, but in the English language you have a bit more freedom and can use most any recognisable date reference such as "next Thursday" or "+1 day". At the specified time (give or take approximately ten minutes based on the remote system's checking frequency) the post is removed.
+
+[b]Multiple Profiles[/b]
+
+The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secondary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned.
+
+[b]Web Pages[/b]
+
+Provides the ability to use web page design feaures and create custom webpages from your own content and also to design the pages with page layouts, custom menus, and content blocks.
+
+[b]Private Notes[/b]
+
+On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes.
+
+[b]Enhanced Photo Albums[/b]
+
+Provides a photo album viewer that is a bit prettier than the normal interface.
+
+[b]Extended Identity Sharing[/b]
+
+By default your identity travels with you as you browse the matrix to remote sites - and they know who you are and can show you content that only you can see. With Extended Identity Sharing you can provide this information to any website you visit from within the matrix.
+
+[b]Expert Mode[/b]
+
+This allows you to see some advanced configuration options that would confuse some people or cause support issues. In particular this can give you full control over theme features and colours - so that you can tweak a large number of settings of the display theme to your liking.
+
+[b]Premium Channel[/b]
+
+This allows you to set restrictions and terms on those that connect with your channel. This may be used by celebrities or anybody else who wishes to describe their channel to people who wish to connect with it. In certain cases you may be asked for payment in order to connect.
+
+[b]Richtext Editor[/b]
+
+The status post editor is plaintext, but the matrix allows a wide range of markup using BBcode. The visual editor provides "what you see is what you get" for many of the most frequently used markup tags.
+
+[b]Post Preview[/b]
+
+Allows previewing posts and comments exactly as they would look on the page before publishing them.
+
+[b]Channel Sources[/b]
+
+Automatically import and re-publish channel content from other channels or feeds. This allows you to create sub-channels and super-channels from content provided elsewhere. The rules are that the content must be public, and the channel owner must give you permission to source their channel.
+
+[b]Even More Encryption[/b]
+
+Private messages are encrypted during transport and storage. In this day and age, this encyption may not be enough if your communications are extremely sensitive. This options lets you provide optional encryption of content "end-to-end" with a shared secret key. How the recipient learns the secret key is completely up to you. You can provide a hint such as "the name of aunt Claire's first dog".
+
+[b]Search by Date[/b]
+
+This provides the ability to select posts by date ranges
+
+[b]Collections Filter[/b]
+
+Enable widget to display stream posts only from selected collections. This also toggles the outbound permissions while you are viewing a collection. This is analogous to Google "circles" or Disapora "aspects".
+
+[b]Saved Searches[/b]
+
+Provides a search widget on your matrix page which can save selected search terms for re-use.
+
+[b]Personal Tab[/b]
+
+Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation.
+
+[b]New Tab[/b]
+
+Enables a tab to display all new matrix activity as a firehose or timeline.
+
+[b]Affinity Tool[/b]
+
+Filter matrix stream activity by the depth of your relationships
+
+[b]Edit Sent Posts[/b]
+
+Edit and correct posts and comments after sending
+
+[b]Tagging[/b]
+
+Ability to tag existing posts, including those written by others.
+
+[b]Post Categories[/b]
+
+Add categories to your channel posts
+
+[b]Saved Folders[/b]
+
+Ability to file posts under folders or tags for later recall
+
+[b]Dislike Posts[/b]
+
+Ability to dislike posts/comments
+
+[b]Star Posts[/b]
+
+Ability to mark special posts with a star indicator
+
+[b]Tag Cloud[/b]
+
+Provide a personal tag cloud on your channel page
\ No newline at end of file
diff --git a/doc/features.bb b/doc/features.bb
new file mode 100644
index 000000000..8fcbef02f
--- /dev/null
+++ b/doc/features.bb
@@ -0,0 +1,111 @@
+[b]Features[/b]
+
+[b][color= grey][size=24]Red Matrix Features[/size][/color][/b]
+
+
+The Red Matrix is a general-purpose communication network, with several unique features.  It is designed to be used by the widest range of users on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.
+
+This page lists some of the core features of Red that are bundled with the official.  As we any free and open source software, there many other extensions, additions, plugins, themes and configurations that limited only by the needs and imagination of Red's users.
+
+[b][color= grey][size=20]Built for Privacy and Freedom[/size][/color][/b]
+
+One of the design goals of Red is to enable easy communication on the web, while preserving privacy, if so desired by users.  To achieve this goal, Red includes a number of features allowing arbitrary levels of privacy:
+
+[b][color= grey]Affinity Slider[/color][/b]
+
+When adding contacts in the Red Matrix, users have the option of assigning affinity levels to the new member in their contact list.  For example, when adding someone who happens to be a person who's blog you follow, you could assign their channel an affinity level of "Acquaintances". 
+
+[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img]
+
+On the other hand, when adding a friend's channel, they could be placed under the affinity level of "Friends".
+
+At this point, Red's [i]Affinity Slider[/i] tool, which usually appears at the top of your "Matrix" page, allows content on your Red account to be displayed by desired affinity levels. By moving the slider to cover all contacts with affinity levels of "Me" to "Friends", only contacts (or channels) that are marked as "Me", "Best Friends", and "Friends" will be displayed on your page.  All other channels and contacts, such as the contact added under affinity level "Acquaintances", will not be displayed.
+
+The Affinity Slider allows instantaneous filtering of large amounts of content, grouped by levels of closeness.
+
+[b][color= grey]Access Control Lists[/color][/b]
+
+When sharing content with someone in their contact list, users have the option of restricting who sees the content.  By clicking on the padlock underneath the sharing box, one could choose desired recipients of the post, by clicking on their names.
+
+Once sent, the message will be viewable only by the sender and the selected recipients.  In other words, the message will not appear on any public walls.
+
+
+[b][color=grey]Private Message Encryption and Privacy Concerns[/color][/b]
+
+In the Red Matrix, public messages are not encrypted prior to leaving the originating server, they are also stored in the database in clear text.
+
+Messages marked [b][color=white]private[/color][/b], however, are encrypted with AES-CBC 256-bit symmetric cipher, which is then protected (encrypted in turn) by public key cryptography, based on 4096-bit RSA keys, associated with the channel that is sending the message.  
+
+Each Red channel has it's own unique set of private and associated public RSA 4096-bit keys, generated when the channels is first created.  
+
+[b][color= grey]TLS/SSL[/color][/b]
+
+For Red hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL.  Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways.
+
+[b][color= grey]Channel Settings[/color][/b]
+
+In Red, each channel allows fine-grained permissions to be set for various aspects of communication.  For example, under the "Security and Privacy Settings" heading, each aspect on the left side of the page, has six (6) possible viewing/access options, that can be selected by clicking on the dropdown menu.
+
+[img]https://friendicared.net/photo/0f5be8da282858edd645b0a1a6626491.png[/img]
+
+The six options are:
+
+ - Nobody except yourself.
+ - Only those you specifically allow.
+ - Anybody in your address book.
+ - Anybody on this website.
+ - Anybody in this network.
+ - Anybody on the Internet.
+
+
+[b][color= grey]Account Cloning[/color][/b]
+
+Accounts in the Red Matrix are called to as [i]nomadic identities[/].  Nomadic, because a user's identity (see What is Zot? for the full explanation) is stuck to the hub where the identity was originally created.  For example, when you created your Facebook, or Gmail account, it is tied to those services.  They cannot function without Facebook.com or Gmail.com.  
+
+By contrast, say you've created a Red identity called [b][color=white]tina@redhub.com[/color][/b].  You can clone it to another Red hub by choosing the same, or a different name: [b][color=white]liveForever@SomeRedMatrixHub.info[/color][/b]
+
+Both channels are now synchronized, which means all your contacts and preferences will be duplicated on your clone.  It doesn't matter whether you send a post from your original hub, or the new hub.  Posts will be mirrored on both accounts.
+
+This is a rather revolutionary feature, if we consider some scenarios:
+
+ - What happens if the hub where an identity is based, suddenly goes offline?  Without cloning, a user will not be able to communicate until that hub comes back online.  With cloning, you just log into your cloned account, and life goes on happily ever after.
+
+ - The administrator of your hub can no longer afford to pay for his free and public Red Matrix hub. He announces that the hub will be shutting down in two weeks.  This gives you ample time to clone your identity(ies) and preserve your Red relationships, friends and content.
+
+ - What if your identity is subject to government censorship?  Your hub provider is compelled to delete your account, along with any identities and associated data.  With cloning, the Red Matrix offers [b][color=white]censorship resistance [/color][/b].  You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.  
+
+Red offers interesting new possibilities for privacy. You can read more at the <<Private Communications Best Practices>> page.
+
+Some caveats apply. For a full explanation of identity cloning, read the <HOW TO CLONE MY IDENTITY>.
+
+
+[b][color= grey]Account Backup[/color][/b]
+
+Red offers a simple, one-click account backup, where you can download a complete backup of your profile(s).  
+
+Backups can then be used to clone or restore a profile.
+
+[b][color= grey]Account Deletion[/color][/b]
+
+Accounts can be immediately deleted by clicking on a link. That's it.  All associated content is immediately deleted from the matrix (this includes posts and any other content produced by the deleted profile).
+
+[b][color=grey][size=20]Content Creation[/size][/color][/b]
+
+[b][color=white]Writing Posts[/color][/b]
+
+Red supports a number of different ways of adding content, from a graphical text editor, to various types of markup and pure HTML.
+
+Red bundles the TinyMCE rich text editor, which can be turned on under "Settings."
+For user who prefer not to use TinyMCE, content can be entered by typing BBCode markup.
+Furthermore, when creating "Websites" or using "Comanche" and its PCL[FINISH], content can be entered in HTML, Markdown and plain text.
+
+[b][color=white]Deletion of content[/color][/b]
+Any content created in the Red Matrix remains under the control of the user (or channel) that originally created.  At any time, a user can delete a message, or a range of messages.  The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot.
+
+[b][color=white]Media[/color][/b]
+Similar to any other modern blogging system, social network, or a micro-blogging service, Red supports the uploading of files, embedding of videos, linking web pages.
+
+[b][color=white]Previewing[/color][/b] 
+Post can be previewed prior to sending.
+
+Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb
new file mode 100644
index 000000000..e68634da1
--- /dev/null
+++ b/doc/git_for_non_developers.bb
@@ -0,0 +1,46 @@
+[b]Git For Non-Developers[/b]
+
+So you're handling a translation, or you're contributing to a theme, and every time you make a pull request you have to talk to one of the developers before your changes can be merged in?
+
+Chances are, you just haven't found a quick how-to explaining how to keep things in sync on your end.  It's really very easy.
+
+After you've created a fork of the repo (just click "fork" at github), you need to clone your own copy.
+
+For the sake of examples, we'll assume you're working on a theme called redexample (which does not exist).
+
+[code]git clone https://github.com/username/red.git[/code]
+
+Once you've done that, cd into the directory, and add an upstream.
+
+[code]
+cd red
+git remote add upstream https://github.com/friendica/red
+[/code]
+
+From now on, you can pull upstream changes with the command
+[code]git fetch upstream[/code]
+
+Before your changes can be merged automatically, you will often need to merge upstream changes.
+
+[code]
+git merge upstream/master
+[/code]
+
+You should always merge upstream before pushing any changes, and [i]must[/i] merge upstream with any pull requests to make them automatically mergeable.
+
+99% of the time, this will all go well.  The only time it won't is if somebody else has been editing the same files as you - and often, only if they have been editing the same lines of the same files.  If that happens, that would be a good time to request help until you get the hang of handling your own merge conflicts.
+
+Then you just need to add your changes [code]git add view/theme/redexample/[/code]
+
+This will add all the files in view/theme/redexample and any subdirectories.  If your particular files are mixed throughout the code, you should add one at a time.  Try not to do git add -a, as this will add everything, including temporary files (we mostly, but not always catch those with a .gitignore) and any local changes you have, but did not intend to commit.
+
+Once you have added all the files you have changed, you need to commit them.  [code]git commit[/code]
+
+This will open up an editor where you can describe the changes you have made.  Save this file, and exit the editor.
+
+Finally, push the changes to your own git
+[code]git push[/code]
+
+And that's it!
+
+Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
diff --git a/doc/install.bb b/doc/install.bb
new file mode 100644
index 000000000..ef9ed2ca6
--- /dev/null
+++ b/doc/install.bb
@@ -0,0 +1,103 @@
+[b]Red Installation[/b]
+
+Red should run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Red is more than a simple web application.  The kind of functionality offered by Red requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Red. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation.
+
+Also if you encounter installation issues, please let us know via the Github issue tracker (#^[url=https://github.com/friendica/red/issues]https://github.com/friendica/red/issues[/url]). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.   
+
+Before you begin: Choose a domain name or subdomain name for your server. 
+
+1. Requirements
+    - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a
+local .htaccess file
+
+    - PHP  5.3 or later
+        - PHP *command line* access with register_argc_argv set to true in the
+php.ini file
+        - curl, gd, mysql, and openssl extensions
+        - some form of email server or email gateway such that PHP mail() works
+        - mcrypt (optional; used for server-to-server message encryption)
+
+    - Mysql 5.x
+
+    - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
+(Windows) [Note: other options are presented in Section 7 of this document] 
+
+    - Installation into a top-level domain or sub-domain (without a
+directory/path component in the URL) is preferred. Directory paths will
+not be as convenient to use and have not been thoroughly tested.
+
+
+    [Dreamhost.com offers all of the necessary hosting features at a
+reasonable price. If your hosting provider doesn't allow Unix shell access,
+you might have trouble getting everything to work.]
+
+2. Unpack the Red files into the root of your web server document area.
+
+    - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be 
+
+        `git clone #^[url=https://github.com/friendica/red.git]https://github.com/friendica/red.git[/url] mywebsite`
+
+    - and then you can pick up the latest changes at any time with
+
+        `git pull`
+        
+    - make sure folder *view/tpl/smarty3* exists and is writable by webserver
+        
+        `mkdir view/tpl/smarty3`
+        
+        `chmod 777 view/smarty3`
+    
+    - For installing addons
+    
+        - First you should be **on** your website folder
+        
+            `cd mywebsite`
+            
+        - Then you should clone the addon repository (separtely)
+        
+            `git clone #^[url=https://github.com/friendica/red-addons.git]https://github.com/friendica/red-addons.git[/url] addon`
+            
+        - For keeping the addon tree updated, you should be on you addon tree and issue a git pull
+        
+            `cd mywebsite/addon`
+            
+            `git pull`
+            
+    - If you copy the directory tree to your webserver, make sure
+    that you also copy .htaccess - as "dot" files are often hidden
+    and aren't normally copied.
+
+
+3. Create an empty database and note the access details (hostname, username, password, database name).
+
+4. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing.
+
+5. *If* the automated installation fails for any reason, check the following:
+
+    - ".htconfig.php" exists ... If not, edit htconfig.php and change system settings. Rename
+to .htconfig.php
+    - Database is populated. ... If not, import the contents of "database.sql" with phpmyadmin
+or mysql command line
+
+6. At this point visit your website again, and register your personal account.
+Registration errors should all be recoverable automatically.
+If you get any *critical* failure at this point, it generally indicates the
+database was not installed correctly. You might wish to move/rename
+.htconfig.php to another name and empty (called 'dropping') the database
+tables, so that you can start fresh.
+
+7. Set up a cron job or scheduled task to run the poller once every 15
+minutes in order to perform background processing. Example:
+
+    `cd /base/directory; /path/to/php include/poller.php`
+
+Change "/base/directory", and "/path/to/php" as appropriate for your situation.
+
+If you are using a Linux server, run "crontab -e" and add a line like the
+one shown, substituting for your unique paths and settings:
+
+`*/15 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php`
+
+You can generally find the location of PHP by executing "which php". If you
+have troubles with this section please contact your hosting provider for
+assistance. Red will not work correctly if you cannot perform this step.
\ No newline at end of file
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb
new file mode 100644
index 000000000..002088be3
--- /dev/null
+++ b/doc/intro_for_developers.bb
@@ -0,0 +1,99 @@
+[b]Red Developer Guide[/b]
+
+[b]File system layout:[/b]
+
+[addon] optional addons/plugins
+
+[boot.php] Every process uses this to bootstrap the application structure
+
+[doc] Help Files
+
+[images] core required images
+
+[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing
+
+[index.php] The front-end controller for web access
+
+[install] Installation and upgrade files and DB schema
+
+[js] core required javascript
+
+[library] Third party modules (must be license compatible)
+
+[mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php)
+
+[spec] protocol specifications
+
+[util] translation tools, main English string database and other miscellaneous utilities
+
+[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git)
+
+[view] theming and language files
+
+[view/(css,js,img,php,tpl)] default theme files
+
+[view/(en,it,es ...)] language strings and resources
+
+[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides
+
+[b]The Database:[/b]
+
+    [li]abook - contact table, replaces Friendica 'contact'[/li]
+    [li]account - service provider account[/li]
+    [li]addon - registered plugins[/li]
+    [li]attach - file attachments[/li]
+    [li]auth_codes - OAuth usage[/li]
+    [li]cache - TBD[/li]
+    [li]challenge - old DFRN structure, may re-use or may deprecate[/li]
+    [li]channel - replaces Friendica 'user'[/li]
+    [li]clients - OAuth usage[/li]
+    [li]config - main configuration storage[/li]
+    [li]event - Events[/li]
+    [li]fcontact - friend suggestion stuff[/li]
+    [li]ffinder - friend suggestion stuff[/li]
+    [li]fserver - obsolete[/li]
+    [li]fsuggest - friend suggestion stuff[/li]
+    [li]gcign - ignored friend suggestions[/li]
+    [li]gcontact - social graph storage, obsolete[/li]
+    [li]glink - social graph storage - obsolete[/li]
+    [li]group - privacy groups[/li]
+    [li]group_member - privacy groups[/li]
+    [li]hook - plugin hook registry[/li]
+    [li]hubloc - Red location storage, ties a location to an xchan[/li]
+    [li]intro - DFRN introductions, may be obsolete[/li]
+    [li]item - posts[/li]
+    [li]item_id - other identifiers on other services for posts[/li]
+    [li]mail - private messages[/li]
+    [li]manage - may be unused in Red, table of accounts that can "su" each other[/li]
+    [li]notify - notifications[/li]
+    [li]notify-threads - need to factor this out and use item thread info on notifications[/li]
+    [li]outq - Red output queue[/li]
+    [li]pconfig - personal (per channel) configuration storage[/li]
+    [li]photo - photo storage[/li]
+    [li]profile - channel profiles[/li]
+    [li]profile_check - DFRN remote auth use, may be obsolete[/li]
+    [li]queue - old Friendica queue, obsolete[/li]
+    [li]register - registrations requiring admin approval[/li]
+    [li]session - web session storage[/li]
+    [li]site - site table to find directory peers[/li]
+    [li]spam - unfinished[/li]
+    [li]term - item taxonomy (categories, tags, etc.) table[/li]
+    [li]tokens - OAuth usage[/li]
+    [li]verify - general purpose verification structure[/li]
+    [li]xchan - replaces 'gcontact', list of known channels in the universe[/li]
+    [li]xlink - "friends of friends" linkages derived from poco[/li]
+    [li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li]
+    [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li]
+
+    
+[b]How to theme Red - by Olivier Migeot[/b]
+
+This is a short documentation on what I found while trying to modify Red's appearance.
+
+First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it .
+
+Oh, and don't forget to rename the _init function in /php/theme.php to be _init() instead of redbasic_init().
+
+At that point, if you need to add javascript or css files, add them to /js or /css, and then "register" them in _init() through head_add_js('file.js') and head_add_css('file.css').
+
+Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory.
\ No newline at end of file
diff --git a/doc/main.bb b/doc/main.bb
new file mode 100644
index 000000000..5db1736e9
--- /dev/null
+++ b/doc/main.bb
@@ -0,0 +1,59 @@
+[b]Red Matrix Documentation and Resources[/b]
+
+Contents
+
+[zrl=[baseurl]/help/about]What is the Red Matrix?[/zrl]
+[zrl=[baseurl]/help/features]Red Matrix Features[/zrl]
+[zrl=[baseurl]/help/what_is_zot] What is Zot?[/zrl]
+
+[b]Using the Red Matrix[/b]
+
+[zrl=[baseurl]/help/account_basics]Account Basics[/zrl]
+[zrl=[baseurl]/help/profiles]Profiles[/zrl]
+[zrl=[baseurl]/help/channels]Channels[/zrl]
+[zrl=[baseurl]/help/connecting_to_channels]Connecting to Channels[/zrl]
+[zrl=[baseurl]/help/permissions]Permissions[/zrl]
+[zrl=[baseurl]/help/cloud]Cloud Storage[/zrl]
+
+[b]But Wait - There's More. MUCH More...[/b]
+
+[zrl=[baseurl]/help/tags_and_mentions]Tags and Mentions[/zrl]
+[zrl=[baseurl]/help/webpages]Web Pages[/zrl]
+[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
+[zrl=[baseurl]/help/extra_features]BBcode reference for posts and comments[/zrl]
+[zrl=[baseurl]/help/checking_account_quota_usage]Checking Account Quota Usage[/zrl]
+[zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl]
+
+[b]For Hub Administrators[/b]
+
+[zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]
+[zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]
+[zrl=[baseurl]/help/problems-following-an-update]Problems Following A Software Update[/zrl]
+[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
+
+
+[b]Technical Documentation[/b]
+
+[zrl=[baseurl]/help/install]Install[/zrl]
+[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl]
+[zrl=[baseurl]/help/plugins]Plugins[/zrl]
+[zrl=[baseurl]/help/schema_development]Schemas[/zrl]
+[zrl=[baseurl]/help/developers]Developers[/zrl]
+[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl]
+[zrl=[baseurl]/help/api_functions]API functions[/zrl]
+[zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl]
+[zrl=https://friendicared.net/doc/html/]Code Reference (doxygen generated - sets cookies)[/zrl]
+[zrl=[baseurl]/help/to_do_doco]To-Do list for the Red Documentation Project[/zrl]
+[zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl]
+[zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]
+
+[b]External Resources[/b]
+
+[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]
+[url=https://github.com/friendica/red]Main Website[/url]
+[url=https://github.com/friendica/red-addons]Addon Website[/url]
+[url=https://zothub.com/channel/one]Development Channel[/url]
+
+[b]About[/b]
+
+[url=https://friendicared.net/siteinfo] Site/Version Info[/url]
\ No newline at end of file
diff --git a/doc/permissions.bb b/doc/permissions.bb
new file mode 100644
index 000000000..69ee62139
--- /dev/null
+++ b/doc/permissions.bb
@@ -0,0 +1,97 @@
+[b]Permissions[/b]
+
+Permissions in the Red Matrix are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
+
+[b]Default Permissions[/b]
+
+On your settings page, you will find a list of default permissions. These permissions are automatically applied to everybody unless you specify otherwise. The scope of these permissions varies from "Only me" to "Everybody" - though some scopes may not be available for some permissions. For example, you can't allow "anybody on the internet" to send you private messages, because we'd have no way to identify the sender, therefore no way to reply to them.
+
+The scopes of permissions are:
+
+[li]Nobody Except Yourself. This is self explanatory. Only you will be allowed to use this permission.[/li]
+
+[li]Only those you specifically allow. By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen.[/li]
+
+[li]Anybody in your address book. Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions.[/li]
+
+[li]Anybody On This Website. Anybody using the same website as you will have permission approved. Anybody who registered at a different site will have this permission denied.[/li]
+
+[li]Anybody in this network. Anybody in the Red Matrix will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
+Anybody on the internet. Completely public. This permission will be approved for anybody at all.[/li]
+
+The individual permissions are:
+
+[i]Can view my "public" stream and posts.[/i]
+
+This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in.
+
+[i]Can view my "public" channel profile.[/i]
+
+This permission determines who can view your channel's profile. This refers to the "about" tab
+
+[i]Can view my "public" photo albums.[/i]
+
+ This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience.
+
+[i]Can view my "public" address book.[/i]
+
+This permission determines who can view your contacts. These are the connections displayed in the "View connections" section.
+
+[i]Can view my "public" file storage.[/i]
+
+This permission determines who can view your public files. This isn't done yet, so this is placeholder text.
+
+[i]Can view my "public" pages.[/i]
+
+This permission determines who can view your public web pages. This isn't done yet, so this is placeholder text.
+
+[i]Can send me their channel stream and posts.[/i]
+
+This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery.
+
+[i]Can post on my channel page ("wall").[/i]
+
+This permission determines who can write to your wall when clicking through to your channel.
+
+[i]Can comment on my posts.[/i]
+
+This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public pages" permission
+
+[i]Can send me private mail messages.[/i]
+
+This determines who can send you private messages (zotmail).
+
+[i]Can post photos to my photo albums.[/i]
+
+This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other.
+
+[i]Can forward to all my channel contacts via post tags.[/i]
+
+Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way.
+
+[i]Can chat with me (when available).[/i]
+
+This determines who can join the public chat rooms created by your channel.
+
+[i]Can write to my "public" file storage.[/i]
+
+This determines who can upload files to your public file storage. This isn't done yet, so this is placeholder text.
+
+[i]Can edit my "public" pages.[/i]
+
+This determines who can edit your webpages. This is useful for wikis or sites with multiple editors.
+
+[i]Can administer my channel resources.[/i]
+
+This determines who can have full control of your channel. This should normally be set to "nobody except myself".
+
+[i]Note:[/i]
+Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here.
+
+If you have set any of these permissions to "only those I specifically allow", you may specify indivudal permissions on the connnection edit screen.
+
+[b]Affinity[/b]
+
+The connection edit screen offers a slider to select a degree of friendship with the connnection (this tool is enabled through the "Extra Features" tab of your Settings page). Think of this as a measure of how much you like or dislike them. 1 is for people you like, whose posts you want to see all the time. 99 is for people you don't care for, and whose posts you might only wish to look at occasionally. Once you've assigned a value here, you can use the affinity tool on the matrix page to filter content based on this number.
+
+The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature.
\ No newline at end of file
diff --git a/doc/plugins.bb b/doc/plugins.bb
new file mode 100644
index 000000000..2440de762
--- /dev/null
+++ b/doc/plugins.bb
@@ -0,0 +1,257 @@
+[b]Plugins[/b]
+
+So you want to make the Red Matrix do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. 
+
+
+In your Red Matrix folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. 
+[code]
+	mkdir addon
+[/code]
+Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters.
+
+Once you've chosen a name, create a directory beneath 'addon' to hold your working file or files.
+[code]
+	mkdir addon/randplace
+[/code]
+Now create your plugin file. It needs to have the same name, and it's a PHP script, so using your favourite editor, create the file
+[code]
+	addon/randplace/randplace.php
+[/code]
+The very first line of this file needs to be
+[code]
+	<?php
+[/code]
+Then we're going to create a comment block to describe the plugin. There's a special format for this. We use /* ... */ comment-style and some tagged lines consisting of
+[code]
+	/**
+	 *
+	 * Name: Random Place (here you can use better descriptions than you could in the filename)
+	 * Description: Sample Red Matrix plugin, Sets a random place when posting.
+	 * Version: 1.0
+	 * Author: Mike Macgirvin <mike@zothub.com>
+	 *
+	 */
+[/code]
+These tags will be seen by the site administrator when he/she installs or manages plugins from the admin panel. There can be more than one author. Just add another line starting with 'Author:'.
+
+The typical plugin will have at least the following functions:
+[code]
+ pluginname_load()
+ pluginname_unload()
+[/code]
+In our case, we'll call them randplace_load() and randplace_unload(), as that is the name of our plugin. These functions are called whenever we wish to either initialise the plugin or remove it from the current webpage. Also if your plugin requires things like altering the database schema before it can run for the very first time, you would likely place these instructions in the functions named
+[code]
+ pluginname_install()
+ pluginname_uninstall()
+[/code]
+
+Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
+
+We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. 
+
+[code]
+	function randplace_load() {
+	    register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+
+    	register_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+    	register_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+
+	}
+[/code]
+
+So we're going to catch three events, 'post_local' which is triggered when a post is made on the local system, 'feature_settings' to set some preferences for our plugin, and 'feature_settings_post' to store those settings. 
+
+Next we'll create an unload function. This is easy, as it just unregisters our hooks. It takes exactly the same arguments. 
+[code]
+	function randplace_unload() {
+	    unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+
+    	unregister_hook('feature_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+    	unregister_hook('feature_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+
+	}
+[/code]
+
+Hooks are called with two arguments. The first is always $a, which is our global App structure and contains a huge amount of information about the state of the web request we are processing; as well as who the viewer is, and what our login state is, and the current contents of the web page we're probably constructing.
+
+The second argument is specific to the hook you're calling. It contains information relevant to that particular place in the program, and often allows you to look at, and even change it. In order to change it, you need to add '&' to the variable name so it is passed to your function by reference. Otherwise it will create a copy and any changes you make will be lost when the hook process returns. Usually (but not always) the second argument is a named array of data structures. Please see the "hook reference" (not yet written as of this date) for details on any specific hook. Occasionally you may need to view the program source to see precisely how a given hook is called and how the results are processed. 
+
+Let's go ahead and add some code to implement our post_local hook handler. 
+[code]
+	function randplace_post_hook($a, &$item) {
+
+	    /**
+    	 *
+	     * An item was posted on the local system.
+    	 * We are going to look for specific items:
+	     *      - A status post by a profile owner
+    	 *      - The profile owner must have allowed our plugin
+	     *
+    	 */
+
+	    logger('randplace invoked');
+
+	    if(! local_user())   /* non-zero if this is a logged in user of this system */
+	        return;
+
+	    if(local_user() != $item['uid'])    /* Does this person own the post? */
+	        return;
+
+	    if(($item['parent']) || ($item['item_restrict'])) {
+		    /* If the item has a parent, or item_restrict is non-zero, this is a comment or something else, not a status post. */
+	        return;
+		}
+
+	    /* Retrieve our personal config setting */
+
+	    $active = get_pconfig(local_user(), 'randplace', 'enable');
+
+    	if(! $active)
+        	return;
+	    /**
+    	 *
+	     * OK, we're allowed to do our stuff.
+    	 * Here's what we are going to do:
+	     * load the list of timezone names, and use that to generate a list of world cities.
+    	 * Then we'll pick one of those at random and put it in the "location" field for the post.
+	     *
+    	 */
+
+	    $cities = array();
+    	$zones = timezone_identifiers_list();
+	    foreach($zones as $zone) {
+    	    if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/')))
+        	    $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1));
+	    }
+
+    	if(! count($cities))
+        	return;
+	    $city = array_rand($cities,1);
+    	$item['location'] = $cities[$city];
+
+	    return;
+	}
+[/code]
+
+Now let's add our functions to create and store preference settings.
+[code]
+	/**
+	 *
+	 * Callback from the settings post function.
+	 * $post contains the global $_POST array.
+	 * We will make sure we've got a valid user account 
+	 * and that only our own submit button was clicked
+	 * and if so set our configuration setting for this person.
+	 *
+	 */
+
+	function randplace_settings_post($a,$post) {
+	    if(! local_user())
+	        return;
+	    if($_POST['randplace-submit'])
+	        set_pconfig(local_user(),'randplace','enable',intval($_POST['randplace']));
+	}
+
+
+
+	/**
+	 *
+	 * Called from the Feature Setting form.
+	 * The second argument is a string in this case, the HTML content region of the page.
+	 * Add our own settings info to the string.
+	 *
+	 * For uniformity of settings pages, we use the following convention
+     *     <div class="settings-block">
+	 *       <h3>title</h3>
+	 *       .... settings html - many elements will be floated...
+	 *       <div class="clear"></div> <!-- generic class which clears all floats -->
+	 *       <input type="submit" name="pluginnname-submit" class="settings-submit" ..... />
+	 *     </div>
+	 */
+
+
+
+	function randplace_settings(&$a,&$s) {
+
+	    if(! local_user())
+	        return;
+
+	    /* Add our stylesheet to the page so we can make our settings look nice */
+
+	    head_add_css(/addon/randplace/randplace.css');
+
+	    /* Get the current state of our config variable */
+
+	    $enabled = get_pconfig(local_user(),'randplace','enable');
+
+	    $checked = (($enabled) ? ' checked="checked" ' : '');
+
+	    /* Add some HTML to the existing form */
+
+	    $s .= '<div class="settings-block">';
+	    $s .= '<h3>' . t('Randplace Settings') . '</h3>';
+	    $s .= '<div id="randplace-enable-wrapper">';
+	    $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>';
+	    $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>';
+	    $s .= '</div><div class="clear"></div>';
+
+	    /* provide a submit button */
+
+	    $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+	}
+
+[/code]
+   
+
+
+***Advanced Plugins***
+
+Sometimes your plugins want to provide a range of new functionality which isn't provided at all or is clumsy to provide using hooks. In this case your plugin can also act as a 'module'. A module in our case refers to a structured webpage handler which responds to a given URL. Then anything which accesses that URL will be handled completely by your plugin.
+
+The key to this is to create a simple function named pluginname_module() which does nothing. 
+[code]
+	function randplace_module() { return; }
+[/code]
+Once this function exists, the URL #^[url=https://yoursite/randplace]https://yoursite/randplace[/url] will access your plugin as a module. Then you can define functions which are called at various points to build a webpage just like the modules in the mod/ directory. The typical functions and the order which they are called is
+[code]
+	modulename_init($a)    // (e.g. randplace_init($a);) called first - if you wish to emit json or xml, 
+	                       // you should do it here, followed by killme() which will avoid the default action of building a webpage
+	modulename_aside($a)   // Often used to create sidebar content
+	modulename_post($a)    // Called whenever the page is accessed via the "post" method
+	modulename_content($a) // called to generate the central page content. This function should return a string 
+	                       // consisting of the central page content.
+[/code]
+Your module functions have access to the URL path as if they were standalone programs in the Unix operating system. For instance if you visit the page
+[code]
+	https://yoursite/randplace/something/somewhere/whatever
+[/code]
+we will create an argc/argv list for use by your module functions
+[code]
+	$x = argc(); $x will be 4, the number of path arguments after the sitename
+
+	for($x = 0; $x < argc(); $x ++)
+		echo $x . ' ' . argv($x);
+
+
+	0 randplace
+	1 something
+	2 somewhere
+	3 whatever
+[/code]
+
+***Porting Friendica Plugins***
+
+The Red Matrix uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
+
+[li] Friendica's pluginname_install() is pluginname_load()[/li]
+
+[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li]
+
+The Red Matrix has _install and _uninstall functions but these are used differently.
+
+[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li]
+
+[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li]
+
+Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different.
\ No newline at end of file
diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb
new file mode 100644
index 000000000..bb2e07a07
--- /dev/null
+++ b/doc/problems-following-an-update.bb
@@ -0,0 +1,37 @@
+[b]Problems Following An Update[/b]
+
+A good 90% of all bugs encountered immediately after updating the code to the latest version are simple cache errors of one sort or another.  If you update and find something very obvious is broken - like your matrix page doesn't load, notifications are missing, or comment boxes are missing - the chances are it's not a bug at all.  Breaking basic functionality is the kind of thing developers tend to notice.
+
+If this happens to you, there are a few simple steps to take before resorting to the support forums:
+
+[b]Browser Cache[/b]
+
+Symptoms:  Menus do not expand, ACL selector does not open, progress indicator does not display (or loops forever), Matrix and channel pages do not load.
+
+Force reload the page.  Shift reload, or ctrl+f5.  Occasionally, but very, very rarely, you will also need to clear the session data - which is achieved by restarting the browser.
+
+[b]FastCGI[/b]
+
+Symptoms: Incorrect variables.  The basic UI mostly works, but displays incorrect content or is missing content entirely.  
+
+If you're using php5-fpm, this problem is usually resolved with [code]service php5-fpm restart[/code]
+
+[b]Smarty Cache[/b]
+
+Symptoms:  
+
+1) [zrl=https://beardyunixer.com/page/jargon/wsod]White Screen Of Death[/zrl].  This is most prevalent on the settings and admin pages.
+
+2) Missing icons, tabs, menus or features.
+
+We use the Smarty3 template engine to generate pages.  These templates are compiled before they are displayed.  Occasionally, a new or modified template will fail to overwrite the old compiled version.  To clear the Smarty cache, delete all the files in view/tpl/smarty3/compiled [b]but do not delete the directory itself[/b].  Templates will then be recompiled on their next access.
+
+[b]Theme Issues[/b]
+
+There are many themes for The Red Matrix.  Only Redbasic is officialy supported by the core developers.  This applies [i]even if a core developer happens to support an additional theme[/i].  This means new features are only guaranteed to work in Redbasic.
+
+Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes.  This means new features may only work properly in Redbasic.  Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there.  If the issue goes away, this is not a bug - it's a theme that isn't up to date.
+
+Should you report an issue with the theme developers then?  No.  Theme developers use their themes.  Chances are, they know.  Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed.  There are two workarounds for this situation.  Firstly, you can temporarily use Redbasic.  Secondly, most themes are open source too - open a pull request and make yourself a friend.
+
+Return to the [url=[baseurl]/help/troubleshooting]Troubleshooting documentation page[/url]
\ No newline at end of file
diff --git a/doc/profiles.bb b/doc/profiles.bb
new file mode 100644
index 000000000..e9b1d5571
--- /dev/null
+++ b/doc/profiles.bb
@@ -0,0 +1,33 @@
+[b]Profiles[/b]
+
+Red has unlimited profiles. You may use different profiles to show different "sides of yourself" to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded "sides" of each channel. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing".
+
+You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile.
+
+That said, if you want other friends to be able to find you, it helps to have the following information in your public profile...
+
+[li]Your real name or at least a nickname everybody knows[/li]
+[li]A photo of you[/li]
+[li]Your location on the planet, at least to a country level.[/li]
+
+Without this basic information, you could get very lonely here. Most people (even your best friends) will not try and connect with somebody that has a fake name or doesn't contain a real photo.
+
+In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like.
+
+To create an alternate profile, select "View Profile" from the menu of your Red Matrix site, then click on the pencil at your profile photo. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there.
+
+In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on "Edit visibility" next to the profile in question (only available for the profiles that are not your default profile) and then click on user images to add them to or remove them from the group of people who can see this profile.
+
+Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile.
+
+There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the "Settings" page.
+
+If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished.
+
+[b]Keywords and Directory Search[/b]
+
+On the directory page, you may search for people with published profiles. The search is typically for your nickname or part of your full name. However this search will also match against other profile fields - such as gender, location, "about", work, and education. You may also include "Keywords" in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page.
+
+Directory searches are also able to use "boolean" logic so that you can search for "+lesbian +Florida" and find those who's sexual preference (or keywords) contain the world "lesbian" and that live in Florida. See the section on "Topical Tags" on the Tags-and-Mentions page for more information on performing boolean searches.
+
+On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance.
\ No newline at end of file
diff --git a/doc/red2pi.bb b/doc/red2pi.bb
new file mode 100644
index 000000000..2abba8ec5
--- /dev/null
+++ b/doc/red2pi.bb
@@ -0,0 +1,349 @@
+[b]How to install the Red Matrix on a Raspberry Pi[/b]
+
+[zrl=[baseurl]/help/main] Back to the main page[/zrl]
+Last update 2014-02-22
+[hr]
+
+You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name?
+
+Then this page is for you! You will:
+[list=1]
+[*] Install Raspberry OS (Debian Linux) on a Raspberry
+[*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin
+[*] Register a free domain (dynamic DNS) and use it for your RED hub
+[*] Install the RED Matrix
+[*] Keep your Raspberry Pi and your Redmatrix up-to-date
+[*] TODO Running Friendica with SSL
+[*] TODO Make the webserver less vulnarable to attacks
+[/list]
+
+[size=large]1. Install Raspberry OS (Debian Linux)[/size]
+
+instructions under #^[url=http://www.raspberrypi.org/downloads]http://www.raspberrypi.org/downloads[/url]
+This page links to the quick start containing detailed instruction.
+
+[b]Format SD card[/b]
+
+using the programm gparted under Linux Mint 15
+
+format as FAT32
+
+[b]Download NOOBS (offline and network install)[/b]
+
+#^[url=http://downloads.raspberrypi.org/noobs]http://downloads.raspberrypi.org/noobs[/url]
+
+unzip
+
+copy unzipped files to SD card
+
+[b]Install Raspbian as OS on the Rasperry Pi[/b]
+
+connect with keyboard via USB
+
+connect with monitor via HDMI
+
+Insert SD card into Rasperry Pi
+
+Connect with power supply to switch on the Rasperry
+
+choose Raspbian as OS (> installs Raspbian....)
+
+wait for the coniguration program raspi-config (you can later start it by sudo raspi-config)
+
+[b]Configure Raspbian[/b]
+
+in raspi-config > advanced > choose to use ssh (!! You need this to connect to administrate your Pi from your PC !!)
+
+in raspi-config > change the password (of default user "pi" from "raspberry" to your password)
+
+in raspi-config (optional) > Internationalisation options > Change Locale > to de_DE.utf-8 utf-8 (for example)
+
+in raspi-config (optional) > Internationalisation options > Change Timezoe > set your timezone
+
+in raspi-config (optional) > Overlock > medium
+
+(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url])
+
+
+[b]More[/b]
+
+[code]sudo reboot[/code]
+
+Now its time to connect the Pi to the network.
+[ul]
+[*] pull out keyboard
+[*] pull out monitor
+[*] you even can pull out the power supply (USB)
+[*] plug-in the network cable to the router
+[*] plug-in the power supply again
+[*] wait for a minute or to give the Pi time to boot and start ssh...
+[/ul]
+
+On your PC connect to the Pi to administrate (here update it).
+Open the console on the PC (Window: Start > cmd, Linux: Shell)
+
+Hint: use the router admin tool to find out the IP of your PI[code]ssh pi@192.168.178.37
+sudo apt-get update
+sudo apt-get dist-upgrade[/code]
+
+(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url])
+
+
+
+[size=large]2. Install Apache Web Server, PHP, MaySQL, phpMyAdmin[/size]
+
+[b]Install Apache Webserver[/b]
+
+[code]sudo bash
+sudo groupadd www-data[/code] might exist already
+
+[code]sudo usermod -a -G www-data www-data
+sudo apt-get update
+sudo reboot[/code]
+
+wait...
+reconnect via ssh, example: [code]ssh pi@192.168.178.37
+sudo apt-get install apache2 apache2-doc apache2-utils[/code]
+
+Open webbrowser on PC and check #^[url=http://192.168.178.37]http://192.168.178.37[/url]
+Should show you a page like "It works"
+
+(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url])
+
+
+[b]Install PHP, MaySQL, phpMyAdmin[/b]
+
+[code]sudo bash
+apt-get install libapache2-mod-php5 php5 php-pear php5-xcache php5-curl
+apt-get install php5-mysql
+apt-get install mysql-server mysql-client[/code] enter and note the mysql passwort
+
+[code]apt-get install phpmyadmin[/code]
+
+Configuring phpmyadmin
+- Select apache2
+- Configure database for phpmyadmin with dbconfig-common?: Choose Yes
+
+(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url])
+
+
+[b]Test installation[/b]
+
+[code]cd /var/www[/code]
+
+create a php file to test the php installation[code]sudo nano phpinfo.php[/code]
+
+Insert into the file:[code]
+<?php
+  phpinfo();
+?>
+[/code]
+(save CTRL+0, ENTER, CTRL+X)
+
+open webbrowser on PC and try #^[url=http://192.168.178.37/phpinfo.php]http://192.168.178.37/phpinfo.php[/url] (page shows infos on php)
+
+connect phpMyAdmin with MySQL database [code]nano /etc/apache2/apache2.conf[/code]
+- CTRL+V... to the end of the file
+- Insert at the end of the file:  (save CTRL+0, ENTER, CTRL+X)[code]Include /etc/phpmyadmin/apache.conf[/code]
+
+restart apache[code]/etc/init.d/apache2 restart
+sudo apt-get update
+sudo apt-get upgrade
+sudo reboot[/code]
+
+(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url])
+
+
+[b]phpMyAdmin[/b]
+
+open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url]
+
+(Source #^[url=http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#]http://www.manfred-steger.de/tuts/20-der-eigene-webserver-mit-dem-raspberry-pi#[/url])
+
+
+[b]Create an empty database... that is later used by RED[/b]
+
+open webbrowser on PC and try #^[url=http://192.168.178.37/phpmyadmin]http://192.168.178.37/phpmyadmin[/url]
+
+Create an empty database
+
+Note the access details (hostname, username, password, database name).
+
+
+[size=large]3. Selfhost[/size] 
+
+(Source: #^[url=http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html]http://www.techjawab.com/2013/06/setup-dynamic-dns-dyndns-for-free-on.html[/url])
+
+#^[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url]
+
+[b]Step 1[/b]
+Register for a Free domain at #^[url=http://freedns.afraid.org/signup/]http://freedns.afraid.org/signup/[/url]
+(We will take techhome.homenet.org in this guide)
+
+[b]Step 2[/b]
+
+Logon to FreeDNS (where you just registered) and goto #^[url=http://freedns.afraid.org/dynamic/]http://freedns.afraid.org/dynamic/[/url]
+Right click on "Direct Link" and copy the URL and paste it somewhere.
+You should notice a large and unique alpha-numeric key in the URL, make a note of it as shown below:
+[code]http://freedns.afraid.org/dynamic/update.php?alphanumeric-key[/code]
+
+
+[b]Step 3[/b]
+Install inadyn using the following command:[code]sudo apt-get install inadyn[/code]
+
+[b]Step 4[/b]
+Configure inadyn using the below steps:[code]sudo nano /etc/inadyn.conf[/code]
+And add the following contains in it replacing the actual values:
+[code]
+--username [color=red]techhome[/color]
+--password [color=red]mypassword[/color]
+--update_period 3600
+--forced_update_period 14400
+--alias [color=red]techhome.homenet.org</b>,[color=red]alphanumeric key[/color]
+--background
+--dyndns_system default@freedns.afraid.org
+--syslog
+[/code]
+
+
+[b]Step 5[/b]
+
+Now, we need to ensure that the DNS updater (Inadyn) runs automatically after every re-boot[code]export EDITOR=gedit && sudo crontab -e[/code]
+Add the following line:[code]@reboot /usr/sbin/inadyn[/code]
+
+
+[b]Step 6[/b]
+
+Reboot system and then run the following command to ensure inadyn is running:[code]
+sudo reboot
+ps -A | grep inadyn
+[/code]
+Now your host is ready and up for accessing from internet...
+You can trying ssh-ing from another computer over the internet
+[code]ssh username@techhome.homenet.org[/code]
+Or, if any web server is running, then simply browse to  #^[url=http://techhome.homenet.org]http://techhome.homenet.org[/url]
+Or, you can just ping it to test ping techhome.homenet.org
+To check the logs you can use this:
+[code]more /var/log/messages |grep INADYN[/code]
+
+
+[size=large]4. Install RED [/size] 
+
+(Source: #^[zrl=https://friendicared.net/help/Install]https://friendicared.net/help/Install[/zrl])
+
+Linux Appache document root is /var/www/
+Two files exist there (created by the steps above): index.html, phpinfo.php
+
+
+[b]Install RED and its Addons[/b]
+
+Cleanup: Remove the directory www/ (Git will not create files and folders in directories that are not empty.) Make sure you are in directory var[code]pi@pi /var $ cd /var[/code]
+ 
+Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code]
+
+Download the sources of RED from GIT
+[code]pi@pi /var $ sudo git clone https://github.com/friendica/red.git www[/code]
+
+Download the sources of the addons from GIT
+[code]pi@pi /var/www $ sudo git clone https://github.com/friendica/red-addons.git addon[/code]
+
+Make user www-data the owner of the whole red directory (including subdirectories and files)
+(TODO: This step has to be proofed by the next installation.)
+[code]pi@pi /var $ chown -R www-data:www-data /var/www/[/code]
+
+Check if you can update the sources from git[code]
+pi@pi /var $ cd www
+pi@pi /var/www $ git pull
+[/code]
+
+Check if you can update the addons
+[code]pi@pi /var/www $ cd addon/
+pi@pi /var/www/addon $ sudo git pull[/code]
+
+Make sure folder view/tpl/smarty3 exists and is writable by the webserver
+[code]pi@pi /var/www $ sudo chmod ou+w view/tpl/smarty3/[/code]
+
+Create .htconfig.php and is writable by the webserver
+[code]pi@pi /var/www $ sudo touch .htconfig.php
+pi@pi /var/www $ sudo chmod ou+w .htconfig.php[/code]
+
+Prevent search engines from indexing your site. Why? This can fill up your database.
+(Source: [url=http://wiki.pixelbits.de/redmatrix]Pixelbits[/url] )
+[code]pi@pi /var/www $ sudo touch robots.txt[/code]
+Open the file.
+[code]pi@pi /var/www $ sudo nano robots.txt[/code]
+Paste this text and save.
+[code]
+# Prevent search engines to index this site
+  User-agent: *
+  Disallow: /search
+[/code]
+
+
+[b]First start and initial configuration of your RED Matrix hub[/b]
+
+In browser open #^[zrl=http://einervonvielen.mooo.com/]http://einervonvielen.mooo.com/[/zrl]
+(Replace einervonvielen.mooo.com by your domain, see chapter selfhost. Be patient. It takes time.)
+(#^[zrl=http://einervonvielen.mooo.com/index.php?q=setup]http://einervonvielen.mooo.com/index.php?q=setup[/zrl])
+
+There might be errors like the following.
+
+Error: libCURL PHP module required but not installed.
+Solution:
+apt-get install php5-curl
+
+Error: Apache webserver mod-rewrite module is required but not installed.
+Solution
+(Source: #^[url=http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html]http://xmodulo.com/2013/01/how-to-enable-mod_rewrite-in-apache2-on-debian-ubuntu.html[/url])
+The default installation of Apache2 comes with mod_rewrite installed. To check whether this is the case, verify the existence of /etc/apache2/mods-available/rewrite.load
+- pi@pi /var/www $ nano /etc/apache2/mods-available/rewrite.load
+ (You should find the contendt: LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so)
+To enable and load mod_rewrite, do the rest of steps.
+Create a symbolic link in /etc/apache2/mods-enabled
+- pi@pi /var/www $ sudo a2enmod rewrite
+Then open up the following file, and replace every occurrence of "AllowOverride None" with "AllowOverride all".
+- pi@pi /var/www $ sudo nano /etc/apache2/sites-available/default
+Finally, restart Apache2.
+- pi@pi /var/www $ sudo service apache2 restart
+
+Error store is writable (not checked)
+Solution:
+(TODO: Make writeable to group www-data only?)
+pi@pi /var/www $ sudo mkdir store
+pi@pi /var/www $ chown -R www-data:www-data /var/www/red/
+pi@pi /var/www $ sudo chmod ou+w view
+
+[b]More[/b]
+
+Set up a cron job to run the poller once every 15 minutes in order to perform background processing.
+- pi@pi /var/www $ which php
+Make sure you are in the document root directory of the webserver
+- pi@pi /var/www $ cd /var/www/
+Try to execute the poller in oder to make sure it works
+- pi@pi /var/www $ /usr/bin/php include/poller.php
+Create the cronjob
+- pi@pi /var/www $ crontab -e
+Enter
+- */15 * * * * cd /var/www/; /usr/bin/php include/poller.php
+- Save and exit.
+
+
+[size=large]5. Keep your Raspberry Pi and your Redmatrix up-to-date[/size] 
+
+Git update of RED every day at 4 am and addons at 5 am every day
+Try if the command is working
+- pi@pi /var/www $ sudo git pull
+Create the cronjob
+- pi@pi /var/www $ crontab -e
+Enter the following to update RED at 4:01 am every day
+- 01 04 * * * cd /var/www/; sudo git pull
+Enter the following to update the addons at 5:01 am every day
+- 01 05 * * * cd /var/www/addon/; sudo git pull
+Enter the following to update the Raspberry Pi (Raspbian OS = Debian) at 6:01 am every day
+- 01 06 * * * sudo aptitude -y update && sudo aptitude -y safe-upgrade
+Save and exit.
+
+[size=large]6. Running Friendica with SSL[/size] 
+
+Follow the instructions here:
+#^[url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url]
\ No newline at end of file
diff --git a/doc/remove_account.bb b/doc/remove_account.bb
new file mode 100644
index 000000000..90ef1d7df
--- /dev/null
+++ b/doc/remove_account.bb
@@ -0,0 +1,17 @@
+[b]Remove Account[/b]
+
+[b]Remove Account[/b]
+
+It is presently not possible to remove an account without asking your site administrator for assistance. 
+
+[b]Remove Channel[/b]
+
+Visit the URL 
+
+	[baseurl]/removeme 
+
+You will need to confirm your password and the channel you are currently logged into will be removed. 
+
+This is irreversible.
+
+If you have identity clones on other sites this only removes the channel instance which exists on this site.
\ No newline at end of file
diff --git a/doc/schema_development.bb b/doc/schema_development.bb
new file mode 100644
index 000000000..6b2c3d315
--- /dev/null
+++ b/doc/schema_development.bb
@@ -0,0 +1,74 @@
+[b]Red Development - A Guide To The Schema System[/b]
+
+A schema, in a nutshell, is a collection of settings for a bunch of variables to define
+certain elements of a theme.  A schema is loaded as though it were part of config.php
+and has access to all the same information.  Importantly, this means it is identity aware,
+and can be used to do some interesting things.  One could, for example, restrict options
+by service class, or present different options to different members.
+
+By default, we filter only by whether or not expert mode is enabled.  If expert mode is
+enabled, all options are presented to the member.  If it is not, only scheme, background
+image, font face, and iconset are available as choices.
+
+A schema is loaded *after* the member's personal settings.  Therefore, to allow a member
+to overwrite a particular aspect of a schema you would use the following syntax:
+[code]
+        if (! $foo)
+            $foo = 'bar';
+[/code]
+However, there are circumstances - particularly with positional elements - where it
+may be desirable (or necessary) to override a member's settings.  In this case, the syntax
+is even simpler:
+[code]
+            $foo = 'bar';
+[/code]
+Members will not thank you for this, however, so only use it when it is required.
+
+If no personal options are set, and no schema is selected, we will first try to load a schema
+with the file name "default.php".  This file should never be included with a theme.  If it
+is, merge conflicts will occur as people update their code.  Rather, this should be defined
+by administrators on a site by site basis.
+
+You schema does not need to - and should not - contain all of these values.  Only the values
+that differ from the defaults should be listed.  This gives you some very powerful options
+with very few lines of code.
+
+Note the options available differ with each theme.  The options available with the Redbasic 
+theme are as follows:
+
+[li] nav_colour
+	The colour of the navigation bar.  Options are red, black and silver.  Alternatively, 
+	one can set $nav_bg_1, $nav_bg_2, $nav_bg_3 and $nav_bg_4 to provide gradient and
+	hover effects.[/li]
+[li] banner_colour
+	The font colour of the banner element.  Accepts an RGB or Hex value.[/li]
+[li] bgcolour
+	Set the body background colour.  Accepts an RGB or Hex value.[/li]
+[li] background_image
+	Sets a background image.  Accepts a URL or path.[/li]
+[li] item_colour
+	Set the background colour of items.  Accepts an RGB or Hex value.[/li]
+[li] item_opacity
+	Set the opacity of items.  Accepts a value from 0.01 to 1[/li]
+[li] toolicon_colour
+	Set the colour of tool icons.  Accepts an RGB or Hex value.[/li]
+[li] toolicon_activecolour
+	Set the colour of active or hovered icon tools.[/li]
+[li] font_size
+	Set the size of fonts in items and posts.  Accepts px or em.[/li]
+[li] body_font_size
+	Sets the size of fonts at the body level.  Accepts px or em.[/li]
+[li] font_colour
+	Sets the font colour.  Accepts an RGB or Hex value.[/li]
+[li] radius
+	Set the radius of corners.  Accepts a numeral, and is always in px.[/li]
+[li] shadow
+	Set the size of shadows shown with inline images.  Accepts a numerical 
+	value.  Note shadows are not applied to smileys.[/li]
+[li] converse_width
+	Set the maximum width of conversations.  Accepts px, or %.[/li]
+[li] nav_min_opacity[/li]
+[li] top_photo[/li]
+[li] reply_photo[/li]
+[li] sloppy_photos
+	Determins whether photos are "sloppy" or aligned.  Set or unset (1 or '')[/li]
\ No newline at end of file
diff --git a/doc/tags_and_mentions.bb b/doc/tags_and_mentions.bb
new file mode 100644
index 000000000..0614a1e47
--- /dev/null
+++ b/doc/tags_and_mentions.bb
@@ -0,0 +1,23 @@
+[b]Tags And Mentions[/b]
+
+Like many other platforms, Red uses a special notation inside messages to indicate "tags" or contextual links to other entities.
+
+[b]Mentions[/b]
+
+Channels are tagged by simply preceding their name with the @ character.  Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
+
+When you start to mention somebody, it will create an auto-complete box to select from your immediate connections. Select one as appropriate. Some connections will be displayed in different colours. A light blue entry (using the default theme) indicates a channel which will redeliver to others if tagged. This is generally a conversation group or forum. But be aware that when tagged, the message will also go to anybody they choose, in addition to anybody you choose.    
+
+[b]Private Mentions[/b]
+
+If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or collections from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to include them (and perhaps restrict the post from "everybody" if this was the default). You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda (in addition to any recipients you selected with the privacy selector - if any). 
+
+You may also tag public collections. When you create or edit a collection, there is a checkbox to allow the group members to be seen by others. If this box is checked for a collection and you tag (for instance) @!Friends - the post will be restricted to the Friends collection. Check that the collection is public before doing this - as there is no way to take back a post except to delete it. The collection name will appear in the post and will alert members of that collection that they are members of it.    
+
+
+
+[b]Topical Tags[/b]
+
+Topical tags are indicated by preceding the tag name with the  # character. This will create a link in the post to a generalised site search for the term provided.  For example, #[zrl=https://friendicared.net/search?tag=cars]cars[/zrl] will provide a search link for all posts mentioning 'cars' on your site. Topical tags are generally a minimum of three characters in length.  Shorter search terms are not likely to yield any search results, although this depends on the database configuration. The same rules apply as with names that spaces within tags are represented by the underscore character. It is therefore not possible to create a tag whose target contains an underscore.
+
+Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #[zrl=https://friendicared.net/search?tag=2012-elections]2012-elections[/zrl].
\ No newline at end of file
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
new file mode 100644
index 000000000..295095e87
--- /dev/null
+++ b/doc/to_do_code.bb
@@ -0,0 +1,51 @@
+[b]Project Code To-Do List[/b]
+
+We need much more than this, but here are areas where developers can help. Please edit this page when items are finished. Another place for developers to start is with the issues list.
+
+[li]Turn top-level Apps menu into an Apps page - which will probably require App plugins to have icons. Add documentation specifically to the plugin/addon documentation for creating apps. Add links to the App Store (which doesn't currently exist).[/li]
+
+[li]Documentation - see Red Documentation Project To-Do List[/li]
+
+[li]Infinite scroll to the directory pages[/li]
+
+[li]Finish the anti-spam bayesian engine[/li]
+
+[li]Integrate the "open site" list with the register page[/li]
+
+[li]Write more webpage layouts[/li]
+
+[li]Write more webpage widgets[/li]
+
+[li](Advanced) create a UI for building Comanche pages[/li]
+
+[li]templatise and translate the Web interface to webDAV[/li]
+
+[li]Extend WebDAV to provide desktop access to photo albums]/li]
+
+[li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
+
+[li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
+
+[li]Events module - bring back birthday reminders for friends, fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV[/li]
+
+[li]Events module - event followups and RSVP[/li]
+
+[li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
+
+[li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there.[/li]
+
+[li]Photos module - turn photos into normal conversations and fix tagging[/li]
+
+[li]Provide RSS feed support which look like channels (in matrix only - copyright issues)[/li]
+
+[li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]
+
+[li]Activity Stream generation for liking things, liking channels and other combinations.[/li]
+
+[li]Implement owned and exchangeable "things".[/li]
+
+[li]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).[/li]
+
+[li]Put mod_admin under Comanche[/li]
+
+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.
\ No newline at end of file
diff --git a/doc/to_do_doco.bb b/doc/to_do_doco.bb
new file mode 100644
index 000000000..4505de31a
--- /dev/null
+++ b/doc/to_do_doco.bb
@@ -0,0 +1,21 @@
+[b]Documentation To-Do List[/b]
+
+[b]Documentation we need to write[/b]
+
+    Database schema detailed descriptions
+
+    Complete plugin hook documentation
+
+    API documentation
+
+    Function and code documentation (doxygen)
+
+    New Member guide
+
+    "Extra Feature" reference, description of each
+
+    Detailed Personal Settings Documentation
+
+    Administration Guide (post-install)
+
+    Administration Guide (pre-install)
\ No newline at end of file
diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb
new file mode 100644
index 000000000..ea7dbb11a
--- /dev/null
+++ b/doc/troubleshooting.bb
@@ -0,0 +1,5 @@
+[b]Troubleshooting[/b]
+
+[li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li]
+
+Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
diff --git a/doc/webpages.bb b/doc/webpages.bb
new file mode 100644
index 000000000..74760c8bf
--- /dev/null
+++ b/doc/webpages.bb
@@ -0,0 +1,13 @@
+[b]Creating Web Pages[/b]
+
+Red enables users to create static webpages.  To activate this feature, enable the web pages feature in your Additional Features section.
+
+Once enabled, a new tab will appear on your channel page labelled "Webpages".  Clicking this link will take you to the webpage editor.  Here you can create a post using either BBCode or the rich text editor.
+
+Pages will be accessible at mydomain/page/username/pagelinktitle
+
+The "page link title" box allows a user to specify the "pagelinktitle" of this URL.  If no page link title is set, we will set one for you automatically, using the message ID of the item.  
+
+Beneath the page creation box, a list of existing pages will appear with an "edit" link.  Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages.
+
+If you are the admin of a site, you can specify a channel whose webpages we will use at key points around the site.  Presently, the only place this is implemented is the home page.  If you specify the channel "admin" and then the channel called "admin" creates a webpage called "home", we will display it's content on your websites home page.  We expect this functionality to be extended to other areas in future.
\ No newline at end of file
diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
new file mode 100644
index 000000000..a398a65a4
--- /dev/null
+++ b/doc/what_is_zot.bb
@@ -0,0 +1,61 @@
+[b]What is Zot?[/b]
+
+Zot is the protocol that powers the Red Matrix, providing three core capabilities: Communications, Identity, and Access Control.
+
+The functionality it provides can also be described as follows: 
+
+ - a relationship online is just a bunch of permissions
+ - the internet is just another folder
+
+[b][color= grey][size=20]Communications[/size][/color][/b]
+
+Zot is a revolutionary protocol which provides [i]decentralised communications[/i] and [i]identity management[/i] across the matrix. The resulting platform can provide web services comparable to those offered by large corporate providers, but without the large corporate provider and their associated privacy issues, insatiable profit drive, and walled-garden mentality.
+
+Communications and social networking are an integral part of the matrix. Any channel (and any services provided by that channel) can make full use of feature-rich social communications on a global scale. These communications may be public or private - and private communications comprise not only fully encrypted transport, but also encrypted storage to help protect against accidental snooping and disclosure by rogue system administrators and internet service providers. 
+
+Zot allows a wide array of background services in the matrix, from offering friend suggestions, to directory services. You can also perform other things which would typically only be possibly on a centralized provider - such as "Wall to Wall" posts. Priivate/multiple profiles can be easily created, and web content can be tailored to the viewer via the [i]Affinity Slider[/i]. 
+
+You won't find these features at all on other decentralized communication services. In addition to providing hub (server) decentralization, perhaps the most innovative and interesting Zot feature is its provision of [i]decentralized identity[/i] services.
+
+[b][color= grey][size=20]Identity[/size][/color][/b] 
+
+Zot's identity layer is unique. It provides [i]invisible single sign-on[/i] across all sites in the matrix. 
+
+It also provides [i]nomadic identity[/i], so that your communications with friends, family, and or anyone else you're communicating with won't be affected by the loss of your primary communication node - either temporarily or permanently. 
+
+The important bits of your identity and relationships can be backed up to a thumb drive, or your laptop, and may appear at any node in the matrix at any time - with all your friends and preferences intact. 
+
+Crucially, these nomadic instances are kept in sync so any instance can take over if another one is compromised or damaged. This protects you against not only major system failure, but also temporary site overloads and governmental manipulation or censorship. 
+
+Nomadic identity, single sign-on, and Red's decentralization of hubs, we believe, introduce a high degree of degree of [i]resiliency[/i] and [i]persistence[/i] in internet communications, that are sorely needed amidst global trends towards corporate centralization, as well as mass and indiscriminate government surveillance and censorship.
+
+As you browse the matrix, viewing channels and their unique content, you are seamlessly authenticated as you go, even across completely different server hubs. No passwords to enter. Nothing to type. You're just greeted by name on every new site you visit. 
+
+How does Zot do that? We call it [i]magic-auth[/i], because Red hides the details of the complexities that go into single sign-on logins, and nomadic identities, from the experience of browsing on the matrix.  This is one of the design goals of Red: to increase privacy, and freedom on the web, while reducing the complexity and tedium brought by the need to enter new passwords and user names for every different sight that someone might visit online.
+
+You login only once on your home hub (or any nomadic backup hub you have chosen). This allows you to access any authenticated services provided anywhere in the matrix - such as shopping, blogs, forums, and access to private information. This is just like the services offered by large corporate providers with huge user databases; however you can be a member of this community, as well as a server on this network using a $35 Rasberry Pi. Your password isn't stored on a thousand different sites, or even worse, only on a few sites like Google and Facebook, beyond your direct control.
+
+You cannot be silenced. You cannot be removed from the matrix, unless you yourself choose to exit it.
+
+[b][color= grey][size=20]Access Control[/size][/color][/b]
+
+Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. 
+
+Currently, the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities, such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control.
+
+This type of control is available on large corporate providers such as Facebook and Google, because they own the user database. Within the matrix, there is no need for a huge user databaseon your machine - because the matrix [i]is[/i] your user database. It has what is essentially infinite capacity (limited by the total number of hubs online across the internet), and is spread amongst hundreds, and potentially millions of computers. 
+
+Access can be granted or denied for any resource, to any channel, or any group of channels; anywhere within the matrix. Others can access your content if you permit them to do so, and they do not even need to have an account on your hub. Your private photos cannot be viewed, because permission really work; they are not an addon that was added as an afterthought. If you aren't on the list of allowed viewers for a particular photo, you aren't going to look at it. 
+
+[b][color= grey][size=18]Additional Resources and Links[/size][/color][/b]
+
+For more detailed, technical information about Zot, check out the following links: 
+
+ - [url=https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview]A high level overview[/url]
+
+ - [url=https://github.com/friendica/red/wiki/zot]Zot development specification[/url]
+
+ - [url=https://github.com/friendica/red/blob/master/include/zot.php]Zot reference implementation in PHP[/url]
+
+
+Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
-- 
cgit v1.2.3


From 5cc70f75a43438ad77542adf025d0ac3063b909b Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Mon, 24 Feb 2014 05:20:27 +0000
Subject: The string replacement missed that little blighter.

---
 doc/main.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/main.bb b/doc/main.bb
index 5db1736e9..7ae5d3736 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -56,4 +56,4 @@ Contents
 
 [b]About[/b]
 
-[url=https://friendicared.net/siteinfo] Site/Version Info[/url]
\ No newline at end of file
+[zrl=[baseurl]/siteinfo]Site/Version Info[/zrl]
-- 
cgit v1.2.3


From fea3422b46fc6840fd7821d653a0eecb6b2c6bc6 Mon Sep 17 00:00:00 2001
From: Thomas Willingham 
Date: Mon, 24 Feb 2014 17:34:40 +0000
Subject: Doco - just a friendicared => [baseurl]

---
 doc/main.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/main.bb b/doc/main.bb
index 7ae5d3736..0e8ea15fd 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -42,7 +42,7 @@ Contents
 [zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl]
 [zrl=[baseurl]/help/api_functions]API functions[/zrl]
 [zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl]
-[zrl=https://friendicared.net/doc/html/]Code Reference (doxygen generated - sets cookies)[/zrl]
+[zrl=[baseurl]/doc/html/]Code Reference (doxygen generated - sets cookies)[/zrl]
 [zrl=[baseurl]/help/to_do_doco]To-Do list for the Red Documentation Project[/zrl]
 [zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl]
 [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]
-- 
cgit v1.2.3


From e4eeb9d101e7064049f721edcf959ef3bd968ac0 Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo 
Date: Mon, 24 Feb 2014 15:29:56 -0300
Subject: Updates to pt-br translation, including some email templates.

---
 view/pt-br/follow_notify_eml.tpl   |   12 +-
 view/pt-br/friend_complete_eml.tpl |   23 +-
 view/pt-br/intro_complete_eml.tpl  |   26 +-
 view/pt-br/lostpass_eml.tpl        |   33 +-
 view/pt-br/messages.po             | 4835 ++++++++++++++++++------------------
 view/pt-br/passchanged_eml.tpl     |   24 +-
 view/pt-br/register_open_eml.tpl   |   23 +-
 view/pt-br/register_verify_eml.tpl |   18 +-
 view/pt-br/request_notify_eml.tpl  |   16 +-
 view/pt-br/strings.php             |  246 +-
 10 files changed, 2653 insertions(+), 2603 deletions(-)

diff --git a/view/pt-br/follow_notify_eml.tpl b/view/pt-br/follow_notify_eml.tpl
index ba07b19da..bc86e5fe1 100644
--- a/view/pt-br/follow_notify_eml.tpl
+++ b/view/pt-br/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
 
-Dear {{$myname}},
+Caro/a {{$myname}},
 
-You have a new follower at {{$sitename}} -  '{{$requestor}}'.
+Você tem um novo seguidor em {{$sitename}} -  '{{$requestor}}'.
 
-You may visit their profile at {{$url}}.
+Você pode ver o perfil dele em {{$url}}.
 
-Please login to your site to approve or ignore/cancel the request.
+Por favor, autentique-se no seu site para aprovara ou ignorar/cancelar esta solicitação.
 
 {{$siteurl}}
 
-Regards,
+Gratidão,
 
-	{{$sitename}} administrator
+	{{$sitename}} administrador
diff --git a/view/pt-br/friend_complete_eml.tpl b/view/pt-br/friend_complete_eml.tpl
index 1c647b994..51adf23e3 100644
--- a/view/pt-br/friend_complete_eml.tpl
+++ b/view/pt-br/friend_complete_eml.tpl
@@ -1,22 +1,23 @@
 
-Dear {{$username}},
+Caro/a {{$username}},
 
-	Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted 
-your connection request at '{{$sitename}}'.
+	Boas notícias... '{{$fn}}' em '{{$dfrn_url}}' aceitou
+seu pedido de conexão em '{{$sitename}}'.
 
-You are now mutual friends and may exchange status updates, photos, and email
-without restriction.
+Vocês agora são amigos mútuos e podem trocar atualizações de status, fotos,
+e email sem restrição.
 
-Please visit your 'Connnections' page at {{$sitename}} if you wish to make 
-any changes to this relationship. 
+Por favor, visite sua página 'Conexões' em {{$sitename}} se quiser efetuar
+quaisquer mudanças nesse relacionamento.
 
 {{$siteurl}}
 
-[For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '{{$fn}}'].
+[Por exemplo, você pode criar um perfil à parte com informações que não
+estão disponíveis para o público geral - e conceder permissões de acesso
+para '{{$fn}}'].
 
-Sincerely,
+Atenciosamente,
 
-	{{$sitename}} Administrator
+	{{$sitename}} Administrador
 
  
diff --git a/view/pt-br/intro_complete_eml.tpl b/view/pt-br/intro_complete_eml.tpl
index 2c2428d68..bd20e0a6e 100644
--- a/view/pt-br/intro_complete_eml.tpl
+++ b/view/pt-br/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Dear {{$username}},
+Caro/a {{$username}},
 
-	'{{$fn}}' at '{{$dfrn_url}}' has accepted 
-your connection request at '{{$sitename}}'.
+	'{{$fn}}' em '{{$dfrn_url}}' aceitou sua solicitação de conexão
+em '{{$sitename}}'.
 
-	'{{$fn}}' has chosen to accept you a "fan", which restricts 
-some forms of communication - such as private messaging and some profile
-interactions. If this is a celebrity or community page, these settings were
-applied automatically.
+	'{{$fn}}' optou por aceitá-lo como "fã", o que restringe algumas
+formas de comunicação - como mensagens privadas e certas interações com o
+perfil. Se esta é uma página de celebridade ou comunidade, essa
+configuração é aplicada automaticamente.
 
-	'{{$fn}}' may choose to extend this into a two-way or more permissive 
-relationship in the future. 
+	'{{$fn}}' pode escolher no futuro transformar essa relação em uma
+mais permissiva, de duas vias.
 
-	You will start receiving public status updates from '{{$fn}}', 
-which will appear on your 'Matrix' page at  
+	Você começará a receber atualizações de status públicas de '{{$fn}}', 
+que aparecerão na sua Matriz em
 
 {{$siteurl}}
 
-Sincerely,
+Atenciosamente,
 
-	{{$sitename}} Administrator
+	{{$sitename}} Administrador
diff --git a/view/pt-br/lostpass_eml.tpl b/view/pt-br/lostpass_eml.tpl
index 3b79d2791..15a72ffb6 100644
--- a/view/pt-br/lostpass_eml.tpl
+++ b/view/pt-br/lostpass_eml.tpl
@@ -1,32 +1,33 @@
 
-Dear {{$username}},
-	A request was recently received at {{$sitename}} to reset your account 
-password. In order to confirm this request, please select the verification link
-below or paste it into your web browser address bar. 
+Caro/a {{$username}},
 
-If you did NOT request this change, please DO NOT follow the link
-provided and ignore and/or delete this email. 
+	Uma solicitação para reiniciar a senha da sua conta foi recebida em
+{{$sitename}}. Para confirmar este pedido, acesse o link de verificação clicando
+nele abaixo ou copiando na barra de endereço do seu navegador.
 
-Your password will not be changed unless we can verify that you
-issued this request. 
+Se você NÃO solicitou essa mudança, por favor NÃO SIGA o link a seguir e
+ignore e/ou delete este e-mail.
 
-Follow this link to verify your identity:
+Sua senha não será modificada até que você confirme este pedido.
+
+Siga este link para confirmá-lo:
 
 {{$reset_link}}
 
-You will then receive a follow-up message containing the new password.
+Você receberá então um outro e-mail contendo uma nova senha.
 
-You may change that password from your account settings page after logging in.
+Você poderá trocar essa senha a partir das suas configurações de conta,
+após autenticar-se.
 
-The login details are as follows:
+Os detalhes de autenticação são os seguintes:
 
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
+Localização do site:	{{$siteurl}}
+Nome:	{{$email}}
 
 
 
 
-Sincerely,
-	{{$sitename}} Administrator
+Atenciosamente,
+	{{$sitename}} Administrador
 
  
diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po
index 3decef9bf..74288b429 100644
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Red Matrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-14 00:02-0800\n"
-"PO-Revision-Date: 2014-02-20 21:57+0000\n"
+"POT-Creation-Date: 2014-02-21 00:03-0800\n"
+"PO-Revision-Date: 2014-02-24 17:27+0000\n"
 "Last-Translator: solstag \n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/red-matrix/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgid "Categories"
 msgstr "Categorias"
 
 #: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../include/Contact.php:107 ../../include/identity.php:632
 #: ../../mod/directory.php:184 ../../mod/match.php:62
 #: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
 msgid "Connect"
@@ -69,8 +69,8 @@ msgstr "Por exemplo: joao@exemplo.com, http://exemplo.com/maria"
 msgid "Notes"
 msgstr "Notas"
 
-#: ../../include/widgets.php:173 ../../include/text.php:754
-#: ../../include/text.php:768 ../../mod/filer.php:36
+#: ../../include/widgets.php:173 ../../include/text.php:759
+#: ../../include/text.php:773 ../../mod/filer.php:36
 msgid "Save"
 msgstr "Salvar"
 
@@ -96,7 +96,7 @@ msgstr "Pastas salvas"
 msgid "Everything"
 msgstr "Tudo"
 
-#: ../../include/widgets.php:318 ../../include/items.php:3636
+#: ../../include/widgets.php:318
 msgid "Archives"
 msgstr "Arquivos"
 
@@ -112,7 +112,7 @@ msgstr "Eu"
 msgid "Best Friends"
 msgstr "Melhores amigos"
 
-#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/widgets.php:373 ../../include/identity.php:314
 #: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
 msgid "Friends"
 msgstr "Amigos"
@@ -175,7 +175,7 @@ msgid "Channel Sources"
 msgstr "Fontes do canal"
 
 #: ../../include/widgets.php:487 ../../include/nav.php:181
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+#: ../../mod/admin.php:838 ../../mod/admin.php:1043
 msgid "Settings"
 msgstr "Configurações"
 
@@ -226,7 +226,7 @@ msgstr "Visite o %2$s de %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s atualizou %2$s, alterando %3$s."
 
-#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1423
+#: ../../include/nav.php:72 ../../include/nav.php:91 ../../boot.php:1425
 msgid "Logout"
 msgstr "Sair"
 
@@ -236,7 +236,7 @@ msgstr "Encerrar essa sessão"
 
 #: ../../include/nav.php:75 ../../include/nav.php:125
 msgid "Home"
-msgstr "Meu canal"
+msgstr "Ver canal"
 
 #: ../../include/nav.php:75
 msgid "Your posts and conversations"
@@ -310,7 +310,7 @@ msgstr "Páginas web"
 msgid "Your webpages"
 msgstr "Suas páginas web"
 
-#: ../../include/nav.php:89 ../../boot.php:1424
+#: ../../include/nav.php:89 ../../boot.php:1426
 msgid "Login"
 msgstr "Entrar"
 
@@ -331,7 +331,7 @@ msgstr "Clique para se autenticar com seu hub de origem"
 msgid "Home Page"
 msgstr "Página inicial"
 
-#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1400
+#: ../../include/nav.php:129 ../../mod/register.php:206 ../../boot.php:1402
 msgid "Register"
 msgstr "Registrar"
 
@@ -355,8 +355,8 @@ msgstr "Aplicações"
 msgid "Addon applications, utilities, games"
 msgstr "Aplicações adicionais, utilitários, jogos"
 
-#: ../../include/nav.php:139 ../../include/text.php:752
-#: ../../include/text.php:766 ../../mod/search.php:29
+#: ../../include/nav.php:139 ../../include/text.php:757
+#: ../../include/text.php:771 ../../mod/search.php:29
 msgid "Search"
 msgstr "Pesquisar"
 
@@ -516,320 +516,320 @@ msgstr "mais antigo"
 msgid "newer"
 msgstr "mais recente"
 
-#: ../../include/text.php:670
+#: ../../include/text.php:675
 msgid "No connections"
 msgstr "Nenhuma conexão"
 
-#: ../../include/text.php:681
+#: ../../include/text.php:686
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d conexão"
 msgstr[1] "%d conexões"
 
-#: ../../include/text.php:693
+#: ../../include/text.php:698
 msgid "View Connections"
 msgstr "Ver conexões"
 
-#: ../../include/text.php:834
+#: ../../include/text.php:839
 msgid "poke"
 msgstr "cutucar"
 
-#: ../../include/text.php:834 ../../include/conversation.php:240
+#: ../../include/text.php:839 ../../include/conversation.php:240
 msgid "poked"
 msgstr "cutucado"
 
-#: ../../include/text.php:835
+#: ../../include/text.php:840
 msgid "ping"
 msgstr "pingar"
 
-#: ../../include/text.php:835
+#: ../../include/text.php:840
 msgid "pinged"
 msgstr "pingou"
 
-#: ../../include/text.php:836
+#: ../../include/text.php:841
 msgid "prod"
 msgstr "espetar"
 
-#: ../../include/text.php:836
+#: ../../include/text.php:841
 msgid "prodded"
 msgstr "espetou"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:842
 msgid "slap"
 msgstr "estapear"
 
-#: ../../include/text.php:837
+#: ../../include/text.php:842
 msgid "slapped"
 msgstr "estapeou"
 
-#: ../../include/text.php:838
+#: ../../include/text.php:843
 msgid "finger"
 msgstr "dar um toque"
 
-#: ../../include/text.php:838
+#: ../../include/text.php:843
 msgid "fingered"
 msgstr "deu um toque"
 
-#: ../../include/text.php:839
+#: ../../include/text.php:844
 msgid "rebuff"
 msgstr "rebater"
 
-#: ../../include/text.php:839
+#: ../../include/text.php:844
 msgid "rebuffed"
 msgstr "rebateu"
 
-#: ../../include/text.php:851
+#: ../../include/text.php:856
 msgid "happy"
 msgstr "feliz"
 
-#: ../../include/text.php:852
+#: ../../include/text.php:857
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:853
+#: ../../include/text.php:858
 msgid "mellow"
 msgstr "suave"
 
-#: ../../include/text.php:854
+#: ../../include/text.php:859
 msgid "tired"
 msgstr "cansado"
 
-#: ../../include/text.php:855
+#: ../../include/text.php:860
 msgid "perky"
 msgstr "animado/a"
 
-#: ../../include/text.php:856
+#: ../../include/text.php:861
 msgid "angry"
 msgstr "nervoso"
 
-#: ../../include/text.php:857
+#: ../../include/text.php:862
 msgid "stupified"
 msgstr "embasbacado/a"
 
-#: ../../include/text.php:858
+#: ../../include/text.php:863
 msgid "puzzled"
 msgstr "confuso/a"
 
-#: ../../include/text.php:859
+#: ../../include/text.php:864
 msgid "interested"
 msgstr "interessado"
 
-#: ../../include/text.php:860
+#: ../../include/text.php:865
 msgid "bitter"
 msgstr "amargo/a"
 
-#: ../../include/text.php:861
+#: ../../include/text.php:866
 msgid "cheerful"
 msgstr "alegre"
 
-#: ../../include/text.php:862
+#: ../../include/text.php:867
 msgid "alive"
 msgstr "vivo"
 
-#: ../../include/text.php:863
+#: ../../include/text.php:868
 msgid "annoyed"
 msgstr "aborrecido"
 
-#: ../../include/text.php:864
+#: ../../include/text.php:869
 msgid "anxious"
 msgstr "ansioso"
 
-#: ../../include/text.php:865
+#: ../../include/text.php:870
 msgid "cranky"
 msgstr "irritado/a"
 
-#: ../../include/text.php:866
+#: ../../include/text.php:871
 msgid "disturbed"
 msgstr "perturbado"
 
-#: ../../include/text.php:867
+#: ../../include/text.php:872
 msgid "frustrated"
 msgstr "frustrado"
 
-#: ../../include/text.php:868
+#: ../../include/text.php:873
 msgid "motivated"
 msgstr "motivado"
 
-#: ../../include/text.php:869
+#: ../../include/text.php:874
 msgid "relaxed"
 msgstr "relaxado"
 
-#: ../../include/text.php:870
+#: ../../include/text.php:875
 msgid "surprised"
 msgstr "surpreso"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Monday"
 msgstr "Segunda"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Tuesday"
 msgstr "Terça"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Thursday"
 msgstr "Quinta"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Friday"
 msgstr "Sexta"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Saturday"
 msgstr "Sábado"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1036
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "January"
 msgstr "Janeiro"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "February"
 msgstr "Fevereiro"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "March"
 msgstr "Março"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "April"
 msgstr "Abril"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "May"
 msgstr "Maio"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "June"
 msgstr "Junho"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "July"
 msgstr "Julho"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "August"
 msgstr "Agosto"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "September"
 msgstr "Setembro"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "October"
 msgstr "Outubro"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "November"
 msgstr "Novembro"
 
-#: ../../include/text.php:1035
+#: ../../include/text.php:1040
 msgid "December"
 msgstr "Dezembro"
 
-#: ../../include/text.php:1113
+#: ../../include/text.php:1118
 msgid "unknown.???"
 msgstr "desconhecido.???"
 
-#: ../../include/text.php:1114
+#: ../../include/text.php:1119
 msgid "bytes"
 msgstr "bytes"
 
-#: ../../include/text.php:1149
+#: ../../include/text.php:1154
 msgid "remove category"
 msgstr "remover categoria"
 
-#: ../../include/text.php:1171
+#: ../../include/text.php:1176
 msgid "remove from file"
 msgstr "remover do arquivo"
 
-#: ../../include/text.php:1229 ../../include/text.php:1241
+#: ../../include/text.php:1234 ../../include/text.php:1246
 msgid "Click to open/close"
 msgstr "Clique para abrir/fechar"
 
-#: ../../include/text.php:1417 ../../mod/events.php:332
+#: ../../include/text.php:1401 ../../mod/events.php:332
 msgid "link to source"
-msgstr "exibir a origem"
+msgstr "Link para a origem"
 
-#: ../../include/text.php:1436
+#: ../../include/text.php:1420
 msgid "Select a page layout: "
 msgstr "Selecione um layout de página:"
 
-#: ../../include/text.php:1439 ../../include/text.php:1504
+#: ../../include/text.php:1423 ../../include/text.php:1488
 msgid "default"
 msgstr "default"
 
-#: ../../include/text.php:1475
+#: ../../include/text.php:1459
 msgid "Page content type: "
 msgstr "Tipo de conteúdo da página: "
 
-#: ../../include/text.php:1516
+#: ../../include/text.php:1500
 msgid "Select an alternate language"
 msgstr "Selecione um idioma alternativo"
 
-#: ../../include/text.php:1637 ../../include/conversation.php:117
+#: ../../include/text.php:1621 ../../include/conversation.php:117
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
 msgid "photo"
 msgstr "foto"
 
-#: ../../include/text.php:1640 ../../include/conversation.php:120
+#: ../../include/text.php:1624 ../../include/conversation.php:120
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr "evento"
 
-#: ../../include/text.php:1643 ../../include/conversation.php:145
+#: ../../include/text.php:1627 ../../include/conversation.php:145
 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
 msgid "status"
 msgstr "status"
 
-#: ../../include/text.php:1645 ../../include/conversation.php:147
+#: ../../include/text.php:1629 ../../include/conversation.php:147
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr "comentário"
 
-#: ../../include/text.php:1650
+#: ../../include/text.php:1634
 msgid "activity"
 msgstr "atividade"
 
-#: ../../include/text.php:1907
+#: ../../include/text.php:1891
 msgid "Design"
 msgstr "Design"
 
-#: ../../include/text.php:1909
+#: ../../include/text.php:1893
 msgid "Blocks"
 msgstr "Blocos"
 
-#: ../../include/text.php:1910
+#: ../../include/text.php:1894
 msgid "Menus"
 msgstr "Menus"
 
-#: ../../include/text.php:1911
+#: ../../include/text.php:1895
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../include/text.php:1912
+#: ../../include/text.php:1896
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
-#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
-#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
-#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
-#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
-#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
-#: ../../include/bbcode.php:633
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:601
+#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
+#: ../../include/bbcode.php:612 ../../include/bbcode.php:615
+#: ../../include/bbcode.php:618 ../../include/bbcode.php:623
+#: ../../include/bbcode.php:626 ../../include/bbcode.php:631
+#: ../../include/bbcode.php:634 ../../include/bbcode.php:637
+#: ../../include/bbcode.php:640
 msgid "Image/photo"
 msgstr "Imagem/foto"
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:651
 msgid "Encrypted content"
 msgstr "Conteúdo criptografado"
 
@@ -846,15 +846,15 @@ msgstr "%1$s escreveu a seguinte %2$s %3$s"
 msgid "post"
 msgstr "publicação"
 
-#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+#: ../../include/bbcode.php:569 ../../include/bbcode.php:589
 msgid "$1 wrote:"
 msgstr "$1 escreveu:"
 
-#: ../../include/Contact.php:120
+#: ../../include/Contact.php:123
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../../include/Contact.php:121
+#: ../../include/Contact.php:124
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Abre a localização selecionada em outra aba ou janela"
 
@@ -1127,8 +1127,8 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
-#: ../../mod/admin.php:750 ../../boot.php:1426
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:742
+#: ../../mod/admin.php:751 ../../boot.php:1428
 msgid "Email"
 msgstr "E-mail"
 
@@ -1246,7 +1246,7 @@ msgstr "Início:"
 msgid "Finishes:"
 msgstr "Fim:"
 
-#: ../../include/event.php:40 ../../include/identity.php:679
+#: ../../include/event.php:40 ../../include/identity.php:683
 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
 #: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
 msgid "Location:"
@@ -1263,7 +1263,7 @@ msgstr "Um grupo com esse nome, anteriormente excluído, foi reativado. Permiss
 msgid "Default privacy group for new contacts"
 msgstr "Grupo de privacidade padrão para novos contatos"
 
-#: ../../include/group.php:242 ../../mod/admin.php:750
+#: ../../include/group.php:242 ../../mod/admin.php:751
 msgid "All Channels"
 msgstr "Todos os canais"
 
@@ -1303,7 +1303,7 @@ msgstr "exibir mais"
 
 #: ../../include/js_strings.php:8
 msgid "show fewer"
-msgstr "mostrar menos"
+msgstr "exibir menos"
 
 #: ../../include/js_strings.php:9
 msgid "Password too short"
@@ -1414,39 +1414,40 @@ msgstr "Não foi possível determinar o remetente."
 msgid "Stored post could not be verified."
 msgstr "Não foi possível verificar a publicação armazenada."
 
-#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
+#: ../../include/photo/photo_driver.php:643 ../../include/photos.php:51
 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
 #: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
 #: ../../mod/photos.php:656 ../../mod/photos.php:678
 msgid "Profile Photos"
 msgstr "Fotos do perfil"
 
-#: ../../include/attach.php:98 ../../include/attach.php:129
-#: ../../include/attach.php:185 ../../include/attach.php:200
-#: ../../include/attach.php:233 ../../include/attach.php:247
-#: ../../include/attach.php:268 ../../include/attach.php:463
-#: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../include/attach.php:119 ../../include/attach.php:166
+#: ../../include/attach.php:229 ../../include/attach.php:243
+#: ../../include/attach.php:283 ../../include/attach.php:297
+#: ../../include/attach.php:322 ../../include/attach.php:513
+#: ../../include/attach.php:585 ../../include/chat.php:113
+#: ../../include/photos.php:15 ../../include/items.php:3575
 #: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
 #: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
-#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
-#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
-#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
-#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/invite.php:104 ../../mod/settings.php:493 ../../mod/menu.php:44
+#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/bookmarks.php:46 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/chat.php:87 ../../mod/chat.php:92
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
+#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
+#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
+#: ../../mod/network.php:12 ../../mod/profiles.php:152
 #: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/settings.php:493
-#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
-#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
-#: ../../mod/connections.php:169 ../../mod/notifications.php:66
-#: ../../mod/blocks.php:29 ../../mod/blocks.php:44
-#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
-#: ../../mod/poke.php:128 ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
 #: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
 #: ../../mod/editblock.php:48 ../../mod/filestorage.php:10
 #: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
@@ -1457,61 +1458,61 @@ msgstr "Fotos do perfil"
 msgid "Permission denied."
 msgstr "Permissão negada."
 
-#: ../../include/attach.php:180 ../../include/attach.php:228
+#: ../../include/attach.php:224 ../../include/attach.php:278
 msgid "Item was not found."
 msgstr "O item não foi encontrado."
 
-#: ../../include/attach.php:281
+#: ../../include/attach.php:335
 msgid "No source file."
 msgstr "Nenhum arquivo de origem."
 
-#: ../../include/attach.php:298
+#: ../../include/attach.php:352
 msgid "Cannot locate file to replace"
 msgstr "Não foi possível locar o arquivo a ser substituído"
 
-#: ../../include/attach.php:316
+#: ../../include/attach.php:370
 msgid "Cannot locate file to revise/update"
 msgstr "Não foi possível localizar o arquivo a ser revisado/atualizado"
 
-#: ../../include/attach.php:327
+#: ../../include/attach.php:381
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "O arquivo excedeu o tamanho limite de %d"
 
-#: ../../include/attach.php:339
+#: ../../include/attach.php:393
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Você atingiu o seu limite de %1$.0f Mbytes de armazenamento de anexos."
 
-#: ../../include/attach.php:423
+#: ../../include/attach.php:475
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Não foi possível enviar o arquivo. Provável limite do sistema ou a ação foi encerrada."
 
-#: ../../include/attach.php:435
+#: ../../include/attach.php:487
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Não foi possível verificar o arquivo armazenado. Falha no envio."
 
-#: ../../include/attach.php:479 ../../include/attach.php:496
+#: ../../include/attach.php:528 ../../include/attach.php:545
 msgid "Path not available."
 msgstr "O caminho não está disponível."
 
-#: ../../include/attach.php:546
+#: ../../include/attach.php:590
 msgid "Empty pathname"
 msgstr "O nome do caminho está em branco"
 
-#: ../../include/attach.php:564
+#: ../../include/attach.php:606
 msgid "duplicate filename or path"
 msgstr "nome de arquivo ou caminho duplicado"
 
-#: ../../include/attach.php:589
+#: ../../include/attach.php:630
 msgid "Path not found."
 msgstr "Caminho não encontrado."
 
-#: ../../include/attach.php:634
+#: ../../include/attach.php:674
 msgid "mkdir failed."
 msgstr "mkdir falhou."
 
-#: ../../include/attach.php:638
+#: ../../include/attach.php:678
 msgid "database storage failed."
 msgstr "armazenamento de banco de dados falhou."
 
@@ -1554,8 +1555,8 @@ msgid "Select"
 msgstr "Selecionar"
 
 #: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
-#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/thing.php:236 ../../mod/settings.php:579 ../../mod/group.php:176
+#: ../../mod/admin.php:746 ../../mod/connedit.php:359
 #: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
 msgid "Delete"
 msgstr "Excluir"
@@ -1597,7 +1598,7 @@ msgid "View in context"
 msgstr "Ver no contexto"
 
 #: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:121
 #: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
 #: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
 #: ../../mod/photos.php:975
@@ -1728,7 +1729,7 @@ msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Expira YYYY-MM-DD HH:MM"
 
 #: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
-#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
+#: ../../mod/webpages.php:122 ../../mod/editpost.php:141
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
 #: ../../mod/editblock.php:151 ../../mod/photos.php:995
 msgid "Preview"
@@ -1742,7 +1743,7 @@ msgstr "Compartilhar"
 msgid "Page link title"
 msgstr "Título do link da página"
 
-#: ../../include/conversation.php:1101 ../../mod/editpost.php:104
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:113
 #: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/editlayout.php:107
 #: ../../mod/editwebpage.php:145 ../../mod/editblock.php:121
 msgid "Upload photo"
@@ -1752,7 +1753,7 @@ msgstr "Enviar foto"
 msgid "upload photo"
 msgstr "enviar foto"
 
-#: ../../include/conversation.php:1103 ../../mod/editpost.php:105
+#: ../../include/conversation.php:1103 ../../mod/editpost.php:114
 #: ../../mod/mail.php:220 ../../mod/mail.php:333 ../../mod/editlayout.php:108
 #: ../../mod/editwebpage.php:146 ../../mod/editblock.php:122
 msgid "Attach file"
@@ -1762,7 +1763,7 @@ msgstr "Anexar arquivo"
 msgid "attach file"
 msgstr "anexar arquivo"
 
-#: ../../include/conversation.php:1105 ../../mod/editpost.php:106
+#: ../../include/conversation.php:1105 ../../mod/editpost.php:115
 #: ../../mod/mail.php:221 ../../mod/mail.php:334 ../../mod/editlayout.php:109
 #: ../../mod/editwebpage.php:147 ../../mod/editblock.php:123
 msgid "Insert web link"
@@ -1788,7 +1789,7 @@ msgstr "Inserir link de áudio"
 msgid "audio link"
 msgstr "link de áudio"
 
-#: ../../include/conversation.php:1111 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:119
 #: ../../mod/editlayout.php:113 ../../mod/editwebpage.php:151
 #: ../../mod/editblock.php:127
 msgid "Set your location"
@@ -1798,7 +1799,7 @@ msgstr "Definir sua localização"
 msgid "set location"
 msgstr "definir localização"
 
-#: ../../include/conversation.php:1113 ../../mod/editpost.php:111
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:120
 #: ../../mod/editlayout.php:114 ../../mod/editwebpage.php:152
 #: ../../mod/editblock.php:128
 msgid "Clear browser location"
@@ -1808,19 +1809,19 @@ msgstr "Limpar a localização do navegador"
 msgid "clear location"
 msgstr "limpar a localização"
 
-#: ../../include/conversation.php:1116 ../../mod/editpost.php:124
+#: ../../include/conversation.php:1116 ../../mod/editpost.php:133
 #: ../../mod/editlayout.php:127 ../../mod/editwebpage.php:169
 #: ../../mod/editblock.php:142
 msgid "Set title"
 msgstr "Definir o título"
 
-#: ../../include/conversation.php:1119 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1119 ../../mod/editpost.php:135
 #: ../../mod/editlayout.php:130 ../../mod/editwebpage.php:171
 #: ../../mod/editblock.php:145
 msgid "Categories (comma-separated list)"
 msgstr "Categorias (lista separada por vírgulas)"
 
-#: ../../include/conversation.php:1121 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1121 ../../mod/editpost.php:122
 #: ../../mod/editlayout.php:116 ../../mod/editwebpage.php:154
 #: ../../mod/editblock.php:130
 msgid "Permission settings"
@@ -1830,43 +1831,43 @@ msgstr "Configurações de permissão"
 msgid "permissions"
 msgstr "permissões"
 
-#: ../../include/conversation.php:1130 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1130 ../../mod/editpost.php:130
 #: ../../mod/editlayout.php:124 ../../mod/editwebpage.php:164
 #: ../../mod/editblock.php:139
 msgid "Public post"
 msgstr "Publicação pública"
 
-#: ../../include/conversation.php:1132 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1132 ../../mod/editpost.php:136
 #: ../../mod/editlayout.php:131 ../../mod/editwebpage.php:172
 #: ../../mod/editblock.php:146
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Por exemplo: joao@exemplo.com, maria@exemplo.com"
 
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:138
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:147
 #: ../../mod/mail.php:226 ../../mod/mail.php:339 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:182 ../../mod/editblock.php:156
 msgid "Set expiration date"
 msgstr "Definir data de expiração"
 
 #: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
-#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
+#: ../../mod/editpost.php:149 ../../mod/mail.php:228 ../../mod/mail.php:341
 msgid "Encrypt text"
 msgstr "Encriptar texto"
 
-#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:151
 msgid "OK"
 msgstr "Ok"
 
-#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/settings.php:517
+#: ../../mod/settings.php:543 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/editpost.php:152 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../../include/conversation.php:1381
 msgid "Commented Order"
-msgstr "Recentemente comentados"
+msgstr "Recentes e comentados"
 
 #: ../../include/conversation.php:1384
 msgid "Sort by Comment Date"
@@ -1874,7 +1875,7 @@ msgstr "Ordenar pela data do último comentário"
 
 #: ../../include/conversation.php:1387
 msgid "Posted Order"
-msgstr "Ordem de publicação"
+msgstr "Recentemente publicados"
 
 #: ../../include/conversation.php:1390
 msgid "Sort by Post Date"
@@ -1953,238 +1954,238 @@ msgstr "Links guardados"
 msgid "Manage Webpages"
 msgstr "Administrar páginas web"
 
-#: ../../include/identity.php:29 ../../mod/item.php:1177
+#: ../../include/identity.php:30 ../../mod/item.php:1187
 msgid "Unable to obtain identity information from database"
 msgstr "Não foi possível obter a informação da identidade a partir do banco de dados"
 
-#: ../../include/identity.php:62
+#: ../../include/identity.php:63
 msgid "Empty name"
 msgstr "O nome está em branco"
 
-#: ../../include/identity.php:64
+#: ../../include/identity.php:65
 msgid "Name too long"
 msgstr "O nome é muito grande"
 
-#: ../../include/identity.php:143
+#: ../../include/identity.php:147
 msgid "No account identifier"
 msgstr "Nenhuma identificação da conta"
 
-#: ../../include/identity.php:153
+#: ../../include/identity.php:157
 msgid "Nickname is required."
 msgstr "É necessário informar o apelido."
 
-#: ../../include/identity.php:167
+#: ../../include/identity.php:171
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "A identificação possui caracteres não suportados ou já está sendo usada nesse site."
 
-#: ../../include/identity.php:226
+#: ../../include/identity.php:230
 msgid "Unable to retrieve created identity"
 msgstr "Não foi possível recuperar a identidade criada"
 
-#: ../../include/identity.php:285
+#: ../../include/identity.php:289
 msgid "Default Profile"
 msgstr "Perfil padrão"
 
-#: ../../include/identity.php:477
+#: ../../include/identity.php:481
 msgid "Requested channel is not available."
 msgstr "Canal solicitado não está disponível."
 
-#: ../../include/identity.php:489
+#: ../../include/identity.php:493
 msgid " Sorry, you don't have the permission to view this profile. "
 msgstr "Desculpe, você não tem permissão para ver este perfil."
 
-#: ../../include/identity.php:524 ../../mod/webpages.php:8
+#: ../../include/identity.php:528 ../../mod/webpages.php:8
 #: ../../mod/connect.php:13 ../../mod/layouts.php:8
 #: ../../mod/achievements.php:8 ../../mod/blocks.php:10
 #: ../../mod/profile.php:16 ../../mod/filestorage.php:40
 msgid "Requested profile is not available."
 msgstr "O perfil solicitado não está disponível."
 
-#: ../../include/identity.php:642 ../../mod/profiles.php:603
+#: ../../include/identity.php:646 ../../mod/profiles.php:603
 msgid "Change profile photo"
 msgstr "Mudar a foto do perfil"
 
-#: ../../include/identity.php:648
+#: ../../include/identity.php:652
 msgid "Profiles"
 msgstr "Perfis"
 
-#: ../../include/identity.php:648
+#: ../../include/identity.php:652
 msgid "Manage/edit profiles"
 msgstr "Administrar/editar perfis"
 
-#: ../../include/identity.php:649 ../../mod/profiles.php:604
+#: ../../include/identity.php:653 ../../mod/profiles.php:604
 msgid "Create New Profile"
 msgstr "Criar um novo perfil"
 
-#: ../../include/identity.php:652
+#: ../../include/identity.php:656
 msgid "Edit Profile"
 msgstr "Editar perfil"
 
-#: ../../include/identity.php:663 ../../mod/profiles.php:615
+#: ../../include/identity.php:667 ../../mod/profiles.php:615
 msgid "Profile Image"
 msgstr "Imagem do perfil"
 
-#: ../../include/identity.php:666 ../../mod/profiles.php:618
+#: ../../include/identity.php:670 ../../mod/profiles.php:618
 msgid "visible to everybody"
 msgstr "visível para todos"
 
-#: ../../include/identity.php:667 ../../mod/profiles.php:619
+#: ../../include/identity.php:671 ../../mod/profiles.php:619
 msgid "Edit visibility"
 msgstr "Editar a visibilidade"
 
-#: ../../include/identity.php:681 ../../include/identity.php:908
+#: ../../include/identity.php:685 ../../include/identity.php:912
 #: ../../mod/directory.php:159
 msgid "Gender:"
 msgstr "Gênero:"
 
-#: ../../include/identity.php:682 ../../include/identity.php:928
+#: ../../include/identity.php:686 ../../include/identity.php:932
 #: ../../mod/directory.php:161
 msgid "Status:"
 msgstr "Situação:"
 
-#: ../../include/identity.php:683 ../../include/identity.php:939
+#: ../../include/identity.php:687 ../../include/identity.php:943
 #: ../../mod/directory.php:163
 msgid "Homepage:"
 msgstr "Página web:"
 
-#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+#: ../../include/identity.php:688 ../../mod/dirprofile.php:157
 msgid "Online Now"
 msgstr "Online agora"
 
-#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../include/identity.php:756 ../../include/identity.php:836
 #: ../../mod/ping.php:262
 msgid "g A l F d"
 msgstr "G l d F"
 
-#: ../../include/identity.php:753 ../../include/identity.php:833
+#: ../../include/identity.php:757 ../../include/identity.php:837
 msgid "F d"
 msgstr "F d"
 
-#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../include/identity.php:802 ../../include/identity.php:877
 #: ../../mod/ping.php:284
 msgid "[today]"
 msgstr "[hoje]"
 
-#: ../../include/identity.php:810
+#: ../../include/identity.php:814
 msgid "Birthday Reminders"
 msgstr "Lembres de aniversário"
 
-#: ../../include/identity.php:811
+#: ../../include/identity.php:815
 msgid "Birthdays this week:"
 msgstr "Aniversários nesta semana:"
 
-#: ../../include/identity.php:866
+#: ../../include/identity.php:870
 msgid "[No description]"
 msgstr "[Sem descrição]"
 
-#: ../../include/identity.php:884
+#: ../../include/identity.php:888
 msgid "Event Reminders"
 msgstr "Lembretes de eventos"
 
-#: ../../include/identity.php:885
+#: ../../include/identity.php:889
 msgid "Events this week:"
 msgstr "Eventos nesta semana:"
 
-#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../include/identity.php:902 ../../include/identity.php:986
 #: ../../mod/profperm.php:107
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../include/identity.php:906 ../../mod/settings.php:924
+#: ../../include/identity.php:910 ../../mod/settings.php:937
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../../include/identity.php:913
+#: ../../include/identity.php:917
 msgid "j F, Y"
 msgstr "j de F, Y"
 
-#: ../../include/identity.php:914
+#: ../../include/identity.php:918
 msgid "j F"
 msgstr "j de F"
 
-#: ../../include/identity.php:921
+#: ../../include/identity.php:925
 msgid "Birthday:"
 msgstr "Aniversário:"
 
-#: ../../include/identity.php:925
+#: ../../include/identity.php:929
 msgid "Age:"
 msgstr "Idade:"
 
-#: ../../include/identity.php:934
+#: ../../include/identity.php:938
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "para %1$d %2$s"
 
-#: ../../include/identity.php:937 ../../mod/profiles.php:526
+#: ../../include/identity.php:941 ../../mod/profiles.php:526
 msgid "Sexual Preference:"
 msgstr "Preferência sexual:"
 
-#: ../../include/identity.php:941 ../../mod/profiles.php:528
+#: ../../include/identity.php:945 ../../mod/profiles.php:528
 msgid "Hometown:"
 msgstr "Cidade natal:"
 
-#: ../../include/identity.php:943
+#: ../../include/identity.php:947
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/identity.php:945 ../../mod/profiles.php:529
+#: ../../include/identity.php:949 ../../mod/profiles.php:529
 msgid "Political Views:"
 msgstr "Posição política:"
 
-#: ../../include/identity.php:947
+#: ../../include/identity.php:951
 msgid "Religion:"
 msgstr "Religião:"
 
-#: ../../include/identity.php:949 ../../mod/directory.php:165
+#: ../../include/identity.php:953 ../../mod/directory.php:165
 msgid "About:"
 msgstr "Sobre:"
 
-#: ../../include/identity.php:951
+#: ../../include/identity.php:955
 msgid "Hobbies/Interests:"
 msgstr "Hobbies/Interesses:"
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:532
+#: ../../include/identity.php:957 ../../mod/profiles.php:532
 msgid "Likes:"
 msgstr "Gosta de:"
 
-#: ../../include/identity.php:955 ../../mod/profiles.php:533
+#: ../../include/identity.php:959 ../../mod/profiles.php:533
 msgid "Dislikes:"
 msgstr "Não gosta de:"
 
-#: ../../include/identity.php:958
+#: ../../include/identity.php:962
 msgid "Contact information and Social Networks:"
 msgstr "Informações de contato e redes sociais:"
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:964
 msgid "My other channels:"
 msgstr "Meus outros canais:"
 
-#: ../../include/identity.php:962
+#: ../../include/identity.php:966
 msgid "Musical interests:"
 msgstr "Interesses musicais:"
 
-#: ../../include/identity.php:964
+#: ../../include/identity.php:968
 msgid "Books, literature:"
 msgstr "Livros, literatura:"
 
-#: ../../include/identity.php:966
+#: ../../include/identity.php:970
 msgid "Television:"
 msgstr "Televisão:"
 
-#: ../../include/identity.php:968
+#: ../../include/identity.php:972
 msgid "Film/dance/culture/entertainment:"
 msgstr "Filmes/dança/cultura/entretenimento:"
 
-#: ../../include/identity.php:970
+#: ../../include/identity.php:974
 msgid "Love/Romance:"
 msgstr "Amor/romance:"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:976
 msgid "Work/employment:"
 msgstr "Trabalho/emprego:"
 
-#: ../../include/identity.php:974
+#: ../../include/identity.php:978
 msgid "School/education:"
 msgstr "Escola/educação:"
 
@@ -2193,11 +2194,12 @@ msgid "Private Message"
 msgstr "Mensagem privada"
 
 #: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
-#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
-#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
-#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
+#: ../../include/menu.php:41 ../../mod/thing.php:235
+#: ../../mod/settings.php:578 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:112 ../../mod/layouts.php:102
+#: ../../mod/editlayout.php:106 ../../mod/blocks.php:93
+#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
+#: ../../mod/filestorage.php:170
 msgid "Edit"
 msgstr "Editar"
 
@@ -2288,15 +2290,15 @@ msgstr "Este(a) é você"
 
 #: ../../include/ItemObject.php:548 ../../mod/events.php:469
 #: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/settings.php:516 ../../mod/settings.php:628
+#: ../../mod/settings.php:656 ../../mod/settings.php:680
+#: ../../mod/settings.php:752 ../../mod/settings.php:929
 #: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
-#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
-#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
+#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:739
+#: ../../mod/admin.php:879 ../../mod/admin.php:1078 ../../mod/admin.php:1165
 #: ../../mod/connedit.php:437 ../../mod/profiles.php:506
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/settings.php:516
-#: ../../mod/settings.php:628 ../../mod/settings.php:656
-#: ../../mod/settings.php:680 ../../mod/settings.php:752
-#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
 #: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
 #: ../../mod/filestorage.php:131 ../../mod/photos.php:566
 #: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
@@ -2645,7 +2647,7 @@ msgstr "Você saiu."
 msgid "Failed authentication"
 msgstr "Não foi possível autenticar"
 
-#: ../../include/auth.php:203
+#: ../../include/auth.php:203 ../../mod/openid.php:185
 msgid "Login failed."
 msgstr "Não foi possível entrar."
 
@@ -3013,35 +3015,31 @@ msgstr "Essa ação excede o limite definido para o seu plano de assinatura."
 msgid "This action is not available under your subscription plan."
 msgstr "Essa ação não está disponível para o seu plano de assinatura."
 
-#: ../../include/follow.php:21
+#: ../../include/follow.php:23
 msgid "Channel is blocked on this site."
 msgstr "O canal está bloqueado neste site."
 
-#: ../../include/follow.php:26
+#: ../../include/follow.php:28
 msgid "Channel location missing."
 msgstr "A localização do canal foi perdida"
 
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr "Não foi possível descobrir o canal. O site pode estar fora do ar ou desconfigurado."
-
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
-msgstr "A resposta do canal remoto não foi compreendida."
-
-#: ../../include/follow.php:58
+#: ../../include/follow.php:54
 msgid "Response from remote channel was incomplete."
 msgstr "A resposta do canal remoto está incompleta."
 
-#: ../../include/follow.php:129
+#: ../../include/follow.php:126
+msgid "Channel discovery failed."
+msgstr "A descoberta de canais falhou."
+
+#: ../../include/follow.php:143
 msgid "local account not found."
 msgstr "a conta local não foi encontrada."
 
-#: ../../include/follow.php:138
+#: ../../include/follow.php:152
 msgid "Cannot connect to yourself."
 msgstr "Não é possível conectar-se consigo mesmo."
 
-#: ../../include/security.php:280
+#: ../../include/security.php:291
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -3145,36 +3143,40 @@ msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr "Extremamente avançado. Não mexa nisso a não ser que saiba o que está fazendo"
 
-#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../include/items.php:240 ../../mod/like.php:55 ../../mod/profperm.php:23
 #: ../../mod/group.php:68 ../../index.php:350
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
-#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
+#: ../../include/items.php:756 ../../mod/connedit.php:395
+msgid "Unknown"
+msgstr "Desconhecidos"
+
+#: ../../include/items.php:3513 ../../mod/thing.php:78 ../../mod/admin.php:151
+#: ../../mod/admin.php:783 ../../mod/admin.php:986 ../../mod/viewsrc.php:18
 #: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
 msgid "Item not found."
 msgstr "O item não foi encontrado."
 
-#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3849 ../../mod/group.php:38 ../../mod/group.php:140
 msgid "Collection not found."
 msgstr "A coleção não foi encontrada."
 
-#: ../../include/items.php:3824
+#: ../../include/items.php:3864
 msgid "Collection is empty."
 msgstr "A coleção está vazia."
 
-#: ../../include/items.php:3831
+#: ../../include/items.php:3871
 #, php-format
 msgid "Collection: %s"
 msgstr "Coleção: %s"
 
-#: ../../include/items.php:3842
+#: ../../include/items.php:3882
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexão: %s"
 
-#: ../../include/items.php:3845
+#: ../../include/items.php:3885
 msgid "Connection not found."
 msgstr "A conexão não foi encontrada."
 
@@ -3410,2790 +3412,2823 @@ msgid ""
 "http://getzot.com"
 msgstr "Para maiores informações sobre o Projeto Red Matrix e porque ele tem potencial para mudar a Internet como a conhecemos, por favor visite: http://getzot.com"
 
-#: ../../mod/item.php:145
-msgid "Unable to locate original post."
-msgstr "Não foi possível localizar a publicação original."
-
-#: ../../mod/item.php:346
-msgid "Empty post discarded."
-msgstr "A publicação em branco foi descartada."
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "O nome é obrigatório"
 
-#: ../../mod/item.php:388
-msgid "Executable content type not permitted to this channel."
-msgstr "Conteúdo de tipo executável não permitido para este canal."
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "A chave e o segredo são obrigatórios"
 
-#: ../../mod/item.php:835
-msgid "System error. Post not saved."
-msgstr "Erro no sistema. A publicação não foi salva."
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
+msgstr "Atualizar"
 
-#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
-msgid "Wall Photos"
-msgstr "Fotos do mural"
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
+msgstr "As senhas não correspondem. A senha não foi modificada."
 
-#: ../../mod/item.php:1182
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Você atingiu o seu limite de %1$.0f publicações de novos tópicos."
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Não é permitido uma senha em branco. A senha não foi modificada."
 
-#: ../../mod/item.php:1188
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Você atingiu o seu limite de %1$.0f páginas web."
+#: ../../mod/settings.php:212
+msgid "Password changed."
+msgstr "A senha foi modificada."
 
-#: ../../mod/menu.php:21
-msgid "Menu updated."
-msgstr "Menu atualizado."
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
+msgstr "Não foi possível atualizar a senha. Por favor, tente novamente."
 
-#: ../../mod/menu.php:25
-msgid "Unable to update menu."
-msgstr "Não foi possível atualizar o menu."
+#: ../../mod/settings.php:228
+msgid "Not valid email."
+msgstr "Não é um e-mail válido"
 
-#: ../../mod/menu.php:30
-msgid "Menu created."
-msgstr "Menu criado."
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
+msgstr "Endereço de e-mail protegido. Não é possível mudar para esse e-mail."
 
-#: ../../mod/menu.php:34
-msgid "Unable to create menu."
-msgstr "Não foi possível criar o menu."
+#: ../../mod/settings.php:240
+msgid "System failure storing new email. Please try again."
+msgstr "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente."
 
-#: ../../mod/menu.php:57
-msgid "Manage Menus"
-msgstr "Administrar menus"
+#: ../../mod/settings.php:444
+msgid "Settings updated."
+msgstr "As configurações foram atualizadas."
 
-#: ../../mod/menu.php:60
-msgid "Drop"
-msgstr "Descartar"
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
+msgstr "Adicionar aplicação"
 
-#: ../../mod/menu.php:62
-msgid "Create a new menu"
-msgstr "Criar um novo menu"
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
+msgstr "Nome"
 
-#: ../../mod/menu.php:63
-msgid "Delete this menu"
-msgstr "Deletar este menu"
+#: ../../mod/settings.php:518
+msgid "Name of application"
+msgstr "Nome da aplicação"
 
-#: ../../mod/menu.php:64 ../../mod/menu.php:109
-msgid "Edit menu contents"
-msgstr "Editar os conteúdos do menu"
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
+msgstr "Chave de consumidor"
 
-#: ../../mod/menu.php:65
-msgid "Edit this menu"
-msgstr "Editar este menu"
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Gerado automaticamente - troque se desejável. Comprimento máximo 20"
 
-#: ../../mod/menu.php:80
-msgid "New Menu"
-msgstr "Novo menu"
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
+msgstr "Segredo de consumidor"
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
-msgid "Menu name"
-msgstr "Nome do menu"
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
+msgstr "Redirecionamento"
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
-msgid "Must be unique, only seen by you"
-msgstr "Deve ser único, exibido somente para você"
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso"
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
-msgid "Menu title"
-msgstr "Título do menu"
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
+msgstr "URL do ícone"
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
-msgid "Menu title as seen by others"
-msgstr "Título do menu quando visto por outros"
+#: ../../mod/settings.php:522
+msgid "Optional"
+msgstr "Opcional"
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
-msgid "Allow bookmarks"
-msgstr "Habilitar links guardados"
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
+msgstr "Você não pode editar esta aplicação."
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
-msgid "Menu may be used to store saved bookmarks"
-msgstr "O menu pode ser utilizado para armazenar links guardados"
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
+msgstr "Aplicações conectadas"
 
-#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
-msgid "Create"
-msgstr "Criar"
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
+msgstr "Chave do cliente começa com"
 
-#: ../../mod/menu.php:92 ../../mod/mitem.php:14
-msgid "Menu not found."
-msgstr "O menu não foi encontrado."
+#: ../../mod/settings.php:581
+msgid "No name"
+msgstr "Sem nome"
 
-#: ../../mod/menu.php:98
-msgid "Menu deleted."
-msgstr "Menu deletado."
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
+msgstr "Remover autorização"
 
-#: ../../mod/menu.php:100
-msgid "Menu could not be deleted."
-msgstr "Não foi possível deletar o menu."
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
+msgstr "Não foi definida nenhuma configuração do recurso"
 
-#: ../../mod/menu.php:106
-msgid "Edit Menu"
-msgstr "Editar menu"
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
+msgstr "Configurações do recurso"
 
-#: ../../mod/menu.php:108
-msgid "Add or remove entries to this menu"
-msgstr "Adicionar ou remover entradas deste menu"
+#: ../../mod/settings.php:624
+msgid "Account Settings"
+msgstr "Configurações da conta"
 
-#: ../../mod/menu.php:114 ../../mod/mitem.php:186
-msgid "Modify"
-msgstr "Modificar"
+#: ../../mod/settings.php:625
+msgid "Password Settings"
+msgstr "Configurações da senha"
 
-#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
-#: ../../mod/dirprofile.php:181
-msgid "Not found."
-msgstr "Não encontrado."
+#: ../../mod/settings.php:626
+msgid "New Password:"
+msgstr "Nova senha:"
 
-#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
-#: ../../mod/blocks.php:96
-msgid "View"
-msgstr "Ver"
+#: ../../mod/settings.php:627
+msgid "Confirm:"
+msgstr "Confirme:"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Autorizar a conexão com a aplicação"
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
+msgstr "Deixe os campos de senha em branco, a não ser que você queira alterá-la"
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Volte para a sua aplicação e digite este código de segurança:"
+#: ../../mod/settings.php:629 ../../mod/settings.php:938
+msgid "Email Address:"
+msgstr "Endereço de e-mail:"
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Por favor, autentique-se para continuar."
+#: ../../mod/settings.php:630
+msgid "Remove Account"
+msgstr "Remover conta"
 
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Deseja autorizar esta aplicação a acessar suas publicações e contatos e/ou criar novas publicações para você?"
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Atenção: Esta ação é permanente e não pode ser revertida."
 
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
-#: ../../mod/settings.php:883
-msgid "Yes"
-msgstr "Sim"
+#: ../../mod/settings.php:647
+msgid "Off"
+msgstr "Desligado"
 
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
-#: ../../mod/settings.php:883
-msgid "No"
-msgstr "Não"
+#: ../../mod/settings.php:647
+msgid "On"
+msgstr "Ligado"
 
-#: ../../mod/apps.php:8
-msgid "No installed applications."
-msgstr "Não existe nenhuma aplicação instalada."
+#: ../../mod/settings.php:654
+msgid "Additional Features"
+msgstr "Recursos adicionais"
 
-#: ../../mod/apps.php:13
-msgid "Applications"
-msgstr "Aplicações"
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
+msgstr "Configurações do conector"
 
-#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
-msgid "Edit post"
-msgstr "Editar a publicação"
+#: ../../mod/settings.php:709 ../../mod/admin.php:379
+msgid "No special theme for mobile devices"
+msgstr "Sem tema especial para aparelhos móveis"
 
-#: ../../mod/cloud.php:112
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
-msgstr "Red Matrix - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++"
+#: ../../mod/settings.php:750
+msgid "Display Settings"
+msgstr "Configurações de exibição"
 
-#: ../../mod/bookmarks.php:38
-msgid "Bookmark added"
-msgstr "O link foi guardado"
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
+msgstr "Tema do perfil:"
 
-#: ../../mod/bookmarks.php:53
-msgid "My Bookmarks"
-msgstr "Meus links guardados"
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
+msgstr "Tema móvel:"
 
-#: ../../mod/bookmarks.php:64
-msgid "My Connections Bookmarks"
-msgstr "Links guardados das minhas conexões"
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
+msgstr "Atualizar navegador a cada xx segundos"
 
-#: ../../mod/subthread.php:105
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s está acompanhando %3$s de %2$s"
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Mínimo de 10 segundos, sem máximo"
 
-#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
-#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
-#: ../../mod/update_community.php:18
-msgid "[Embedded content - reload page to view]"
-msgstr "[Conteúdo incorporado - recarregue a página para ver]"
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Número máximo permitido de conversas carregadas:"
 
-#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
-#: ../../mod/wall_upload.php:35
-msgid "Channel not found."
-msgstr "O canal não foi encontrado."
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
+msgstr "Máximo de 100 itens"
 
-#: ../../mod/chanview.php:93
-msgid "toggle full screen mode"
-msgstr "alternar o mode de tela inteira"
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
+msgstr "Não exibir emoticons"
 
-#: ../../mod/tagger.php:98
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s etiquetou %3$s de %2$s com %4$s"
+#: ../../mod/settings.php:761
+msgid "Do not view remote profiles in frames"
+msgstr "Não exibir perfis remotos em frames"
 
-#: ../../mod/chat.php:18 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Você precisa estar autenticado para ver esta página."
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
+msgstr "Por padrão, abrir em uma sub-janela do seu próprio site"
 
-#: ../../mod/chat.php:163
-msgid "Leave Room"
-msgstr "Sair da sala"
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
+msgstr "Ninguém exceto você mesmo"
 
-#: ../../mod/chat.php:164
-msgid "I am away right now"
-msgstr "Eu estou ausente no momento"
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
+msgstr "Apenas quem você der permissão"
 
-#: ../../mod/chat.php:165
-msgid "I am online"
-msgstr "Eu estou online"
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
+msgstr "Qualquer um nos seus contatos"
 
-#: ../../mod/chat.php:189 ../../mod/chat.php:209
-msgid "New Chatroom"
-msgstr "Nova sala de bate-papo"
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
+msgstr "Qualquer um neste site"
 
-#: ../../mod/chat.php:190
-msgid "Chatroom Name"
-msgstr "Nome da sala de bate-papo"
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
+msgstr "Qualquer um nesta rede"
 
-#: ../../mod/chat.php:205
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Salas de bate-papo de %1$s"
+#: ../../mod/settings.php:801
+msgid "Anybody authenticated"
+msgstr "Qualquer um autenticado"
 
-#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
-#: ../../mod/directory.php:15 ../../mod/display.php:9
-#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:443
-msgid "Public access denied."
-msgstr "Acesso público negado."
+#: ../../mod/settings.php:802
+msgid "Anybody on the internet"
+msgstr "Qualquer um na internet"
 
-#: ../../mod/viewconnections.php:43
-msgid "No connections."
-msgstr "Nenhuma conexão."
+#: ../../mod/settings.php:879
+msgid "Publish your default profile in the network directory"
+msgstr "Publicar seu perfil padrão no diretório da rede?"
 
-#: ../../mod/viewconnections.php:55
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Ver o perfil de %s [%s]"
+#: ../../mod/settings.php:879 ../../mod/settings.php:884
+#: ../../mod/settings.php:955 ../../mod/api.php:106 ../../mod/profiles.php:484
+msgid "No"
+msgstr "Não"
 
-#: ../../mod/viewconnections.php:70
-msgid "View Connnections"
-msgstr "Ver conexões"
+#: ../../mod/settings.php:879 ../../mod/settings.php:884
+#: ../../mod/settings.php:955 ../../mod/api.php:105 ../../mod/profiles.php:483
+msgid "Yes"
+msgstr "Sim"
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "A etiqueta foi removida"
+#: ../../mod/settings.php:884
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Permitir sugerir você como amigo potencial para outros membros?"
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Remover a etiqueta de item"
+#: ../../mod/settings.php:888 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "ou"
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Selecione uma etiqueta para remover: "
+#: ../../mod/settings.php:893
+msgid "Your channel address is"
+msgstr "O endereço do seu canal é"
 
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
-msgid "Remove"
-msgstr "Remover"
+#: ../../mod/settings.php:927
+msgid "Channel Settings"
+msgstr "Configurações do canal"
 
-#: ../../mod/connect.php:55 ../../mod/connect.php:103
-msgid "Continue"
-msgstr "Continuar"
+#: ../../mod/settings.php:936
+msgid "Basic Settings"
+msgstr "Configurações básicas"
 
-#: ../../mod/connect.php:84
-msgid "Premium Channel Setup"
-msgstr "Configuração de canal premium"
+#: ../../mod/settings.php:939
+msgid "Your Timezone:"
+msgstr "Seu fuso horário:"
 
-#: ../../mod/connect.php:86
-msgid "Enable premium channel connection restrictions"
-msgstr "Habilitar restrições de canal premium para conexão"
+#: ../../mod/settings.php:940
+msgid "Default Post Location:"
+msgstr "Localização padrão de suas publicações:"
 
-#: ../../mod/connect.php:87
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc."
+#: ../../mod/settings.php:941
+msgid "Use Browser Location:"
+msgstr "Usar localizador do navegador:"
 
-#: ../../mod/connect.php:89 ../../mod/connect.php:109
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:"
+#: ../../mod/settings.php:943
+msgid "Adult Content"
+msgstr "Conteúdo adulto"
 
-#: ../../mod/connect.php:90
+#: ../../mod/settings.php:943
 msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Tentativas de conexões verão então o seguinte texto antes de prosseguir:"
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)"
 
-#: ../../mod/connect.php:91 ../../mod/connect.php:112
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página."
+#: ../../mod/settings.php:945
+msgid "Security and Privacy Settings"
+msgstr "Configurações de segurança e privacidade"
 
-#: ../../mod/connect.php:100
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Nenhuma instrução foi especificada pelo dono do canal.)"
+#: ../../mod/settings.php:947
+msgid "Hide my online presence"
+msgstr "Esconda minha presença online"
 
-#: ../../mod/connect.php:108
-msgid "Restricted or Premium Channel"
-msgstr "Canal restrito ou premium"
+#: ../../mod/settings.php:947
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Previne exibir em seu perfil que você está online"
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr "Nenhum potencial delegado para páginas localizado."
+#: ../../mod/settings.php:949
+msgid "Simple Privacy Settings:"
+msgstr "Configurações de privacidade simples:"
 
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
-msgstr "Delegar administração de página"
+#: ../../mod/settings.php:950
+msgid ""
+"Very Public - extremely permissive (should be used with caution)"
+msgstr "Muito público - extremamente permissivo (deve ser usado com cuidado)"
 
-#: ../../mod/delegate.php:123
+#: ../../mod/settings.php:951
 msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr "Delegados podem administrar todos os aspectos desta conta/página exceto pelas configurações básicas da conta. Por favor, não delegue sua conta pessoal para alguém que você não confie completamente."
+"Typical - default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)"
+msgstr "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)"
 
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr "Atuais administradores da página"
+#: ../../mod/settings.php:952
+msgid "Private - default private, never open or public"
+msgstr "Privado - privado por padrão, nunca aberto ou público"
 
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr "Atuais delegados da página"
+#: ../../mod/settings.php:953
+msgid "Blocked - default blocked to/from everybody"
+msgstr "Bloqueado - por padrão bloquado de/para todos"
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr "Potenciais delegados"
+#: ../../mod/settings.php:955
+msgid "Allow others to tag your posts"
+msgstr "Permitir que outros etiquetem suas publicações"
 
-#: ../../mod/delegate.php:131
-msgid "Add"
-msgstr "Adicionar"
+#: ../../mod/settings.php:955
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado"
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
-msgstr "Sem entradas."
+#: ../../mod/settings.php:957
+msgid "Advanced Privacy Settings"
+msgstr "Configurações de privacidade avançadas"
 
-#: ../../mod/chatsvc.php:102
-msgid "Away"
-msgstr "Ausente"
+#: ../../mod/settings.php:959
+msgid "Maximum Friend Requests/Day:"
+msgstr "Número máximo de requisições de amizade por dia:"
 
-#: ../../mod/chatsvc.php:106
-msgid "Online"
-msgstr "Online"
+#: ../../mod/settings.php:959
+msgid "May reduce spam activity"
+msgstr "Pode reduzir a frequência de spam"
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "O item não está disponível."
+#: ../../mod/settings.php:960
+msgid "Default Post Permissions"
+msgstr "Permissões padrão de publicação"
 
-#: ../../mod/mitem.php:47
-msgid "Menu element updated."
-msgstr "O elemento de menu foi atualizado."
+#: ../../mod/settings.php:961 ../../mod/mitem.php:134 ../../mod/mitem.php:177
+msgid "(click to open/close)"
+msgstr "(clique para abrir/fechar)"
 
-#: ../../mod/mitem.php:51
-msgid "Unable to update menu element."
-msgstr "Não foi possível atualizar o elemento de menu."
+#: ../../mod/settings.php:972
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Máximo número de mensagens privadas por dia de pessoas desconhecidas:"
 
-#: ../../mod/mitem.php:57
-msgid "Menu element added."
-msgstr "O elemento de menu foi adicionado."
+#: ../../mod/settings.php:972
+msgid "Useful to reduce spamming"
+msgstr "Útil para reduzir a frequência de spam"
 
-#: ../../mod/mitem.php:61
-msgid "Unable to add menu element."
-msgstr "Não foi possível adicionar o elemento de menu."
+#: ../../mod/settings.php:975
+msgid "Notification Settings"
+msgstr "Configurações de notificação"
 
-#: ../../mod/mitem.php:96
-msgid "Manage Menu Elements"
-msgstr "Administrar elementos de menu"
+#: ../../mod/settings.php:976
+msgid "By default post a status message when:"
+msgstr "Por padrão, publicar uma mensagem de status quando:"
 
-#: ../../mod/mitem.php:99
-msgid "Edit menu"
-msgstr "Editar menu"
+#: ../../mod/settings.php:977
+msgid "accepting a friend request"
+msgstr "aceitar um pedido de amizade"
 
-#: ../../mod/mitem.php:102
-msgid "Edit element"
-msgstr "Editar elemento"
+#: ../../mod/settings.php:978
+msgid "joining a forum/community"
+msgstr "associar-se a um fórum/comunidade"
 
-#: ../../mod/mitem.php:103
-msgid "Drop element"
-msgstr "Descartar elemento"
+#: ../../mod/settings.php:979
+msgid "making an interesting profile change"
+msgstr "modificar algo interessante em seu perfil"
 
-#: ../../mod/mitem.php:104
-msgid "New element"
-msgstr "Novo elemento"
+#: ../../mod/settings.php:980
+msgid "Send a notification email when:"
+msgstr "Enviar um e-mail de notificação quando:"
 
-#: ../../mod/mitem.php:105
-msgid "Edit this menu container"
-msgstr "Editar esta caixa de menu"
+#: ../../mod/settings.php:981
+msgid "You receive an introduction"
+msgstr "Você recebeu uma apresentação"
 
-#: ../../mod/mitem.php:106
-msgid "Add menu element"
-msgstr "Adicionar um elemento de menu"
+#: ../../mod/settings.php:982
+msgid "Your introductions are confirmed"
+msgstr "Suas solicitações forem confirmadas"
 
-#: ../../mod/mitem.php:107
-msgid "Delete this menu item"
-msgstr "Deleter este item de menu"
+#: ../../mod/settings.php:983
+msgid "Someone writes on your profile wall"
+msgstr "Alguém escrever no mural do seu perfil"
 
-#: ../../mod/mitem.php:108
-msgid "Edit this menu item"
-msgstr "Editar este item de menu"
+#: ../../mod/settings.php:984
+msgid "Someone writes a followup comment"
+msgstr "Alguém comentou a sua mensagem"
 
-#: ../../mod/mitem.php:131
-msgid "New Menu Element"
-msgstr "Novo elemento de menu"
+#: ../../mod/settings.php:985
+msgid "You receive a private message"
+msgstr "Você recebeu uma mensagem privada"
 
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
-msgid "Menu Item Permissions"
-msgstr "Permissões do item do menu"
+#: ../../mod/settings.php:986
+msgid "You receive a friend suggestion"
+msgstr "Você recebe uma sugestão de amizade"
 
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
-msgid "(click to open/close)"
-msgstr "(clique para abrir/fechar)"
+#: ../../mod/settings.php:987
+msgid "You are tagged in a post"
+msgstr "Você é mencionado num post"
 
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
-msgid "Link text"
-msgstr "Texto do link"
+#: ../../mod/settings.php:988
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Você foi cutucado/espetado/etc. numa publicação"
 
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
-msgid "URL of link"
-msgstr "URL do link"
+#: ../../mod/settings.php:991
+msgid "Advanced Account/Page Type Settings"
+msgstr "Configurações avançadas de conta/tipo de página"
 
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
-msgstr "Usar Red magic-auth se disponível"
+#: ../../mod/settings.php:992
+msgid "Change the behaviour of this account for special situations"
+msgstr "Mudar o comportamento dessa conta em situações especiais"
 
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
-msgid "Open link in new window"
-msgstr "Abrir link em uma nova janela"
+#: ../../mod/settings.php:995
+msgid ""
+"Please enable expert mode (in Settings > "
+"Additional features) to adjust!"
+msgstr "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) para ajustar!"
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Order in list"
-msgstr "Ordem na lista"
+#: ../../mod/settings.php:996
+msgid "Miscellaneous Settings"
+msgstr "Configurações miscelâneas"
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Números mais altos descem para o fim da lista"
+#: ../../mod/settings.php:998
+msgid "Personal menu to display in your channel pages"
+msgstr "Menu pessoal para exibir nas páginas dos seus canais"
 
-#: ../../mod/mitem.php:154
-msgid "Menu item not found."
-msgstr "O item de menu não foi encontrado."
+#: ../../mod/menu.php:21
+msgid "Menu updated."
+msgstr "Menu atualizado."
 
-#: ../../mod/mitem.php:163
-msgid "Menu item deleted."
-msgstr "O item de menu foi deletado."
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
+msgstr "Não foi possível atualizar o menu."
 
-#: ../../mod/mitem.php:165
-msgid "Menu item could not be deleted."
-msgstr "Não foi possível deletar o item de menu."
+#: ../../mod/menu.php:30
+msgid "Menu created."
+msgstr "Menu criado."
 
-#: ../../mod/mitem.php:174
-msgid "Edit Menu Element"
-msgstr "Editar elemento de menu"
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
+msgstr "Não foi possível criar o menu."
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Identificador de perfil inválido."
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
+msgstr "Administrar menus"
 
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
-msgstr "Editor de visibilidade do perfil"
+#: ../../mod/menu.php:60
+msgid "Drop"
+msgstr "Descartar"
 
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
-msgstr "Clique em um contato para adicionar ou remover."
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
+msgstr "Criar um novo menu"
 
-#: ../../mod/profperm.php:118
-msgid "Visible To"
-msgstr "Visível para"
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
+msgstr "Deletar este menu"
 
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
-msgstr "Todas as conexões"
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
+msgstr "Editar os conteúdos do menu"
 
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Coleção criada"
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
+msgstr "Editar este menu"
 
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Não foi possível criar a coleção."
+#: ../../mod/menu.php:80
+msgid "New Menu"
+msgstr "Novo menu"
 
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Coleção atualizada"
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
+msgstr "Nome do menu"
 
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Criar uma coleção de canais."
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
+msgstr "Deve ser único, exibido somente para você"
 
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr "Nome da coleção:"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
+msgstr "Título do menu"
 
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr "Membros são visíveis para outros canais"
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
+msgstr "Título do menu quando visto por outros"
 
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Coleção removida."
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
+msgstr "Habilitar links guardados"
 
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Não foi possível remover a coleção."
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
+msgstr "O menu pode ser utilizado para armazenar links guardados"
 
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr "Editor de coleção"
+#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
+msgid "Create"
+msgstr "Criar"
 
-#: ../../mod/group.php:196
-msgid "Members"
-msgstr "Membros"
+#: ../../mod/menu.php:92 ../../mod/mitem.php:14
+msgid "Menu not found."
+msgstr "O menu não foi encontrado."
 
-#: ../../mod/group.php:198
-msgid "All Connected Channels"
-msgstr "Todas os canais conectados"
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
+msgstr "Menu deletado."
 
-#: ../../mod/group.php:231
-msgid "Click on a channel to add or remove."
-msgstr "Clique em um canal para adicionar ou remover."
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
+msgstr "Não foi possível deletar o menu."
 
-#: ../../mod/admin.php:48
-msgid "Theme settings updated."
-msgstr "As configurações de tema foram atualizadas."
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
+msgstr "Editar menu"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:430
-msgid "Site"
-msgstr "Site"
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
+msgstr "Adicionar ou remover entradas deste menu"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
-msgid "Users"
-msgstr "Usuários"
+#: ../../mod/menu.php:114 ../../mod/mitem.php:186
+msgid "Modify"
+msgstr "Modificar"
 
-#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
-msgid "Plugins"
-msgstr "Plugins"
+#: ../../mod/menu.php:120 ../../mod/mitem.php:78 ../../mod/xchan.php:27
+#: ../../mod/dirprofile.php:181
+msgid "Not found."
+msgstr "Não encontrado."
 
-#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
-msgid "Themes"
-msgstr "Temas"
+#: ../../mod/webpages.php:121 ../../mod/layouts.php:105
+#: ../../mod/blocks.php:96
+msgid "View"
+msgstr "Ver"
 
-#: ../../mod/admin.php:92 ../../mod/admin.php:529
-msgid "Server"
-msgstr "Servidor"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autorizar a conexão com a aplicação"
 
-#: ../../mod/admin.php:93
-msgid "DB updates"
-msgstr "Atualizações do Banco de Dados"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Volte para a sua aplicação e digite este código de segurança:"
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
-msgid "Logs"
-msgstr "Logs"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Por favor, autentique-se para continuar."
 
-#: ../../mod/admin.php:113
-msgid "Plugin Features"
-msgstr "Recursos dos plugins"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Deseja autorizar esta aplicação a acessar suas publicações e contatos e/ou criar novas publicações para você?"
 
-#: ../../mod/admin.php:115
-msgid "User registrations waiting for confirmation"
-msgstr "Registros de usuário aguardando confirmação"
+#: ../../mod/apps.php:8
+msgid "No installed applications."
+msgstr "Não existe nenhuma aplicação instalada."
 
-#: ../../mod/admin.php:189
-msgid "Message queues"
-msgstr "Filas de mensagem"
+#: ../../mod/apps.php:13
+msgid "Applications"
+msgstr "Aplicações"
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
-#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
-#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
-msgid "Administration"
-msgstr "Administração"
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
+msgid "Edit post"
+msgstr "Editar a publicação"
 
-#: ../../mod/admin.php:195
-msgid "Summary"
-msgstr "Resumo"
+#: ../../mod/cloud.php:112
+msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgstr "Red Matrix - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++"
 
-#: ../../mod/admin.php:197
-msgid "Registered users"
-msgstr "Usuários registrados"
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
+msgstr "O link foi guardado"
 
-#: ../../mod/admin.php:199 ../../mod/admin.php:532
-msgid "Pending registrations"
-msgstr "Registros pendentes"
+#: ../../mod/bookmarks.php:53
+msgid "My Bookmarks"
+msgstr "Meus links guardados"
 
-#: ../../mod/admin.php:200
-msgid "Version"
-msgstr "Versão"
+#: ../../mod/bookmarks.php:64
+msgid "My Connections Bookmarks"
+msgstr "Links guardados das minhas conexões"
 
-#: ../../mod/admin.php:202 ../../mod/admin.php:533
-msgid "Active plugins"
-msgstr "Plugins ativos"
+#: ../../mod/item.php:145
+msgid "Unable to locate original post."
+msgstr "Não foi possível localizar a publicação original."
 
-#: ../../mod/admin.php:350
-msgid "Site settings updated."
-msgstr "As configurações de site foram atualizadas."
+#: ../../mod/item.php:346
+msgid "Empty post discarded."
+msgstr "A publicação em branco foi descartada."
 
-#: ../../mod/admin.php:379 ../../mod/settings.php:709
-msgid "No special theme for mobile devices"
-msgstr "Sem tema especial para aparelhos móveis"
+#: ../../mod/item.php:388
+msgid "Executable content type not permitted to this channel."
+msgstr "Conteúdo de tipo executável não permitido para este canal."
 
-#: ../../mod/admin.php:381
-msgid "No special theme for accessibility"
-msgstr "Sem tema especial para acessibilidade"
+#: ../../mod/item.php:845
+msgid "System error. Post not saved."
+msgstr "Erro no sistema. A publicação não foi salva."
 
-#: ../../mod/admin.php:409
-msgid "Closed"
-msgstr "Fechado"
+#: ../../mod/item.php:1112 ../../mod/wall_upload.php:34
+msgid "Wall Photos"
+msgstr "Fotos do mural"
 
-#: ../../mod/admin.php:410
-msgid "Requires approval"
-msgstr "Requer aprovação"
+#: ../../mod/item.php:1192
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Você atingiu o seu limite de %1$.0f publicações de novos tópicos."
 
-#: ../../mod/admin.php:411
-msgid "Open"
-msgstr "Aberto"
+#: ../../mod/item.php:1198
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Você atingiu o seu limite de %1$.0f páginas web."
 
-#: ../../mod/admin.php:416
-msgid "Private"
-msgstr "Privado"
+#: ../../mod/subthread.php:105
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s está acompanhando %3$s de %2$s"
 
-#: ../../mod/admin.php:417
-msgid "Paid Access"
-msgstr "Acesso pago"
+#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
+#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
+#: ../../mod/update_community.php:18
+msgid "[Embedded content - reload page to view]"
+msgstr "[Conteúdo incorporado - recarregue a página para ver]"
 
-#: ../../mod/admin.php:418
-msgid "Free Access"
-msgstr "Acesso gratuito"
+#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
+#: ../../mod/wall_upload.php:28
+msgid "Channel not found."
+msgstr "O canal não foi encontrado."
 
-#: ../../mod/admin.php:419
-msgid "Tiered Access"
-msgstr "Acesso em níveis"
+#: ../../mod/chanview.php:93
+msgid "toggle full screen mode"
+msgstr "alternar o mode de tela inteira"
 
-#: ../../mod/admin.php:432 ../../mod/register.php:189
-msgid "Registration"
-msgstr "Registro"
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s etiquetou %3$s de %2$s com %4$s"
 
-#: ../../mod/admin.php:433
-msgid "File upload"
-msgstr "Carregamento de arquivos"
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Você precisa estar autenticado para ver esta página."
 
-#: ../../mod/admin.php:434
-msgid "Policies"
-msgstr "Políticas"
+#: ../../mod/chat.php:163
+msgid "Leave Room"
+msgstr "Sair da sala"
 
-#: ../../mod/admin.php:435
-msgid "Advanced"
-msgstr "Avançado"
+#: ../../mod/chat.php:164
+msgid "I am away right now"
+msgstr "Eu estou ausente no momento"
 
-#: ../../mod/admin.php:439
-msgid "Site name"
-msgstr "Nome do site"
+#: ../../mod/chat.php:165
+msgid "I am online"
+msgstr "Eu estou online"
 
-#: ../../mod/admin.php:440
-msgid "Banner/Logo"
-msgstr "Cartaz/Logo"
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
+msgid "New Chatroom"
+msgstr "Nova sala de bate-papo"
 
-#: ../../mod/admin.php:441
-msgid "Administrator Information"
-msgstr "Informações do Administrador"
+#: ../../mod/chat.php:190
+msgid "Chatroom Name"
+msgstr "Nome da sala de bate-papo"
 
-#: ../../mod/admin.php:441
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Informações de contato com administradores do site. Exibida na página siteinfo. BBCode pode ser usado aqui."
+#: ../../mod/chat.php:205
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Salas de bate-papo de %1$s"
 
-#: ../../mod/admin.php:442
-msgid "System language"
-msgstr "Idioma do sistema"
+#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
+#: ../../mod/directory.php:15 ../../mod/display.php:9
+#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
+#: ../../mod/photos.php:443
+msgid "Public access denied."
+msgstr "Acesso público negado."
 
-#: ../../mod/admin.php:443
-msgid "System theme"
-msgstr "Tema do sistema"
+#: ../../mod/viewconnections.php:43
+msgid "No connections."
+msgstr "Nenhuma conexão."
 
-#: ../../mod/admin.php:443
-msgid ""
-"Default system theme - may be over-ridden by user profiles - change theme settings"
-msgstr "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - mudar configurações do tema"
+#: ../../mod/viewconnections.php:55
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Ver o perfil de %s [%s]"
 
-#: ../../mod/admin.php:444
-msgid "Mobile system theme"
-msgstr "Tema do sistema móvel"
+#: ../../mod/viewconnections.php:70
+msgid "View Connnections"
+msgstr "Ver conexões"
 
-#: ../../mod/admin.php:444
-msgid "Theme for mobile devices"
-msgstr "Tema para dispositivos móveis"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "A etiqueta foi removida"
 
-#: ../../mod/admin.php:445
-msgid "Accessibility system theme"
-msgstr "Tema do sistema acessível"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Remover a etiqueta de item"
 
-#: ../../mod/admin.php:445
-msgid "Accessibility theme"
-msgstr "Tema acessível"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Selecione uma etiqueta para remover: "
 
-#: ../../mod/admin.php:446
-msgid "Channel to use for this website's static pages"
-msgstr "Canal a utilizar para as páginas estáticas desse website"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
+msgid "Remove"
+msgstr "Remover"
 
-#: ../../mod/admin.php:446
-msgid "Site Channel"
-msgstr "Canal do site"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
+msgstr "Continuar"
 
-#: ../../mod/admin.php:448
-msgid "Maximum image size"
-msgstr "Tamanho máximo de imagens"
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
+msgstr "Configuração de canal premium"
 
-#: ../../mod/admin.php:448
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
+msgstr "Habilitar restrições de canal premium para conexão"
+
+#: ../../mod/connect.php:87
 msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Tamanho máximo em bytes de imagens carregadas. O padrão é 0, significando sem limites."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc."
 
-#: ../../mod/admin.php:449
-msgid "Register policy"
-msgstr "Política de registro"
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:"
 
-#: ../../mod/admin.php:450
-msgid "Access policy"
-msgstr "Política de acesso"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Tentativas de conexões verão então o seguinte texto antes de prosseguir:"
 
-#: ../../mod/admin.php:451
-msgid "Register text"
-msgstr "Texto de registro"
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página."
 
-#: ../../mod/admin.php:451
-msgid "Will be displayed prominently on the registration page."
-msgstr "Será exibido proeminentemente na página de registro."
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Nenhuma instrução foi especificada pelo dono do canal.)"
 
-#: ../../mod/admin.php:452
-msgid "Accounts abandoned after x days"
-msgstr "Contas abandonadas após x dias"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
+msgstr "Canal restrito ou premium"
 
-#: ../../mod/admin.php:452
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Não gastará recursos do sistema coletando de sites externos para contas abandonadas. Use 0 para sem limite de tempo."
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Nenhum potencial delegado para páginas localizado."
 
-#: ../../mod/admin.php:453
-msgid "Allowed friend domains"
-msgstr "Domínios permitidos para amigos"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Delegar administração de página"
 
-#: ../../mod/admin.php:453
+#: ../../mod/delegate.php:123
 msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Lista, separada por vírgulas, de domínios permitidos para estabelecer amizades com este site. Wildcards são aceitas. Vazio para permitir qualquer domínio"
-
-#: ../../mod/admin.php:454
-msgid "Allowed email domains"
-msgstr "Domínios permitidos de e-mail"
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Delegados podem administrar todos os aspectos desta conta/página exceto pelas configurações básicas da conta. Por favor, não delegue sua conta pessoal para alguém que você não confie completamente."
 
-#: ../../mod/admin.php:454
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Lista, separada por vírgulas, de domínios permitidos em endereços de e-mail para registros nesse site. Wildcards são aceitas. Vazio para permitir qualquer domínio"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Atuais administradores da página"
 
-#: ../../mod/admin.php:455
-msgid "Block public"
-msgstr "Bloquear público"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Atuais delegados da página"
 
-#: ../../mod/admin.php:455
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Marque para bloquear o acesso público a todas as páginas pessoais que seriam públicas, a não ser que se esteja autenticado."
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potenciais delegados"
 
-#: ../../mod/admin.php:456
-msgid "Force publish"
-msgstr "Forçar publicação"
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../../mod/admin.php:456
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Marque para forçar todos os perfis neste site a aparecerem listados no diretório do site."
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Sem entradas."
 
-#: ../../mod/admin.php:457
-msgid "No login on Homepage"
-msgstr "Sem formulário de autenticação na página inicial"
+#: ../../mod/chatsvc.php:102
+msgid "Away"
+msgstr "Ausente"
 
-#: ../../mod/admin.php:457
-msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
-msgstr "Marque para esconder o formulário de autenticação da página inicial do seu site quando visitantes chegarem sem estar autenticados (e.g. quando você inclui os conteúdos da página inicial através do canal do site)."
+#: ../../mod/chatsvc.php:106
+msgid "Online"
+msgstr "Online"
 
-#: ../../mod/admin.php:459
-msgid "Proxy user"
-msgstr "Usuário do proxy"
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "O item não está disponível."
 
-#: ../../mod/admin.php:460
-msgid "Proxy URL"
-msgstr "URL do proxy"
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr "O elemento de menu foi atualizado."
 
-#: ../../mod/admin.php:461
-msgid "Network timeout"
-msgstr "Timeout da rede"
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr "Não foi possível atualizar o elemento de menu."
 
-#: ../../mod/admin.php:461
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Valor em segundos. Use 0 para ilimitado (não recomendado)."
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr "O elemento de menu foi adicionado."
 
-#: ../../mod/admin.php:462
-msgid "Delivery interval"
-msgstr "Intervalo de entrega"
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr "Não foi possível adicionar o elemento de menu."
 
-#: ../../mod/admin.php:462
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Atrase os processos de entrega em segundo plano por este número de segundos para reduzir a carga do sistema. Recomendado: 4-5 para hosts compartilhados, 2-3 para servidores virtuais privados. 0-1 para grandes servidores dedicados."
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr "Administrar elementos de menu"
 
-#: ../../mod/admin.php:463
-msgid "Poll interval"
-msgstr "Intervalo de coleta"
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr "Editar menu"
 
-#: ../../mod/admin.php:463
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Atrase os processos de coleta em segundo plano por este número de segundos para reduzir a carga do sistema. Se 0, use o intervalo de entrega."
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr "Editar elemento"
 
-#: ../../mod/admin.php:464
-msgid "Maximum Load Average"
-msgstr "Carga média máxima"
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr "Descartar elemento"
 
-#: ../../mod/admin.php:464
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Carga máxima do sistema antes de adiar processos de entrega e coleta - padrão 50."
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr "Novo elemento"
 
-#: ../../mod/admin.php:520
-msgid "No server found"
-msgstr "Nenhum servidor foi encontrado"
-
-#: ../../mod/admin.php:527 ../../mod/admin.php:750
-msgid "ID"
-msgstr "ID"
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr "Editar esta caixa de menu"
 
-#: ../../mod/admin.php:527
-msgid "for channel"
-msgstr "para o canal"
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr "Adicionar um elemento de menu"
 
-#: ../../mod/admin.php:527
-msgid "on server"
-msgstr "no servidor"
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr "Deleter este item de menu"
 
-#: ../../mod/admin.php:527
-msgid "Status"
-msgstr "Status"
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr "Editar este item de menu"
 
-#: ../../mod/admin.php:548
-msgid "Update has been marked successful"
-msgstr "A atualização foi designada bem sucedida"
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr "Novo elemento de menu"
 
-#: ../../mod/admin.php:558
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "Execução de %s falhou. Verifique os logs do sistema."
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr "Permissões do item do menu"
 
-#: ../../mod/admin.php:561
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "A atualização %s foi aplicada com sucesso."
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr "Texto do link"
 
-#: ../../mod/admin.php:565
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "A atualização %s não retornou um status. Situação incerta quando ao seu sucesso."
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr "URL do link"
 
-#: ../../mod/admin.php:568
-#, php-format
-msgid "Update function %s could not be found."
-msgstr "A função de atualização %s não foi encontrada."
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr "Usar Red magic-auth se disponível"
 
-#: ../../mod/admin.php:583
-msgid "No failed updates."
-msgstr "Nenhuma falha nas atualizações."
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr "Abrir link em uma nova janela"
 
-#: ../../mod/admin.php:587
-msgid "Failed Updates"
-msgstr "Falha nas atualizações"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr "Ordem na lista"
 
-#: ../../mod/admin.php:589
-msgid "Mark success (if update was manually applied)"
-msgstr "Marque sucesso (se a atualização foi aplicada manualmente)"
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Números mais altos descem para o fim da lista"
 
-#: ../../mod/admin.php:590
-msgid "Attempt to execute this update step automatically"
-msgstr "Tente executar este passo da atualização automaticamente"
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr "O item de menu não foi encontrado."
 
-#: ../../mod/admin.php:616
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s usuário foi bloqueado/desbloqueado"
-msgstr[1] "%s usuários foram bloqueados/desbloqueados"
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr "O item de menu foi deletado."
 
-#: ../../mod/admin.php:623
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s usuário foi deletado"
-msgstr[1] "%s usuários foram deletados"
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr "Não foi possível deletar o item de menu."
 
-#: ../../mod/admin.php:654
-msgid "Account not found"
-msgstr "A conta não foi encontrada"
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr "Editar elemento de menu"
 
-#: ../../mod/admin.php:665
-#, php-format
-msgid "User '%s' deleted"
-msgstr "O usuário/a '%s' foi deletado/a"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Identificador de perfil inválido."
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "O usuário/a '%s' foi desbloqueado/a"
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Editor de visibilidade do perfil"
 
-#: ../../mod/admin.php:674
-#, php-format
-msgid "User '%s' blocked"
-msgstr "O usuário/a '%s' foi bloqueado/a"
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Clique em um contato para adicionar ou remover."
 
-#: ../../mod/admin.php:739
-msgid "select all"
-msgstr "selecionar tudo"
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Visível para"
 
-#: ../../mod/admin.php:740
-msgid "User registrations waiting for confirm"
-msgstr "Registros de usuário aguardando confirmação"
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Todas as conexões"
 
-#: ../../mod/admin.php:741
-msgid "Request date"
-msgstr "Data de requisição"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Coleção criada"
 
-#: ../../mod/admin.php:742
-msgid "No registrations."
-msgstr "Nenhum registro."
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Não foi possível criar a coleção."
 
-#: ../../mod/admin.php:743
-msgid "Approve"
-msgstr "Aprovar"
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Coleção atualizada"
 
-#: ../../mod/admin.php:744
-msgid "Deny"
-msgstr "Negar"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Criar uma coleção de canais."
 
-#: ../../mod/admin.php:746 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Block"
-msgstr "Bloquear"
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
+msgstr "Nome da coleção:"
 
-#: ../../mod/admin.php:747 ../../mod/connedit.php:333
-#: ../../mod/connedit.php:475
-msgid "Unblock"
-msgstr "Desbloquear"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
+msgstr "Membros são visíveis para outros canais"
 
-#: ../../mod/admin.php:750
-msgid "Register date"
-msgstr "Data de registro"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Coleção removida."
 
-#: ../../mod/admin.php:750
-msgid "Last login"
-msgstr "Última autenticação"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Não foi possível remover a coleção."
 
-#: ../../mod/admin.php:750
-msgid "Expires"
-msgstr "Expira"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
+msgstr "Editor de coleção"
 
-#: ../../mod/admin.php:750
-msgid "Service Class"
-msgstr "Classe de serviço"
+#: ../../mod/group.php:196
+msgid "Members"
+msgstr "Membros"
 
-#: ../../mod/admin.php:752
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Os usuários selecionados serão deletados!\\n\\nTudo o que esses usuários postaram neste site será permanentemente deletado!\\n\\nTem certeza?"
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
+msgstr "Todas os canais conectados"
 
-#: ../../mod/admin.php:753
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "O/A usuário/a {0} será deletado/a!\\n\\nTudo o que esse/a usuário/a postou neste site será permanentemente deletado!\\n\\nTem certeza?"
+#: ../../mod/group.php:231
+msgid "Click on a channel to add or remove."
+msgstr "Clique em um canal para adicionar ou remover."
 
-#: ../../mod/admin.php:794
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Plugin %s desabilitado."
+#: ../../mod/admin.php:48
+msgid "Theme settings updated."
+msgstr "As configurações de tema foram atualizadas."
 
-#: ../../mod/admin.php:798
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Plugin %s habilitado."
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
+msgid "Site"
+msgstr "Site"
 
-#: ../../mod/admin.php:808 ../../mod/admin.php:1010
-msgid "Disable"
-msgstr "Desabilitar"
+#: ../../mod/admin.php:89 ../../mod/admin.php:738 ../../mod/admin.php:750
+msgid "Users"
+msgstr "Usuários"
 
-#: ../../mod/admin.php:810 ../../mod/admin.php:1012
-msgid "Enable"
-msgstr "Habilitar"
+#: ../../mod/admin.php:90 ../../mod/admin.php:836 ../../mod/admin.php:878
+msgid "Plugins"
+msgstr "Plugins"
 
-#: ../../mod/admin.php:836 ../../mod/admin.php:1041
-msgid "Toggle"
-msgstr "Alternar"
+#: ../../mod/admin.php:91 ../../mod/admin.php:1041 ../../mod/admin.php:1077
+msgid "Themes"
+msgstr "Temas"
 
-#: ../../mod/admin.php:844 ../../mod/admin.php:1051
-msgid "Author: "
-msgstr "Autor:"
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
+msgid "Server"
+msgstr "Servidor"
 
-#: ../../mod/admin.php:845 ../../mod/admin.php:1052
-msgid "Maintainer: "
-msgstr "Mantenedor:"
+#: ../../mod/admin.php:93
+msgid "DB updates"
+msgstr "Atualizações do Banco de Dados"
 
-#: ../../mod/admin.php:974
-msgid "No themes found."
-msgstr "Nenhum tema foi encontrado."
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1164
+msgid "Logs"
+msgstr "Logs"
 
-#: ../../mod/admin.php:1033
-msgid "Screenshot"
-msgstr "Captura de tela"
+#: ../../mod/admin.php:113
+msgid "Plugin Features"
+msgstr "Recursos dos plugins"
 
-#: ../../mod/admin.php:1081
-msgid "[Experimental]"
-msgstr "[Experimental]"
+#: ../../mod/admin.php:115
+msgid "User registrations waiting for confirmation"
+msgstr "Registros de usuário aguardando confirmação"
 
-#: ../../mod/admin.php:1082
-msgid "[Unsupported]"
-msgstr "[Desassistido]"
+#: ../../mod/admin.php:189
+msgid "Message queues"
+msgstr "Filas de mensagem"
 
-#: ../../mod/admin.php:1109
-msgid "Log settings updated."
-msgstr "As configurações de log foram atualizadas."
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:737 ../../mod/admin.php:835 ../../mod/admin.php:877
+#: ../../mod/admin.php:1040 ../../mod/admin.php:1076 ../../mod/admin.php:1163
+msgid "Administration"
+msgstr "Administração"
 
-#: ../../mod/admin.php:1165
-msgid "Clear"
-msgstr "Limpar"
+#: ../../mod/admin.php:195
+msgid "Summary"
+msgstr "Resumo"
 
-#: ../../mod/admin.php:1171
-msgid "Debugging"
-msgstr "Depuração"
+#: ../../mod/admin.php:197
+msgid "Registered users"
+msgstr "Usuários registrados"
 
-#: ../../mod/admin.php:1172
-msgid "Log file"
-msgstr "Arquivo de log"
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
+msgid "Pending registrations"
+msgstr "Registros pendentes"
 
-#: ../../mod/admin.php:1172
-msgid ""
-"Must be writable by web server. Relative to your Red top-level directory."
-msgstr "É necessário que o servidor web possa escrever neste arquivo. Relativo ao diretório raiz da Red."
+#: ../../mod/admin.php:200
+msgid "Version"
+msgstr "Versão"
 
-#: ../../mod/admin.php:1173
-msgid "Log level"
-msgstr "Nível do log"
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
+msgid "Active plugins"
+msgstr "Plugins ativos"
 
-#: ../../mod/filer.php:35
-msgid "- select -"
-msgstr "- selecionar -"
+#: ../../mod/admin.php:350
+msgid "Site settings updated."
+msgstr "As configurações de site foram atualizadas."
 
-#: ../../mod/home.php:89
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bem-vindo(a) a %s"
+#: ../../mod/admin.php:381
+msgid "No special theme for accessibility"
+msgstr "Sem tema especial para acessibilidade"
 
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
-#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
-msgid "Item not found"
-msgstr "O item não foi encontrado"
+#: ../../mod/admin.php:409
+msgid "Closed"
+msgstr "Fechado"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "O item não está editável"
+#: ../../mod/admin.php:410
+msgid "Requires approval"
+msgstr "Requer aprovação"
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Deletar item?"
+#: ../../mod/admin.php:411
+msgid "Open"
+msgstr "Aberto"
 
-#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110
-#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
-msgid "Insert YouTube video"
-msgstr "Inserir vídeo do YouTube"
+#: ../../mod/admin.php:416
+msgid "Private"
+msgstr "Privado"
 
-#: ../../mod/editpost.php:108 ../../mod/editlayout.php:111
-#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Inserir vídeo Vorbis (.ogg)"
+#: ../../mod/admin.php:417
+msgid "Paid Access"
+msgstr "Acesso pago"
 
-#: ../../mod/editpost.php:109 ../../mod/editlayout.php:112
-#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Inserir áudio Vorbis (.ogg)"
+#: ../../mod/admin.php:418
+msgid "Free Access"
+msgstr "Acesso gratuito"
 
-#: ../../mod/directory.php:144 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:98
-msgid "Age: "
-msgstr "Idade: "
+#: ../../mod/admin.php:419
+msgid "Tiered Access"
+msgstr "Acesso em níveis"
 
-#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
-msgid "Gender: "
-msgstr "Gênero: "
+#: ../../mod/admin.php:432 ../../mod/register.php:189
+msgid "Registration"
+msgstr "Registro"
 
-#: ../../mod/directory.php:208
-msgid "Finding:"
-msgstr "Pesquisando:"
+#: ../../mod/admin.php:433
+msgid "File upload"
+msgstr "Carregamento de arquivos"
 
-#: ../../mod/directory.php:216
-msgid "next page"
-msgstr "próxima página"
+#: ../../mod/admin.php:434
+msgid "Policies"
+msgstr "Políticas"
 
-#: ../../mod/directory.php:216
-msgid "previous page"
-msgstr "página anterior"
+#: ../../mod/admin.php:435
+msgid "Advanced"
+msgstr "Avançado"
 
-#: ../../mod/directory.php:223
-msgid "No entries (some entries may be hidden)."
-msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)."
+#: ../../mod/admin.php:439
+msgid "Site name"
+msgstr "Nome do site"
 
-#: ../../mod/connedit.php:49 ../../mod/connections.php:37
-msgid "Could not access contact record."
-msgstr "Não foi possível acessar o registro do contato."
+#: ../../mod/admin.php:440
+msgid "Banner/Logo"
+msgstr "Cartaz/Logo"
 
-#: ../../mod/connedit.php:63 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
-msgstr "Não foi possível localizar o perfil selecionado."
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr "Informações do Administrador"
 
-#: ../../mod/connedit.php:107 ../../mod/connections.php:94
-msgid "Connection updated."
-msgstr "A conexão foi atualizada."
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Informações de contato com administradores do site. Exibida na página siteinfo. BBCode pode ser usado aqui."
 
-#: ../../mod/connedit.php:109 ../../mod/connections.php:96
-msgid "Failed to update connection record."
-msgstr "Não foi possível atualizar o registro da conexão."
+#: ../../mod/admin.php:442
+msgid "System language"
+msgstr "Idioma do sistema"
 
-#: ../../mod/connedit.php:204
-msgid "Could not access address book record."
-msgstr "Não foi possível acessar o registro do contato."
+#: ../../mod/admin.php:443
+msgid "System theme"
+msgstr "Tema do sistema"
 
-#: ../../mod/connedit.php:218
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "A atualização falhou - o canal está indisponível no momento."
+#: ../../mod/admin.php:443
+msgid ""
+"Default system theme - may be over-ridden by user profiles - change theme settings"
+msgstr "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - mudar configurações do tema"
 
-#: ../../mod/connedit.php:225
-msgid "Channel has been unblocked"
-msgstr "O canal foi desbloqueado"
+#: ../../mod/admin.php:444
+msgid "Mobile system theme"
+msgstr "Tema do sistema móvel"
 
-#: ../../mod/connedit.php:226
-msgid "Channel has been blocked"
-msgstr "O canal foi bloqueado"
+#: ../../mod/admin.php:444
+msgid "Theme for mobile devices"
+msgstr "Tema para dispositivos móveis"
 
-#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
-#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
-#: ../../mod/connedit.php:281
-msgid "Unable to set address book parameters."
-msgstr "Não foi possível definir os parâmetros do contato."
+#: ../../mod/admin.php:445
+msgid "Accessibility system theme"
+msgstr "Tema do sistema acessível"
 
-#: ../../mod/connedit.php:237
-msgid "Channel has been unignored"
-msgstr "O canal não está mais ignorado"
+#: ../../mod/admin.php:445
+msgid "Accessibility theme"
+msgstr "Tema acessível"
 
-#: ../../mod/connedit.php:238
-msgid "Channel has been ignored"
-msgstr "O canal passou a estar ignorado"
+#: ../../mod/admin.php:446
+msgid "Channel to use for this website's static pages"
+msgstr "Canal a utilizar para as páginas estáticas desse website"
 
-#: ../../mod/connedit.php:249
-msgid "Channel has been unarchived"
-msgstr "O canal deixou o arquivo"
+#: ../../mod/admin.php:446
+msgid "Site Channel"
+msgstr "Canal do site"
 
-#: ../../mod/connedit.php:250
-msgid "Channel has been archived"
-msgstr "O canal foi colocado no arquivo"
+#: ../../mod/admin.php:448
+msgid "Maximum image size"
+msgstr "Tamanho máximo de imagens"
 
-#: ../../mod/connedit.php:261
-msgid "Channel has been unhidden"
-msgstr "O canal não está mais oculto"
+#: ../../mod/admin.php:448
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Tamanho máximo em bytes de imagens carregadas. O padrão é 0, significando sem limites."
 
-#: ../../mod/connedit.php:262
-msgid "Channel has been hidden"
-msgstr "O canal passou a estar oculto"
+#: ../../mod/admin.php:449
+msgid "Register policy"
+msgstr "Política de registro"
 
-#: ../../mod/connedit.php:276
-msgid "Channel has been approved"
-msgstr "O canal foi aprovado"
+#: ../../mod/admin.php:450
+msgid "Access policy"
+msgstr "Política de acesso"
 
-#: ../../mod/connedit.php:277
-msgid "Channel has been unapproved"
-msgstr "O canal deixou de estar aprovado"
+#: ../../mod/admin.php:451
+msgid "Register text"
+msgstr "Texto de registro"
 
-#: ../../mod/connedit.php:295
-msgid "Contact has been removed."
-msgstr "O contato foi removido."
+#: ../../mod/admin.php:451
+msgid "Will be displayed prominently on the registration page."
+msgstr "Será exibido proeminentemente na página de registro."
 
-#: ../../mod/connedit.php:315
-#, php-format
-msgid "View %s's profile"
-msgstr "Ver o perfil de %s"
+#: ../../mod/admin.php:452
+msgid "Accounts abandoned after x days"
+msgstr "Contas abandonadas após x dias"
 
-#: ../../mod/connedit.php:319
-msgid "Refresh Permissions"
-msgstr "Atualizar permissões"
+#: ../../mod/admin.php:452
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Não gastará recursos do sistema coletando de sites externos para contas abandonadas. Use 0 para sem limite de tempo."
 
-#: ../../mod/connedit.php:322
-msgid "Fetch updated permissions"
-msgstr "Buscar as permissões atualizadas"
+#: ../../mod/admin.php:453
+msgid "Allowed friend domains"
+msgstr "Domínios permitidos para amigos"
 
-#: ../../mod/connedit.php:326
-msgid "Recent Activity"
-msgstr "Atividades recentes"
+#: ../../mod/admin.php:453
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Lista, separada por vírgulas, de domínios permitidos para estabelecer amizades com este site. Wildcards são aceitas. Vazio para permitir qualquer domínio"
 
-#: ../../mod/connedit.php:329
-msgid "View recent posts and comments"
-msgstr "Exibir publicações e comentários recentes"
+#: ../../mod/admin.php:454
+msgid "Allowed email domains"
+msgstr "Domínios permitidos de e-mail"
 
-#: ../../mod/connedit.php:336
-msgid "Block or Unblock this connection"
-msgstr "Bloquear ou desbloquear esta conexão"
+#: ../../mod/admin.php:454
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Lista, separada por vírgulas, de domínios permitidos em endereços de e-mail para registros nesse site. Wildcards são aceitas. Vazio para permitir qualquer domínio"
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-msgid "Unignore"
-msgstr "Não ignorar"
+#: ../../mod/admin.php:455
+msgid "Block public"
+msgstr "Bloquear público"
 
-#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
-#: ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorar"
+#: ../../mod/admin.php:455
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Marque para bloquear o acesso público a todas as páginas pessoais que seriam públicas, a não ser que se esteja autenticado."
 
-#: ../../mod/connedit.php:343
-msgid "Ignore or Unignore this connection"
-msgstr "Ignorar ou deixar de ignorar esta conexão"
+#: ../../mod/admin.php:456
+msgid "Force publish"
+msgstr "Forçar publicação"
 
-#: ../../mod/connedit.php:346
-msgid "Unarchive"
-msgstr "Não arquivar"
+#: ../../mod/admin.php:456
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Marque para forçar todos os perfis neste site a aparecerem listados no diretório do site."
 
-#: ../../mod/connedit.php:346
-msgid "Archive"
-msgstr "Arquivar"
+#: ../../mod/admin.php:457
+msgid "No login on Homepage"
+msgstr "Sem formulário de autenticação na página inicial"
 
-#: ../../mod/connedit.php:349
-msgid "Archive or Unarchive this connection"
-msgstr "Colocar ou retirar do arquivo esta conexão"
+#: ../../mod/admin.php:457
+msgid ""
+"Check to hide the login form from your sites homepage when visitors arrive "
+"who are not logged in (e.g. when you put the content of the homepage in via "
+"the site channel)."
+msgstr "Marque para esconder o formulário de autenticação da página inicial do seu site quando visitantes chegarem sem estar autenticados (e.g. quando você inclui os conteúdos da página inicial através do canal do site)."
 
-#: ../../mod/connedit.php:352
-msgid "Unhide"
-msgstr "Não ocultar"
+#: ../../mod/admin.php:459
+msgid "Proxy user"
+msgstr "Usuário do proxy"
 
-#: ../../mod/connedit.php:352
-msgid "Hide"
-msgstr "Ocultar"
+#: ../../mod/admin.php:460
+msgid "Proxy URL"
+msgstr "URL do proxy"
 
-#: ../../mod/connedit.php:355
-msgid "Hide or Unhide this connection"
-msgstr "Ocultar ou deixar de ocultar esta conexão"
+#: ../../mod/admin.php:461
+msgid "Network timeout"
+msgstr "Timeout da rede"
 
-#: ../../mod/connedit.php:362
-msgid "Delete this connection"
-msgstr "Deletar esta conexão"
+#: ../../mod/admin.php:461
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor em segundos. Use 0 para ilimitado (não recomendado)."
 
-#: ../../mod/connedit.php:395
-msgid "Unknown"
-msgstr "Desconhecidos"
+#: ../../mod/admin.php:462
+msgid "Delivery interval"
+msgstr "Intervalo de entrega"
 
-#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
-msgid "Approve this connection"
-msgstr "Aprovar esta conexão"
+#: ../../mod/admin.php:462
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr "Atrase os processos de entrega em segundo plano por este número de segundos para reduzir a carga do sistema. Recomendado: 4-5 para hosts compartilhados, 2-3 para servidores virtuais privados. 0-1 para grandes servidores dedicados."
 
-#: ../../mod/connedit.php:405
-msgid "Accept connection to allow communication"
-msgstr "Aceite a conexão para permitir comunicação"
+#: ../../mod/admin.php:463
+msgid "Poll interval"
+msgstr "Intervalo de coleta"
 
-#: ../../mod/connedit.php:421
-msgid "Automatic Permissions Settings"
-msgstr "Configurações de permissão automáticas"
+#: ../../mod/admin.php:463
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Atrase os processos de coleta em segundo plano por este número de segundos para reduzir a carga do sistema. Se 0, use o intervalo de entrega."
 
-#: ../../mod/connedit.php:421
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Conexões: configurações para %s"
+#: ../../mod/admin.php:464
+msgid "Maximum Load Average"
+msgstr "Carga média máxima"
 
-#: ../../mod/connedit.php:425
+#: ../../mod/admin.php:464
 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 "Ao receber uma apresentação de um canal, quaisquer permissões definidas aqui serão automaticamente aplicadas à nova conexão e a apresentação aprovada. Deixe esta página se você não quer usar este recurso."
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Carga máxima do sistema antes de adiar processos de entrega e coleta - padrão 50."
 
-#: ../../mod/connedit.php:427
-msgid "Slide to adjust your degree of friendship"
-msgstr "Deslize para ajustar seu grau de amizade"
+#: ../../mod/admin.php:520
+msgid "No server found"
+msgstr "Nenhum servidor foi encontrado"
 
-#: ../../mod/connedit.php:433
-msgid "inherited"
-msgstr "herdado"
+#: ../../mod/admin.php:527 ../../mod/admin.php:751
+msgid "ID"
+msgstr "ID"
 
-#: ../../mod/connedit.php:435
-msgid "Connection has no individual permissions!"
-msgstr "A conexão não tem permissões individuais!"
+#: ../../mod/admin.php:527
+msgid "for channel"
+msgstr "para o canal"
 
-#: ../../mod/connedit.php:436
-msgid ""
-"This may be appropriate based on your privacy "
-"settings, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Isso pode ser adequado baseado nas suas configurações de privacidade, mas talvez você queira rever suas \"Permissões Avançadas\"."
+#: ../../mod/admin.php:527
+msgid "on server"
+msgstr "no servidor"
 
-#: ../../mod/connedit.php:438
-msgid "Profile Visibility"
-msgstr "Visibilidade do perfil"
+#: ../../mod/admin.php:527
+msgid "Status"
+msgstr "Status"
 
-#: ../../mod/connedit.php:439
+#: ../../mod/admin.php:548
+msgid "Update has been marked successful"
+msgstr "A atualização foi designada bem sucedida"
+
+#: ../../mod/admin.php:558
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro."
+msgid "Executing %s failed. Check system logs."
+msgstr "Execução de %s falhou. Verifique os logs do sistema."
 
-#: ../../mod/connedit.php:440
-msgid "Contact Information / Notes"
-msgstr "Informações de contato / Notas"
+#: ../../mod/admin.php:561
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "A atualização %s foi aplicada com sucesso."
 
-#: ../../mod/connedit.php:441
-msgid "Edit contact notes"
-msgstr "Editar anotações sobre o contato"
+#: ../../mod/admin.php:565
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "A atualização %s não retornou um status. Situação incerta quando ao seu sucesso."
 
-#: ../../mod/connedit.php:443
-msgid "Their Settings"
-msgstr "Configurações dele/a"
+#: ../../mod/admin.php:568
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "A função de atualização %s não foi encontrada."
 
-#: ../../mod/connedit.php:444
-msgid "My Settings"
-msgstr "Minhas configurações"
+#: ../../mod/admin.php:583
+msgid "No failed updates."
+msgstr "Nenhuma falha nas atualizações."
 
-#: ../../mod/connedit.php:446
-msgid "Forum Members"
-msgstr "Membros do fórum"
+#: ../../mod/admin.php:587
+msgid "Failed Updates"
+msgstr "Falha nas atualizações"
 
-#: ../../mod/connedit.php:447
-msgid "Soapbox"
-msgstr "Caixa de sabão"
+#: ../../mod/admin.php:589
+msgid "Mark success (if update was manually applied)"
+msgstr "Marque sucesso (se a atualização foi aplicada manualmente)"
 
-#: ../../mod/connedit.php:448
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Compartilhamento completo (permissões típicas de redes sociais)"
+#: ../../mod/admin.php:590
+msgid "Attempt to execute this update step automatically"
+msgstr "Tente executar este passo da atualização automaticamente"
 
-#: ../../mod/connedit.php:449
-msgid "Cautious Sharing "
-msgstr "Compartilhamento cauteloso"
+#: ../../mod/admin.php:616
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuário foi bloqueado/desbloqueado"
+msgstr[1] "%s usuários foram bloqueados/desbloqueados"
 
-#: ../../mod/connedit.php:450
-msgid "Follow Only"
-msgstr "Apenas seguir"
+#: ../../mod/admin.php:623
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuário foi deletado"
+msgstr[1] "%s usuários foram deletados"
 
-#: ../../mod/connedit.php:451
-msgid "Individual Permissions"
-msgstr "Permissões individuais"
-
-#: ../../mod/connedit.php:452
-msgid ""
-"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
-"individual settings. Changing those inherited settings on this page will "
-"have no effect."
-msgstr "Algumas permissões serão herdadas das configurações de privacidade do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum."
+#: ../../mod/admin.php:654
+msgid "Account not found"
+msgstr "A conta não foi encontrada"
 
-#: ../../mod/connedit.php:453
-msgid "Advanced Permissions"
-msgstr "Permissões avançadas"
+#: ../../mod/admin.php:665
+#, php-format
+msgid "User '%s' deleted"
+msgstr "O usuário/a '%s' foi deletado/a"
 
-#: ../../mod/connedit.php:454
-msgid "Simple Permissions (select one and submit)"
-msgstr "Permissões simples (slecione uma e submeta)"
+#: ../../mod/admin.php:674
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "O usuário/a '%s' foi desbloqueado/a"
 
-#: ../../mod/connedit.php:458
+#: ../../mod/admin.php:674
 #, php-format
-msgid "Visit %s's profile - %s"
-msgstr "Ver o perfil de %s - %s"
+msgid "User '%s' blocked"
+msgstr "O usuário/a '%s' foi bloqueado/a"
 
-#: ../../mod/connedit.php:459
-msgid "Block/Unblock contact"
-msgstr "Bloquear/desbloquear o contato"
+#: ../../mod/admin.php:740
+msgid "select all"
+msgstr "selecionar tudo"
 
-#: ../../mod/connedit.php:460
-msgid "Ignore contact"
-msgstr "Ignorar o contato"
+#: ../../mod/admin.php:741
+msgid "User registrations waiting for confirm"
+msgstr "Registros de usuário aguardando confirmação"
 
-#: ../../mod/connedit.php:461
-msgid "Repair URL settings"
-msgstr "Reparar configurações de URL"
+#: ../../mod/admin.php:742
+msgid "Request date"
+msgstr "Data de requisição"
 
-#: ../../mod/connedit.php:462
-msgid "View conversations"
-msgstr "Ver as conversas"
+#: ../../mod/admin.php:743
+msgid "No registrations."
+msgstr "Nenhum registro."
 
-#: ../../mod/connedit.php:464
-msgid "Delete contact"
-msgstr "Excluir o contato"
+#: ../../mod/admin.php:744
+msgid "Approve"
+msgstr "Aprovar"
 
-#: ../../mod/connedit.php:467
-msgid "Last update:"
-msgstr "Última atualização:"
+#: ../../mod/admin.php:745
+msgid "Deny"
+msgstr "Negar"
 
-#: ../../mod/connedit.php:469
-msgid "Update public posts"
-msgstr "Atualizar publicações públicas"
+#: ../../mod/admin.php:747 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../../mod/connedit.php:471
-msgid "Update now"
-msgstr "Atualizar agora"
+#: ../../mod/admin.php:748 ../../mod/connedit.php:333
+#: ../../mod/connedit.php:475
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../../mod/connedit.php:477
-msgid "Currently blocked"
-msgstr "Atualmente bloqueado"
+#: ../../mod/admin.php:751
+msgid "Register date"
+msgstr "Data de registro"
 
-#: ../../mod/connedit.php:478
-msgid "Currently ignored"
-msgstr "Atualmente ignorado"
+#: ../../mod/admin.php:751
+msgid "Last login"
+msgstr "Última autenticação"
 
-#: ../../mod/connedit.php:479
-msgid "Currently archived"
-msgstr "Atualmente arquivado"
+#: ../../mod/admin.php:751
+msgid "Expires"
+msgstr "Expira"
 
-#: ../../mod/connedit.php:480
-msgid "Currently pending"
-msgstr "Atualmente pendente"
+#: ../../mod/admin.php:751
+msgid "Service Class"
+msgstr "Classe de serviço"
 
-#: ../../mod/connedit.php:481
-msgid "Hide this contact from others"
-msgstr "Esconda este contato dos demais"
+#: ../../mod/admin.php:753
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Os usuários selecionados serão deletados!\\n\\nTudo o que esses usuários postaram neste site será permanentemente deletado!\\n\\nTem certeza?"
 
-#: ../../mod/connedit.php:481
+#: ../../mod/admin.php:754
 msgid ""
-"Replies/likes to your public posts may still be visible"
-msgstr "Respostas/reações às suas publicações públicas podem continuar visíveis."
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "O/A usuário/a {0} será deletado/a!\\n\\nTudo o que esse/a usuário/a postou neste site será permanentemente deletado!\\n\\nTem certeza?"
 
-#: ../../mod/layouts.php:52
-msgid "Layout Help"
-msgstr "Ajuda de layout"
+#: ../../mod/admin.php:795
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plugin %s desabilitado."
 
-#: ../../mod/layouts.php:55
-msgid "Help with this feature"
-msgstr "Ajuda com este recurso"
+#: ../../mod/admin.php:799
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plugin %s habilitado."
 
-#: ../../mod/layouts.php:74
-msgid "Layout Name"
-msgstr "Nome do layout"
+#: ../../mod/admin.php:809 ../../mod/admin.php:1011
+msgid "Disable"
+msgstr "Desabilitar"
 
-#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
-msgid "Help:"
-msgstr "Ajuda:"
+#: ../../mod/admin.php:811 ../../mod/admin.php:1013
+msgid "Enable"
+msgstr "Habilitar"
 
-#: ../../mod/help.php:68 ../../index.php:223
-msgid "Not Found"
-msgstr "Não encontrada"
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Toggle"
+msgstr "Alternar"
 
-#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
-#: ../../index.php:226
-msgid "Page not found."
-msgstr "Página não encontrada."
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
+msgid "Author: "
+msgstr "Autor:"
 
-#: ../../mod/rmagic.php:56
-msgid "Remote Authentication"
-msgstr "Autenticação remota"
+#: ../../mod/admin.php:846 ../../mod/admin.php:1053
+msgid "Maintainer: "
+msgstr "Mantenedor:"
 
-#: ../../mod/rmagic.php:57
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Entre o endereço do seu canal (e.g. canal@exemplo.com)"
+#: ../../mod/admin.php:975
+msgid "No themes found."
+msgstr "Nenhum tema foi encontrado."
 
-#: ../../mod/rmagic.php:58
-msgid "Authenticate"
-msgstr "Autenticar"
+#: ../../mod/admin.php:1034
+msgid "Screenshot"
+msgstr "Captura de tela"
 
-#: ../../mod/page.php:35
-msgid "Invalid item."
-msgstr "Item inválido."
+#: ../../mod/admin.php:1082
+msgid "[Experimental]"
+msgstr "[Experimental]"
 
-#: ../../mod/network.php:79
-msgid "No such group"
-msgstr "Este grupo não existe"
+#: ../../mod/admin.php:1083
+msgid "[Unsupported]"
+msgstr "[Desassistido]"
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
-msgstr "Resultados da busca por:"
+#: ../../mod/admin.php:1110
+msgid "Log settings updated."
+msgstr "As configurações de log foram atualizadas."
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
-msgstr "A coleção está vazia"
+#: ../../mod/admin.php:1166
+msgid "Clear"
+msgstr "Limpar"
 
-#: ../../mod/network.php:180
-msgid "Collection: "
-msgstr "Coleção:"
+#: ../../mod/admin.php:1172
+msgid "Debugging"
+msgstr "Depuração"
 
-#: ../../mod/network.php:193
-msgid "Connection: "
-msgstr "Conexão:"
+#: ../../mod/admin.php:1173
+msgid "Log file"
+msgstr "Arquivo de log"
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
-msgstr "Conexão inválida."
+#: ../../mod/admin.php:1173
+msgid ""
+"Must be writable by web server. Relative to your Red top-level directory."
+msgstr "É necessário que o servidor web possa escrever neste arquivo. Relativo ao diretório raiz da Red."
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
-msgid "Profile not found."
-msgstr "O perfil não foi encontrado."
+#: ../../mod/admin.php:1174
+msgid "Log level"
+msgstr "Nível do log"
 
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "O perfil foi excluído."
+#: ../../mod/filer.php:35
+msgid "- select -"
+msgstr "- selecionar -"
 
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Perfil-"
+#: ../../mod/home.php:89
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bem-vindo(a) a %s"
 
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "O novo perfil foi criado."
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:36
+#: ../../mod/editwebpage.php:32 ../../mod/editblock.php:36
+msgid "Item not found"
+msgstr "O item não foi encontrado"
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "O perfil não está disponível para clonagem."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "O item não está editável"
 
-#: ../../mod/profiles.php:178
-msgid "Profile Name is required."
-msgstr "É obrigatório informar o nome do perfil."
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr "Deletar item?"
 
-#: ../../mod/profiles.php:294
-msgid "Marital Status"
-msgstr "Estado civil"
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:110
+#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
+msgid "Insert YouTube video"
+msgstr "Inserir vídeo do YouTube"
 
-#: ../../mod/profiles.php:298
-msgid "Romantic Partner"
-msgstr "Parceiro/a romântico/a"
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:111
+#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserir vídeo Vorbis (.ogg)"
 
-#: ../../mod/profiles.php:302
-msgid "Likes"
-msgstr "Gosta de"
+#: ../../mod/editpost.php:118 ../../mod/editlayout.php:112
+#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserir áudio Vorbis (.ogg)"
 
-#: ../../mod/profiles.php:306
-msgid "Dislikes"
-msgstr "Não gosta de"
-
-#: ../../mod/profiles.php:310
-msgid "Work/Employment"
-msgstr "Trabalho/Emprego"
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
+msgid "Age: "
+msgstr "Idade: "
 
-#: ../../mod/profiles.php:313
-msgid "Religion"
-msgstr "Religião"
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
+msgid "Gender: "
+msgstr "Gênero: "
 
-#: ../../mod/profiles.php:317
-msgid "Political Views"
-msgstr "Posição política"
+#: ../../mod/directory.php:208
+msgid "Finding:"
+msgstr "Pesquisando:"
 
-#: ../../mod/profiles.php:321
-msgid "Gender"
-msgstr "Gênero"
+#: ../../mod/directory.php:216
+msgid "next page"
+msgstr "próxima página"
 
-#: ../../mod/profiles.php:325
-msgid "Sexual Preference"
-msgstr "Preferência sexual"
+#: ../../mod/directory.php:216
+msgid "previous page"
+msgstr "página anterior"
 
-#: ../../mod/profiles.php:329
-msgid "Homepage"
-msgstr "Página web"
+#: ../../mod/directory.php:223
+msgid "No entries (some entries may be hidden)."
+msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)."
 
-#: ../../mod/profiles.php:333
-msgid "Interests"
-msgstr "Interesses"
+#: ../../mod/connedit.php:49 ../../mod/connections.php:37
+msgid "Could not access contact record."
+msgstr "Não foi possível acessar o registro do contato."
 
-#: ../../mod/profiles.php:337
-msgid "Address"
-msgstr "Endereço"
+#: ../../mod/connedit.php:63 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
+msgstr "Não foi possível localizar o perfil selecionado."
 
-#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
-msgid "Location"
-msgstr "Localização"
+#: ../../mod/connedit.php:107 ../../mod/connections.php:94
+msgid "Connection updated."
+msgstr "A conexão foi atualizada."
 
-#: ../../mod/profiles.php:427
-msgid "Profile updated."
-msgstr "O perfil foi atualizado."
+#: ../../mod/connedit.php:109 ../../mod/connections.php:96
+msgid "Failed to update connection record."
+msgstr "Não foi possível atualizar o registro da conexão."
 
-#: ../../mod/profiles.php:482
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Esconder sua lista de contatos/amigos dos visitantes no seu perfil?"
+#: ../../mod/connedit.php:204
+msgid "Could not access address book record."
+msgstr "Não foi possível acessar o registro do contato."
 
-#: ../../mod/profiles.php:505
-msgid "Edit Profile Details"
-msgstr "Editar os detalhes do perfil"
+#: ../../mod/connedit.php:218
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "A atualização falhou - o canal está indisponível no momento."
 
-#: ../../mod/profiles.php:507
-msgid "View this profile"
-msgstr "Ver este perfil"
+#: ../../mod/connedit.php:225
+msgid "Channel has been unblocked"
+msgstr "O canal foi desbloqueado"
 
-#: ../../mod/profiles.php:508
-msgid "Change Profile Photo"
-msgstr "Mudar a foto do perfil"
+#: ../../mod/connedit.php:226
+msgid "Channel has been blocked"
+msgstr "O canal foi bloqueado"
 
-#: ../../mod/profiles.php:509
-msgid "Create a new profile using these settings"
-msgstr "Criar um novo perfil usando estas configurações"
+#: ../../mod/connedit.php:230 ../../mod/connedit.php:242
+#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
+#: ../../mod/connedit.php:281
+msgid "Unable to set address book parameters."
+msgstr "Não foi possível definir os parâmetros do contato."
 
-#: ../../mod/profiles.php:510
-msgid "Clone this profile"
-msgstr "Clonar este perfil"
+#: ../../mod/connedit.php:237
+msgid "Channel has been unignored"
+msgstr "O canal não está mais ignorado"
 
-#: ../../mod/profiles.php:511
-msgid "Delete this profile"
-msgstr "Excluir este perfil"
+#: ../../mod/connedit.php:238
+msgid "Channel has been ignored"
+msgstr "O canal passou a estar ignorado"
 
-#: ../../mod/profiles.php:512
-msgid "Profile Name:"
-msgstr "Nome do perfil:"
+#: ../../mod/connedit.php:249
+msgid "Channel has been unarchived"
+msgstr "O canal deixou o arquivo"
 
-#: ../../mod/profiles.php:513
-msgid "Your Full Name:"
-msgstr "Seu nome completo:"
+#: ../../mod/connedit.php:250
+msgid "Channel has been archived"
+msgstr "O canal foi colocado no arquivo"
 
-#: ../../mod/profiles.php:514
-msgid "Title/Description:"
-msgstr "Título/Descrição:"
+#: ../../mod/connedit.php:261
+msgid "Channel has been unhidden"
+msgstr "O canal não está mais oculto"
 
-#: ../../mod/profiles.php:515
-msgid "Your Gender:"
-msgstr "Seu gênero:"
+#: ../../mod/connedit.php:262
+msgid "Channel has been hidden"
+msgstr "O canal passou a estar oculto"
 
-#: ../../mod/profiles.php:516
-#, php-format
-msgid "Birthday (%s):"
-msgstr "Aniversário (%s):"
+#: ../../mod/connedit.php:276
+msgid "Channel has been approved"
+msgstr "O canal foi aprovado"
 
-#: ../../mod/profiles.php:517
-msgid "Street Address:"
-msgstr "Endereço:"
+#: ../../mod/connedit.php:277
+msgid "Channel has been unapproved"
+msgstr "O canal deixou de estar aprovado"
 
-#: ../../mod/profiles.php:518
-msgid "Locality/City:"
-msgstr "Localidade/Cidade:"
+#: ../../mod/connedit.php:295
+msgid "Contact has been removed."
+msgstr "O contato foi removido."
 
-#: ../../mod/profiles.php:519
-msgid "Postal/Zip Code:"
-msgstr "CEP:"
+#: ../../mod/connedit.php:315
+#, php-format
+msgid "View %s's profile"
+msgstr "Ver o perfil de %s"
 
-#: ../../mod/profiles.php:520
-msgid "Country:"
-msgstr "País:"
+#: ../../mod/connedit.php:319
+msgid "Refresh Permissions"
+msgstr "Atualizar permissões"
 
-#: ../../mod/profiles.php:521
-msgid "Region/State:"
-msgstr "Região/Estado:"
+#: ../../mod/connedit.php:322
+msgid "Fetch updated permissions"
+msgstr "Buscar as permissões atualizadas"
 
-#: ../../mod/profiles.php:522
-msgid "♥ Marital Status:"
-msgstr "Estado civil ♥:"
+#: ../../mod/connedit.php:326
+msgid "Recent Activity"
+msgstr "Atividades recentes"
 
-#: ../../mod/profiles.php:523
-msgid "Who: (if applicable)"
-msgstr "Quem: (se aplicável)"
+#: ../../mod/connedit.php:329
+msgid "View recent posts and comments"
+msgstr "Exibir publicações e comentários recentes"
 
-#: ../../mod/profiles.php:524
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Exemplos: fulano123, Fulano de Tal, fulano@exemplo.com"
+#: ../../mod/connedit.php:336
+msgid "Block or Unblock this connection"
+msgstr "Bloquear ou desbloquear esta conexão"
 
-#: ../../mod/profiles.php:525
-msgid "Since [date]:"
-msgstr "Desde [data]:"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+msgid "Unignore"
+msgstr "Não ignorar"
 
-#: ../../mod/profiles.php:527
-msgid "Homepage URL:"
-msgstr "Endereço do website:"
+#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: ../../mod/profiles.php:530
-msgid "Religious Views:"
-msgstr "Orientação religiosa:"
+#: ../../mod/connedit.php:343
+msgid "Ignore or Unignore this connection"
+msgstr "Ignorar ou deixar de ignorar esta conexão"
 
-#: ../../mod/profiles.php:531
-msgid "Keywords:"
-msgstr "Palavras-chave:"
+#: ../../mod/connedit.php:346
+msgid "Unarchive"
+msgstr "Não arquivar"
 
-#: ../../mod/profiles.php:534
-msgid "Example: fishing photography software"
-msgstr "Exemplo: pesca fotografia software"
+#: ../../mod/connedit.php:346
+msgid "Archive"
+msgstr "Arquivar"
 
-#: ../../mod/profiles.php:535
-msgid "Used in directory listings"
-msgstr "Usado em listas de diretório"
+#: ../../mod/connedit.php:349
+msgid "Archive or Unarchive this connection"
+msgstr "Colocar ou retirar do arquivo esta conexão"
 
-#: ../../mod/profiles.php:536
-msgid "Tell us about yourself..."
-msgstr "Fale um pouco sobre você..."
+#: ../../mod/connedit.php:352
+msgid "Unhide"
+msgstr "Não ocultar"
 
-#: ../../mod/profiles.php:537
-msgid "Hobbies/Interests"
-msgstr "Hobbies/Interesses"
+#: ../../mod/connedit.php:352
+msgid "Hide"
+msgstr "Ocultar"
 
-#: ../../mod/profiles.php:538
-msgid "Contact information and Social Networks"
-msgstr "Informações de contato e redes sociais"
+#: ../../mod/connedit.php:355
+msgid "Hide or Unhide this connection"
+msgstr "Ocultar ou deixar de ocultar esta conexão"
 
-#: ../../mod/profiles.php:539
-msgid "My other channels"
-msgstr "Meus outros canais"
+#: ../../mod/connedit.php:362
+msgid "Delete this connection"
+msgstr "Deletar esta conexão"
 
-#: ../../mod/profiles.php:540
-msgid "Musical interests"
-msgstr "Interesses musicais"
+#: ../../mod/connedit.php:405 ../../mod/connedit.php:434
+msgid "Approve this connection"
+msgstr "Aprovar esta conexão"
 
-#: ../../mod/profiles.php:541
-msgid "Books, literature"
-msgstr "Livros, literatura"
+#: ../../mod/connedit.php:405
+msgid "Accept connection to allow communication"
+msgstr "Aceite a conexão para permitir comunicação"
 
-#: ../../mod/profiles.php:542
-msgid "Television"
-msgstr "Televisão"
+#: ../../mod/connedit.php:421
+msgid "Automatic Permissions Settings"
+msgstr "Configurações de permissão automáticas"
 
-#: ../../mod/profiles.php:543
-msgid "Film/dance/culture/entertainment"
-msgstr "Filme/dança/cultura/entretenimento"
+#: ../../mod/connedit.php:421
+#, php-format
+msgid "Connections: settings for %s"
+msgstr "Conexões: configurações para %s"
 
-#: ../../mod/profiles.php:544
-msgid "Love/romance"
-msgstr "Amor/romance"
+#: ../../mod/connedit.php:425
+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 "Ao receber uma apresentação de um canal, quaisquer permissões definidas aqui serão automaticamente aplicadas à nova conexão e a apresentação aprovada. Deixe esta página se você não quer usar este recurso."
 
-#: ../../mod/profiles.php:545
-msgid "Work/employment"
-msgstr "Trabalho/emprego"
+#: ../../mod/connedit.php:427
+msgid "Slide to adjust your degree of friendship"
+msgstr "Deslize para ajustar seu grau de amizade"
 
-#: ../../mod/profiles.php:546
-msgid "School/education"
-msgstr "Escola/educação"
+#: ../../mod/connedit.php:433
+msgid "inherited"
+msgstr "herdado"
 
-#: ../../mod/profiles.php:551
-msgid ""
-"This is your public profile.
                                      It may "
-"be visible to anybody using the internet."
-msgstr "Este é o seu perfil público.
                                      Ele pode estar visível para qualquer um que acesse a Internet."
+#: ../../mod/connedit.php:435
+msgid "Connection has no individual permissions!"
+msgstr "A conexão não tem permissões individuais!"
 
-#: ../../mod/profiles.php:600
-msgid "Edit/Manage Profiles"
-msgstr "Editar/Administrar perfis"
+#: ../../mod/connedit.php:436
+msgid ""
+"This may be appropriate based on your privacy "
+"settings, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Isso pode ser adequado baseado nas suas configurações de privacidade, mas talvez você queira rever suas \"Permissões Avançadas\"."
 
-#: ../../mod/profiles.php:601
-msgid "Add profile things"
-msgstr "Adicionar coisas ao perfil"
+#: ../../mod/connedit.php:438
+msgid "Profile Visibility"
+msgstr "Visibilidade do perfil"
 
-#: ../../mod/profiles.php:602
-msgid "Include desirable objects in your profile"
-msgstr "Inclua objetos desejáveis no seu perfil"
+#: ../../mod/connedit.php:439
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro."
 
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Canal adicionado."
+#: ../../mod/connedit.php:440
+msgid "Contact Information / Notes"
+msgstr "Informações de contato / Notas"
 
-#: ../../mod/post.php:226
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente."
+#: ../../mod/connedit.php:441
+msgid "Edit contact notes"
+msgstr "Editar anotações sobre o contato"
 
-#: ../../mod/post.php:256
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Bem vindo %s. Autenticação remota realizada com sucesso."
+#: ../../mod/connedit.php:443
+msgid "Their Settings"
+msgstr "Configurações dele/a"
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Este site não é um servidor de diretório"
+#: ../../mod/connedit.php:444
+msgid "My Settings"
+msgstr "Minhas configurações"
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Falha ao criar a fonte. Nenhum canal selecionado."
+#: ../../mod/connedit.php:446
+msgid "Forum Members"
+msgstr "Membros do fórum"
 
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "Fonte criada."
+#: ../../mod/connedit.php:447
+msgid "Soapbox"
+msgstr "Caixa de sabão"
 
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "A fonte foi atualizada."
+#: ../../mod/connedit.php:448
+msgid "Full Sharing (typical social network permissions)"
+msgstr "Compartilhamento completo (permissões típicas de redes sociais)"
 
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
+#: ../../mod/connedit.php:449
+msgid "Cautious Sharing "
+msgstr "Compartilhamento cauteloso"
 
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "Administrar as fontes remotas de conteúdo para o seu canal."
+#: ../../mod/connedit.php:450
+msgid "Follow Only"
+msgstr "Apenas seguir"
 
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Nova fonte"
+#: ../../mod/connedit.php:451
+msgid "Individual Permissions"
+msgstr "Permissões individuais"
 
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
+#: ../../mod/connedit.php:452
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importar todo ou uma seleção do conteúdo do seguinte canal para este canal, e distribuí-lo de acordo com as configurações do seu canal."
+"Some permissions may be inherited from your channel privacy settings, which have higher priority than "
+"individual settings. Changing those inherited settings on this page will "
+"have no effect."
+msgstr "Algumas permissões serão herdadas das configurações de privacidade do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum."
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Importar apenas conteúd com estas palavras (uma por linha)"
+#: ../../mod/connedit.php:453
+msgid "Advanced Permissions"
+msgstr "Permissões avançadas"
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "Deixe em branco para importar todo o conteúdo público"
+#: ../../mod/connedit.php:454
+msgid "Simple Permissions (select one and submit)"
+msgstr "Permissões simples (slecione uma e submeta)"
 
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:110
-msgid "Channel Name"
-msgstr "Nome do canal"
+#: ../../mod/connedit.php:458
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "Ver o perfil de %s - %s"
 
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "A fonte não foi encontrada."
+#: ../../mod/connedit.php:459
+msgid "Block/Unblock contact"
+msgstr "Bloquear/desbloquear o contato"
 
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Editar fonte"
+#: ../../mod/connedit.php:460
+msgid "Ignore contact"
+msgstr "Ignorar o contato"
 
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Deletar fonte"
+#: ../../mod/connedit.php:461
+msgid "Repair URL settings"
+msgstr "Reparar configurações de URL"
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "A fonte foi removida."
+#: ../../mod/connedit.php:462
+msgid "View conversations"
+msgstr "Ver as conversas"
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Não foi possível remover a fonte."
+#: ../../mod/connedit.php:464
+msgid "Delete contact"
+msgstr "Excluir o contato"
 
-#: ../../mod/lockview.php:34
-msgid "Remote privacy information not available."
-msgstr "Não existe informação disponível sobre a privacidade remota."
+#: ../../mod/connedit.php:467
+msgid "Last update:"
+msgstr "Última atualização:"
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr "Visível para:"
+#: ../../mod/connedit.php:469
+msgid "Update public posts"
+msgstr "Atualizar publicações públicas"
 
-#: ../../mod/magic.php:70
-msgid "Hub not found."
-msgstr "O hub não foi encontrado."
+#: ../../mod/connedit.php:471
+msgid "Update now"
+msgstr "Atualizar agora"
 
-#: ../../mod/setup.php:161
-msgid "Red Matrix Server - Setup"
-msgstr "Servidor Red Matrix - Configuração"
+#: ../../mod/connedit.php:477
+msgid "Currently blocked"
+msgstr "Atualmente bloqueado"
 
-#: ../../mod/setup.php:167
-msgid "Could not connect to database."
-msgstr "Não foi possível conectar ao banco de dados."
+#: ../../mod/connedit.php:478
+msgid "Currently ignored"
+msgstr "Atualmente ignorado"
 
-#: ../../mod/setup.php:171
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL."
+#: ../../mod/connedit.php:479
+msgid "Currently archived"
+msgstr "Atualmente arquivado"
 
-#: ../../mod/setup.php:176
-msgid "Could not create table."
-msgstr "Não foi possível criar a tabela."
+#: ../../mod/connedit.php:480
+msgid "Currently pending"
+msgstr "Atualmente pendente"
 
-#: ../../mod/setup.php:182
-msgid "Your site database has been installed."
-msgstr "O banco de dados do seu site foi instalado."
+#: ../../mod/connedit.php:481
+msgid "Hide this contact from others"
+msgstr "Esconda este contato dos demais"
 
-#: ../../mod/setup.php:187
+#: ../../mod/connedit.php:481
 msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
-msgstr "Pode ser que você precise importar o arquivo \"install/database.sql\" manualmente, usando o phpmyadmin or mysql."
+"Replies/likes to your public posts may still be visible"
+msgstr "Respostas/reações às suas publicações públicas podem continuar visíveis."
 
-#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Por favor, veja o arquivo \"install/INSTALL.txt\"."
+#: ../../mod/layouts.php:52
+msgid "Layout Help"
+msgstr "Ajuda de layout"
 
-#: ../../mod/setup.php:254
-msgid "System check"
-msgstr "Checagem do sistema"
+#: ../../mod/layouts.php:55
+msgid "Help with this feature"
+msgstr "Ajuda com este recurso"
 
-#: ../../mod/setup.php:259
-msgid "Check again"
-msgstr "Cheque novamente"
+#: ../../mod/layouts.php:74
+msgid "Layout Name"
+msgstr "Nome do layout"
 
-#: ../../mod/setup.php:281
-msgid "Database connection"
-msgstr "Conexão ao banco de dados"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
+msgstr "Ajuda:"
 
-#: ../../mod/setup.php:282
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
-msgstr "Para instalar a Red Matrix é necessário saber como se conectar ao seu banco de dados."
+#: ../../mod/help.php:68 ../../index.php:223
+msgid "Not Found"
+msgstr "Não encontrada"
 
-#: ../../mod/setup.php:283
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso."
+#: ../../mod/help.php:71 ../../mod/page.php:83 ../../mod/display.php:100
+#: ../../index.php:226
+msgid "Page not found."
+msgstr "Página não encontrada."
 
-#: ../../mod/setup.php:284
+#: ../../mod/rmagic.php:38
 msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID."
 
-#: ../../mod/setup.php:288
-msgid "Database Server Name"
-msgstr "Nome do servidor de banco de dados"
+#: ../../mod/rmagic.php:38
+msgid "The error message was:"
+msgstr "A mensagem de erro foi:"
 
-#: ../../mod/setup.php:288
-msgid "Default is localhost"
-msgstr "O default é localhost"
+#: ../../mod/rmagic.php:42
+msgid "Authentication failed."
+msgstr "A autenticação falhou."
 
-#: ../../mod/setup.php:289
-msgid "Database Port"
-msgstr "Porta do banco de dados"
+#: ../../mod/rmagic.php:78
+msgid "Remote Authentication"
+msgstr "Autenticação remota"
 
-#: ../../mod/setup.php:289
-msgid "Communication port number - use 0 for default"
-msgstr "Número da porta de comunicação - use 0 para o default"
+#: ../../mod/rmagic.php:79
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Entre o endereço do seu canal (e.g. canal@exemplo.com)"
 
-#: ../../mod/setup.php:290
-msgid "Database Login Name"
-msgstr "Nome do usuário do banco de dados"
+#: ../../mod/rmagic.php:80
+msgid "Authenticate"
+msgstr "Autenticar"
 
-#: ../../mod/setup.php:291
-msgid "Database Login Password"
-msgstr "Senha do usuário do banco de dados"
+#: ../../mod/page.php:35
+msgid "Invalid item."
+msgstr "Item inválido."
 
-#: ../../mod/setup.php:292
-msgid "Database Name"
-msgstr "Nome do banco de dados"
+#: ../../mod/network.php:79
+msgid "No such group"
+msgstr "Este grupo não existe"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid "Site administrator email address"
-msgstr "Endereço de email do administrador do site"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
+msgstr "Resultados da busca por:"
 
-#: ../../mod/setup.php:294 ../../mod/setup.php:336
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web."
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "A coleção está vazia"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Website URL"
-msgstr "URL do website"
+#: ../../mod/network.php:180
+msgid "Collection: "
+msgstr "Coleção:"
 
-#: ../../mod/setup.php:295 ../../mod/setup.php:338
-msgid "Please use SSL (https) URL if available."
-msgstr "Por favor, use uma URL SSL (https) se disponível."
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr "Conexão:"
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please select a default timezone for your website"
-msgstr "Por favor, selecione o fuso horário padrão para o seu site"
+#: ../../mod/network.php:196
+msgid "Invalid connection."
+msgstr "Conexão inválida."
 
-#: ../../mod/setup.php:325
-msgid "Site settings"
-msgstr "Configurações do site"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
+msgid "Profile not found."
+msgstr "O perfil não foi encontrado."
 
-#: ../../mod/setup.php:384
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web."
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "O perfil foi excluído."
 
-#: ../../mod/setup.php:385
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron."
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Perfil-"
 
-#: ../../mod/setup.php:389
-msgid "PHP executable path"
-msgstr "Caminho para o executável do PHP"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "O novo perfil foi criado."
 
-#: ../../mod/setup.php:389
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação."
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
+msgstr "O perfil não está disponível para clonagem."
 
-#: ../../mod/setup.php:394
-msgid "Command line PHP"
-msgstr "PHP em linha de comando"
+#: ../../mod/profiles.php:178
+msgid "Profile Name is required."
+msgstr "É obrigatório informar o nome do perfil."
 
-#: ../../mod/setup.php:403
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema."
+#: ../../mod/profiles.php:294
+msgid "Marital Status"
+msgstr "Estado civil"
 
-#: ../../mod/setup.php:404
-msgid "This is required for message delivery to work."
-msgstr "Isto é necessário para o funcionamento do envio de mensagens."
+#: ../../mod/profiles.php:298
+msgid "Romantic Partner"
+msgstr "Parceiro/a romântico/a"
 
-#: ../../mod/setup.php:406
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/profiles.php:302
+msgid "Likes"
+msgstr "Gosta de"
 
-#: ../../mod/setup.php:427
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia"
+#: ../../mod/profiles.php:306
+msgid "Dislikes"
+msgstr "Não gosta de"
 
-#: ../../mod/setup.php:428
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\"."
+#: ../../mod/profiles.php:310
+msgid "Work/Employment"
+msgstr "Trabalho/Emprego"
 
-#: ../../mod/setup.php:430
-msgid "Generate encryption keys"
-msgstr "Gerar chaves de criptografia"
+#: ../../mod/profiles.php:313
+msgid "Religion"
+msgstr "Religião"
 
-#: ../../mod/setup.php:437
-msgid "libCurl PHP module"
-msgstr "Módulo PHP libCurl"
+#: ../../mod/profiles.php:317
+msgid "Political Views"
+msgstr "Posição política"
 
-#: ../../mod/setup.php:438
-msgid "GD graphics PHP module"
-msgstr "Módulo PHP GD graphics"
+#: ../../mod/profiles.php:321
+msgid "Gender"
+msgstr "Gênero"
 
-#: ../../mod/setup.php:439
-msgid "OpenSSL PHP module"
-msgstr "Módulo PHP OpenSSL"
+#: ../../mod/profiles.php:325
+msgid "Sexual Preference"
+msgstr "Preferência sexual"
 
-#: ../../mod/setup.php:440
-msgid "mysqli PHP module"
-msgstr "Módulo PHP mysqli"
+#: ../../mod/profiles.php:329
+msgid "Homepage"
+msgstr "Página web"
 
-#: ../../mod/setup.php:441
-msgid "mb_string PHP module"
-msgstr "Módulo PHP mb_string "
+#: ../../mod/profiles.php:333
+msgid "Interests"
+msgstr "Interesses"
 
-#: ../../mod/setup.php:442
-msgid "mcrypt PHP module"
-msgstr "Módulo PHP mcrypt"
+#: ../../mod/profiles.php:337
+msgid "Address"
+msgstr "Endereço"
 
-#: ../../mod/setup.php:447 ../../mod/setup.php:449
-msgid "Apache mod_rewrite module"
-msgstr "Módulo mod_rewrite do Apache"
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
+msgid "Location"
+msgstr "Localização"
 
-#: ../../mod/setup.php:447
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado."
+#: ../../mod/profiles.php:427
+msgid "Profile updated."
+msgstr "O perfil foi atualizado."
 
-#: ../../mod/setup.php:453 ../../mod/setup.php:456
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/profiles.php:482
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Esconder sua lista de contatos/amigos dos visitantes no seu perfil?"
 
-#: ../../mod/setup.php:453
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini"
+#: ../../mod/profiles.php:505
+msgid "Edit Profile Details"
+msgstr "Editar os detalhes do perfil"
 
-#: ../../mod/setup.php:461
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Erro: o módulo libCURL do PHP é necessário, mas não está instalado."
+#: ../../mod/profiles.php:507
+msgid "View this profile"
+msgstr "Ver este perfil"
 
-#: ../../mod/setup.php:465
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado."
+#: ../../mod/profiles.php:508
+msgid "Change Profile Photo"
+msgstr "Mudar a foto do perfil"
 
-#: ../../mod/setup.php:469
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Erro: o módulo openssl do PHP é necessário, mas não está instalado."
+#: ../../mod/profiles.php:509
+msgid "Create a new profile using these settings"
+msgstr "Criar um novo perfil usando estas configurações"
 
-#: ../../mod/setup.php:473
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Erro: o módulo mysqli do PHP é necessário, mas não está instalado."
+#: ../../mod/profiles.php:510
+msgid "Clone this profile"
+msgstr "Clonar este perfil"
 
-#: ../../mod/setup.php:477
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Erro: o módulo mb_string do PHP é necessário, mas não está instalado."
+#: ../../mod/profiles.php:511
+msgid "Delete this profile"
+msgstr "Excluir este perfil"
 
-#: ../../mod/setup.php:481
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado."
+#: ../../mod/profiles.php:512
+msgid "Profile Name:"
+msgstr "Nome do perfil:"
 
-#: ../../mod/setup.php:497
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo."
+#: ../../mod/profiles.php:513
+msgid "Your Full Name:"
+msgstr "Seu nome completo:"
 
-#: ../../mod/setup.php:498
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta."
+#: ../../mod/profiles.php:514
+msgid "Title/Description:"
+msgstr "Título/Descrição:"
 
-#: ../../mod/setup.php:499
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red."
+#: ../../mod/profiles.php:515
+msgid "Your Gender:"
+msgstr "Seu gênero:"
 
-#: ../../mod/setup.php:500
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções."
+#: ../../mod/profiles.php:516
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Aniversário (%s):"
 
-#: ../../mod/setup.php:503
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php tem permissão de escrita"
+#: ../../mod/profiles.php:517
+msgid "Street Address:"
+msgstr "Endereço:"
 
-#: ../../mod/setup.php:513
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização."
+#: ../../mod/profiles.php:518
+msgid "Locality/City:"
+msgstr "Localidade/Cidade:"
 
-#: ../../mod/setup.php:514
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory view/tpl/smarty3/ under the Red top level "
-"folder."
-msgstr "Para guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório view/tpl/smarty3/ dentro do diretório raiz da Red."
+#: ../../mod/profiles.php:519
+msgid "Postal/Zip Code:"
+msgstr "CEP:"
 
-#: ../../mod/setup.php:515 ../../mod/setup.php:533
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório."
+#: ../../mod/profiles.php:520
+msgid "Country:"
+msgstr "País:"
 
-#: ../../mod/setup.php:516
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Nota: como uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em view/tpl/smarty3/  e não aos arquivos de template (.tpl) que ele contém."
+#: ../../mod/profiles.php:521
+msgid "Region/State:"
+msgstr "Região/Estado:"
 
-#: ../../mod/setup.php:519
-msgid "view/tpl/smarty3 is writable"
-msgstr "view/tpl/smarty3 tem permissão de escrita"
+#: ../../mod/profiles.php:522
+msgid "♥ Marital Status:"
+msgstr "Estado civil ♥:"
 
-#: ../../mod/setup.php:532
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red"
+#: ../../mod/profiles.php:523
+msgid "Who: (if applicable)"
+msgstr "Quem: (se aplicável)"
 
-#: ../../mod/setup.php:536
-msgid "store is writable"
-msgstr "store tem permissão de escrita"
+#: ../../mod/profiles.php:524
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemplos: fulano123, Fulano de Tal, fulano@exemplo.com"
 
-#: ../../mod/setup.php:551
-msgid "SSL certificate validation"
-msgstr "Validação do certificado SSL"
+#: ../../mod/profiles.php:525
+msgid "Since [date]:"
+msgstr "Desde [data]:"
 
-#: ../../mod/setup.php:551
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site."
+#: ../../mod/profiles.php:527
+msgid "Homepage URL:"
+msgstr "Endereço do website:"
 
-#: ../../mod/setup.php:558
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor."
+#: ../../mod/profiles.php:530
+msgid "Religious Views:"
+msgstr "Orientação religiosa:"
 
-#: ../../mod/setup.php:560
-msgid "Url rewrite is working"
-msgstr "A reescrita de URLs está funcionando"
+#: ../../mod/profiles.php:531
+msgid "Keywords:"
+msgstr "Palavras-chave:"
 
-#: ../../mod/setup.php:570
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
+#: ../../mod/profiles.php:534
+msgid "Example: fishing photography software"
+msgstr "Exemplo: pesca fotografia software"
 
-#: ../../mod/setup.php:594
-msgid "Errors encountered creating database tables."
-msgstr "Foram encontrados erros durante a criação das tabelas do banco de dados."
+#: ../../mod/profiles.php:535
+msgid "Used in directory listings"
+msgstr "Usado em listas de diretório"
 
-#: ../../mod/setup.php:607
-msgid "
                                      What next
                                      "
-msgstr "
                                      Próximos passos
                                      "
+#: ../../mod/profiles.php:536
+msgid "Tell us about yourself..."
+msgstr "Fale um pouco sobre você..."
 
-#: ../../mod/setup.php:608
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor."
+#: ../../mod/profiles.php:537
+msgid "Hobbies/Interests"
+msgstr "Hobbies/Interesses"
 
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr "Versão %s"
+#: ../../mod/profiles.php:538
+msgid "Contact information and Social Networks"
+msgstr "Informações de contato e redes sociais"
 
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr "Plugins/complementos/aplicações instalados:"
+#: ../../mod/profiles.php:539
+msgid "My other channels"
+msgstr "Meus outros canais"
 
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr "Nenhum plugin/complemento/aplicação instalado"
+#: ../../mod/profiles.php:540
+msgid "Musical interests"
+msgstr "Interesses musicais"
 
-#: ../../mod/siteinfo.php:93
-msgid "Project Donations"
-msgstr "Doações para o projeto"
+#: ../../mod/profiles.php:541
+msgid "Books, literature"
+msgstr "Livros, literatura"
 
-#: ../../mod/siteinfo.php:94
-msgid ""
-"
                                      The Red Matrix is provided for you by volunteers working in their spare "
-"time. Your support will help us to build a better web. Select the following "
-"option for a one-time donation of your choosing
                                      "
-msgstr "
                                      A Red Matrix é oferecida a você por voluntários trabalhando no seu tempo livre. Seu apoio irá nos ajudar a construir uma web melhor. Selecione uma das opções abaixo para realizar uma única doação de sua escolha:
                                      "
+#: ../../mod/profiles.php:542
+msgid "Television"
+msgstr "Televisão"
 
-#: ../../mod/siteinfo.php:95
-msgid "
                                      or
                                      "
-msgstr "
                                      ou
                                      "
+#: ../../mod/profiles.php:543
+msgid "Film/dance/culture/entertainment"
+msgstr "Filme/dança/cultura/entretenimento"
 
-#: ../../mod/siteinfo.php:96
-msgid "Recurring Donation Options"
-msgstr "Opções para doações recorrentes"
+#: ../../mod/profiles.php:544
+msgid "Love/romance"
+msgstr "Amor/romance"
 
-#: ../../mod/siteinfo.php:115
-msgid "Red"
-msgstr "Red"
+#: ../../mod/profiles.php:545
+msgid "Work/employment"
+msgstr "Trabalho/emprego"
 
-#: ../../mod/siteinfo.php:116
+#: ../../mod/profiles.php:546
+msgid "School/education"
+msgstr "Escola/educação"
+
+#: ../../mod/profiles.php:551
 msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr "Este é um hub da Red Matrix - uma rede global cooperativa de websites descentralizados com privacidade aprimorada."
+"This is your public profile.
                                      It may "
+"be visible to anybody using the internet."
+msgstr "Este é o seu perfil público.
                                      Ele pode estar visível para qualquer um que acesse a Internet."
 
-#: ../../mod/siteinfo.php:119
-msgid "Running at web location"
-msgstr "Sendo executado no endereço web"
+#: ../../mod/profiles.php:600
+msgid "Edit/Manage Profiles"
+msgstr "Editar/Administrar perfis"
 
-#: ../../mod/siteinfo.php:120
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr "Para aprender mais sobre a Red Matrix, visite GetZot.com."
+#: ../../mod/profiles.php:601
+msgid "Add profile things"
+msgstr "Adicionar coisas ao perfil"
 
-#: ../../mod/siteinfo.php:121
-msgid "Bug reports and issues: please visit"
-msgstr "Relatos e acompanhamentos de erros podem ser encontrados em"
+#: ../../mod/profiles.php:602
+msgid "Include desirable objects in your profile"
+msgstr "Inclua objetos desejáveis no seu perfil"
 
-#: ../../mod/siteinfo.php:124
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Canal adicionado."
+
+#: ../../mod/post.php:226
 msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com"
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente."
 
-#: ../../mod/siteinfo.php:126
-msgid "Site Administrators"
-msgstr "Administradores do site"
+#: ../../mod/post.php:256 ../../mod/openid.php:70 ../../mod/openid.php:175
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Bem vindo %s. Autenticação remota realizada com sucesso."
 
-#: ../../mod/new_channel.php:107
-msgid "Add a Channel"
-msgstr "Adicionar um canal"
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Este site não é um servidor de diretório"
 
-#: ../../mod/new_channel.php:108
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "Um canal é uma coleção sua de páginas relacionadas. Um canal pode ser usado para um perfil de rede social, um blog, grupos de conversação e fóruns, páginas de celebridades, e muito mais. Você pode criar tantos canais quanto seu provedor de serviço permita."
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Falha ao criar a fonte. Nenhum canal selecionado."
 
-#: ../../mod/new_channel.php:111
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Exemplos: \"Beto Salinas\", \"Elis e seus Cavalos\", \"Futebol\", \"Grupo de aviadores\""
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Fonte criada."
 
-#: ../../mod/new_channel.php:112
-msgid "Choose a short nickname"
-msgstr "Escolha um apelido curto"
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "A fonte foi atualizada."
+
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
+
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Administrar as fontes remotas de conteúdo para o seu canal."
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Nova fonte"
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importar todo ou uma seleção do conteúdo do seguinte canal para este canal, e distribuí-lo de acordo com as configurações do seu canal."
+
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importar apenas conteúd com estas palavras (uma por linha)"
 
-#: ../../mod/new_channel.php:113
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Seu apelido será usado para criar um endereço para o canal de fácil memorização (como um endereço de email), que você poderá compartilhar com outros."
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Deixe em branco para importar todo o conteúdo público"
 
-#: ../../mod/new_channel.php:114
-msgid "Or import an existing channel from another location"
-msgstr "Ou importe um canal existente de outro local"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:110
+msgid "Channel Name"
+msgstr "Nome do canal"
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Não foi encontrada uma conta válida."
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "A fonte não foi encontrada."
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail."
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Editar fonte"
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Membro do site (%s)"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Deletar fonte"
 
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Foi feita uma solicitação de restauração de senha em %s"
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "A fonte foi removida."
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Não foi possível verificar a solicitação (você pode tê-la submetido anteriormente). A senha não foi restaurada."
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Não foi possível remover a fonte."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1434
-msgid "Password Reset"
-msgstr "Reiniciar a senha"
+#: ../../mod/lockview.php:34
+msgid "Remote privacy information not available."
+msgstr "Não existe informação disponível sobre a privacidade remota."
 
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
-msgstr "Sua senha foi restaurada, conforme solicitado."
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Visível para:"
 
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
-msgstr "Sua nova senha é"
+#: ../../mod/magic.php:70
+msgid "Hub not found."
+msgstr "O hub não foi encontrado."
 
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
-msgstr "Salve ou copie a sua nova senha e, então"
+#: ../../mod/setup.php:161
+msgid "Red Matrix Server - Setup"
+msgstr "Servidor Red Matrix - Configuração"
 
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
-msgstr "clique aqui para entrar"
+#: ../../mod/setup.php:167
+msgid "Could not connect to database."
+msgstr "Não foi possível conectar ao banco de dados."
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/setup.php:171
 msgid ""
-"Your password may be changed from the Settings page after "
-"successful login."
-msgstr "Sua senha pode ser alterada na página de Configurações após você entrar em sua conta."
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL."
 
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Sua senha foi modificada em %s"
+#: ../../mod/setup.php:176
+msgid "Could not create table."
+msgstr "Não foi possível criar a tabela."
 
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr "Esqueceu a sua senha?"
+#: ../../mod/setup.php:182
+msgid "Your site database has been installed."
+msgstr "O banco de dados do seu site foi instalado."
 
-#: ../../mod/lostpass.php:123
+#: ../../mod/setup.php:187
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções."
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
+msgstr "Pode ser que você precise importar o arquivo \"install/database.sql\" manualmente, usando o phpmyadmin or mysql."
 
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
-msgstr "Endereço de e-mail"
+#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Por favor, veja o arquivo \"install/INSTALL.txt\"."
 
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr "Restaurar"
+#: ../../mod/setup.php:254
+msgid "System check"
+msgstr "Checagem do sistema"
 
-#: ../../mod/settings.php:71
-msgid "Name is required"
-msgstr "O nome é obrigatório"
+#: ../../mod/setup.php:259
+msgid "Check again"
+msgstr "Cheque novamente"
 
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
-msgstr "A chave e o segredo são obrigatórios"
+#: ../../mod/setup.php:281
+msgid "Database connection"
+msgstr "Conexão ao banco de dados"
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:542
-msgid "Update"
-msgstr "Atualizar"
+#: ../../mod/setup.php:282
+msgid ""
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
+msgstr "Para instalar a Red Matrix é necessário saber como se conectar ao seu banco de dados."
 
-#: ../../mod/settings.php:195
-msgid "Passwords do not match. Password unchanged."
-msgstr "As senhas não correspondem. A senha não foi modificada."
+#: ../../mod/setup.php:283
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso."
 
-#: ../../mod/settings.php:199
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Não é permitido uma senha em branco. A senha não foi modificada."
+#: ../../mod/setup.php:284
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."
 
-#: ../../mod/settings.php:212
-msgid "Password changed."
-msgstr "A senha foi modificada."
+#: ../../mod/setup.php:288
+msgid "Database Server Name"
+msgstr "Nome do servidor de banco de dados"
 
-#: ../../mod/settings.php:214
-msgid "Password update failed. Please try again."
-msgstr "Não foi possível atualizar a senha. Por favor, tente novamente."
+#: ../../mod/setup.php:288
+msgid "Default is localhost"
+msgstr "O default é localhost"
 
-#: ../../mod/settings.php:228
-msgid "Not valid email."
-msgstr "Não é um e-mail válido"
+#: ../../mod/setup.php:289
+msgid "Database Port"
+msgstr "Porta do banco de dados"
 
-#: ../../mod/settings.php:231
-msgid "Protected email address. Cannot change to that email."
-msgstr "Endereço de e-mail protegido. Não é possível mudar para esse e-mail."
+#: ../../mod/setup.php:289
+msgid "Communication port number - use 0 for default"
+msgstr "Número da porta de comunicação - use 0 para o default"
 
-#: ../../mod/settings.php:240
-msgid "System failure storing new email. Please try again."
-msgstr "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente."
+#: ../../mod/setup.php:290
+msgid "Database Login Name"
+msgstr "Nome do usuário do banco de dados"
 
-#: ../../mod/settings.php:444
-msgid "Settings updated."
-msgstr "As configurações foram atualizadas."
+#: ../../mod/setup.php:291
+msgid "Database Login Password"
+msgstr "Senha do usuário do banco de dados"
 
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-#: ../../mod/settings.php:577
-msgid "Add application"
-msgstr "Adicionar aplicação"
+#: ../../mod/setup.php:292
+msgid "Database Name"
+msgstr "Nome do banco de dados"
 
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Name"
-msgstr "Nome"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid "Site administrator email address"
+msgstr "Endereço de email do administrador do site"
 
-#: ../../mod/settings.php:518
-msgid "Name of application"
-msgstr "Nome da aplicação"
+#: ../../mod/setup.php:294 ../../mod/setup.php:336
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web."
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
-msgid "Consumer Key"
-msgstr "Chave de consumidor"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Website URL"
+msgstr "URL do website"
 
-#: ../../mod/settings.php:519 ../../mod/settings.php:520
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Gerado automaticamente - troque se desejável. Comprimento máximo 20"
+#: ../../mod/setup.php:295 ../../mod/setup.php:338
+msgid "Please use SSL (https) URL if available."
+msgstr "Por favor, use uma URL SSL (https) se disponível."
 
-#: ../../mod/settings.php:520 ../../mod/settings.php:546
-msgid "Consumer Secret"
-msgstr "Segredo de consumidor"
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please select a default timezone for your website"
+msgstr "Por favor, selecione o fuso horário padrão para o seu site"
 
-#: ../../mod/settings.php:521 ../../mod/settings.php:547
-msgid "Redirect"
-msgstr "Redirecionamento"
+#: ../../mod/setup.php:325
+msgid "Site settings"
+msgstr "Configurações do site"
 
-#: ../../mod/settings.php:521
+#: ../../mod/setup.php:384
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web."
+
+#: ../../mod/setup.php:385
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso"
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron."
+
+#: ../../mod/setup.php:389
+msgid "PHP executable path"
+msgstr "Caminho para o executável do PHP"
+
+#: ../../mod/setup.php:389
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação."
 
-#: ../../mod/settings.php:522 ../../mod/settings.php:548
-msgid "Icon url"
-msgstr "URL do ícone"
+#: ../../mod/setup.php:394
+msgid "Command line PHP"
+msgstr "PHP em linha de comando"
 
-#: ../../mod/settings.php:522
-msgid "Optional"
-msgstr "Opcional"
+#: ../../mod/setup.php:403
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema."
 
-#: ../../mod/settings.php:533
-msgid "You can't edit this application."
-msgstr "Você não pode editar esta aplicação."
+#: ../../mod/setup.php:404
+msgid "This is required for message delivery to work."
+msgstr "Isto é necessário para o funcionamento do envio de mensagens."
 
-#: ../../mod/settings.php:576
-msgid "Connected Apps"
-msgstr "Aplicações conectadas"
+#: ../../mod/setup.php:406
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/settings.php:580
-msgid "Client key starts with"
-msgstr "Chave do cliente começa com"
+#: ../../mod/setup.php:427
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia"
 
-#: ../../mod/settings.php:581
-msgid "No name"
-msgstr "Sem nome"
+#: ../../mod/setup.php:428
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/settings.php:582
-msgid "Remove authorization"
-msgstr "Remover autorização"
+#: ../../mod/setup.php:430
+msgid "Generate encryption keys"
+msgstr "Gerar chaves de criptografia"
 
-#: ../../mod/settings.php:593
-msgid "No feature settings configured"
-msgstr "Não foi definida nenhuma configuração do recurso"
+#: ../../mod/setup.php:437
+msgid "libCurl PHP module"
+msgstr "Módulo PHP libCurl"
 
-#: ../../mod/settings.php:601
-msgid "Feature Settings"
-msgstr "Configurações do recurso"
+#: ../../mod/setup.php:438
+msgid "GD graphics PHP module"
+msgstr "Módulo PHP GD graphics"
 
-#: ../../mod/settings.php:624
-msgid "Account Settings"
-msgstr "Configurações da conta"
+#: ../../mod/setup.php:439
+msgid "OpenSSL PHP module"
+msgstr "Módulo PHP OpenSSL"
 
-#: ../../mod/settings.php:625
-msgid "Password Settings"
-msgstr "Configurações da senha"
+#: ../../mod/setup.php:440
+msgid "mysqli PHP module"
+msgstr "Módulo PHP mysqli"
 
-#: ../../mod/settings.php:626
-msgid "New Password:"
-msgstr "Nova senha:"
+#: ../../mod/setup.php:441
+msgid "mb_string PHP module"
+msgstr "Módulo PHP mb_string "
 
-#: ../../mod/settings.php:627
-msgid "Confirm:"
-msgstr "Confirme:"
+#: ../../mod/setup.php:442
+msgid "mcrypt PHP module"
+msgstr "Módulo PHP mcrypt"
 
-#: ../../mod/settings.php:627
-msgid "Leave password fields blank unless changing"
-msgstr "Deixe os campos de senha em branco, a não ser que você queira alterá-la"
+#: ../../mod/setup.php:447 ../../mod/setup.php:449
+msgid "Apache mod_rewrite module"
+msgstr "Módulo mod_rewrite do Apache"
 
-#: ../../mod/settings.php:629 ../../mod/settings.php:925
-msgid "Email Address:"
-msgstr "Endereço de e-mail:"
+#: ../../mod/setup.php:447
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:630
-msgid "Remove Account"
-msgstr "Remover conta"
+#: ../../mod/setup.php:453 ../../mod/setup.php:456
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../mod/settings.php:631
-msgid "Warning: This action is permanent and cannot be reversed."
-msgstr "Atenção: Esta ação é permanente e não pode ser revertida."
+#: ../../mod/setup.php:453
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini"
 
-#: ../../mod/settings.php:647
-msgid "Off"
-msgstr "Desligado"
+#: ../../mod/setup.php:461
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Erro: o módulo libCURL do PHP é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:647
-msgid "On"
-msgstr "Ligado"
+#: ../../mod/setup.php:465
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:654
-msgid "Additional Features"
-msgstr "Recursos adicionais"
+#: ../../mod/setup.php:469
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Erro: o módulo openssl do PHP é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:679
-msgid "Connector Settings"
-msgstr "Configurações do conector"
+#: ../../mod/setup.php:473
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Erro: o módulo mysqli do PHP é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:750
-msgid "Display Settings"
-msgstr "Configurações de exibição"
+#: ../../mod/setup.php:477
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Erro: o módulo mb_string do PHP é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:756
-msgid "Display Theme:"
-msgstr "Tema do perfil:"
+#: ../../mod/setup.php:481
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado."
 
-#: ../../mod/settings.php:757
-msgid "Mobile Theme:"
-msgstr "Tema móvel:"
+#: ../../mod/setup.php:497
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo."
 
-#: ../../mod/settings.php:758
-msgid "Update browser every xx seconds"
-msgstr "Atualizar navegador a cada xx segundos"
+#: ../../mod/setup.php:498
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta."
 
-#: ../../mod/settings.php:758
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Mínimo de 10 segundos, sem máximo"
+#: ../../mod/setup.php:499
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red."
 
-#: ../../mod/settings.php:759
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Número máximo permitido de conversas carregadas:"
+#: ../../mod/setup.php:500
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções."
 
-#: ../../mod/settings.php:759
-msgid "Maximum of 100 items"
-msgstr "Máximo de 100 itens"
+#: ../../mod/setup.php:503
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php tem permissão de escrita"
 
-#: ../../mod/settings.php:760
-msgid "Don't show emoticons"
-msgstr "Não exibir emoticons"
+#: ../../mod/setup.php:513
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização."
 
-#: ../../mod/settings.php:761
-msgid "Do not view remote profiles in frames"
-msgstr "Não exibir perfis remotos em frames"
+#: ../../mod/setup.php:514
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/tpl/smarty3/ under the Red top level "
+"folder."
+msgstr "Para guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório view/tpl/smarty3/ dentro do diretório raiz da Red."
 
-#: ../../mod/settings.php:761
-msgid "By default open in a sub-window of your own site"
-msgstr "Por padrão, abrir em uma sub-janela do seu próprio site"
+#: ../../mod/setup.php:515 ../../mod/setup.php:533
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório."
 
-#: ../../mod/settings.php:796
-msgid "Nobody except yourself"
-msgstr "Ninguém exceto você mesmo"
+#: ../../mod/setup.php:516
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr "Nota: como uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em view/tpl/smarty3/  e não aos arquivos de template (.tpl) que ele contém."
 
-#: ../../mod/settings.php:797
-msgid "Only those you specifically allow"
-msgstr "Apenas quem você der permissão"
+#: ../../mod/setup.php:519
+msgid "view/tpl/smarty3 is writable"
+msgstr "view/tpl/smarty3 tem permissão de escrita"
 
-#: ../../mod/settings.php:798
-msgid "Anybody in your address book"
-msgstr "Qualquer um nos seus contatos"
+#: ../../mod/setup.php:532
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red"
 
-#: ../../mod/settings.php:799
-msgid "Anybody on this website"
-msgstr "Qualquer um neste site"
+#: ../../mod/setup.php:536
+msgid "store is writable"
+msgstr "store tem permissão de escrita"
 
-#: ../../mod/settings.php:800
-msgid "Anybody in this network"
-msgstr "Qualquer um nesta rede"
+#: ../../mod/setup.php:551
+msgid "SSL certificate validation"
+msgstr "Validação do certificado SSL"
 
-#: ../../mod/settings.php:801
-msgid "Anybody on the internet"
-msgstr "Qualquer um na internet"
+#: ../../mod/setup.php:551
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site."
 
-#: ../../mod/settings.php:878
-msgid "Publish your default profile in the network directory"
-msgstr "Publicar seu perfil padrão no diretório da rede?"
+#: ../../mod/setup.php:558
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor."
 
-#: ../../mod/settings.php:883
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Permitir sugerir você como amigo potencial para outros membros?"
+#: ../../mod/setup.php:560
+msgid "Url rewrite is working"
+msgstr "A reescrita de URLs está funcionando"
 
-#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288
-msgid "or"
-msgstr "ou"
+#: ../../mod/setup.php:570
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
 
-#: ../../mod/settings.php:892
-msgid "Your channel address is"
-msgstr "O endereço do seu canal é"
+#: ../../mod/setup.php:594
+msgid "Errors encountered creating database tables."
+msgstr "Foram encontrados erros durante a criação das tabelas do banco de dados."
 
-#: ../../mod/settings.php:914
-msgid "Channel Settings"
-msgstr "Configurações do canal"
+#: ../../mod/setup.php:607
+msgid "
                                      What next
                                      "
+msgstr "
                                      Próximos passos
                                      "
 
-#: ../../mod/settings.php:923
-msgid "Basic Settings"
-msgstr "Configurações básicas"
+#: ../../mod/setup.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor."
 
-#: ../../mod/settings.php:926
-msgid "Your Timezone:"
-msgstr "Seu fuso horário:"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr "Versão %s"
 
-#: ../../mod/settings.php:927
-msgid "Default Post Location:"
-msgstr "Localização padrão de suas publicações:"
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Plugins/complementos/aplicações instalados:"
 
-#: ../../mod/settings.php:928
-msgid "Use Browser Location:"
-msgstr "Usar localizador do navegador:"
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Nenhum plugin/complemento/aplicação instalado"
 
-#: ../../mod/settings.php:930
-msgid "Adult Content"
-msgstr "Conteúdo adulto"
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
+msgstr "Doações para o projeto"
 
-#: ../../mod/settings.php:930
+#: ../../mod/siteinfo.php:94
 msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)"
-
-#: ../../mod/settings.php:932
-msgid "Security and Privacy Settings"
-msgstr "Configurações de segurança e privacidade"
+"
                                      The Red Matrix is provided for you by volunteers working in their spare "
+"time. Your support will help us to build a better, freer, and privacy "
+"respecting web. Select the following option for a one-time donation of your "
+"choosing
                                      "
+msgstr "
                                      A Red Matrix é oferecida a você por voluntários trabalhando no seu tempo livre. Seu apoio irá nos ajudar a construir uma web melhor, mais livre e com respeito à privacidade. Selecione uma das opções abaixo para realizar uma única doação de sua escolha:
                                      "
 
-#: ../../mod/settings.php:934
-msgid "Hide my online presence"
-msgstr "Esconda minha presença online"
+#: ../../mod/siteinfo.php:95
+msgid "
                                      or
                                      "
+msgstr "
                                      ou
                                      "
 
-#: ../../mod/settings.php:934
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Previne exibir em seu perfil que você está online"
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
+msgstr "Opções para doações recorrentes"
 
-#: ../../mod/settings.php:936
-msgid "Simple Privacy Settings:"
-msgstr "Configurações de privacidade simples:"
+#: ../../mod/siteinfo.php:115
+msgid "Red"
+msgstr "Red"
 
-#: ../../mod/settings.php:937
+#: ../../mod/siteinfo.php:116
 msgid ""
-"Very Public - extremely permissive (should be used with caution)"
-msgstr "Muito público - extremamente permissivo (deve ser usado com cuidado)"
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Este é um hub da Red Matrix - uma rede global cooperativa de websites descentralizados com privacidade aprimorada."
+
+#: ../../mod/siteinfo.php:119
+msgid "Running at web location"
+msgstr "Sendo executado no endereço web"
 
-#: ../../mod/settings.php:938
+#: ../../mod/siteinfo.php:120
 msgid ""
-"Typical - default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)"
-msgstr "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)"
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Para aprender mais sobre a Red Matrix, visite GetZot.com."
 
-#: ../../mod/settings.php:939
-msgid "Private - default private, never open or public"
-msgstr "Privado - privado por padrão, nunca aberto ou público"
+#: ../../mod/siteinfo.php:121
+msgid "Bug reports and issues: please visit"
+msgstr "Relatos e acompanhamentos de erros podem ser encontrados em"
 
-#: ../../mod/settings.php:940
-msgid "Blocked - default blocked to/from everybody"
-msgstr "Bloqueado - por padrão bloquado de/para todos"
+#: ../../mod/siteinfo.php:124
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com"
 
-#: ../../mod/settings.php:943
-msgid "Advanced Privacy Settings"
-msgstr "Configurações de privacidade avançadas"
+#: ../../mod/siteinfo.php:126
+msgid "Site Administrators"
+msgstr "Administradores do site"
 
-#: ../../mod/settings.php:945
-msgid "Maximum Friend Requests/Day:"
-msgstr "Número máximo de requisições de amizade por dia:"
+#: ../../mod/new_channel.php:107
+msgid "Add a Channel"
+msgstr "Adicionar um canal"
 
-#: ../../mod/settings.php:945
-msgid "May reduce spam activity"
-msgstr "Pode reduzir a frequência de spam"
+#: ../../mod/new_channel.php:108
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Um canal é uma coleção sua de páginas relacionadas. Um canal pode ser usado para um perfil de rede social, um blog, grupos de conversação e fóruns, páginas de celebridades, e muito mais. Você pode criar tantos canais quanto seu provedor de serviço permita."
 
-#: ../../mod/settings.php:946
-msgid "Default Post Permissions"
-msgstr "Permissões padrão de publicação"
+#: ../../mod/new_channel.php:111
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Exemplos: \"Beto Salinas\", \"Elis e seus Cavalos\", \"Futebol\", \"Grupo de aviadores\""
 
-#: ../../mod/settings.php:958
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Máximo número de mensagens privadas por dia de pessoas desconhecidas:"
+#: ../../mod/new_channel.php:112
+msgid "Choose a short nickname"
+msgstr "Escolha um apelido curto"
 
-#: ../../mod/settings.php:958
-msgid "Useful to reduce spamming"
-msgstr "Útil para reduzir a frequência de spam"
+#: ../../mod/new_channel.php:113
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Seu apelido será usado para criar um endereço para o canal de fácil memorização (como um endereço de email), que você poderá compartilhar com outros."
 
-#: ../../mod/settings.php:961
-msgid "Notification Settings"
-msgstr "Configurações de notificação"
+#: ../../mod/new_channel.php:114
+msgid "Or import an existing channel from another location"
+msgstr "Ou importe um canal existente de outro local"
 
-#: ../../mod/settings.php:962
-msgid "By default post a status message when:"
-msgstr "Por padrão, publicar uma mensagem de status quando:"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Não foi encontrada uma conta válida."
 
-#: ../../mod/settings.php:963
-msgid "accepting a friend request"
-msgstr "aceitar um pedido de amizade"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail."
 
-#: ../../mod/settings.php:964
-msgid "joining a forum/community"
-msgstr "associar-se a um fórum/comunidade"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Membro do site (%s)"
 
-#: ../../mod/settings.php:965
-msgid "making an interesting profile change"
-msgstr "modificar algo interessante em seu perfil"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Foi feita uma solicitação de restauração de senha em %s"
 
-#: ../../mod/settings.php:966
-msgid "Send a notification email when:"
-msgstr "Enviar um e-mail de notificação quando:"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Não foi possível verificar a solicitação (você pode tê-la submetido anteriormente). A senha não foi restaurada."
 
-#: ../../mod/settings.php:967
-msgid "You receive an introduction"
-msgstr "Você recebeu uma apresentação"
+#: ../../mod/lostpass.php:85 ../../boot.php:1436
+msgid "Password Reset"
+msgstr "Reiniciar a senha"
 
-#: ../../mod/settings.php:968
-msgid "Your introductions are confirmed"
-msgstr "Suas solicitações forem confirmadas"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
+msgstr "Sua senha foi restaurada, conforme solicitado."
 
-#: ../../mod/settings.php:969
-msgid "Someone writes on your profile wall"
-msgstr "Alguém escrever no mural do seu perfil"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
+msgstr "Sua nova senha é"
 
-#: ../../mod/settings.php:970
-msgid "Someone writes a followup comment"
-msgstr "Alguém comentou a sua mensagem"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
+msgstr "Salve ou copie a sua nova senha e, então"
 
-#: ../../mod/settings.php:971
-msgid "You receive a private message"
-msgstr "Você recebeu uma mensagem privada"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
+msgstr "clique aqui para entrar"
 
-#: ../../mod/settings.php:972
-msgid "You receive a friend suggestion"
-msgstr "Você recebe uma sugestão de amizade"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the Settings page after "
+"successful login."
+msgstr "Sua senha pode ser alterada na página de Configurações após você entrar em sua conta."
 
-#: ../../mod/settings.php:973
-msgid "You are tagged in a post"
-msgstr "Você é mencionado num post"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Sua senha foi modificada em %s"
 
-#: ../../mod/settings.php:974
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Você foi cutucado/espetado/etc. numa publicação"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Esqueceu a sua senha?"
 
-#: ../../mod/settings.php:977
-msgid "Advanced Account/Page Type Settings"
-msgstr "Configurações avançadas de conta/tipo de página"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções."
 
-#: ../../mod/settings.php:978
-msgid "Change the behaviour of this account for special situations"
-msgstr "Mudar o comportamento dessa conta em situações especiais"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr "Endereço de e-mail"
 
-#: ../../mod/settings.php:981
-msgid ""
-"Please enable expert mode (in Settings > Additional features) to adjust!"
-msgstr "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) para ajustar!"
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Restaurar"
 
 #: ../../mod/import.php:36
 msgid "Nothing to import."
@@ -6272,32 +6307,32 @@ msgstr "Para qualquer das opções, por favor escolha se deseja fazer deste hub
 msgid "Make this hub my primary location"
 msgstr "Faça deste hub meu local primário"
 
-#: ../../mod/manage.php:63
+#: ../../mod/manage.php:64
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Você criou %1$.0f de %2$.0f canais permitidos."
 
-#: ../../mod/manage.php:71
+#: ../../mod/manage.php:72
 msgid "Create a new channel"
 msgstr "Criar um novo canal"
 
-#: ../../mod/manage.php:76
+#: ../../mod/manage.php:77
 msgid "Channel Manager"
 msgstr "Administrador do canal"
 
-#: ../../mod/manage.php:77
+#: ../../mod/manage.php:78
 msgid "Current Channel"
 msgstr "Canal atual"
 
-#: ../../mod/manage.php:79
+#: ../../mod/manage.php:80
 msgid "Attach to one of your channels by selecting it."
 msgstr "Selecione um dos seus canais para utilizá-lo."
 
-#: ../../mod/manage.php:80
+#: ../../mod/manage.php:81
 msgid "Default Channel"
 msgstr "Canal padrão"
 
-#: ../../mod/manage.php:81
+#: ../../mod/manage.php:82
 msgid "Make Default"
 msgstr "Tornar padrão"
 
@@ -6403,6 +6438,10 @@ msgstr "Comunicação segura indisponível. Você talvez consig
 msgid "Send Reply"
 msgstr "Enviar resposta"
 
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "Erro do protocolo OpenID. Nenhuma ID retornada."
+
 #: ../../mod/editlayout.php:72
 msgid "Edit Layout"
 msgstr "Editar layout"
@@ -6944,7 +6983,7 @@ msgstr "ou nome de um álbum já existente: "
 
 #: ../../mod/photos.php:605
 msgid "Do not show a status post for this upload"
-msgstr "Não mostrar uma publicação de status para este carregamento"
+msgstr "Não exibir uma publicação de status para este carregamento"
 
 #: ../../mod/photos.php:656 ../../mod/photos.php:678 ../../mod/photos.php:1127
 #: ../../mod/photos.php:1142
@@ -7285,41 +7324,41 @@ msgstr "Imagem de cabeçalho"
 msgid "Header image only on profile pages"
 msgstr "Imagem de cabeçalho apenas em páginas de perfil"
 
-#: ../../boot.php:1232
+#: ../../boot.php:1234
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "A atualização %s falhou. Veja os logs de erro."
 
-#: ../../boot.php:1235
+#: ../../boot.php:1237
 #, php-format
 msgid "Update Error at %s"
 msgstr "Erro de atualização em %s"
 
-#: ../../boot.php:1399
+#: ../../boot.php:1401
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr "Crie uma conta para acessar serviços e aplicações na Red Matrix"
 
-#: ../../boot.php:1427
+#: ../../boot.php:1429
 msgid "Password"
 msgstr "Senha"
 
-#: ../../boot.php:1428
+#: ../../boot.php:1430
 msgid "Remember me"
 msgstr "Lembrar de mim"
 
-#: ../../boot.php:1433
+#: ../../boot.php:1435
 msgid "Forgot your password?"
 msgstr "Esqueceu a sua senha?"
 
-#: ../../boot.php:1498
+#: ../../boot.php:1500
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../../boot.php:1499
+#: ../../boot.php:1501
 msgid "Got Zot?"
 msgstr "Já tem Zot?"
 
-#: ../../boot.php:1899
+#: ../../boot.php:1906
 msgid "toggle mobile"
 msgstr "alternar para interface móvel"
diff --git a/view/pt-br/passchanged_eml.tpl b/view/pt-br/passchanged_eml.tpl
index 0d94be3c2..8a9e0b637 100644
--- a/view/pt-br/passchanged_eml.tpl
+++ b/view/pt-br/passchanged_eml.tpl
@@ -1,20 +1,22 @@
 
-Dear {{$username}},
-	Your password has been changed as requested. Please retain this 
-information for your records (or change your password immediately to 
-something that you will remember).
+Caro/a {{$username}},
 
+	Sua senha foi modificada como solicitado. Por favor retenha
+essa informação contigo (ou modifique sua senha imediatamente para
+algo que você se lembrará).
 
-Your login details are as follows:
 
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-Password:	{{$new_password}}
+Suas informações de autenticação são as seguintes:
 
-You may change that password from your account settings page after logging in.
+Localização do site:	{{$siteurl}}
+Nome:	{{$email}}
+Senha:	{{$new_password}}
 
+Você pode modificar esta senha a partir da página de configurações de conta,
+após autenticar-se.
 
-Sincerely,
-	{{$sitename}} Administrator
+
+Atenciosamente,
+	{{$sitename}} Administrador
 
  
diff --git a/view/pt-br/register_open_eml.tpl b/view/pt-br/register_open_eml.tpl
index 4b397201c..6dd4b714b 100644
--- a/view/pt-br/register_open_eml.tpl
+++ b/view/pt-br/register_open_eml.tpl
@@ -1,19 +1,18 @@
 
-An account has been created at {{$sitename}} for this email address. 
-The login details are as follows:
+Uma conta foi criada em {{$sitename}} para este endereço de e-mail.
+Os detalhes de autenticação são os seguintes:
 
-Site Location:	{{$siteurl}}
-Login:	{{$email}}
-Password: (the password which was provided during registration)
+Localização do site:	{{$siteurl}}
+Nome:	{{$email}}
+Senha: (the password which was provided during registration)
 
-If this account was created without your knowledge and is not desired, you may 
-visit this site and reset the password. This will allow you to remove the 
-account from the links on the Settings page, and we 
-apologise for any inconvenience. 
+Se esta conta foi criada sem seu conhecimento e não é desejada, você pode
+visitar o site e reiniciar a senha. Isso permitirá que você a remova a partir
+da página de Configurações, e nesse caso desculpamo-nos pela inconveniência.  
 
-Thank you and welcome to {{$sitename}}.
+Obrigado e bem vindo a {{$sitename}}.
 
-Sincerely,
-	{{$sitename}} Administrator
+Atenciosamente,
+	{{$sitename}} Administrador
 
  
diff --git a/view/pt-br/register_verify_eml.tpl b/view/pt-br/register_verify_eml.tpl
index 85d9a12d3..9576039bc 100644
--- a/view/pt-br/register_verify_eml.tpl
+++ b/view/pt-br/register_verify_eml.tpl
@@ -1,25 +1,25 @@
 
-A new user registration request was received at {{$sitename}} which requires 
-your approval. 
+Uma nova solicitação de registro de usuário foi recebida em {{$sitename}} e
+requer sua aprovação.
 
 
-The login details are as follows:
+Os detalhes de autenticação são os seguintes:
 
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-IP Address: {{$details}}
+Localização do site:	{{$siteurl}}
+Nome:	{{$email}}
+Endereço IP: {{$details}}
 
-To approve this request please visit the following link:
+Para aprovar essa solicitação, acesse o link abaixo:
 
 
 {{$siteurl}}/regmod/allow/{{$hash}} 
 
 
-To deny the request and remove the account, please visit:
+Para negar a solicitação e remover a conta, acesse:
 
 
 {{$siteurl}}/regmod/deny/{{$hash}}
 
 
-Thank you.
+Obrigado.
 
diff --git a/view/pt-br/request_notify_eml.tpl b/view/pt-br/request_notify_eml.tpl
index d01b8ff27..3f0befb3f 100644
--- a/view/pt-br/request_notify_eml.tpl
+++ b/view/pt-br/request_notify_eml.tpl
@@ -1,17 +1,17 @@
 
-Dear {{$myname}},
+Caro/a {{$myname}},
 
-You have just received a connection request at {{$sitename}} 
+Você acaba de receber uma solicitação de conexão em {{$sitename}} 
 
-from '{{$requestor}}'.
+por '{{$requestor}}'.
 
-You may visit their profile at {{$url}}.
+Você pode ver o perfil dele em {{$url}}.
 
-Please login to your site to view the complete introduction 
-and approve or ignore/cancel the request.
+Por favor, autentique-se no seu site para ver a apresentação completa
+e aprovar ou ignorar/cancelar o pedido.
 
 {{$siteurl}}
 
-Regards,
+Gratidão,
 
-	{{$sitename}} administrator
+	{{$sitename}} administrador
diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php
index e59f5978a..c1c127e61 100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
@@ -53,7 +53,7 @@ $a->strings["Visit %1\$s's %2\$s"] = "Visite o %2\$s de %1\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s atualizou %2\$s, alterando %3\$s.";
 $a->strings["Logout"] = "Sair";
 $a->strings["End this session"] = "Encerrar essa sessão";
-$a->strings["Home"] = "Meu canal";
+$a->strings["Home"] = "Ver canal";
 $a->strings["Your posts and conversations"] = "Suas publicações e conversas";
 $a->strings["View Profile"] = "Ver perfil";
 $a->strings["Your profile page"] = "A página do seu perfil";
@@ -184,7 +184,7 @@ $a->strings["bytes"] = "bytes";
 $a->strings["remove category"] = "remover categoria";
 $a->strings["remove from file"] = "remover do arquivo";
 $a->strings["Click to open/close"] = "Clique para abrir/fechar";
-$a->strings["link to source"] = "exibir a origem";
+$a->strings["link to source"] = "Link para a origem";
 $a->strings["Select a page layout: "] = "Selecione um layout de página:";
 $a->strings["default"] = "default";
 $a->strings["Page content type: "] = "Tipo de conteúdo da página: ";
@@ -314,7 +314,7 @@ $a->strings["Channels not in any collection"] = "Canais que não estão em nenhu
 $a->strings["Delete this item?"] = "Excluir este item?";
 $a->strings["Comment"] = "Comentar";
 $a->strings["show more"] = "exibir mais";
-$a->strings["show fewer"] = "mostrar menos";
+$a->strings["show fewer"] = "exibir menos";
 $a->strings["Password too short"] = "A senha é muito curta";
 $a->strings["Passwords do not match"] = "As senhas não correspondem";
 $a->strings["everybody"] = "todos";
@@ -438,9 +438,9 @@ $a->strings["Set expiration date"] = "Definir data de expiração";
 $a->strings["Encrypt text"] = "Encriptar texto";
 $a->strings["OK"] = "Ok";
 $a->strings["Cancel"] = "Cancelar";
-$a->strings["Commented Order"] = "Recentemente comentados";
+$a->strings["Commented Order"] = "Recentes e comentados";
 $a->strings["Sort by Comment Date"] = "Ordenar pela data do último comentário";
-$a->strings["Posted Order"] = "Ordem de publicação";
+$a->strings["Posted Order"] = "Recentemente publicados";
 $a->strings["Sort by Post Date"] = "Ordenar pela data da publicação";
 $a->strings["Personal"] = "Pessoal";
 $a->strings["Posts that mention or involve you"] = "Publicações que mencionam ou envolvem você";
@@ -714,9 +714,8 @@ $a->strings["This action exceeds the limits set by your subscription plan."] = "
 $a->strings["This action is not available under your subscription plan."] = "Essa ação não está disponível para o seu plano de assinatura.";
 $a->strings["Channel is blocked on this site."] = "O canal está bloqueado neste site.";
 $a->strings["Channel location missing."] = "A localização do canal foi perdida";
-$a->strings["Channel discovery failed. Website may be down or misconfigured."] = "Não foi possível descobrir o canal. O site pode estar fora do ar ou desconfigurado.";
-$a->strings["Response from remote channel was not understood."] = "A resposta do canal remoto não foi compreendida.";
 $a->strings["Response from remote channel was incomplete."] = "A resposta do canal remoto está incompleta.";
+$a->strings["Channel discovery failed."] = "A descoberta de canais falhou.";
 $a->strings["local account not found."] = "a conta local não foi encontrada.";
 $a->strings["Cannot connect to yourself."] = "Não é possível conectar-se consigo mesmo.";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "O token de segurança do formulário não estava correto. Isso provavelmente aconteceu porque o formulário ficou aberto por muito tempo (>3 horas) antes da sua submissão.";
@@ -745,6 +744,7 @@ $a->strings["Can send me bookmarks"] = "Pode me enviar links guardados";
 $a->strings["Can administer my channel resources"] = "Pode administrar os recursos do meu canal";
 $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremamente avançado. Não mexa nisso a não ser que saiba o que está fazendo";
 $a->strings["Permission denied"] = "Permissão negada";
+$a->strings["Unknown"] = "Desconhecidos";
 $a->strings["Item not found."] = "O item não foi encontrado.";
 $a->strings["Collection not found."] = "A coleção não foi encontrada.";
 $a->strings["Collection is empty."] = "A coleção está vazia.";
@@ -808,13 +808,113 @@ $a->strings["Please visit my channel at"] = "Por favor, visite o meu canal em";
 $a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Após você se registrar (em qualquer site da Red Matrix - eles são todos interconectados!), peço que conecte-se comigo usando o endereço do meu canal:";
 $a->strings["Click the [Register] link on the following page to join."] = "Clique no link [Registrar] na seguinte página para participar.";
 $a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Para maiores informações sobre o Projeto Red Matrix e porque ele tem potencial para mudar a Internet como a conhecemos, por favor visite: http://getzot.com";
-$a->strings["Unable to locate original post."] = "Não foi possível localizar a publicação original.";
-$a->strings["Empty post discarded."] = "A publicação em branco foi descartada.";
-$a->strings["Executable content type not permitted to this channel."] = "Conteúdo de tipo executável não permitido para este canal.";
-$a->strings["System error. Post not saved."] = "Erro no sistema. A publicação não foi salva.";
-$a->strings["Wall Photos"] = "Fotos do mural";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Você atingiu o seu limite de %1$.0f publicações de novos tópicos.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Você atingiu o seu limite de %1$.0f páginas web.";
+$a->strings["Name is required"] = "O nome é obrigatório";
+$a->strings["Key and Secret are required"] = "A chave e o segredo são obrigatórios";
+$a->strings["Update"] = "Atualizar";
+$a->strings["Passwords do not match. Password unchanged."] = "As senhas não correspondem. A senha não foi modificada.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Não é permitido uma senha em branco. A senha não foi modificada.";
+$a->strings["Password changed."] = "A senha foi modificada.";
+$a->strings["Password update failed. Please try again."] = "Não foi possível atualizar a senha. Por favor, tente novamente.";
+$a->strings["Not valid email."] = "Não é um e-mail válido";
+$a->strings["Protected email address. Cannot change to that email."] = "Endereço de e-mail protegido. Não é possível mudar para esse e-mail.";
+$a->strings["System failure storing new email. Please try again."] = "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente.";
+$a->strings["Settings updated."] = "As configurações foram atualizadas.";
+$a->strings["Add application"] = "Adicionar aplicação";
+$a->strings["Name"] = "Nome";
+$a->strings["Name of application"] = "Nome da aplicação";
+$a->strings["Consumer Key"] = "Chave de consumidor";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Gerado automaticamente - troque se desejável. Comprimento máximo 20";
+$a->strings["Consumer Secret"] = "Segredo de consumidor";
+$a->strings["Redirect"] = "Redirecionamento";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso";
+$a->strings["Icon url"] = "URL do ícone";
+$a->strings["Optional"] = "Opcional";
+$a->strings["You can't edit this application."] = "Você não pode editar esta aplicação.";
+$a->strings["Connected Apps"] = "Aplicações conectadas";
+$a->strings["Client key starts with"] = "Chave do cliente começa com";
+$a->strings["No name"] = "Sem nome";
+$a->strings["Remove authorization"] = "Remover autorização";
+$a->strings["No feature settings configured"] = "Não foi definida nenhuma configuração do recurso";
+$a->strings["Feature Settings"] = "Configurações do recurso";
+$a->strings["Account Settings"] = "Configurações da conta";
+$a->strings["Password Settings"] = "Configurações da senha";
+$a->strings["New Password:"] = "Nova senha:";
+$a->strings["Confirm:"] = "Confirme:";
+$a->strings["Leave password fields blank unless changing"] = "Deixe os campos de senha em branco, a não ser que você queira alterá-la";
+$a->strings["Email Address:"] = "Endereço de e-mail:";
+$a->strings["Remove Account"] = "Remover conta";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Atenção: Esta ação é permanente e não pode ser revertida.";
+$a->strings["Off"] = "Desligado";
+$a->strings["On"] = "Ligado";
+$a->strings["Additional Features"] = "Recursos adicionais";
+$a->strings["Connector Settings"] = "Configurações do conector";
+$a->strings["No special theme for mobile devices"] = "Sem tema especial para aparelhos móveis";
+$a->strings["Display Settings"] = "Configurações de exibição";
+$a->strings["Display Theme:"] = "Tema do perfil:";
+$a->strings["Mobile Theme:"] = "Tema móvel:";
+$a->strings["Update browser every xx seconds"] = "Atualizar navegador a cada xx segundos";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, sem máximo";
+$a->strings["Maximum number of conversations to load at any time:"] = "Número máximo permitido de conversas carregadas:";
+$a->strings["Maximum of 100 items"] = "Máximo de 100 itens";
+$a->strings["Don't show emoticons"] = "Não exibir emoticons";
+$a->strings["Do not view remote profiles in frames"] = "Não exibir perfis remotos em frames";
+$a->strings["By default open in a sub-window of your own site"] = "Por padrão, abrir em uma sub-janela do seu próprio site";
+$a->strings["Nobody except yourself"] = "Ninguém exceto você mesmo";
+$a->strings["Only those you specifically allow"] = "Apenas quem você der permissão";
+$a->strings["Anybody in your address book"] = "Qualquer um nos seus contatos";
+$a->strings["Anybody on this website"] = "Qualquer um neste site";
+$a->strings["Anybody in this network"] = "Qualquer um nesta rede";
+$a->strings["Anybody authenticated"] = "Qualquer um autenticado";
+$a->strings["Anybody on the internet"] = "Qualquer um na internet";
+$a->strings["Publish your default profile in the network directory"] = "Publicar seu perfil padrão no diretório da rede?";
+$a->strings["No"] = "Não";
+$a->strings["Yes"] = "Sim";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permitir sugerir você como amigo potencial para outros membros?";
+$a->strings["or"] = "ou";
+$a->strings["Your channel address is"] = "O endereço do seu canal é";
+$a->strings["Channel Settings"] = "Configurações do canal";
+$a->strings["Basic Settings"] = "Configurações básicas";
+$a->strings["Your Timezone:"] = "Seu fuso horário:";
+$a->strings["Default Post Location:"] = "Localização padrão de suas publicações:";
+$a->strings["Use Browser Location:"] = "Usar localizador do navegador:";
+$a->strings["Adult Content"] = "Conteúdo adulto";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)";
+$a->strings["Security and Privacy Settings"] = "Configurações de segurança e privacidade";
+$a->strings["Hide my online presence"] = "Esconda minha presença online";
+$a->strings["Prevents displaying in your profile that you are online"] = "Previne exibir em seu perfil que você está online";
+$a->strings["Simple Privacy Settings:"] = "Configurações de privacidade simples:";
+$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Muito público - extremamente permissivo (deve ser usado com cuidado)";
+$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)";
+$a->strings["Private - default private, never open or public"] = "Privado - privado por padrão, nunca aberto ou público";
+$a->strings["Blocked - default blocked to/from everybody"] = "Bloqueado - por padrão bloquado de/para todos";
+$a->strings["Allow others to tag your posts"] = "Permitir que outros etiquetem suas publicações";
+$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado";
+$a->strings["Advanced Privacy Settings"] = "Configurações de privacidade avançadas";
+$a->strings["Maximum Friend Requests/Day:"] = "Número máximo de requisições de amizade por dia:";
+$a->strings["May reduce spam activity"] = "Pode reduzir a frequência de spam";
+$a->strings["Default Post Permissions"] = "Permissões padrão de publicação";
+$a->strings["(click to open/close)"] = "(clique para abrir/fechar)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Máximo número de mensagens privadas por dia de pessoas desconhecidas:";
+$a->strings["Useful to reduce spamming"] = "Útil para reduzir a frequência de spam";
+$a->strings["Notification Settings"] = "Configurações de notificação";
+$a->strings["By default post a status message when:"] = "Por padrão, publicar uma mensagem de status quando:";
+$a->strings["accepting a friend request"] = "aceitar um pedido de amizade";
+$a->strings["joining a forum/community"] = "associar-se a um fórum/comunidade";
+$a->strings["making an interesting profile change"] = "modificar algo interessante em seu perfil";
+$a->strings["Send a notification email when:"] = "Enviar um e-mail de notificação quando:";
+$a->strings["You receive an introduction"] = "Você recebeu uma apresentação";
+$a->strings["Your introductions are confirmed"] = "Suas solicitações forem confirmadas";
+$a->strings["Someone writes on your profile wall"] = "Alguém escrever no mural do seu perfil";
+$a->strings["Someone writes a followup comment"] = "Alguém comentou a sua mensagem";
+$a->strings["You receive a private message"] = "Você recebeu uma mensagem privada";
+$a->strings["You receive a friend suggestion"] = "Você recebe uma sugestão de amizade";
+$a->strings["You are tagged in a post"] = "Você é mencionado num post";
+$a->strings["You are poked/prodded/etc. in a post"] = "Você foi cutucado/espetado/etc. numa publicação";
+$a->strings["Advanced Account/Page Type Settings"] = "Configurações avançadas de conta/tipo de página";
+$a->strings["Change the behaviour of this account for special situations"] = "Mudar o comportamento dessa conta em situações especiais";
+$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) para ajustar!";
+$a->strings["Miscellaneous Settings"] = "Configurações miscelâneas";
+$a->strings["Personal menu to display in your channel pages"] = "Menu pessoal para exibir nas páginas dos seus canais";
 $a->strings["Menu updated."] = "Menu atualizado.";
 $a->strings["Unable to update menu."] = "Não foi possível atualizar o menu.";
 $a->strings["Menu created."] = "Menu criado.";
@@ -845,8 +945,6 @@ $a->strings["Authorize application connection"] = "Autorizar a conexão com a ap
 $a->strings["Return to your app and insert this Securty Code:"] = "Volte para a sua aplicação e digite este código de segurança:";
 $a->strings["Please login to continue."] = "Por favor, autentique-se para continuar.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Deseja autorizar esta aplicação a acessar suas publicações e contatos e/ou criar novas publicações para você?";
-$a->strings["Yes"] = "Sim";
-$a->strings["No"] = "Não";
 $a->strings["No installed applications."] = "Não existe nenhuma aplicação instalada.";
 $a->strings["Applications"] = "Aplicações";
 $a->strings["Edit post"] = "Editar a publicação";
@@ -854,6 +952,13 @@ $a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"
 $a->strings["Bookmark added"] = "O link foi guardado";
 $a->strings["My Bookmarks"] = "Meus links guardados";
 $a->strings["My Connections Bookmarks"] = "Links guardados das minhas conexões";
+$a->strings["Unable to locate original post."] = "Não foi possível localizar a publicação original.";
+$a->strings["Empty post discarded."] = "A publicação em branco foi descartada.";
+$a->strings["Executable content type not permitted to this channel."] = "Conteúdo de tipo executável não permitido para este canal.";
+$a->strings["System error. Post not saved."] = "Erro no sistema. A publicação não foi salva.";
+$a->strings["Wall Photos"] = "Fotos do mural";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Você atingiu o seu limite de %1$.0f publicações de novos tópicos.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Você atingiu o seu limite de %1$.0f páginas web.";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está acompanhando %3\$s de %2\$s";
 $a->strings["[Embedded content - reload page to view]"] = "[Conteúdo incorporado - recarregue a página para ver]";
 $a->strings["Channel not found."] = "O canal não foi encontrado.";
@@ -909,7 +1014,6 @@ $a->strings["Delete this menu item"] = "Deleter este item de menu";
 $a->strings["Edit this menu item"] = "Editar este item de menu";
 $a->strings["New Menu Element"] = "Novo elemento de menu";
 $a->strings["Menu Item Permissions"] = "Permissões do item do menu";
-$a->strings["(click to open/close)"] = "(clique para abrir/fechar)";
 $a->strings["Link text"] = "Texto do link";
 $a->strings["URL of link"] = "URL do link";
 $a->strings["Use Red magic-auth if available"] = "Usar Red magic-auth se disponível";
@@ -955,7 +1059,6 @@ $a->strings["Pending registrations"] = "Registros pendentes";
 $a->strings["Version"] = "Versão";
 $a->strings["Active plugins"] = "Plugins ativos";
 $a->strings["Site settings updated."] = "As configurações de site foram atualizadas.";
-$a->strings["No special theme for mobile devices"] = "Sem tema especial para aparelhos móveis";
 $a->strings["No special theme for accessibility"] = "Sem tema especial para acessibilidade";
 $a->strings["Closed"] = "Fechado";
 $a->strings["Requires approval"] = "Requer aprovação";
@@ -1114,7 +1217,6 @@ $a->strings["Unhide"] = "Não ocultar";
 $a->strings["Hide"] = "Ocultar";
 $a->strings["Hide or Unhide this connection"] = "Ocultar ou deixar de ocultar esta conexão";
 $a->strings["Delete this connection"] = "Deletar esta conexão";
-$a->strings["Unknown"] = "Desconhecidos";
 $a->strings["Approve this connection"] = "Aprovar esta conexão";
 $a->strings["Accept connection to allow communication"] = "Aceite a conexão para permitir comunicação";
 $a->strings["Automatic Permissions Settings"] = "Configurações de permissão automáticas";
@@ -1160,6 +1262,9 @@ $a->strings["Layout Name"] = "Nome do layout";
 $a->strings["Help:"] = "Ajuda:";
 $a->strings["Not Found"] = "Não encontrada";
 $a->strings["Page not found."] = "Página não encontrada.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID.";
+$a->strings["The error message was:"] = "A mensagem de erro foi:";
+$a->strings["Authentication failed."] = "A autenticação falhou.";
 $a->strings["Remote Authentication"] = "Autenticação remota";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Entre o endereço do seu canal (e.g. canal@exemplo.com)";
 $a->strings["Authenticate"] = "Autenticar";
@@ -1330,7 +1435,7 @@ $a->strings["Version %s"] = "Versão %s";
 $a->strings["Installed plugins/addons/apps:"] = "Plugins/complementos/aplicações instalados:";
 $a->strings["No installed plugins/addons/apps"] = "Nenhum plugin/complemento/aplicação instalado";
 $a->strings["Project Donations"] = "Doações para o projeto";
-$a->strings["
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
                                      "] = "
                                      A Red Matrix é oferecida a você por voluntários trabalhando no seu tempo livre. Seu apoio irá nos ajudar a construir uma web melhor. Selecione uma das opções abaixo para realizar uma única doação de sua escolha:
                                      ";
+$a->strings["
                                      The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better, freer, and privacy respecting web. Select the following option for a one-time donation of your choosing
                                      "] = "
                                      A Red Matrix é oferecida a você por voluntários trabalhando no seu tempo livre. Seu apoio irá nos ajudar a construir uma web melhor, mais livre e com respeito à privacidade. Selecione uma das opções abaixo para realizar uma única doação de sua escolha:
                                      ";
 $a->strings["
                                      or
                                      "] = "
                                      ou
                                      ";
 $a->strings["Recurring Donation Options"] = "Opções para doações recorrentes";
 $a->strings["Red"] = "Red";
@@ -1362,104 +1467,6 @@ $a->strings["Forgot your Password?"] = "Esqueceu a sua senha?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções.";
 $a->strings["Email Address"] = "Endereço de e-mail";
 $a->strings["Reset"] = "Restaurar";
-$a->strings["Name is required"] = "O nome é obrigatório";
-$a->strings["Key and Secret are required"] = "A chave e o segredo são obrigatórios";
-$a->strings["Update"] = "Atualizar";
-$a->strings["Passwords do not match. Password unchanged."] = "As senhas não correspondem. A senha não foi modificada.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Não é permitido uma senha em branco. A senha não foi modificada.";
-$a->strings["Password changed."] = "A senha foi modificada.";
-$a->strings["Password update failed. Please try again."] = "Não foi possível atualizar a senha. Por favor, tente novamente.";
-$a->strings["Not valid email."] = "Não é um e-mail válido";
-$a->strings["Protected email address. Cannot change to that email."] = "Endereço de e-mail protegido. Não é possível mudar para esse e-mail.";
-$a->strings["System failure storing new email. Please try again."] = "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente.";
-$a->strings["Settings updated."] = "As configurações foram atualizadas.";
-$a->strings["Add application"] = "Adicionar aplicação";
-$a->strings["Name"] = "Nome";
-$a->strings["Name of application"] = "Nome da aplicação";
-$a->strings["Consumer Key"] = "Chave de consumidor";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Gerado automaticamente - troque se desejável. Comprimento máximo 20";
-$a->strings["Consumer Secret"] = "Segredo de consumidor";
-$a->strings["Redirect"] = "Redirecionamento";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso";
-$a->strings["Icon url"] = "URL do ícone";
-$a->strings["Optional"] = "Opcional";
-$a->strings["You can't edit this application."] = "Você não pode editar esta aplicação.";
-$a->strings["Connected Apps"] = "Aplicações conectadas";
-$a->strings["Client key starts with"] = "Chave do cliente começa com";
-$a->strings["No name"] = "Sem nome";
-$a->strings["Remove authorization"] = "Remover autorização";
-$a->strings["No feature settings configured"] = "Não foi definida nenhuma configuração do recurso";
-$a->strings["Feature Settings"] = "Configurações do recurso";
-$a->strings["Account Settings"] = "Configurações da conta";
-$a->strings["Password Settings"] = "Configurações da senha";
-$a->strings["New Password:"] = "Nova senha:";
-$a->strings["Confirm:"] = "Confirme:";
-$a->strings["Leave password fields blank unless changing"] = "Deixe os campos de senha em branco, a não ser que você queira alterá-la";
-$a->strings["Email Address:"] = "Endereço de e-mail:";
-$a->strings["Remove Account"] = "Remover conta";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "Atenção: Esta ação é permanente e não pode ser revertida.";
-$a->strings["Off"] = "Desligado";
-$a->strings["On"] = "Ligado";
-$a->strings["Additional Features"] = "Recursos adicionais";
-$a->strings["Connector Settings"] = "Configurações do conector";
-$a->strings["Display Settings"] = "Configurações de exibição";
-$a->strings["Display Theme:"] = "Tema do perfil:";
-$a->strings["Mobile Theme:"] = "Tema móvel:";
-$a->strings["Update browser every xx seconds"] = "Atualizar navegador a cada xx segundos";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, sem máximo";
-$a->strings["Maximum number of conversations to load at any time:"] = "Número máximo permitido de conversas carregadas:";
-$a->strings["Maximum of 100 items"] = "Máximo de 100 itens";
-$a->strings["Don't show emoticons"] = "Não exibir emoticons";
-$a->strings["Do not view remote profiles in frames"] = "Não exibir perfis remotos em frames";
-$a->strings["By default open in a sub-window of your own site"] = "Por padrão, abrir em uma sub-janela do seu próprio site";
-$a->strings["Nobody except yourself"] = "Ninguém exceto você mesmo";
-$a->strings["Only those you specifically allow"] = "Apenas quem você der permissão";
-$a->strings["Anybody in your address book"] = "Qualquer um nos seus contatos";
-$a->strings["Anybody on this website"] = "Qualquer um neste site";
-$a->strings["Anybody in this network"] = "Qualquer um nesta rede";
-$a->strings["Anybody on the internet"] = "Qualquer um na internet";
-$a->strings["Publish your default profile in the network directory"] = "Publicar seu perfil padrão no diretório da rede?";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permitir sugerir você como amigo potencial para outros membros?";
-$a->strings["or"] = "ou";
-$a->strings["Your channel address is"] = "O endereço do seu canal é";
-$a->strings["Channel Settings"] = "Configurações do canal";
-$a->strings["Basic Settings"] = "Configurações básicas";
-$a->strings["Your Timezone:"] = "Seu fuso horário:";
-$a->strings["Default Post Location:"] = "Localização padrão de suas publicações:";
-$a->strings["Use Browser Location:"] = "Usar localizador do navegador:";
-$a->strings["Adult Content"] = "Conteúdo adulto";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)";
-$a->strings["Security and Privacy Settings"] = "Configurações de segurança e privacidade";
-$a->strings["Hide my online presence"] = "Esconda minha presença online";
-$a->strings["Prevents displaying in your profile that you are online"] = "Previne exibir em seu perfil que você está online";
-$a->strings["Simple Privacy Settings:"] = "Configurações de privacidade simples:";
-$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Muito público - extremamente permissivo (deve ser usado com cuidado)";
-$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)";
-$a->strings["Private - default private, never open or public"] = "Privado - privado por padrão, nunca aberto ou público";
-$a->strings["Blocked - default blocked to/from everybody"] = "Bloqueado - por padrão bloquado de/para todos";
-$a->strings["Advanced Privacy Settings"] = "Configurações de privacidade avançadas";
-$a->strings["Maximum Friend Requests/Day:"] = "Número máximo de requisições de amizade por dia:";
-$a->strings["May reduce spam activity"] = "Pode reduzir a frequência de spam";
-$a->strings["Default Post Permissions"] = "Permissões padrão de publicação";
-$a->strings["Maximum private messages per day from unknown people:"] = "Máximo número de mensagens privadas por dia de pessoas desconhecidas:";
-$a->strings["Useful to reduce spamming"] = "Útil para reduzir a frequência de spam";
-$a->strings["Notification Settings"] = "Configurações de notificação";
-$a->strings["By default post a status message when:"] = "Por padrão, publicar uma mensagem de status quando:";
-$a->strings["accepting a friend request"] = "aceitar um pedido de amizade";
-$a->strings["joining a forum/community"] = "associar-se a um fórum/comunidade";
-$a->strings["making an interesting profile change"] = "modificar algo interessante em seu perfil";
-$a->strings["Send a notification email when:"] = "Enviar um e-mail de notificação quando:";
-$a->strings["You receive an introduction"] = "Você recebeu uma apresentação";
-$a->strings["Your introductions are confirmed"] = "Suas solicitações forem confirmadas";
-$a->strings["Someone writes on your profile wall"] = "Alguém escrever no mural do seu perfil";
-$a->strings["Someone writes a followup comment"] = "Alguém comentou a sua mensagem";
-$a->strings["You receive a private message"] = "Você recebeu uma mensagem privada";
-$a->strings["You receive a friend suggestion"] = "Você recebe uma sugestão de amizade";
-$a->strings["You are tagged in a post"] = "Você é mencionado num post";
-$a->strings["You are poked/prodded/etc. in a post"] = "Você foi cutucado/espetado/etc. numa publicação";
-$a->strings["Advanced Account/Page Type Settings"] = "Configurações avançadas de conta/tipo de página";
-$a->strings["Change the behaviour of this account for special situations"] = "Mudar o comportamento dessa conta em situações especiais";
-$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) para ajustar!";
 $a->strings["Nothing to import."] = "Nada a importar.";
 $a->strings["Unable to download data from old server"] = "Não foi possível descarregar os dados do servidor antigo";
 $a->strings["Imported file is empty."] = "O arquivo importado está vazio.";
@@ -1509,6 +1516,7 @@ $a->strings["Private Conversation"] = "Conversa privada";
 $a->strings["Delete conversation"] = "Excluir conversa";
 $a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Comunicação segura indisponível. Você talvez consiga responder pela página de perfil do remetente.";
 $a->strings["Send Reply"] = "Enviar resposta";
+$a->strings["OpenID protocol error. No ID returned."] = "Erro do protocolo OpenID. Nenhuma ID retornada.";
 $a->strings["Edit Layout"] = "Editar layout";
 $a->strings["Delete layout?"] = "Deletar layout?";
 $a->strings["Delete Layout"] = "Deletar layout";
@@ -1637,7 +1645,7 @@ $a->strings["You have used %1$.2f Mbytes of photo storage."] = "Você usou %1$.2
 $a->strings["Upload Photos"] = "Enviar fotos";
 $a->strings["New album name: "] = "Novo nome de álbum: ";
 $a->strings["or existing album name: "] = "ou nome de um álbum já existente: ";
-$a->strings["Do not show a status post for this upload"] = "Não mostrar uma publicação de status para este carregamento";
+$a->strings["Do not show a status post for this upload"] = "Não exibir uma publicação de status para este carregamento";
 $a->strings["Contact Photos"] = "Fotos dos contatos";
 $a->strings["Edit Album"] = "Editar o álbum";
 $a->strings["Show Newest First"] = "Exibir primeiro os mais recentes";
-- 
cgit v1.2.3


From 59211e0ac82f285dde81cc2c384a5fb807241d20 Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo 
Date: Mon, 24 Feb 2014 17:47:57 -0300
Subject: Translation for jQuery.divgrow strings. Fix mismatch in
 jQuery.timeago strings

---
 include/js_strings.php  | 24 +++++++++++++-----------
 view/js/main.js         |  2 +-
 view/tpl/js_strings.tpl | 24 +++++++++++++-----------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/include/js_strings.php b/include/js_strings.php
index afa8f075a..2d96ca9d2 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -2,18 +2,20 @@
 
 function js_strings() {
 	return replace_macros(get_markup_template('js_strings.tpl'), array(
-		'$delitem'    => t('Delete this item?'),
-		'$comment'    => t('Comment'),
-		'$showmore'   => t('show more'),
-		'$showfewer'  => t('show fewer'),
-		'$pwshort'    => t("Password too short"),
-		'$pwnomatch'  => t("Passwords do not match"),
-		'$everybody'  => t('everybody'),
-		'$passphrase' => t('Secret Passphrase'),
-		'$passhint'   => t('Passphrase hint'),
+		'$delitem'     => t('Delete this item?'),
+		'$comment'     => t('Comment'),
+		'$showmore'    => t('show more'),
+		'$showfewer'   => t('show fewer'),
+		'$divgrowmore' => t('+ Show More'),
+		'$divgrowless' => t('- Show Less'),
+		'$pwshort'     => t("Password too short"),
+		'$pwnomatch'   => t("Passwords do not match"),
+		'$everybody'   => t('everybody'),
+		'$passphrase'  => t('Secret Passphrase'),
+		'$passhint'    => t('Passphrase hint'),
 
 		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'),
-		'$t02' => ((t('timeago.suffixAgo') != 'timeago.suffixAgo') ? t('timeago.suffixAgo') : 'null'),
+		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : 'null'),
 		'$t03' => t('ago'),
 		'$t04' => t('from now'),
 		'$t05' => t('less than a minute'),
@@ -32,4 +34,4 @@ function js_strings() {
 
 
 	));
-}
\ No newline at end of file
+}
diff --git a/view/js/main.js b/view/js/main.js
index fa96596f4..5f88ea9ca 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -535,7 +535,7 @@ function updateConvItems(mode,data) {
 		$(".wall-item-body").each(function() {
 				if($(this).height() > 410) {
 				if(! $(this).hasClass('divmore')) {
-					$(this).divgrow({ initialHeight: 400, showBrackets: false });
+					$(this).divgrow({ initialHeight: 400, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false });
 					$(this).addClass('divmore');
 				}
 			}					
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 9eb552767..cb0e8d24a 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -2,18 +2,20 @@
 
 	var aStr = {
 
-		'delitem'    : "{{$delitem}}",
-		'comment'    : "{{$comment}}",
-		'showmore'   : "{{$showmore}}",
-		'showfewer'  : "{{$showfewer}}",
-		'pwshort'    : "{{$pwshort}}",
-		'pwnomatch'  : "{{$pwnomatch}}",
-		'everybody'  : "{{$everybody}}",
-		'passphrase' : "{{$passphrase}}",
-		'passhint'   : "{{$passhint}}",
+		'delitem'     : "{{$delitem}}",
+		'comment'     : "{{$comment}}",
+		'showmore'    : "{{$showmore}}",
+		'showfewer'   : "{{$showfewer}}",
+		'divgrowmore' : "{{$divshowmore}}",
+		'divgrowless' : "{{$divshowless}}",
+		'pwshort'     : "{{$pwshort}}",
+		'pwnomatch'   : "{{$pwnomatch}}",
+		'everybody'   : "{{$everybody}}",
+		'passphrase'  : "{{$passphrase}}",
+		'passhint'    : "{{$passhint}}",
 
-		't01' :  {{$t01}},
-		't02' :  {{$t02}},
+		't01' : "{{$t01}}",
+		't02' : "{{$t02}}",
 		't03' : "{{$t03}}",
 		't04' : "{{$t04}}",
 		't05' : "{{$t05}}",
-- 
cgit v1.2.3


From 5bd71e4e4ddb28e85f3fc71d4cdf6763788da9d7 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 24 Feb 2014 14:19:21 -0800
Subject: set theme for un-viewable profile

---
 include/identity.php | 53 +++++++++++++++++++++++++++++++---------------------
 version.inc          |  2 +-
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 82fc5fbea..9aa7d98c0 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -486,12 +486,12 @@ function profile_load(&$a, $nickname, $profile = '') {
 	// get the current observer
 	$observer = $a->get_observer();
 
+	$can_view_profile = true;
+
 	// Can the observer see our profile?
 	require_once('include/permissions.php');
 	if(! perm_is_allowed($user[0]['channel_id'],$observer['xchan_hash'],'view_profile')) {
-		// permission denied
-		notice( t(' Sorry, you don\'t have the permission to view this profile. ') . EOL);
-		return;
+		$can_view_profile = false;
 	}
 
 	if(! $profile) {
@@ -502,10 +502,10 @@ function profile_load(&$a, $nickname, $profile = '') {
 		if($r)
 			$profile = $r[0]['abook_profile'];
 	}
-	$r = null;
+	$p = null;
 
 	if($profile) {
-		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
+		$p = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
 				LEFT JOIN channel ON profile.uid = channel.channel_id
 				WHERE channel.channel_address = '%s' AND profile.profile_guid = '%s' LIMIT 1",
 				dbesc($nickname),
@@ -513,7 +513,7 @@ function profile_load(&$a, $nickname, $profile = '') {
 		);
 	}
 
-	if(! $r) {
+	if(! $p) {
 		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
 			LEFT JOIN channel ON profile.uid = channel.channel_id
 			WHERE channel.channel_address = '%s' and not ( channel_pageflags & %d ) 
@@ -523,7 +523,7 @@ function profile_load(&$a, $nickname, $profile = '') {
 		);
 	}
 
-	if(! $r) {
+	if(! $p) {
 		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
 		notice( t('Requested profile is not available.') . EOL );
 		$a->error = 404;
@@ -532,37 +532,42 @@ function profile_load(&$a, $nickname, $profile = '') {
 	
 	// fetch user tags if this isn't the default profile
 
-	if(! $r[0]['is_default']) {
+	if(! $p[0]['is_default']) {
 		$x = q("select `keywords` from `profile` where uid = %d and `is_default` = 1 limit 1",
 				intval($profile_uid)
 		);
-		if($x)
-			$r[0]['keywords'] = $x[0]['keywords'];
+		if($x && $can_view_profile)
+			$p[0]['keywords'] = $x[0]['keywords'];
 	}
 
-	if($r[0]['keywords']) {
-		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$r[0]['keywords']);
-		if(strlen($keywords))
+	if($p[0]['keywords']) {
+		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$p[0]['keywords']);
+		if(strlen($keywords) && $can_view_profile)
 			$a->page['htmlhead'] .= '' . "\r\n" ;
 
 	}
 
-	$a->profile = $r[0];
-	$online = get_online_status($nickname);
-	$a->profile['online_status'] = $online['result'];
+	if($can_view_profile) {
+		$a->profile = $p[0];
+		$online = get_online_status($nickname);
+		$a->profile['online_status'] = $online['result'];
 
-	$a->profile_uid = $r[0]['profile_uid'];
+		$a->profile_uid = $p[0]['profile_uid'];
 
-	$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
+		$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
+	}
 
-	$a->profile['channel_mobile_theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
-	$_SESSION['theme'] = $a->profile['channel_theme'];
-	$_SESSION['mobile_theme'] = $a->profile['channel_mobile_theme'];
+	if(local_user()) {
+		$a->profile['channel_mobile_theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
+		$_SESSION['mobile_theme'] = $a->profile['channel_mobile_theme'];
+	}
 
 	/**
 	 * load/reload current theme info
 	 */
 
+	$_SESSION['theme'] = $p[0]['channel_theme'];
+
 	$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
 
 	$theme_info_file = "view/theme/".current_theme()."/php/theme.php";
@@ -570,6 +575,12 @@ function profile_load(&$a, $nickname, $profile = '') {
 		require_once($theme_info_file);
 	}
 
+	if(! $can_view_profile) {
+		// permission denied
+		notice( t(' Sorry, you don\'t have the permission to view this profile. ') . EOL);
+		return;
+	}
+
 	return;
 }
 
diff --git a/version.inc b/version.inc
index 490208526..adf85ba7e 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-23.597
+2014-02-24.598
-- 
cgit v1.2.3


From 29ebfc25ca4c7c475437dd02418eb6f4fc17c952 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 24 Feb 2014 15:07:00 -0800
Subject: take a p

---
 include/identity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/identity.php b/include/identity.php
index 9aa7d98c0..2e611625a 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -514,7 +514,7 @@ function profile_load(&$a, $nickname, $profile = '') {
 	}
 
 	if(! $p) {
-		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
+		$p = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
 			LEFT JOIN channel ON profile.uid = channel.channel_id
 			WHERE channel.channel_address = '%s' and not ( channel_pageflags & %d ) 
 			AND profile.is_default = 1 LIMIT 1",
-- 
cgit v1.2.3


From fdb25f3450a636b28aa640d096ae4feed308086e Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 24 Feb 2014 15:27:39 -0800
Subject: string 'null' showing up in timeago since last modify

---
 include/js_strings.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/js_strings.php b/include/js_strings.php
index 2d96ca9d2..cd0ee8c7c 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -14,8 +14,8 @@ function js_strings() {
 		'$passphrase'  => t('Secret Passphrase'),
 		'$passhint'    => t('Passphrase hint'),
 
-		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'),
-		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : 'null'),
+		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
+		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),
 		'$t03' => t('ago'),
 		'$t04' => t('from now'),
 		'$t05' => t('less than a minute'),
@@ -32,6 +32,5 @@ function js_strings() {
 		'$t16' => t(' '), // wordSeparator
 		'$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]')
 
-
 	));
 }
-- 
cgit v1.2.3


From 5691a609c407b0c70a38b3b1e17d5c070e985931 Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo 
Date: Tue, 25 Feb 2014 01:12:27 -0300
Subject: Fix typo that broke jquery.divgrow. Sorry I should have tested.

---
 view/tpl/js_strings.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index cb0e8d24a..fe5228ee9 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -6,8 +6,8 @@
 		'comment'     : "{{$comment}}",
 		'showmore'    : "{{$showmore}}",
 		'showfewer'   : "{{$showfewer}}",
-		'divgrowmore' : "{{$divshowmore}}",
-		'divgrowless' : "{{$divshowless}}",
+		'divgrowmore' : "{{$divgrowmore}}",
+		'divgrowless' : "{{$divgrowless}}",
 		'pwshort'     : "{{$pwshort}}",
 		'pwnomatch'   : "{{$pwnomatch}}",
 		'everybody'   : "{{$everybody}}",
-- 
cgit v1.2.3


From 2becbae4022f6c418aa455e7477c00560bcd8b41 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 24 Feb 2014 20:46:52 -0800
Subject: remote "add bookmark" - like rpost but saves a bookmark from a remote
 hub into one of your own bookmark folders (or a new one if desired).

---
 boot.php              |   6 +--
 include/bookmarks.php |  33 +++++++++++----
 mod/rbmark.php        | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mod/rpost.php         |   2 +-
 view/tpl/rbmark.tpl   |  16 ++++++++
 5 files changed, 156 insertions(+), 13 deletions(-)
 create mode 100644 mod/rbmark.php
 create mode 100644 view/tpl/rbmark.tpl

diff --git a/boot.php b/boot.php
index be6b5c84b..fbab83f05 100755
--- a/boot.php
+++ b/boot.php
@@ -307,9 +307,9 @@ define ( 'ATTACH_FLAG_OS',     0x0002);
 
 
 
-define ( 'MENU_ITEM_ZID',      0x0001);
-define ( 'MENU_ITEM_NEWWIN',   0x0002);
-
+define ( 'MENU_ITEM_ZID',       0x0001);
+define ( 'MENU_ITEM_NEWWIN',    0x0002);
+define ( 'MENU_ITEM_CHATROOM',  0x0004);
 
 /**
  * Poll/Survey types
diff --git a/include/bookmarks.php b/include/bookmarks.php
index 99cb60e64..895dedaff 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -2,7 +2,17 @@
 
 require_once('include/menu.php');
 
-function bookmark_add($channel,$sender,$taxonomy,$private) {
+function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) {
+
+	$menu_id = 0;
+	$menu_name = '';
+	$ischat = false;
+
+	if(is_array($opts)) {
+		$menu_id = ((x($opts,'menu_id')) ? intval($opt['menu_id']) : 0);
+		$menu_name = ((x($opts,'menu_name')) ? escape_tags($opts['menu_name']) : '');
+		$ischat = ((x($opts,'ischat')) ? intval($opts['ischat']) : 0);
+	}
 
 	$iarr = array();
 	$channel_id = $channel['channel_id'];
@@ -11,7 +21,7 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 		$iarr['contact_allow'] = array($channel['channel_hash']); 
 	$iarr['mitem_link'] = $taxonomy['url'];
 	$iarr['mitem_desc'] = $taxonomy['term'];
-	$iarr['mitem_flags'] = 0;
+	$iarr['mitem_flags'] = (($ischat) ? MENU_ITEM_CHATROOM : 0);
 
 	$m = @parse_url($taxonomy['url']);
     $zrl = false;
@@ -27,16 +37,20 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 		$iarr['mitem_flags'] |= MENU_ITEM_ZID;
 
 	$arr = array();
-	$arr['menu_name'] = substr($sender['xchan_hash'],0,16) . ' ' . $sender['xchan_name'];
+	if(! $menu_name)
+		$arr['menu_name'] = substr($sender['xchan_hash'],0,16) . ' ' . $sender['xchan_name'];
 	$arr['menu_desc'] = sprintf( t('%1$s\'s bookmarks'), $sender['xchan_name']);
 	$arr['menu_flags'] = (($sender['xchan_hash'] === $channel['channel_hash']) ? MENU_BOOKMARK : MENU_SYSTEM|MENU_BOOKMARK);
 	$arr['menu_channel_id'] = $channel_id;
 
-	$x = menu_list($arr['menu_channel_id'],$arr['menu_name'],$arr['menu_flags']);
-	if($x) 
-		$menu_id = $x[0]['menu_id'];
-	else 
-		$menu_id = menu_create($arr);
+	if(! $menu_id) {
+		$x = menu_list($arr['menu_channel_id'],$arr['menu_name'],$arr['menu_flags']);
+		if($x) 
+			$menu_id = $x[0]['menu_id'];
+		else 
+			$menu_id = menu_create($arr);
+	}
+
 	if(! $menu_id) {
 		logger('bookmark_add: unable to create menu ' . $arr['menu_name']);
 		return; 
@@ -51,5 +65,6 @@ function bookmark_add($channel,$sender,$taxonomy,$private) {
 		logger('add_bookmark: duplicate menu entry', LOGGER_DEBUG);
 	if(! $r)
 		$r = menu_add_item($menu_id,$channel_id,$iarr);
+
 	return $r;
-}
\ No newline at end of file
+}
diff --git a/mod/rbmark.php b/mod/rbmark.php
new file mode 100644
index 000000000..1c962152c
--- /dev/null
+++ b/mod/rbmark.php
@@ -0,0 +1,112 @@
+get_channel();
+
+	$t = array('url' => escape_tags($_REQUEST['url']),'term' => escape_tags($_REQUEST['title']));
+	bookmark_add($channel,$channel,$t,((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0),
+		array('menu_id' => ((x($_REQUEST,'menu_id')) ? intval($_REQUEST['menu_id']) : 0),
+			'menu_name' => ((x($_REQUEST,'menu_name')) ? escape_tags($_REQUEST['menu_name']) : '')
+		));
+
+	goaway(z_root() . '/bookmarks');
+
+}
+
+
+function rbmark_content(&$a) {
+
+	$o = '';
+
+	if(! local_user()) {
+
+		// The login procedure is going to bugger our $_REQUEST variables
+		// so save them in the session.
+
+		if(array_key_exists('url',$_REQUEST)) {
+			$_SESSION['bookmark'] = $_REQUEST;
+		}
+		return login();
+	}
+
+	// If we have saved rbmark session variables, but nothing in the current $_REQUEST, recover the saved variables
+
+	if((! array_key_exists('url',$_REQUEST)) && (array_key_exists('bookmark',$_SESSION))) {
+		$_REQUEST = $_SESSION['bookmark'];
+		unset($_SESSION['bookmark']);
+	}
+
+	if($_REQUEST['remote_return']) {
+		$_SESSION['remote_return'] = $_REQUEST['remote_return'];
+	}
+	if(argc() > 1 && argv(1) === 'return') {
+		if($_SESSION['remote_return'])
+			goaway($_SESSION['remote_return']);
+		goaway(z_root() . '/bookmarks');
+	}
+
+	$channel = $a->get_channel();
+
+	$m = menu_list($channel,'',MENU_BOOKMARK);
+	$menus = array();
+	if($m) {
+		$menus = array(0 => '');
+		foreach($m as $n) {
+			$menus[$n['menu_id']] = $n['menu_name'];
+		}
+	}
+	$menu_select = array('menu_id',t('Select a bookmark folder'),false,'',$menus);
+
+
+	$o .= replace_macros(get_markup_template('rbmark.tpl'), array(
+
+		'$header' => t('Save Bookmark'),
+		'$url' => array('url',t('URL of bookmark'),escape_tags($_REQUEST['url'])),
+		'$title' => array('title',t('Description'),escape_tags($_REQUEST['title'])),
+		'$ischat' => (($ischat) ? 1 : 0),
+		'$private' => (($private) ? 1 : 0),
+		'$submit' => t('Save'),
+		'$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'',''),
+		'$menus' => $menu_select
+
+	));
+
+
+
+
+
+
+	return $o;
+
+}
+
+
diff --git a/mod/rpost.php b/mod/rpost.php
index 852a57d78..18d4c86cd 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -33,7 +33,7 @@ function rpost_content(&$a) {
 		if(remote_user()) {
 			// redirect to your own site.
 			// We can only do this with a GET request so you'll need to keep the text short or risk getting truncated
-			// by the wretched beast called 'shusoin'. All the browsers now allow long GET requests, but suhosin
+			// by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin
 			// blocks them.
 
 			$url = get_rpost_path($a->get_observer());
diff --git a/view/tpl/rbmark.tpl b/view/tpl/rbmark.tpl
new file mode 100644
index 000000000..bead1de2f
--- /dev/null
+++ b/view/tpl/rbmark.tpl
@@ -0,0 +1,16 @@
+
                                      {{$header}}
                                      
+
+
+
                                      
+
+
+
+
+{{include file="field_input.tpl" field=$url}}
+{{include file="field_input.tpl" field=$title}}
+{{include file="field_select.tpl" field=$menus}}
+{{include file="field_input.tpl" field=$menu_name}}
+
+
+
+
                                      
-- 
cgit v1.2.3


From b1021df485fb6129acda5bba616bac10aea75a45 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 24 Feb 2014 21:34:49 -0800
Subject: provide ability to bookmark chatrooms using rbmark

---
 include/bookmarks.php | 19 +++++++++++++++++--
 mod/chat.php          | 16 +++++++++++++++-
 view/tpl/chat.tpl     |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/include/bookmarks.php b/include/bookmarks.php
index 895dedaff..21a775f9a 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -37,9 +37,13 @@ function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) {
 		$iarr['mitem_flags'] |= MENU_ITEM_ZID;
 
 	$arr = array();
-	if(! $menu_name)
+	if(! $menu_name) {
 		$arr['menu_name'] = substr($sender['xchan_hash'],0,16) . ' ' . $sender['xchan_name'];
-	$arr['menu_desc'] = sprintf( t('%1$s\'s bookmarks'), $sender['xchan_name']);
+		$arr['menu_desc'] = sprintf( t('%1$s\'s bookmarks'), $sender['xchan_name']);
+	}
+	else {
+		$arr['menu_name'] = $arr['menu_desc'] = $menu_name;
+	}
 	$arr['menu_flags'] = (($sender['xchan_hash'] === $channel['channel_hash']) ? MENU_BOOKMARK : MENU_SYSTEM|MENU_BOOKMARK);
 	$arr['menu_channel_id'] = $channel_id;
 
@@ -68,3 +72,14 @@ function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) {
 
 	return $r;
 }
+
+function get_bookmark_link($observer) {
+
+	if((! $observer) || ($observer['xchan_network'] !== 'zot'))
+		return '';
+
+	$h = @parse_url($observer['xchan_url']);
+	if($h)
+		return $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '') . '/rbmark?f=';
+	return '';
+}
diff --git a/mod/chat.php b/mod/chat.php
index a960f4f37..0f2b94b9d 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -1,6 +1,7 @@
 get_channel();
 
+	$ob = $a->get_observer();
 	$observer = get_observer_hash();
 	if(! $observer) {
 		notice( t('Permission denied.') . EOL);
@@ -144,6 +146,8 @@ function chat_content(&$a) {
 
 	if(argc() > 2 && intval(argv(2))) {
 		$room_id = intval(argv(2));
+		$bookmark_link = get_bookmark_link($ob);
+
 		$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
 		if(! $x)
 			return;
@@ -152,8 +156,16 @@ function chat_content(&$a) {
 			intval($a->profile['profile_uid'])
 		);
 		if($x) {
+			$private = ((($x[0]['allow_cid']) || ($x[0]['allow_gid']) || ($x[0]['deny_cid']) || ($x[0]['deny_gid'])) ? true : false);
 			$room_name = $x[0]['cr_name'];
+			if($bookmark_link)
+				$bookmark_link .= '&url=' . z_root() . '/chat/' . argv(1) . '/' . argv(2) . '&title=' . urlencode($x[0]['cr_name']) . (($private) ? '&private=1' : '') . '&ischat=1'; 
+		}
+		else {
+			notice( t('Room not found') . EOL);
+			return;
 		}
+
 		$o = replace_macros(get_markup_template('chat.tpl'),array(
 			'$room_name' => $room_name,
 			'$room_id' => $room_id,
@@ -162,7 +174,9 @@ function chat_content(&$a) {
 			'$submit' => t('Submit'),
 			'$leave' => t('Leave Room'),
 			'$away' => t('I am away right now'),
-			'$online' => t('I am online')
+			'$online' => t('I am online'),
+			'$bookmark_link' => $bookmark_link,
+			'$bookmark' => t('Bookmark this room')
 
 		));
 		return $o;
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 51aeb836e..acb7e5bef 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -17,7 +17,7 @@
             
         
 
-		{{$leave}} | {{$away}} | {{$online}}
+		{{$leave}} | {{$away}} | {{$online}}{{if $bookmark_link}} | {{$bookmark}}{{/if}}
 
     
 
-- 
cgit v1.2.3